tmk
7 years ago
100 changed files with 4564 additions and 901 deletions
+ 4
- 0
README.md
View File
| @@ -7,6 +7,10 @@ The latest source code is available here: <http://github.com/tmk/tmk_keyboard> | |||
| Updates | |||
| ------- | |||
| #### 2016/06/26 | |||
| Keymap framework was updated. `fn_actions[]` should be defined as `action_t` instead of `uint16_t`. And default code for keymap handling is now included in core you just need define `uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS]` and `action_t fn_actions[]`. | |||
| #### 2016/06/22 | |||
| Some projects were moved from `converter` and `keyboard` to `orphan` directory. Those might be removed in some future but you will be able to access them with `orphans` tag. See <https://github.com/tmk/tmk_keyboard/issues/173> | |||
+ 31
- 55
converter/adb_usb/Makefile
View File
| @@ -1,64 +1,17 @@ | |||
| #---------------------------------------------------------------------------- | |||
| # On command line: | |||
| # | |||
| # make all = Make software. | |||
| # | |||
| # make clean = Clean out built project files. | |||
| # | |||
| # make coff = Convert ELF to AVR COFF. | |||
| # | |||
| # make extcoff = Convert ELF to AVR Extended COFF. | |||
| # | |||
| # make program = Download the hex file to the device. | |||
| # Please customize your programmer settings(PROGRAM_CMD) | |||
| # | |||
| # make teensy = Download the hex file to the device, using teensy_loader_cli. | |||
| # (must have teensy_loader_cli installed). | |||
| # | |||
| # make dfu = Download the hex file to the device, using dfu-programmer (must | |||
| # have dfu-programmer installed). | |||
| # | |||
| # make flip = Download the hex file to the device, using Atmel FLIP (must | |||
| # have Atmel FLIP installed). | |||
| # | |||
| # make dfu-ee = Download the eeprom file to the device, using dfu-programmer | |||
| # (must have dfu-programmer installed). | |||
| # | |||
| # make flip-ee = Download the eeprom file to the device, using Atmel FLIP | |||
| # (must have Atmel FLIP installed). | |||
| # | |||
| # make debug = Start either simulavr or avarice as specified for debugging, | |||
| # with avr-gdb or avr-insight as the front end for debugging. | |||
| # | |||
| # make filename.s = Just compile filename.c into the assembler code only. | |||
| # | |||
| # make filename.i = Create a preprocessed source file for use in submitting | |||
| # bug reports to the GCC project. | |||
| # | |||
| # To rebuild project do "make clean" then "make all". | |||
| #---------------------------------------------------------------------------- | |||
| # Target file name (without extension). | |||
| TARGET = adb_usb_lufa | |||
| TARGET ?= adb_usb | |||
| # Directory common source filess exist | |||
| TMK_DIR = ../../tmk_core | |||
| TMK_DIR ?= ../../tmk_core | |||
| # Directory keyboard dependent files exist | |||
| TARGET_DIR = . | |||
| TARGET_DIR ?= . | |||
| # project specific files | |||
| SRC = keymap_common.c \ | |||
| matrix.c \ | |||
| SRC ?= matrix.c \ | |||
| led.c \ | |||
| adb.c | |||
| ifdef KEYMAP | |||
| SRC := keymap_$(KEYMAP).c $(SRC) | |||
| else | |||
| SRC := keymap_plain.c $(SRC) | |||
| endif | |||
| CONFIG_H = config.h | |||
| @@ -66,7 +19,7 @@ CONFIG_H = config.h | |||
| # atmega32u4 Teensy2.0 | |||
| # atemga32u4 TMK Converter rev.1 | |||
| # atemga32u2 TMK Converter rev.2 | |||
| MCU = atmega32u2 | |||
| MCU ?= atmega32u2 | |||
| # Processor frequency. | |||
| # This will define a symbol, F_CPU, in all source code files equal to the | |||
| @@ -79,14 +32,14 @@ MCU = atmega32u2 | |||
| # does not *change* the processor frequency - it should merely be updated to | |||
| # reflect the processor speed set externally so that the code can use accurate | |||
| # software delays. | |||
| F_CPU = 16000000 | |||
| F_CPU ?= 16000000 | |||
| # | |||
| # LUFA specific | |||
| # | |||
| # Target architecture (see library "Board Types" documentation). | |||
| ARCH = AVR8 | |||
| ARCH ?= AVR8 | |||
| # Input clock frequency. | |||
| # This will define a symbol, F_USB, in all source code files equal to the | |||
| @@ -99,7 +52,7 @@ ARCH = AVR8 | |||
| # | |||
| # If no clock division is performed on the input clock inside the AVR (via the | |||
| # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. | |||
| F_USB = $(F_CPU) | |||
| F_USB ?= $(F_CPU) | |||
| # Interrupt driven control endpoint task(+60) | |||
| OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT | |||
| @@ -125,6 +78,9 @@ COMMAND_ENABLE = yes # Commands for debug and configuration | |||
| #SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend | |||
| #NKRO_ENABLE = yes # USB Nkey Rollover | |||
| ADB_MOUSE_ENABLE = yes | |||
| #UNIMAP_ENABLE = yes | |||
| #ACTIONMAP_ENABLE = yes # Use 16bit actionmap instead of 8bit keymap | |||
| #KEYMAP_SECTION_ENABLE = yes # fixed address keymap for keymap editor | |||
| # ADB Mice need acceleration for todays much bigger screens. | |||
| OPT_DEFS += -DADB_MOUSE_MAXACC=8 | |||
| @@ -133,6 +89,26 @@ OPT_DEFS += -DADB_MOUSE_MAXACC=8 | |||
| # Optimize size but this may cause error "relocation truncated to fit" | |||
| #EXTRALDFLAGS = -Wl,--relax | |||
| # | |||
| # Keymap file | |||
| # | |||
| ifdef UNIMAP_ENABLE | |||
| KEYMAP_FILE = unimap | |||
| else | |||
| ifdef ACTIONMAP_ENABLE | |||
| KEYMAP_FILE = actionmap | |||
| else | |||
| KEYMAP_FILE = keymap | |||
| endif | |||
| endif | |||
| ifdef KEYMAP | |||
| SRC := $(KEYMAP_FILE)_$(KEYMAP).c $(SRC) | |||
| else | |||
| SRC := $(KEYMAP_FILE)_plain.c $(SRC) | |||
| endif | |||
| # Search Path | |||
| VPATH += $(TARGET_DIR) | |||
| VPATH += $(TMK_DIR) | |||
+ 2
- 142
converter/adb_usb/Makefile.rev1
View File
| @@ -1,143 +1,3 @@ | |||
| #---------------------------------------------------------------------------- | |||
| # On command line: | |||
| # | |||
| # make all = Make software. | |||
| # | |||
| # make clean = Clean out built project files. | |||
| # | |||
| # make coff = Convert ELF to AVR COFF. | |||
| # | |||
| # make extcoff = Convert ELF to AVR Extended COFF. | |||
| # | |||
| # make program = Download the hex file to the device. | |||
| # Please customize your programmer settings(PROGRAM_CMD) | |||
| # | |||
| # make teensy = Download the hex file to the device, using teensy_loader_cli. | |||
| # (must have teensy_loader_cli installed). | |||
| # | |||
| # make dfu = Download the hex file to the device, using dfu-programmer (must | |||
| # have dfu-programmer installed). | |||
| # | |||
| # make flip = Download the hex file to the device, using Atmel FLIP (must | |||
| # have Atmel FLIP installed). | |||
| # | |||
| # make dfu-ee = Download the eeprom file to the device, using dfu-programmer | |||
| # (must have dfu-programmer installed). | |||
| # | |||
| # make flip-ee = Download the eeprom file to the device, using Atmel FLIP | |||
| # (must have Atmel FLIP installed). | |||
| # | |||
| # make debug = Start either simulavr or avarice as specified for debugging, | |||
| # with avr-gdb or avr-insight as the front end for debugging. | |||
| # | |||
| # make filename.s = Just compile filename.c into the assembler code only. | |||
| # | |||
| # make filename.i = Create a preprocessed source file for use in submitting | |||
| # bug reports to the GCC project. | |||
| # | |||
| # To rebuild project do "make clean" then "make all". | |||
| #---------------------------------------------------------------------------- | |||
| # Target file name (without extension). | |||
| TARGET = adb_usb_lufa | |||
| # Directory common source filess exist | |||
| TMK_DIR = ../../tmk_core | |||
| # Directory keyboard dependent files exist | |||
| TARGET_DIR = . | |||
| # project specific files | |||
| SRC = keymap_common.c \ | |||
| matrix.c \ | |||
| led.c \ | |||
| adb.c | |||
| ifdef KEYMAP | |||
| SRC := keymap_$(KEYMAP).c $(SRC) | |||
| else | |||
| SRC := keymap_ansi.c $(SRC) | |||
| endif | |||
| CONFIG_H = config.h | |||
| # MCU name | |||
| # atmega32u4 Teensy2.0 | |||
| # atemga32u4 TMK Converter rev.1 | |||
| # atemga32u2 TMK Converter rev.2 | |||
| TARGET = adb_usb_rev1 | |||
| MCU = atmega32u4 | |||
| # Processor frequency. | |||
| # This will define a symbol, F_CPU, in all source code files equal to the | |||
| # processor frequency in Hz. You can then use this symbol in your source code to | |||
| # calculate timings. Do NOT tack on a 'UL' at the end, this will be done | |||
| # automatically to create a 32-bit value in your source code. | |||
| # | |||
| # This will be an integer division of F_USB below, as it is sourced by | |||
| # F_USB after it has run through any CPU prescalers. Note that this value | |||
| # does not *change* the processor frequency - it should merely be updated to | |||
| # reflect the processor speed set externally so that the code can use accurate | |||
| # software delays. | |||
| F_CPU = 16000000 | |||
| # | |||
| # LUFA specific | |||
| # | |||
| # Target architecture (see library "Board Types" documentation). | |||
| ARCH = AVR8 | |||
| # Input clock frequency. | |||
| # This will define a symbol, F_USB, in all source code files equal to the | |||
| # input clock frequency (before any prescaling is performed) in Hz. This value may | |||
| # differ from F_CPU if prescaling is used on the latter, and is required as the | |||
| # raw input clock is fed directly to the PLL sections of the AVR for high speed | |||
| # clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' | |||
| # at the end, this will be done automatically to create a 32-bit value in your | |||
| # source code. | |||
| # | |||
| # If no clock division is performed on the input clock inside the AVR (via the | |||
| # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. | |||
| F_USB = $(F_CPU) | |||
| # Interrupt driven control endpoint task(+60) | |||
| OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT | |||
| # Boot Section Size in *bytes* | |||
| # Teensy halfKay 512 | |||
| # Teensy++ halfKay 1024 | |||
| # Atmel DFU loader 4096 for TMK Converter rev.1/rev.2 | |||
| # LUFA bootloader 4096 | |||
| # USBaspLoader 2048 | |||
| OPT_DEFS += -DBOOTLOADER_SIZE=4096 | |||
| # Build Options | |||
| # comment out to disable the options. | |||
| # | |||
| #BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) | |||
| MOUSEKEY_ENABLE = yes # Mouse keys(+4700) | |||
| EXTRAKEY_ENABLE = yes # Audio control and System control(+450) | |||
| CONSOLE_ENABLE = yes # Console for debug(+400) | |||
| COMMAND_ENABLE = yes # Commands for debug and configuration | |||
| #SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend | |||
| #NKRO_ENABLE = yes # USB Nkey Rollover | |||
| ADB_MOUSE_ENABLE = yes | |||
| # ADB Mice need acceleration for todays much bigger screens. | |||
| OPT_DEFS += -DADB_MOUSE_MAXACC=8 | |||
| # Optimize size but this may cause error "relocation truncated to fit" | |||
| #EXTRALDFLAGS = -Wl,--relax | |||
| # Search Path | |||
| VPATH += $(TARGET_DIR) | |||
| VPATH += $(TMK_DIR) | |||
| include $(TMK_DIR)/protocol/lufa.mk | |||
| include $(TMK_DIR)/protocol.mk | |||
| include $(TMK_DIR)/common.mk | |||
| include $(TMK_DIR)/rules.mk | |||
| include Makefile | |||
+ 2
- 142
converter/adb_usb/Makefile.teensy
View File
| @@ -1,143 +1,3 @@ | |||
| #---------------------------------------------------------------------------- | |||
| # On command line: | |||
| # | |||
| # make all = Make software. | |||
| # | |||
| # make clean = Clean out built project files. | |||
| # | |||
| # make coff = Convert ELF to AVR COFF. | |||
| # | |||
| # make extcoff = Convert ELF to AVR Extended COFF. | |||
| # | |||
| # make program = Download the hex file to the device. | |||
| # Please customize your programmer settings(PROGRAM_CMD) | |||
| # | |||
| # make teensy = Download the hex file to the device, using teensy_loader_cli. | |||
| # (must have teensy_loader_cli installed). | |||
| # | |||
| # make dfu = Download the hex file to the device, using dfu-programmer (must | |||
| # have dfu-programmer installed). | |||
| # | |||
| # make flip = Download the hex file to the device, using Atmel FLIP (must | |||
| # have Atmel FLIP installed). | |||
| # | |||
| # make dfu-ee = Download the eeprom file to the device, using dfu-programmer | |||
| # (must have dfu-programmer installed). | |||
| # | |||
| # make flip-ee = Download the eeprom file to the device, using Atmel FLIP | |||
| # (must have Atmel FLIP installed). | |||
| # | |||
| # make debug = Start either simulavr or avarice as specified for debugging, | |||
| # with avr-gdb or avr-insight as the front end for debugging. | |||
| # | |||
| # make filename.s = Just compile filename.c into the assembler code only. | |||
| # | |||
| # make filename.i = Create a preprocessed source file for use in submitting | |||
| # bug reports to the GCC project. | |||
| # | |||
| # To rebuild project do "make clean" then "make all". | |||
| #---------------------------------------------------------------------------- | |||
| # Target file name (without extension). | |||
| TARGET = adb_usb_lufa | |||
| # Directory common source filess exist | |||
| TMK_DIR = ../../tmk_core | |||
| # Directory keyboard dependent files exist | |||
| TARGET_DIR = . | |||
| # project specific files | |||
| SRC = keymap_common.c \ | |||
| matrix.c \ | |||
| led.c \ | |||
| adb.c | |||
| ifdef KEYMAP | |||
| SRC := keymap_$(KEYMAP).c $(SRC) | |||
| else | |||
| SRC := keymap_ansi.c $(SRC) | |||
| endif | |||
| CONFIG_H = config.h | |||
| # MCU name | |||
| # atmega32u4 Teensy2.0 | |||
| # atemga32u4 TMK Converter rev.1 | |||
| # atemga32u2 TMK Converter rev.2 | |||
| TARGET = adb_usb_teensy | |||
| MCU = atmega32u4 | |||
| # Processor frequency. | |||
| # This will define a symbol, F_CPU, in all source code files equal to the | |||
| # processor frequency in Hz. You can then use this symbol in your source code to | |||
| # calculate timings. Do NOT tack on a 'UL' at the end, this will be done | |||
| # automatically to create a 32-bit value in your source code. | |||
| # | |||
| # This will be an integer division of F_USB below, as it is sourced by | |||
| # F_USB after it has run through any CPU prescalers. Note that this value | |||
| # does not *change* the processor frequency - it should merely be updated to | |||
| # reflect the processor speed set externally so that the code can use accurate | |||
| # software delays. | |||
| F_CPU = 16000000 | |||
| # | |||
| # LUFA specific | |||
| # | |||
| # Target architecture (see library "Board Types" documentation). | |||
| ARCH = AVR8 | |||
| # Input clock frequency. | |||
| # This will define a symbol, F_USB, in all source code files equal to the | |||
| # input clock frequency (before any prescaling is performed) in Hz. This value may | |||
| # differ from F_CPU if prescaling is used on the latter, and is required as the | |||
| # raw input clock is fed directly to the PLL sections of the AVR for high speed | |||
| # clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' | |||
| # at the end, this will be done automatically to create a 32-bit value in your | |||
| # source code. | |||
| # | |||
| # If no clock division is performed on the input clock inside the AVR (via the | |||
| # CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. | |||
| F_USB = $(F_CPU) | |||
| # Interrupt driven control endpoint task(+60) | |||
| OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT | |||
| # Boot Section Size in *bytes* | |||
| # Teensy halfKay 512 | |||
| # Teensy++ halfKay 1024 | |||
| # Atmel DFU loader 4096 for TMK Converter rev.1/rev.2 | |||
| # LUFA bootloader 4096 | |||
| # USBaspLoader 2048 | |||
| OPT_DEFS += -DBOOTLOADER_SIZE=512 | |||
| # Build Options | |||
| # comment out to disable the options. | |||
| # | |||
| #BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) | |||
| MOUSEKEY_ENABLE = yes # Mouse keys(+4700) | |||
| EXTRAKEY_ENABLE = yes # Audio control and System control(+450) | |||
| CONSOLE_ENABLE = yes # Console for debug(+400) | |||
| COMMAND_ENABLE = yes # Commands for debug and configuration | |||
| #SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend | |||
| #NKRO_ENABLE = yes # USB Nkey Rollover | |||
| ADB_MOUSE_ENABLE = yes | |||
| # ADB Mice need acceleration for todays much bigger screens. | |||
| OPT_DEFS += -DADB_MOUSE_MAXACC=8 | |||
| # Optimize size but this may cause error "relocation truncated to fit" | |||
| #EXTRALDFLAGS = -Wl,--relax | |||
| # Search Path | |||
| VPATH += $(TARGET_DIR) | |||
| VPATH += $(TMK_DIR) | |||
| include $(TMK_DIR)/protocol/lufa.mk | |||
| include $(TMK_DIR)/protocol.mk | |||
| include $(TMK_DIR)/common.mk | |||
| include $(TMK_DIR)/rules.mk | |||
| include Makefile | |||
+ 4
- 0
converter/adb_usb/Makefile.unimap
View File
| @@ -0,0 +1,4 @@ | |||
| TARGET = adb_usb_unimap | |||
| UNIMAP_ENABLE = yes | |||
| KEYMAP_SECTION_ENABLE = yes | |||
| include Makefile | |||
+ 3
- 3
converter/adb_usb/README.md
View File
| @@ -1,10 +1,10 @@ | |||
| ADB to USB keyboard converter | |||
| ============================= | |||
| This firmware converts Apple ADB keyboard protocol to USB. You can use TMK Converter, PJRC Teensy2.0 and other USB AVR MCU(ATMega32U4, AT90USB64/128 or etc) for this. But binary size is probably more than 10KB and it won't fit into 8K flash. | |||
| This firmware converts Apple ADB keyboard protocol to USB, you can use it to plug old ADB keyboard into modern computer. It works on TMK ADB-USB Converter, PJRC Teensy2.0 and other USB AVR MCU(ATMega32U4, AT90USB64/128 or etc) and needs more than 10KB flash at least. | |||
| Discuss: http://geekhack.org/showwiki.php?title=Island:14290 | |||
| Discuss here: http://geekhack.org/showwiki.php?title=Island:14290 | |||
| TMK Converter: https://geekhack.org/index.php?topic=72052.0 | |||
| You can buy a TMK converter here: https://geekhack.org/index.php?topic=72052.0 | |||
+ 1287
- 0
converter/adb_usb/binary/adb_usb_rev1_unimap.hex
File diff suppressed because it is too large
View File
+ 1277
- 0
converter/adb_usb/binary/adb_usb_rev2_unimap.hex
File diff suppressed because it is too large
View File
+ 0
- 4
converter/adb_usb/config.h
View File
| @@ -40,10 +40,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| #define LOCKING_RESYNC_ENABLE | |||
| /* legacy keymap support */ | |||
| #define USE_LEGACY_KEYMAP | |||
| /* ADB port setting */ | |||
| #define ADB_PORT PORTD | |||
| #define ADB_PIN PIND | |||
+ 1
- 1
converter/adb_usb/keymap_ansi.c
View File
| @@ -12,5 +12,5 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| ), | |||
| }; | |||
| const uint16_t PROGMEM fn_actions[] = { | |||
| const action_t PROGMEM fn_actions[] = { | |||
| }; | |||
+ 0
- 30
converter/adb_usb/keymap_common.c
View File
| @@ -1,30 +0,0 @@ | |||
| /* | |||
| Copyright 2011,2012,2013 Jun Wako <[email protected]> | |||
| This program is free software: you can redistribute it and/or modify | |||
| it under the terms of the GNU General Public License as published by | |||
| the Free Software Foundation, either version 2 of the License, or | |||
| (at your option) any later version. | |||
| This program is distributed in the hope that it will be useful, | |||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| GNU General Public License for more details. | |||
| You should have received a copy of the GNU General Public License | |||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| */ | |||
| #include "keymap_common.h" | |||
| /* translates key to keycode */ | |||
| uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) | |||
| { | |||
| return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); | |||
| } | |||
| /* translates Fn keycode to action */ | |||
| action_t keymap_fn_to_action(uint8_t keycode) | |||
| { | |||
| return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) }; | |||
| } | |||
+ 0
- 5
converter/adb_usb/keymap_common.h
View File
| @@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| #include <stdint.h> | |||
| #include <stdbool.h> | |||
| #include <avr/pgmspace.h> | |||
| #include "keycode.h" | |||
| #include "action.h" | |||
| #include "action_macro.h" | |||
| @@ -29,10 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| #include "keymap.h" | |||
| extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; | |||
| extern const uint16_t fn_actions[]; | |||
| /* Common layout: ANSI+ISO | |||
| * ,---. .---------------. ,---------------. ,---------------. ,-----------. ,---------------. | |||
| * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| |VDn|VUp|Mut|Pwr| | |||
+ 1
- 1
converter/adb_usb/keymap_hasu.c
View File
| @@ -53,6 +53,6 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| ), | |||
| }; | |||
| const uint16_t PROGMEM fn_actions[] = { | |||
| const action_t PROGMEM fn_actions[] = { | |||
| [0] = ACTION_LAYER_TAP_KEY(1, KC_BSLS), | |||
| }; | |||
+ 1
- 1
converter/adb_usb/keymap_iso.c
View File
| @@ -12,5 +12,5 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| ), | |||
| }; | |||
| const uint16_t PROGMEM fn_actions[] = { | |||
| const action_t PROGMEM fn_actions[] = { | |||
| }; | |||
+ 1
- 1
converter/adb_usb/keymap_plain.c
View File
| @@ -36,7 +36,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| ), | |||
| }; | |||
| const uint16_t PROGMEM fn_actions[] = { | |||
| const action_t PROGMEM fn_actions[] = { | |||
| [0] = ACTION_LAYER_TAP_KEY(1, KC_GRV), | |||
| [1] = ACTION_LAYER_TAP_KEY(1, KC_BSLS), | |||
| }; | |||
+ 213
- 0
converter/adb_usb/unimap_common.h
View File
| @@ -0,0 +1,213 @@ | |||
| /* | |||
| Copyright 2016 Jun Wako <[email protected]> | |||
| This program is free software: you can redistribute it and/or modify | |||
| it under the terms of the GNU General Public License as published by | |||
| the Free Software Foundation, either version 2 of the License, or | |||
| (at your option) any later version. | |||
| This program is distributed in the hope that it will be useful, | |||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| GNU General Public License for more details. | |||
| You should have received a copy of the GNU General Public License | |||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| */ | |||
| #ifndef UNIMAP_COMMON_H | |||
| #define UNIMAP_COMMON_H | |||
| #include <stdint.h> | |||
| #include <avr/pgmspace.h> | |||
| #include "unimap.h" | |||
| /* Apple Extended Keyboard Common layout: ANSI+ISO | |||
| * ,---. .---------------. ,---------------. ,---------------. ,-----------. ,---------------. | |||
| * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| |VDn|VUp|Mut|F24| | |||
| * `---' `---------------' `---------------' `---------------' `-----------' `---------------' | |||
| * ,-----------------------------------------------------------. ,-----------. ,---------------. | |||
| * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backspa| |Ins|Hom|PgU| |NmL| =| /| *| | |||
| * |-----------------------------------------------------------| |-----------| |---------------| | |||
| * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| |Del|End|PgD| | 7| 8| 9| -| | |||
| * |-----------------------------------------------------------| `-----------' |---------------| | |||
| * |CapsLo| A| S| D| F| G| H| J| K| L| ;| '|Return | | 4| 5| 6| +| | |||
| * |-----------------------------------------------------------| ,---. |---------------| | |||
| * |Shif|\ | Z| X| C| V| B| N| M| ,| ,| /|Shift | |Up | | 1| 2| 3| | | |||
| * |-----------------------------------------------------------| ,-----------. |-----------|Ent| | |||
| * |Ctrl |Alt |Gui | Space |Gui |Alt |Ctrl | |Lef|Dow|Rig| | 0| .| | | |||
| * `-----------------------------------------------------------' `-----------' `---------------' | |||
| * Command = Gui | |||
| * Option = Alt | |||
| * Power key = F24 | |||
| * Mic = F13(Adjustable keyboard) | |||
| */ | |||
| // http://lxr.free-electrons.com/source/drivers/macintosh/adbhid.c | |||
| // http://opensource.apple.com//source/IOHIDFamily/IOHIDFamily-701.20.10/IOHIDFamily/Cosmo_USB2ADB.c | |||
| // http://m0115.web.fc2.com/m0115.jpg | |||
| const uint8_t PROGMEM unimap_trans[MATRIX_ROWS][MATRIX_COLS] = { | |||
| // Position(unimap) ADB scan code(matrix) | |||
| // --------------------------------------------- | |||
| { | |||
| UNIMAP_A, // 0x00 | |||
| UNIMAP_S, // 0x01 | |||
| UNIMAP_D, // 0x02 | |||
| UNIMAP_F, // 0x03 | |||
| UNIMAP_H, // 0x04 | |||
| UNIMAP_G, // 0x05 | |||
| UNIMAP_Z, // 0x06 | |||
| UNIMAP_X, // 0x07 | |||
| }, | |||
| { | |||
| UNIMAP_C, // 0x08 | |||
| UNIMAP_V, // 0x09 | |||
| UNIMAP_NONUS_BSLASH, // 0x0A | |||
| UNIMAP_B, // 0x0B | |||
| UNIMAP_Q, // 0x0C | |||
| UNIMAP_W, // 0x0D | |||
| UNIMAP_E, // 0x0E | |||
| UNIMAP_R, // 0x0F | |||
| }, | |||
| { | |||
| UNIMAP_Y, // 0x10 | |||
| UNIMAP_T, // 0x11 | |||
| UNIMAP_1, // 0x12 | |||
| UNIMAP_2, // 0x13 | |||
| UNIMAP_3, // 0x14 | |||
| UNIMAP_4, // 0x15 | |||
| UNIMAP_6, // 0x16 | |||
| UNIMAP_5, // 0x17 | |||
| }, | |||
| { | |||
| UNIMAP_EQUAL, // 0x18 | |||
| UNIMAP_9, // 0x19 | |||
| UNIMAP_7, // 0x1A | |||
| UNIMAP_MINUS, // 0x1B | |||
| UNIMAP_8, // 0x1C | |||
| UNIMAP_0, // 0x1D | |||
| UNIMAP_RBRACKET, // 0x1E | |||
| UNIMAP_O, // 0x1F | |||
| }, | |||
| { | |||
| UNIMAP_U, // 0x20 | |||
| UNIMAP_LBRACKET, // 0x21 | |||
| UNIMAP_I, // 0x22 | |||
| UNIMAP_P, // 0x23 | |||
| UNIMAP_ENTER, // 0x24 | |||
| UNIMAP_L, // 0x25 | |||
| UNIMAP_J, // 0x26 | |||
| UNIMAP_QUOTE, // 0x27 | |||
| }, | |||
| { | |||
| UNIMAP_K, // 0x28 | |||
| UNIMAP_SCOLON, // 0x29 | |||
| UNIMAP_BSLASH, // 0x2A | |||
| UNIMAP_COMMA, // 0x2B | |||
| UNIMAP_SLASH, // 0x2C | |||
| UNIMAP_N, // 0x2D | |||
| UNIMAP_M, // 0x2E | |||
| UNIMAP_DOT, // 0x2F | |||
| }, | |||
| { | |||
| UNIMAP_TAB, // 0x30 | |||
| UNIMAP_SPACE, // 0x31 | |||
| UNIMAP_GRAVE, // 0x32 | |||
| UNIMAP_BSPACE, // 0x33 | |||
| UNIMAP_KP_ENTER, // 0x34 | |||
| UNIMAP_ESCAPE, // 0x35 | |||
| UNIMAP_LCTRL, // 0x36 | |||
| UNIMAP_LGUI, // 0x37 | |||
| }, | |||
| { | |||
| UNIMAP_LSHIFT, // 0x38 | |||
| UNIMAP_CAPSLOCK, // 0x39 | |||
| UNIMAP_LALT, // 0x3A | |||
| UNIMAP_LEFT, // 0x3B | |||
| UNIMAP_RIGHT, // 0x3C | |||
| UNIMAP_DOWN, // 0x3D | |||
| UNIMAP_UP, // 0x3E | |||
| UNIMAP_F23, // 0x3F FN? | |||
| }, | |||
| { | |||
| UNIMAP_F17, // 0x40 | |||
| UNIMAP_KP_DOT, // 0x41 | |||
| UNIMAP_F13, // 0x42 Mic(Adjustable keyboard) | |||
| UNIMAP_KP_MINUS, // 0x43 ADB keypad asterisk(top right) | |||
| UNIMAP_NO, // 0x44 | |||
| UNIMAP_KP_COMMA, // 0x45 ADB keypad plus | |||
| UNIMAP_NO, // 0x46 | |||
| UNIMAP_NUMLOCK, // 0x47 | |||
| }, | |||
| { | |||
| UNIMAP_VOLUME_UP, // 0x48 Vol Up(Adjustable keyboard) | |||
| UNIMAP_VOLUME_DOWN, // 0x49 Vol Down(Adjustable keyboard) | |||
| UNIMAP_VOLUME_MUTE, // 0x4A Vol Mute(Adjustable keyboard) | |||
| UNIMAP_KP_ASTERISK, // 0x4B ADB keypad slash(between equal and asterisk) | |||
| UNIMAP_KP_ENTER, // 0x4C | |||
| UNIMAP_NO, // 0x4D | |||
| UNIMAP_KP_PLUS, // 0x4E ADB keypad minus | |||
| UNIMAP_F18, // 0x4F | |||
| }, | |||
| { | |||
| UNIMAP_F19, // 0x50 | |||
| UNIMAP_KP_SLASH, // 0x51 ADB keypad equal(next to clear/numlock) | |||
| UNIMAP_KP_0, // 0x52 | |||
| UNIMAP_KP_1, // 0x53 | |||
| UNIMAP_KP_2, // 0x54 | |||
| UNIMAP_KP_3, // 0x55 | |||
| UNIMAP_KP_4, // 0x56 | |||
| UNIMAP_KP_5, // 0x57 | |||
| }, | |||
| { | |||
| UNIMAP_KP_6, // 0x58 | |||
| UNIMAP_KP_7, // 0x59 | |||
| UNIMAP_F20, // 0x5A | |||
| UNIMAP_KP_8, // 0x5B | |||
| UNIMAP_KP_9, // 0x5C | |||
| UNIMAP_JYEN, // 0x5D | |||
| UNIMAP_RO, // 0x5E | |||
| UNIMAP_KP_COMMA, // 0x5F | |||
| }, | |||
| { | |||
| UNIMAP_F5, // 0x60 | |||
| UNIMAP_F6, // 0x61 | |||
| UNIMAP_F7, // 0x62 | |||
| UNIMAP_F3, // 0x63 | |||
| UNIMAP_F8, // 0x64 | |||
| UNIMAP_F9, // 0x65 | |||
| UNIMAP_MHEN, // 0x66 | |||
| UNIMAP_F11, // 0x67 | |||
| }, | |||
| { | |||
| UNIMAP_HENK, // 0x68 | |||
| UNIMAP_PSCREEN, // 0x69 | |||
| UNIMAP_F16, // 0x6A | |||
| UNIMAP_SCROLLLOCK, // 0x6B | |||
| UNIMAP_NO, // 0x6C | |||
| UNIMAP_F10, // 0x6D | |||
| UNIMAP_APPLICATION, // 0x6E compose | |||
| UNIMAP_F12, // 0x6F | |||
| }, | |||
| { | |||
| UNIMAP_NO, // 0x70 | |||
| UNIMAP_PAUSE, // 0x71 | |||
| UNIMAP_INSERT, // 0x72 | |||
| UNIMAP_HOME, // 0x73 | |||
| UNIMAP_PGUP, // 0x74 | |||
| UNIMAP_DELETE, // 0x75 | |||
| UNIMAP_F4, // 0x76 | |||
| UNIMAP_END, // 0x77 | |||
| }, | |||
| { | |||
| UNIMAP_F2, // 0x78 | |||
| UNIMAP_PGDOWN, // 0x79 | |||
| UNIMAP_F1, // 0x7A | |||
| UNIMAP_RSHIFT, // 0x7B | |||
| UNIMAP_RALT, // 0x7C | |||
| UNIMAP_RCTRL, // 0x7D | |||
| UNIMAP_RGUI, // 0x7E | |||
| UNIMAP_F24, // 0x7F power key | |||
| } | |||
| }; | |||
| #endif | |||
+ 46
- 0
converter/adb_usb/unimap_plain.c
View File
| @@ -0,0 +1,46 @@ | |||
| /* | |||
| Copyright 2016 Jun Wako <[email protected]> | |||
| This program is free software: you can redistribute it and/or modify | |||
| it under the terms of the GNU General Public License as published by | |||
| the Free Software Foundation, either version 2 of the License, or | |||
| (at your option) any later version. | |||
| This program is distributed in the hope that it will be useful, | |||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| GNU General Public License for more details. | |||
| You should have received a copy of the GNU General Public License | |||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| */ | |||
| #include "unimap_common.h" | |||
| #define AC_FN0 ACTION_LAYER_TAP_KEY(1, KC_GRV) | |||
| #define AC_FN1 ACTION_LAYER_TAP_KEY(1, KC_BSLS) | |||
| #ifdef KEYMAP_SECTION_ENABLE | |||
| const action_t actionmaps[][UNIMAP_ROWS][UNIMAP_COLS] __attribute__ ((section (".keymap.keymaps"))) = { | |||
| #else | |||
| const action_t actionmaps[][UNIMAP_ROWS][UNIMAP_COLS] PROGMEM = { | |||
| #endif | |||
| UNIMAP( | |||
| F13, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, F24, | |||
| ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,PAUS, VOLD,VOLU,MUTE, | |||
| FN0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, NO, BSPC, INS, HOME,PGUP, NLCK,PEQL,PSLS,PAST, | |||
| TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC, FN1, DEL, END, PGDN, P7, P8, P9, PMNS, | |||
| LCAP,A, S, D, F, G, H, J, K, L, SCLN,QUOT, NUHS,ENT, P4, P5, P6, PPLS, | |||
| LSFT,NUBS,Z, X, C, V, B, N, M, COMM,DOT, SLSH, NO, RSFT, UP, P1, P2, P3, NO, | |||
| LCTL,LGUI,LALT,NO, SPC, NO, NO, RALT,RGUI,NO, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT | |||
| ), | |||
| UNIMAP( | |||
| TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, | |||
| TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS, | |||
| TRNS,F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, TRNS,DEL, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,TRNS, | |||
| TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PSCR,SLCK,PAUS,UP, INS, TRNS, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,TRNS, | |||
| TRNS,VOLD,VOLU,MUTE,TRNS,TRNS,TRNS,TRNS,HOME,PGUP,LEFT,RGHT, TRNS,TRNS, TRNS,TRNS,TRNS,TRNS, | |||
| TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,END, PGDN,DOWN, TRNS,TRNS, PGUP, TRNS,TRNS,TRNS,TRNS, | |||
| TRNS,TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, HOME,PGDN,END, TRNS, TRNS,TRNS | |||
| ), | |||
| }; | |||
+ 1
- 2
converter/ibm4704_usb/Makefile
View File
| @@ -8,8 +8,7 @@ TMK_DIR = ../../tmk_core | |||
| TARGET_DIR = . | |||
| # project specific files | |||
| SRC = keymap_common.c \ | |||
| matrix.c \ | |||
| SRC = matrix.c \ | |||
| led.c \ | |||
| protocol/ibm4704.c | |||
+ 1
- 1
converter/ibm4704_usb/keymap_50key.c
View File
| @@ -11,7 +11,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| ), | |||
| }; | |||
| const uint16_t PROGMEM fn_actions[] = { | |||
| const action_t PROGMEM fn_actions[] = { | |||
| }; | |||
+ 1
- 1
converter/ibm4704_usb/keymap_alps102key.c
View File
| @@ -45,6 +45,6 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| ), | |||
| }; | |||
| const uint16_t PROGMEM fn_actions[] = { | |||
| const action_t PROGMEM fn_actions[] = { | |||
| [0] = ACTION_LAYER_MOMENTARY(1), | |||
| }; | |||
+ 0
- 30
converter/ibm4704_usb/keymap_common.c
View File
| @@ -1,30 +0,0 @@ | |||
| /* | |||
| Copyright 2011,2012,2013 Jun Wako <[email protected]> | |||
| This program is free software: you can redistribute it and/or modify | |||
| it under the terms of the GNU General Public License as published by | |||
| the Free Software Foundation, either version 2 of the License, or | |||
| (at your option) any later version. | |||
| This program is distributed in the hope that it will be useful, | |||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| GNU General Public License for more details. | |||
| You should have received a copy of the GNU General Public License | |||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| */ | |||
| #include "keymap_common.h" | |||
| /* translates key to keycode */ | |||
| uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) | |||
| { | |||
| return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); | |||
| } | |||
| /* translates Fn keycode to action */ | |||
| action_t keymap_fn_to_action(uint8_t keycode) | |||
| { | |||
| return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) }; | |||
| } | |||
+ 0
- 6
converter/ibm4704_usb/keymap_common.h
View File
| @@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| #include <stdint.h> | |||
| #include <stdbool.h> | |||
| #include <avr/pgmspace.h> | |||
| #include "keycode.h" | |||
| #include "action.h" | |||
| #include "action_macro.h" | |||
| @@ -29,11 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| #include "keymap.h" | |||
| // 32*8(256) byte array which converts PS/2 code into USB code | |||
| extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; | |||
| extern const uint16_t fn_actions[]; | |||
| /* 107-key */ | |||
| #define KEYMAP( \ | |||
| K46,K64, K00,K18,K19,K1A,K10,K11,K12,K08,K09,K0A,K0F,K1F,K0D,K0C,K0E, K6A,K6B,K6C, K47,K48,K49,K4A, \ | |||
+ 1
- 1
converter/ibm4704_usb/keymap_hasu.c
View File
| @@ -60,7 +60,7 @@ enum macro_id { | |||
| ALT_TAB, | |||
| }; | |||
| const uint16_t PROGMEM fn_actions[] = { | |||
| const action_t PROGMEM fn_actions[] = { | |||
| [0] = ACTION_LAYER_MOMENTARY(1), | |||
| [1] = ACTION_LAYER_TAP_KEY(2, KC_SCLN), | |||
| [2] = ACTION_LAYER_TAP_KEY(3, KC_SLASH), | |||
+ 1
- 1
converter/ibm4704_usb/keymap_plain.c
View File
| @@ -45,6 +45,6 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| ), | |||
| }; | |||
| const uint16_t PROGMEM fn_actions[] = { | |||
| const action_t PROGMEM fn_actions[] = { | |||
| [0] = ACTION_LAYER_MOMENTARY(1), | |||
| }; | |||
+ 0
- 1
converter/m0110_usb/Makefile
View File
| @@ -10,7 +10,6 @@ TARGET_DIR = . | |||
| # keyboard dependent files | |||
| SRC = matrix.c \ | |||
| led.c \ | |||
| keymap_common.c \ | |||
| m0110.c | |||
| # To use own keymap file run make like: make keymap=hasu | |||
+ 0
- 1
converter/m0110_usb/Makefile.teensy
View File
| @@ -10,7 +10,6 @@ TARGET_DIR = . | |||
| # keyboard dependent files | |||
| SRC = matrix.c \ | |||
| led.c \ | |||
| keymap_common.c \ | |||
| m0110.c | |||
| # To use own keymap file run make like: make keymap=hasu | |||
+ 0
- 1
converter/m0110_usb/Makefile.tmk_rev1
View File
| @@ -10,7 +10,6 @@ TARGET_DIR = . | |||
| # keyboard dependent files | |||
| SRC = matrix.c \ | |||
| led.c \ | |||
| keymap_common.c \ | |||
| m0110.c | |||
| # To use own keymap file run make like: make keymap=hasu | |||
+ 0
- 1
converter/m0110_usb/Makefile.tmk_rev2
View File
| @@ -10,7 +10,6 @@ TARGET_DIR = . | |||
| # keyboard dependent files | |||
| SRC = matrix.c \ | |||
| led.c \ | |||
| keymap_common.c \ | |||
| m0110.c | |||
| # To use own keymap file run make like: make keymap=hasu | |||
+ 0
- 37
converter/m0110_usb/keymap_common.c
View File
| @@ -1,37 +0,0 @@ | |||
| /* | |||
| Copyright 2011,2012,2014 Jun Wako <[email protected]> | |||
| This program is free software: you can redistribute it and/or modify | |||
| it under the terms of the GNU General Public License as published by | |||
| the Free Software Foundation, either version 2 of the License, or | |||
| (at your option) any later version. | |||
| This program is distributed in the hope that it will be useful, | |||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| GNU General Public License for more details. | |||
| You should have received a copy of the GNU General Public License | |||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| */ | |||
| #include <stdint.h> | |||
| #include <avr/pgmspace.h> | |||
| #include "action.h" | |||
| #include "keycode.h" | |||
| #include "keymap.h" | |||
| #include "keymap_common.h" | |||
| /* translates key to keycode */ | |||
| uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) | |||
| { | |||
| return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); | |||
| } | |||
| /* translates Fn index to action */ | |||
| action_t keymap_fn_to_action(uint8_t keycode) | |||
| { | |||
| action_t action; | |||
| action.code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]); | |||
| return action; | |||
| } | |||
+ 0
- 5
converter/m0110_usb/keymap_common.h
View File
| @@ -15,15 +15,10 @@ You should have received a copy of the GNU General Public License | |||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| */ | |||
| #include <stdint.h> | |||
| #include <avr/pgmspace.h> | |||
| #include "keycode.h" | |||
| #include "keymap.h" | |||
| extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; | |||
| extern const uint16_t fn_actions[]; | |||
| /* Common layout for M0110 and M0110A | |||
| * This keymap works with both keyboards. As you can see, the M0110A is | |||
| * a superset of M0110 keyboard, only one exception is 'Enter'(34) of M0110 | |||
+ 2
- 2
converter/m0110_usb/keymap_default.c
View File
| @@ -98,9 +98,9 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { | |||
| * Fn action definition | |||
| */ | |||
| #ifdef KEYMAP_SECTION_ENABLE | |||
| const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { | |||
| const action_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { | |||
| #else | |||
| const uint16_t fn_actions[] PROGMEM = { | |||
| const action_t fn_actions[] PROGMEM = { | |||
| #endif | |||
| [0] = ACTION_LAYER_MOMENTARY(1), | |||
| [1] = ACTION_LAYER_MOMENTARY(2), | |||
+ 1
- 1
converter/m0110_usb/keymap_hasu.c
View File
| @@ -79,7 +79,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| /* | |||
| * Fn action definition | |||
| */ | |||
| const uint16_t fn_actions[] PROGMEM = { | |||
| const action_t fn_actions[] PROGMEM = { | |||
| [0] = ACTION_LAYER_MOMENTARY(1), | |||
| [1] = ACTION_LAYER_TAP_KEY(2, KC_SLASH), | |||
| [2] = ACTION_LAYER_TAP_KEY(3, KC_SPACE), | |||
+ 1
- 1
converter/m0110_usb/keymap_intl.c
View File
| @@ -68,6 +68,6 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { | |||
| /* | |||
| * Fn action definition | |||
| */ | |||
| const uint16_t fn_actions[] PROGMEM = { | |||
| const action_t fn_actions[] PROGMEM = { | |||
| [0] = ACTION_LAYER_MOMENTARY(1), | |||
| }; | |||
+ 1
- 1
converter/m0110_usb/keymap_spacefn.c
View File
| @@ -65,7 +65,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| /* | |||
| * Fn action definition | |||
| */ | |||
| const uint16_t fn_actions[] PROGMEM = { | |||
| const action_t fn_actions[] PROGMEM = { | |||
| [0] = ACTION_LAYER_TAP_KEY(1, KC_SPACE), | |||
| [1] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), // tilde | |||
| }; | |||
+ 3
- 20
converter/news_usb/keymap.c
View File
| @@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| #include <stdint.h> | |||
| #include <stdbool.h> | |||
| #include <avr/pgmspace.h> | |||
| #include "keycode.h" | |||
| #include "util.h" | |||
| #include "keymap.h" | |||
| @@ -56,7 +55,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| // Assign Fn key(0-7) to a layer to which switch with the Fn key pressed. | |||
| static const uint8_t PROGMEM fn_layer[] = { | |||
| const uint8_t PROGMEM fn_layer[] = { | |||
| 0, // Fn0 | |||
| 0, // Fn1 | |||
| 0, // Fn2 | |||
| @@ -69,7 +68,7 @@ static const uint8_t PROGMEM fn_layer[] = { | |||
| // Assign Fn key(0-7) to a keycode sent when release Fn key without use of the layer. | |||
| // See layer.c for details. | |||
| static const uint8_t PROGMEM fn_keycode[] = { | |||
| const uint8_t PROGMEM fn_keycode[] = { | |||
| KC_NO, // Fn0 | |||
| KC_NO, // Fn1 | |||
| KC_NO, // Fn2 | |||
| @@ -81,7 +80,7 @@ static const uint8_t PROGMEM fn_keycode[] = { | |||
| }; | |||
| static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| /* 0: default | |||
| * ,---. ,------------------------, ,------------------------. ,---------. | |||
| * |Pow| | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10| | F11| F12| ,-----------. | |||
| @@ -107,19 +106,3 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| LALT,CAPS,LALT, SPC, ERAS, RALT,RGUI,RCTL, PGDN, TAB, LEFT,DOWN,RGHT | |||
| ), | |||
| }; | |||
| uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col) | |||
| { | |||
| return pgm_read_byte(&keymaps[(layer)][(row)][(col)]); | |||
| } | |||
| uint8_t keymap_fn_layer(uint8_t index) | |||
| { | |||
| return pgm_read_byte(&fn_layer[index]); | |||
| } | |||
| uint8_t keymap_fn_keycode(uint8_t index) | |||
| { | |||
| return pgm_read_byte(&fn_keycode[index]); | |||
| } | |||
+ 2
- 15
converter/next_usb/keymap.c
View File
| @@ -50,7 +50,6 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| #include <stdint.h> | |||
| #include <stdbool.h> | |||
| #include <avr/pgmspace.h> | |||
| #include "keycode.h" | |||
| #include "print.h" | |||
| #include "debug.h" | |||
| @@ -59,7 +58,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| #include "keycode.h" | |||
| // 32*8(256) byte array which converts PS/2 code into USB code | |||
| static const uint16_t PROGMEM fn_actions[] = { | |||
| const action_t PROGMEM fn_actions[] = { | |||
| ACTION_LAYER_MOMENTARY(1), // FN0 - left command key | |||
| ACTION_LAYER_MOMENTARY(1), // FN1 - right command key | |||
| ACTION_KEY(KC_BSLS), // FN2 - number pad slash & backslash | |||
| @@ -116,7 +115,7 @@ static const uint16_t PROGMEM fn_actions[] = { | |||
| } | |||
| static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| /* Layer 0: default | |||
| * ,-----------------------------------------------------------. ,-----------. ,---------------. | |||
| @@ -163,15 +162,3 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| ) | |||
| }; | |||
| /* translates key to keycode */ | |||
| uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) | |||
| { | |||
| return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); | |||
| } | |||
| /* translates Fn keycode to action */ | |||
| action_t keymap_fn_to_action(uint8_t keycode) | |||
| { | |||
| return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) }; | |||
| } | |||
+ 2
- 38
converter/pc98_usb/keymap.c
View File
| @@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| #include <stdint.h> | |||
| #include <stdbool.h> | |||
| #include <avr/pgmspace.h> | |||
| #include "keycode.h" | |||
| #include "action.h" | |||
| #include "action_macro.h" | |||
| @@ -72,7 +71,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| /* | |||
| ,---------------------------------------------------------------. | |||
| | 60| 61| 62| 63| 64| 65| 66| 67| 68| 69| 6A| 6B| 36| 37| 3F| 3E| | |||
| @@ -114,7 +113,6 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| LGUI, LALT, LCTL, LSFT, SPC, SPC, RALT | |||
| ), | |||
| }; | |||
| static const uint8_t PROGMEM overlays[][MATRIX_ROWS][MATRIX_COLS] = {}; | |||
| /* | |||
| * Macro definition | |||
| @@ -163,7 +161,7 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| /* | |||
| * Fn actions | |||
| */ | |||
| static const uint16_t PROGMEM fn_actions[] = { | |||
| const action_t PROGMEM fn_actions[] = { | |||
| ACTION_LAYER_TAP_TOGGLE(0), // FN0 | |||
| ACTION_LAYER_TAP_KEY(1, KC_SLASH), // FN1 | |||
| ACTION_LAYER_TAP_KEY(2, KC_SCLN), // FN2 | |||
| @@ -172,37 +170,3 @@ static const uint16_t PROGMEM fn_actions[] = { | |||
| ACTION_MACRO(RBRACKET), // FN5 | |||
| ACTION_MACRO(DUMMY), // FN6 | |||
| }; | |||
| /* | |||
| * No need to edit. | |||
| */ | |||
| #define KEYMAPS_SIZE (sizeof(keymaps) / sizeof(keymaps[0])) | |||
| #define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0])) | |||
| /* translates key to keycode */ | |||
| uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) | |||
| { | |||
| if (layer < KEYMAPS_SIZE) { | |||
| return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); | |||
| } else { | |||
| // fall back to layer 0 | |||
| return pgm_read_byte(&keymaps[0][(key.row)][(key.col)]); | |||
| } | |||
| } | |||
| /* translates Fn keycode to action */ | |||
| action_t keymap_fn_to_action(uint8_t keycode) | |||
| { | |||
| action_t action; | |||
| if (FN_INDEX(keycode) < FN_ACTIONS_SIZE) { | |||
| action.code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]); | |||
| } else { | |||
| action.code = ACTION_NO; | |||
| } | |||
| return action; | |||
| } | |||
+ 1
- 2
converter/ps2_usb/Makefile
View File
| @@ -11,8 +11,7 @@ TMK_DIR = ../../tmk_core | |||
| TARGET_DIR = . | |||
| # project specific files | |||
| SRC = keymap_common.c \ | |||
| matrix.c \ | |||
| SRC = matrix.c \ | |||
| led.c | |||
| ifdef KEYMAP | |||
+ 0
- 1
converter/ps2_usb/Makefile.mbed
View File
| @@ -10,7 +10,6 @@ OBJDIR = ./build | |||
| OBJECTS = \ | |||
| $(OBJDIR)/protocol/ps2_busywait.o \ | |||
| $(OBJDIR)/protocol/ps2_io_mbed.o \ | |||
| $(OBJDIR)/./keymap_common.o \ | |||
| $(OBJDIR)/./matrix.o \ | |||
| $(OBJDIR)/./led.o \ | |||
| $(OBJDIR)/./main.o | |||
+ 1
- 2
converter/ps2_usb/Makefile.pjrc
View File
| @@ -8,8 +8,7 @@ TMK_DIR = ../../tmk_core | |||
| TARGET_DIR = . | |||
| # keyboard dependent files | |||
| SRC = keymap_common.c \ | |||
| matrix.c \ | |||
| SRC = matrix.c \ | |||
| led.c | |||
| ifdef KEYMAP | |||
+ 1
- 2
converter/ps2_usb/Makefile.tmk_rev1
View File
| @@ -12,8 +12,7 @@ TMK_DIR = ../../tmk_core | |||
| TARGET_DIR = . | |||
| # project specific files | |||
| SRC = keymap_common.c \ | |||
| matrix.c \ | |||
| SRC = matrix.c \ | |||
| led.c | |||
| ifdef KEYMAP | |||
+ 1
- 2
converter/ps2_usb/Makefile.tmk_rev2
View File
| @@ -12,8 +12,7 @@ TMK_DIR = ../../tmk_core | |||
| TARGET_DIR = . | |||
| # project specific files | |||
| SRC = keymap_common.c \ | |||
| matrix.c \ | |||
| SRC = matrix.c \ | |||
| led.c | |||
| ifdef KEYMAP | |||
+ 1
- 2
converter/ps2_usb/Makefile.vusb
View File
| @@ -8,8 +8,7 @@ TMK_DIR = ../../tmk_core | |||
| TARGET_DIR = . | |||
| # keyboard dependent files | |||
| SRC = keymap_common.c \ | |||
| matrix.c \ | |||
| SRC = matrix.c \ | |||
| led.c | |||
| ifdef KEYMAP | |||
+ 0
- 31
converter/ps2_usb/keymap_common.c
View File
| @@ -1,31 +0,0 @@ | |||
| /* | |||
| Copyright 2011,2012,2013 Jun Wako <[email protected]> | |||
| This program is free software: you can redistribute it and/or modify | |||
| it under the terms of the GNU General Public License as published by | |||
| the Free Software Foundation, either version 2 of the License, or | |||
| (at your option) any later version. | |||
| This program is distributed in the hope that it will be useful, | |||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| GNU General Public License for more details. | |||
| You should have received a copy of the GNU General Public License | |||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| */ | |||
| #include "keymap_common.h" | |||
| #include "progmem.h" | |||
| /* translates key to keycode */ | |||
| uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) | |||
| { | |||
| return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); | |||
| } | |||
| /* translates Fn keycode to action */ | |||
| action_t keymap_fn_to_action(uint8_t keycode) | |||
| { | |||
| return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) }; | |||
| } | |||
+ 0
- 5
converter/ps2_usb/keymap_common.h
View File
| @@ -28,11 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| #include "keymap.h" | |||
| // 32*8(256) byte array which converts PS/2 code into USB code | |||
| extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; | |||
| extern const uint16_t fn_actions[]; | |||
| /* All keys */ | |||
| #define KEYMAP_ALL( \ | |||
| K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07, KFC,K7E,KFE, \ | |||
+ 1
- 1
converter/ps2_usb/keymap_jis.c
View File
| @@ -30,5 +30,5 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| ), | |||
| }; | |||
| const uint16_t PROGMEM fn_actions[] = { | |||
| const action_t PROGMEM fn_actions[] = { | |||
| }; | |||
+ 1
- 1
converter/ps2_usb/keymap_plain.c
View File
| @@ -28,5 +28,5 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| ), | |||
| }; | |||
| const uint16_t PROGMEM fn_actions[] = { | |||
| const action_t PROGMEM fn_actions[] = { | |||
| }; | |||
+ 1
- 1
converter/ps2_usb/keymap_spacefn.c
View File
| @@ -54,7 +54,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| ), | |||
| }; | |||
| const uint16_t PROGMEM fn_actions[] = { | |||
| const action_t PROGMEM fn_actions[] = { | |||
| [0] = ACTION_LAYER_TAP_KEY(1, KC_SPACE), | |||
| [1] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), // tilde | |||
| }; | |||
+ 3
- 20
converter/sun_usb/keymap.c
View File
| @@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| #include <stdint.h> | |||
| #include <stdbool.h> | |||
| #include <avr/pgmspace.h> | |||
| #include "keycode.h" | |||
| #include "util.h" | |||
| #include "keymap.h" | |||
| @@ -87,7 +86,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| // Assign Fn key(0-7) to a layer to which switch with the Fn key pressed. | |||
| static const uint8_t PROGMEM fn_layer[] = { | |||
| const uint8_t PROGMEM fn_layer[] = { | |||
| 2, // Fn0 | |||
| 3, // Fn1 | |||
| 4, // Fn2 | |||
| @@ -100,7 +99,7 @@ static const uint8_t PROGMEM fn_layer[] = { | |||
| // Assign Fn key(0-7) to a keycode sent when release Fn key without use of the layer. | |||
| // See layer.c for details. | |||
| static const uint8_t PROGMEM fn_keycode[] = { | |||
| const uint8_t PROGMEM fn_keycode[] = { | |||
| KC_NO, // Fn0 | |||
| KC_SCLN, // Fn1 | |||
| KC_SLSH, // Fn2 | |||
| @@ -112,7 +111,7 @@ static const uint8_t PROGMEM fn_keycode[] = { | |||
| }; | |||
| static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| /* | |||
| KEYMAP( | |||
| HELP, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10,F11,F12, PSCR,SLCK,PAUS, MUTE,VOLD,VOLU,PWR, | |||
| @@ -174,19 +173,3 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| CAPS,LALT,LGUI, BTN1, RGUI,RALT,NO, LEFT,DOWN,RGHT | |||
| ), | |||
| }; | |||
| uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col) | |||
| { | |||
| return pgm_read_byte(&keymaps[(layer)][(row)][(col)]); | |||
| } | |||
| uint8_t keymap_fn_layer(uint8_t index) | |||
| { | |||
| return pgm_read_byte(&fn_layer[index]); | |||
| } | |||
| uint8_t keymap_fn_keycode(uint8_t index) | |||
| { | |||
| return pgm_read_byte(&fn_keycode[index]); | |||
| } | |||
+ 0
- 17
converter/sun_usb/keymap_sun3.c
View File
| @@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| #include <stdint.h> | |||
| #include <stdbool.h> | |||
| #include <avr/pgmspace.h> | |||
| #include "keycode.h" | |||
| #include "util.h" | |||
| #include "keymap.h" | |||
| @@ -155,19 +154,3 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| ), | |||
| */ | |||
| }; | |||
| uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col) | |||
| { | |||
| return pgm_read_byte(&keymaps[(layer)][(row)][(col)]); | |||
| } | |||
| uint8_t keymap_fn_layer(uint8_t index) | |||
| { | |||
| return pgm_read_byte(&fn_layer[index]); | |||
| } | |||
| uint8_t keymap_fn_keycode(uint8_t index) | |||
| { | |||
| return pgm_read_byte(&fn_keycode[index]); | |||
| } | |||
+ 3
- 20
converter/terminal_usb/keymap.c
View File
| @@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| #include <stdint.h> | |||
| #include <stdbool.h> | |||
| #include <avr/pgmspace.h> | |||
| #include "keycode.h" | |||
| #include "print.h" | |||
| #include "debug.h" | |||
| @@ -102,7 +101,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| } | |||
| // Assign Fn key(0-7) to a layer to which switch with the Fn key pressed. | |||
| static const uint8_t PROGMEM fn_layer[] = { | |||
| const uint8_t PROGMEM fn_layer[] = { | |||
| 0, // Fn0 | |||
| 0, // Fn1 | |||
| 0, // Fn2 | |||
| @@ -115,7 +114,7 @@ static const uint8_t PROGMEM fn_layer[] = { | |||
| // Assign Fn key(0-7) to a keycode sent when release Fn key without use of the layer. | |||
| // See layer.c for details. | |||
| static const uint8_t PROGMEM fn_keycode[] = { | |||
| const uint8_t PROGMEM fn_keycode[] = { | |||
| KC_NO, // Fn0 | |||
| KC_NO, // Fn1 | |||
| KC_NO, // Fn2 | |||
| @@ -127,7 +126,7 @@ static const uint8_t PROGMEM fn_keycode[] = { | |||
| }; | |||
| static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| /* 0: default | |||
| * ,---. ,---------------. ,---------------. ,---------------. ,-----------. | |||
| * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| | |||
| @@ -198,19 +197,3 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| ), | |||
| */ | |||
| }; | |||
| uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col) | |||
| { | |||
| return pgm_read_byte(&keymaps[(layer)][(row)][(col)]); | |||
| } | |||
| uint8_t keymap_fn_layer(uint8_t index) | |||
| { | |||
| return pgm_read_byte(&fn_layer[index]); | |||
| } | |||
| uint8_t keymap_fn_keycode(uint8_t index) | |||
| { | |||
| return pgm_read_byte(&fn_keycode[index]); | |||
| } | |||
+ 1
- 3
converter/usb_usb/Makefile
View File
| @@ -108,9 +108,7 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096 | |||
| #OPT_DEFS += -DNO_ACTION_LAYER | |||
| #OPT_DEFS += -DNO_ACTION_MACRO | |||
| SRC = \ | |||
| keymap_common.c \ | |||
| usb_usb.cpp \ | |||
| SRC = usb_usb.cpp \ | |||
| main.cpp | |||
| ifdef KEYMAP | |||
+ 1
- 1
converter/usb_usb/keymap.c
View File
| @@ -119,4 +119,4 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { | |||
| #endif | |||
| }; | |||
| const uint16_t fn_actions[] PROGMEM = {}; | |||
| const action_t fn_actions[] PROGMEM = {}; | |||
+ 0
- 31
converter/usb_usb/keymap_common.c
View File
| @@ -1,31 +0,0 @@ | |||
| /* | |||
| Copyright 2014 Jun Wako <[email protected]> | |||
| This program is free software: you can redistribute it and/or modify | |||
| it under the terms of the GNU General Public License as published by | |||
| the Free Software Foundation, either version 2 of the License, or | |||
| (at your option) any later version. | |||
| This program is distributed in the hope that it will be useful, | |||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| GNU General Public License for more details. | |||
| You should have received a copy of the GNU General Public License | |||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| */ | |||
| #include "keymap_common.h" | |||
| #include "progmem.h" | |||
| /* translates key to keycode */ | |||
| uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) | |||
| { | |||
| return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); | |||
| } | |||
| /* translates Fn keycode to action */ | |||
| action_t keymap_fn_to_action(uint8_t keycode) | |||
| { | |||
| return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) }; | |||
| } | |||
+ 0
- 4
converter/usb_usb/keymap_common.h
View File
| @@ -28,10 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| #include "keymap.h" | |||
| extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; | |||
| extern const uint16_t fn_actions[]; | |||
| /* ,---------------. ,---------------. ,---------------. | |||
| * |F13|F14|F15|F16| |F17|F18|F19|F20| |F21|F22|F23|F24| | |||
| * ,---. |---------------| |---------------| |---------------| ,-----------. ,---------------. ,-------. | |||
+ 1
- 1
converter/usb_usb/keymap_editor.c
View File
| @@ -52,7 +52,7 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] __attribute__ ((section (".key | |||
| ), | |||
| }; | |||
| const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { | |||
| const action_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { | |||
| [0] = ACTION_LAYER_MOMENTARY(1), | |||
| [1] = ACTION_LAYER_MOMENTARY(2), | |||
| [2] = ACTION_LAYER_MOMENTARY(3), | |||
+ 2
- 2
converter/usb_usb/keymap_hasu.c
View File
| @@ -142,9 +142,9 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| * Fn action definition | |||
| */ | |||
| #ifdef KEYMAP_SECTION_ENABLE | |||
| const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { | |||
| const action_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { | |||
| #else | |||
| const uint16_t fn_actions[] PROGMEM = { | |||
| const action_t fn_actions[] PROGMEM = { | |||
| #endif | |||
| [0] = ACTION_DEFAULT_LAYER_SET(0), // Default layer(not used) | |||
| [1] = ACTION_LAYER_TAP_TOGGLE(1), // HHKB layer(toggle with 5 taps) | |||
+ 1
- 1
converter/usb_usb/keymap_iso.c
View File
| @@ -32,5 +32,5 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { | |||
| /* | |||
| * Fn action definition | |||
| */ | |||
| const uint16_t fn_actions[] PROGMEM = { | |||
| const action_t fn_actions[] PROGMEM = { | |||
| }; | |||
+ 1
- 1
converter/usb_usb/keymap_jis.c
View File
| @@ -32,5 +32,5 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { | |||
| /* | |||
| * Fn action definition | |||
| */ | |||
| const uint16_t fn_actions[] PROGMEM = { | |||
| const action_t fn_actions[] PROGMEM = { | |||
| }; | |||
+ 1
- 1
converter/usb_usb/keymap_spacefn.c
View File
| @@ -58,7 +58,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| ), | |||
| }; | |||
| const uint16_t PROGMEM fn_actions[] = { | |||
| const action_t PROGMEM fn_actions[] = { | |||
| [0] = ACTION_LAYER_TAP_KEY(1, KC_SPACE), | |||
| [1] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), // tilde | |||
| }; | |||
+ 2
- 16
converter/x68k_usb/keymap.c
View File
| @@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| #include <stdint.h> | |||
| #include <stdbool.h> | |||
| #include <avr/pgmspace.h> | |||
| #include "keycode.h" | |||
| #include "action.h" | |||
| #include "util.h" | |||
| @@ -72,7 +71,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| } | |||
| static const uint16_t fn_actions[] PROGMEM = { | |||
| const action_t fn_actions[] PROGMEM = { | |||
| [0] = ACTION_FUNCTION(0), // toggle all LEDs | |||
| }; | |||
| @@ -92,7 +91,7 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| } | |||
| static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| /* X68000 Keyboard Scan codes | |||
| ,---. ,---. ,-------------------, ,-------------------. ,-----------. ,---------------. | |||
| | 61| | 62| | 63| 64| 65| 66| 67| | 68| 69| 6A| 6B| 6C| | 5A| 5B| 5C| | 5D| 52| 53| 54| | |||
| @@ -128,16 +127,3 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| LGUI,LALT,MHEN, SPC, HENK,KANA,APP, ZKHK, F14, F15, P0, PCMM,PDOT | |||
| ), | |||
| }; | |||
| /* translates key to keycode */ | |||
| uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) | |||
| { | |||
| return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); | |||
| } | |||
| /* translates Fn keycode to action */ | |||
| action_t keymap_fn_to_action(uint8_t keycode) | |||
| { | |||
| return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) }; | |||
| } | |||
+ 1
- 2
converter/xt_usb/Makefile
View File
| @@ -11,8 +11,7 @@ TMK_DIR = ../../tmk_core | |||
| TARGET_DIR = . | |||
| # project specific files | |||
| SRC = keymap_common.c \ | |||
| matrix.c \ | |||
| SRC = matrix.c \ | |||
| led.c | |||
| ifdef KEYMAP | |||
+ 0
- 31
converter/xt_usb/keymap_common.c
View File
| @@ -1,31 +0,0 @@ | |||
| /* | |||
| Copyright 2011,2012,2013 Jun Wako <[email protected]> | |||
| This program is free software: you can redistribute it and/or modify | |||
| it under the terms of the GNU General Public License as published by | |||
| the Free Software Foundation, either version 2 of the License, or | |||
| (at your option) any later version. | |||
| This program is distributed in the hope that it will be useful, | |||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| GNU General Public License for more details. | |||
| You should have received a copy of the GNU General Public License | |||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| */ | |||
| #include "keymap_common.h" | |||
| #include "progmem.h" | |||
| /* translates key to keycode */ | |||
| uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) | |||
| { | |||
| return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); | |||
| } | |||
| /* translates Fn keycode to action */ | |||
| action_t keymap_fn_to_action(uint8_t keycode) | |||
| { | |||
| return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) }; | |||
| } | |||
+ 0
- 4
converter/xt_usb/keymap_common.h
View File
| @@ -28,10 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| #include "keymap.h" | |||
| // 32*8(256) byte array which converts PS/2 code into USB code | |||
| extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; | |||
| extern const uint16_t fn_actions[]; | |||
| /* All keys */ | |||
| #define KEYMAP_ALL( \ | |||
| K00, K02,K03,K04,K05,K06,K07,K08,K09,K0A,K0B,K0C,K0D, K0E,K0F,K0G, \ | |||
+ 1
- 1
converter/xt_usb/keymap_jis.c
View File
| @@ -30,5 +30,5 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| ), | |||
| }; | |||
| const uint16_t PROGMEM fn_actions[] = { | |||
| const action_t PROGMEM fn_actions[] = { | |||
| }; | |||
+ 1
- 1
converter/xt_usb/keymap_plain.c
View File
| @@ -28,5 +28,5 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| ), | |||
| }; | |||
| const uint16_t PROGMEM fn_actions[] = { | |||
| const action_t PROGMEM fn_actions[] = { | |||
| }; | |||
+ 1
- 1
converter/xt_usb/keymap_spacefn.c
View File
| @@ -54,7 +54,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| ), | |||
| }; | |||
| const uint16_t PROGMEM fn_actions[] = { | |||
| const action_t PROGMEM fn_actions[] = { | |||
| [0] = ACTION_LAYER_TAP_KEY(1, KC_SPACE), | |||
| [1] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), // tilde | |||
| }; | |||
+ 0
- 1
keyboard/alps64/Makefile
View File
| @@ -120,7 +120,6 @@ ifdef ACTIONMAP_ENABLE | |||
| KEYMAP_FILE = actionmap | |||
| else | |||
| KEYMAP_FILE = keymap | |||
| SRC := keymap_common.c $(SRC) | |||
| endif | |||
| ifdef KEYMAP | |||
| SRC := $(KEYMAP_FILE)_$(KEYMAP).c $(SRC) | |||
+ 1
- 2
keyboard/alps64/actionmap_hasu.c
View File
| @@ -1,4 +1,3 @@ | |||
| #include <avr/pgmspace.h> | |||
| #include "actionmap.h" | |||
| #include "action_code.h" | |||
| #include "actionmap_common.h" | |||
| @@ -37,7 +36,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| } | |||
| const uint16_t PROGMEM actionmaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| const action_t PROGMEM actionmaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| /* Default Layer | |||
| * ,-----------------------------------------------------------. | |||
| * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \ | | |||
+ 1
- 2
keyboard/alps64/actionmap_plain.c
View File
| @@ -1,4 +1,3 @@ | |||
| #include <avr/pgmspace.h> | |||
| #include "actionmap.h" | |||
| #include "action_code.h" | |||
| #include "actionmap_common.h" | |||
| @@ -10,7 +9,7 @@ | |||
| #define AC_LM1 ACTION_LAYER_MOMENTARY(1) // HHKB layer | |||
| const uint16_t PROGMEM actionmaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| const action_t PROGMEM actionmaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| /* Default Layer | |||
| * ,-----------------------------------------------------------. | |||
| * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|BSpc | | |||
+ 0
- 30
keyboard/alps64/keymap_common.c
View File
| @@ -1,30 +0,0 @@ | |||
| /* | |||
| Copyright 2012,2013 Jun Wako <[email protected]> | |||
| This program is free software: you can redistribute it and/or modify | |||
| it under the terms of the GNU General Public License as published by | |||
| the Free Software Foundation, either version 2 of the License, or | |||
| (at your option) any later version. | |||
| This program is distributed in the hope that it will be useful, | |||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| GNU General Public License for more details. | |||
| You should have received a copy of the GNU General Public License | |||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| */ | |||
| #include "keymap_common.h" | |||
| /* translates key to keycode */ | |||
| uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) | |||
| { | |||
| return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); | |||
| } | |||
| /* translates Fn keycode to action */ | |||
| action_t keymap_fn_to_action(uint8_t keycode) | |||
| { | |||
| return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) }; | |||
| } | |||
+ 0
- 5
keyboard/alps64/keymap_common.h
View File
| @@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| #include <stdint.h> | |||
| #include <stdbool.h> | |||
| #include <avr/pgmspace.h> | |||
| #include "keycode.h" | |||
| #include "action.h" | |||
| #include "action_macro.h" | |||
| @@ -30,10 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| #include "keymap.h" | |||
| extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; | |||
| extern const uint16_t fn_actions[]; | |||
| /* Alps64 keymap definition macro */ | |||
| #define KEYMAP( \ | |||
| K36, K37, K46, K47, K56, K57, K66, K67, K76, K77, K06, K07, K17, K26, K27, \ | |||
+ 2
- 2
keyboard/alps64/keymap_editor.c
View File
| @@ -27,9 +27,9 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { | |||
| }; | |||
| #ifdef KEYMAP_SECTION_ENABLE | |||
| const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { | |||
| const action_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { | |||
| #else | |||
| const uint16_t fn_actions[] PROGMEM = { | |||
| const action_t fn_actions[] PROGMEM = { | |||
| #endif | |||
| [0] = ACTION_LAYER_MOMENTARY(1), | |||
| [1] = ACTION_LAYER_MOMENTARY(2), | |||
+ 1
- 1
keyboard/alps64/keymap_hasu.c
View File
| @@ -121,7 +121,7 @@ enum macro_id { | |||
| /* | |||
| * Fn action definition | |||
| */ | |||
| const uint16_t PROGMEM fn_actions[] = { | |||
| const action_t PROGMEM fn_actions[] = { | |||
| [0] = ACTION_LAYER_MOMENTARY(1), // HHKB layer | |||
| [1] = ACTION_LAYER_TAP_KEY(1, KC_ENTER), // HHKB layer | |||
| [2] = ACTION_LAYER_TAP_KEY(2, KC_SLASH), // Cursor layer with Slash* | |||
+ 1
- 1
keyboard/alps64/keymap_plain.c
View File
| @@ -28,6 +28,6 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { | |||
| TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS), | |||
| }; | |||
| const uint16_t fn_actions[] PROGMEM = { | |||
| const action_t fn_actions[] PROGMEM = { | |||
| [0] = ACTION_LAYER_MOMENTARY(1), | |||
| }; | |||
+ 1
- 2
keyboard/gh60/Makefile
View File
| @@ -48,8 +48,7 @@ TMK_DIR = ../../tmk_core | |||
| TARGET_DIR = . | |||
| # project specific files | |||
| SRC = keymap_common.c \ | |||
| matrix.c \ | |||
| SRC = matrix.c \ | |||
| led.c | |||
| ifdef KEYMAP | |||
+ 0
- 30
keyboard/gh60/keymap_common.c
View File
| @@ -1,30 +0,0 @@ | |||
| /* | |||
| Copyright 2012,2013 Jun Wako <[email protected]> | |||
| This program is free software: you can redistribute it and/or modify | |||
| it under the terms of the GNU General Public License as published by | |||
| the Free Software Foundation, either version 2 of the License, or | |||
| (at your option) any later version. | |||
| This program is distributed in the hope that it will be useful, | |||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| GNU General Public License for more details. | |||
| You should have received a copy of the GNU General Public License | |||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| */ | |||
| #include "keymap_common.h" | |||
| /* translates key to keycode */ | |||
| uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) | |||
| { | |||
| return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); | |||
| } | |||
| /* translates Fn keycode to action */ | |||
| action_t keymap_fn_to_action(uint8_t keycode) | |||
| { | |||
| return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) }; | |||
| } | |||
+ 0
- 5
keyboard/gh60/keymap_common.h
View File
| @@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| #include <stdint.h> | |||
| #include <stdbool.h> | |||
| #include <avr/pgmspace.h> | |||
| #include "keycode.h" | |||
| #include "action.h" | |||
| #include "action_macro.h" | |||
| @@ -30,10 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| #include "keymap.h" | |||
| extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; | |||
| extern const uint16_t fn_actions[]; | |||
| /* GH60 keymap definition macro | |||
| * K2C, K31 and K3C are extra keys for ISO | |||
| */ | |||
+ 1
- 1
keyboard/gh60/keymap_hasu.c
View File
| @@ -131,7 +131,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| /* | |||
| * Fn action definition | |||
| */ | |||
| const uint16_t PROGMEM fn_actions[] = { | |||
| const action_t PROGMEM fn_actions[] = { | |||
| [0] = ACTION_LAYER_MOMENTARY(4), | |||
| [1] = ACTION_LAYER_TAP_KEY(5, KC_SLASH), | |||
| [2] = ACTION_LAYER_TAP_KEY(6, KC_SCLN), | |||
+ 1
- 1
keyboard/gh60/keymap_hhkb.c
View File
| @@ -47,6 +47,6 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| /* | |||
| * Fn action definition | |||
| */ | |||
| const uint16_t PROGMEM fn_actions[] = { | |||
| const action_t PROGMEM fn_actions[] = { | |||
| [0] = ACTION_LAYER_MOMENTARY(1), | |||
| }; | |||
+ 1
- 1
keyboard/gh60/keymap_plain.c
View File
| @@ -8,4 +8,4 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| LSFT,NO, Z, X, C, V, B, N, M, COMM,DOT, SLSH,NO, RSFT, \ | |||
| LCTL,LGUI,LALT, SPC, RALT,RGUI,APP, RCTL), | |||
| }; | |||
| const uint16_t PROGMEM fn_actions[] = {}; | |||
| const action_t PROGMEM fn_actions[] = {}; | |||
+ 1
- 1
keyboard/gh60/keymap_poker.c
View File
| @@ -90,7 +90,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| TRNS,TRNS,TRNS,FN6, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS, \ | |||
| TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS), | |||
| }; | |||
| const uint16_t PROGMEM fn_actions[] = { | |||
| const action_t PROGMEM fn_actions[] = { | |||
| /* Poker Layout */ | |||
| [0] = ACTION_LAYER_MOMENTARY(6), // to Fn overlay | |||
| [1] = ACTION_LAYER_TOGGLE(4), // toggle arrow overlay | |||
+ 1
- 1
keyboard/gh60/keymap_poker_bit.c
View File
| @@ -40,7 +40,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, UP, \ | |||
| TRNS,TRNS,TRNS, TRNS, TRNS,LEFT,DOWN,RGHT), | |||
| }; | |||
| const uint16_t PROGMEM fn_actions[] = { | |||
| const action_t PROGMEM fn_actions[] = { | |||
| /* Poker Layout */ | |||
| [0] = ACTION_LAYER_BIT_XOR(1, 0b0101, ON_BOTH), // Poker Fn(with fix for Esc) | |||
| [1] = ACTION_LAYER_TOGGLE(5), // Poker Arrow toggle | |||
+ 1
- 1
keyboard/gh60/keymap_poker_set.c
View File
| @@ -65,7 +65,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| /* | |||
| * Fn action definition | |||
| */ | |||
| const uint16_t PROGMEM fn_actions[] = { | |||
| const action_t PROGMEM fn_actions[] = { | |||
| /* Poker Layout */ | |||
| [0] = ACTION_LAYER_SET(4, ON_PRESS), // FN0 move to Fn'd when press | |||
| [1] = ACTION_LAYER_SET(5, ON_PRESS), // FN1 move to Fn'd arrow when press | |||
+ 1
- 1
keyboard/gh60/keymap_spacefn.c
View File
| @@ -49,7 +49,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| /* | |||
| * Fn action definition | |||
| */ | |||
| const uint16_t PROGMEM fn_actions[] = { | |||
| const action_t PROGMEM fn_actions[] = { | |||
| [0] = ACTION_LAYER_TAP_KEY(1, KC_SPACE), | |||
| [1] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), // tilde | |||
| }; | |||
+ 16
- 5
keyboard/hhkb/Makefile
View File
| @@ -49,8 +49,7 @@ TARGET_DIR = . | |||
| # List C source files here. (C dependencies are automatically generated.) | |||
| SRC += keymap_common.c \ | |||
| matrix.c \ | |||
| SRC += matrix.c \ | |||
| led.c | |||
| CONFIG_H = config.h | |||
| @@ -119,6 +118,9 @@ COMMAND_ENABLE = yes # Commands for debug and configuration | |||
| NKRO_ENABLE = yes # USB Nkey Rollover | |||
| #KEYMAP_SECTION_ENABLE = yes # fixed address keymap for keymap editor | |||
| #HHKB_JP = yes # HHKB JP support | |||
| #UNIMAP_ENABLE = yes | |||
| #ACTIONMAP_ENABLE = yes # Use 16bit actionmap instead of 8bit keymap | |||
| #KEYMAP_SECTION_ENABLE = yes # fixed address keymap for keymap editor | |||
| #OPT_DEFS += -DNO_ACTION_TAPPING | |||
| #OPT_DEFS += -DNO_ACTION_LAYER | |||
| @@ -128,13 +130,22 @@ NKRO_ENABLE = yes # USB Nkey Rollover | |||
| # | |||
| # Keymap file | |||
| # | |||
| ifdef UNIMAP_ENABLE | |||
| KEYMAP_FILE = unimap | |||
| else | |||
| ifdef ACTIONMAP_ENABLE | |||
| KEYMAP_FILE = actionmap | |||
| else | |||
| KEYMAP_FILE = keymap | |||
| endif | |||
| endif | |||
| ifdef KEYMAP | |||
| SRC := keymap_$(KEYMAP).c $(SRC) | |||
| SRC := $(KEYMAP_FILE)_$(KEYMAP).c $(SRC) | |||
| else | |||
| ifdef HHKB_JP | |||
| SRC := keymap_jp.c $(SRC) | |||
| SRC := $(KEYMAP_FILE)_jp.c $(SRC) | |||
| else | |||
| SRC := keymap_hhkb.c $(SRC) | |||
| SRC := $(KEYMAP_FILE)_hhkb.c $(SRC) | |||
| endif | |||
| endif | |||
+ 1
- 2
keyboard/hhkb/Makefile.pjrc
View File
| @@ -13,8 +13,7 @@ TMK_DIR = ../../tmk_core | |||
| TARGET_DIR = . | |||
| # keyboard dependent files | |||
| SRC = keymap_common.c \ | |||
| matrix.c \ | |||
| SRC = matrix.c \ | |||
| led.c | |||
| ifdef KEYMAP | |||
+ 1
- 2
keyboard/hhkb/Makefile.rn42
View File
| @@ -49,8 +49,7 @@ TARGET_DIR = . | |||
| # List C source files here. (C dependencies are automatically generated.) | |||
| SRC += keymap_common.c \ | |||
| matrix.c \ | |||
| SRC += matrix.c \ | |||
| led.c | |||
| CONFIG_H = config_rn42.h | |||
+ 4
- 0
keyboard/hhkb/Makefile.unimap.jp
View File
| @@ -0,0 +1,4 @@ | |||
| HHKB_JP = yes | |||
| UNIMAP_ENABLE = yes | |||
| KEYMAP_SECTION_ENABLE = yes | |||
| include Makefile | |||
+ 1336
- 0
keyboard/hhkb/hhkb_jp_unimap.hex
File diff suppressed because it is too large
View File
+ 0
- 33
keyboard/hhkb/keymap_common.c
View File
| @@ -1,33 +0,0 @@ | |||
| /* | |||
| Copyright 2012,2013 Jun Wako <[email protected]> | |||
| This program is free software: you can redistribute it and/or modify | |||
| it under the terms of the GNU General Public License as published by | |||
| the Free Software Foundation, either version 2 of the License, or | |||
| (at your option) any later version. | |||
| This program is distributed in the hope that it will be useful, | |||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| GNU General Public License for more details. | |||
| You should have received a copy of the GNU General Public License | |||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| */ | |||
| #include <stdint.h> | |||
| #include "action.h" | |||
| #include <avr/pgmspace.h> | |||
| #include "keymap_common.h" | |||
| /* translates key to keycode */ | |||
| uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key) | |||
| { | |||
| return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); | |||
| } | |||
| /* translates Fn keycode to action */ | |||
| action_t keymap_fn_to_action(uint8_t keycode) | |||
| { | |||
| return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) }; | |||
| } | |||
+ 0
- 4
keyboard/hhkb/keymap_common.h
View File
| @@ -32,10 +32,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| #include "keymap.h" | |||
| extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; | |||
| extern const uint16_t fn_actions[]; | |||
| #define KEYMAP( \ | |||
| K31, K30, K00, K10, K11, K20, K21, K40, K41, K60, K61, K70, K71, K50, K51, \ | |||
| K32, K01, K02, K13, K12, K23, K22, K42, K43, K62, K63, K73, K72, K52, \ | |||
+ 2
- 2
keyboard/hhkb/keymap_hasu.c
View File
| @@ -192,9 +192,9 @@ enum macro_id { | |||
| * Fn action definition | |||
| */ | |||
| #ifdef KEYMAP_SECTION_ENABLE | |||
| const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { | |||
| const action_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { | |||
| #else | |||
| const uint16_t fn_actions[] PROGMEM = { | |||
| const action_t fn_actions[] PROGMEM = { | |||
| #endif | |||
| [0] = ACTION_DEFAULT_LAYER_SET(0), // Default layer(not used) | |||
| [1] = ACTION_LAYER_TAP_TOGGLE(1), // HHKB layer(toggle with 5 taps) | |||
+ 2
- 2
keyboard/hhkb/keymap_hhkb.c
View File
| @@ -54,7 +54,7 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { | |||
| * Fn action definition | |||
| */ | |||
| #ifdef KEYMAP_SECTION_ENABLE | |||
| const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { | |||
| const action_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { | |||
| [0] = ACTION_LAYER_MOMENTARY(1), | |||
| [1] = ACTION_LAYER_MOMENTARY(2), | |||
| [2] = ACTION_LAYER_MOMENTARY(3), | |||
| @@ -89,7 +89,7 @@ const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { | |||
| [31] = ACTION_MODS_TAP_KEY(MOD_RSFT, KC_BSLASH), | |||
| }; | |||
| #else | |||
| const uint16_t fn_actions[] PROGMEM = { | |||
| const action_t fn_actions[] PROGMEM = { | |||
| [0] = ACTION_LAYER_MOMENTARY(1), | |||
| }; | |||
| #endif | |||
+ 2
- 2
keyboard/hhkb/keymap_jp.c
View File
| @@ -42,9 +42,9 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { | |||
| * Fn action definition | |||
| */ | |||
| #ifdef KEYMAP_SECTION_ENABLE | |||
| const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { | |||
| const action_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { | |||
| #else | |||
| const uint16_t fn_actions[] PROGMEM = { | |||
| const action_t fn_actions[] PROGMEM = { | |||
| #endif | |||
| [0] = ACTION_LAYER_MOMENTARY(1), | |||
| }; | |||
+ 1
- 1
keyboard/hhkb/keymap_spacefn.c
View File
| @@ -108,7 +108,7 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| /* | |||
| * Fn action definition | |||
| */ | |||
| const uint16_t PROGMEM fn_actions[] = { | |||
| const action_t PROGMEM fn_actions[] = { | |||
| [0] = ACTION_LAYER_MOMENTARY(1), | |||
| [1] = ACTION_LAYER_TAP_KEY(2, KC_SPACE), | |||
| [2] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), // tilde | |||
+ 222
- 0
keyboard/hhkb/unimap_common.h
View File
| @@ -0,0 +1,222 @@ | |||
| /* | |||
| Copyright 2016 Jun Wako <[email protected]> | |||
| This program is free software: you can redistribute it and/or modify | |||
| it under the terms of the GNU General Public License as published by | |||
| the Free Software Foundation, either version 2 of the License, or | |||
| (at your option) any later version. | |||
| This program is distributed in the hope that it will be useful, | |||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| GNU General Public License for more details. | |||
| You should have received a copy of the GNU General Public License | |||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| */ | |||
| #ifndef UNIMAP_COMMON_H | |||
| #define UNIMAP_COMMON_H | |||
| #include <stdint.h> | |||
| #include <avr/pgmspace.h> | |||
| #include "unimap.h" | |||
| /* HHKB JP | |||
| * ,-----------------------------------------------------------. | |||
| * |` |1 |2 |3 |4 |5 |6 |7 |8 |9 |0 |- |= |JPY|BS | | |||
| * |-----------------------------------------------------------| | |||
| * |Tab |Q |W |E |R |T |Y |U |I |O |P |[ |] |Enter| | |||
| * |------------------------------------------------------` | | |||
| * |Caps |A |S |D |F |G |H |J |K |L |; |' |# | | | |||
| * |-----------------------------------------------------------| | |||
| * |Shift |Z |X |C |V |B |N |M |, |. |/ |Ro |Up |Shi| | |||
| * |-----------------------------------------------------------| | |||
| * |Ctl||Esc|Gui|Alt|Mhn| |Hen|Kan|Alt|Ctl||Lef|Dow|Rig| | |||
| * `-----------------------------------------------------------' | |||
| * Esc = Grave(`) | |||
| * Control = Caps Lock | |||
| * Left Fn = Left Control | |||
| * Right Fn = Right Control | |||
| */ | |||
| // row:16 x col:8 | |||
| const uint8_t PROGMEM unimap_trans[MATRIX_ROWS][MATRIX_COLS] = { | |||
| // 0 | |||
| { | |||
| UNIMAP_NO, | |||
| UNIMAP_NO, | |||
| UNIMAP_GRAVE, | |||
| UNIMAP_TAB, | |||
| UNIMAP_LCTRL, | |||
| UNIMAP_LSHIFT, | |||
| UNIMAP_CAPSLOCK, | |||
| UNIMAP_NO, | |||
| }, | |||
| // 1 | |||
| { | |||
| UNIMAP_NO, | |||
| UNIMAP_NO, | |||
| UNIMAP_4, | |||
| UNIMAP_E, | |||
| UNIMAP_MHEN, | |||
| UNIMAP_C, | |||
| UNIMAP_D, | |||
| UNIMAP_NO, | |||
| }, | |||
| // 2 | |||
| { | |||
| UNIMAP_NO, | |||
| UNIMAP_NO, | |||
| UNIMAP_3, | |||
| UNIMAP_W, | |||
| UNIMAP_LALT, | |||
| UNIMAP_X, | |||
| UNIMAP_S, | |||
| UNIMAP_NO, | |||
| }, | |||
| // 3 | |||
| { | |||
| UNIMAP_NO, | |||
| UNIMAP_NO, | |||
| UNIMAP_1, | |||
| UNIMAP_NO, | |||
| UNIMAP_ESCAPE, | |||
| UNIMAP_NO, | |||
| UNIMAP_NO, | |||
| UNIMAP_NO, | |||
| }, | |||
| // 4 | |||
| { | |||
| UNIMAP_NO, | |||
| UNIMAP_NO, | |||
| UNIMAP_NO, | |||
| UNIMAP_NO, | |||
| UNIMAP_NO, | |||
| UNIMAP_NO, | |||
| UNIMAP_NO, | |||
| UNIMAP_NO, | |||
| }, | |||
| // 5 | |||
| { | |||
| UNIMAP_NO, | |||
| UNIMAP_NO, | |||
| UNIMAP_5, | |||
| UNIMAP_R, | |||
| UNIMAP_NO, | |||
| UNIMAP_V, | |||
| UNIMAP_F, | |||
| UNIMAP_NO, | |||
| }, | |||
| // 6 | |||
| { | |||
| UNIMAP_NO, | |||
| UNIMAP_NO, | |||
| UNIMAP_2, | |||
| UNIMAP_Q, | |||
| UNIMAP_LGUI, | |||
| UNIMAP_Z, | |||
| UNIMAP_A, | |||
| UNIMAP_NO, | |||
| }, | |||
| // 7 | |||
| { | |||
| UNIMAP_NO, | |||
| UNIMAP_NO, | |||
| UNIMAP_6, | |||
| UNIMAP_T, | |||
| UNIMAP_SPACE, | |||
| UNIMAP_B, | |||
| UNIMAP_G, | |||
| UNIMAP_NO, | |||
| }, | |||
| // 8 | |||
| { | |||
| UNIMAP_NO, | |||
| UNIMAP_NO, | |||
| UNIMAP_9, | |||
| UNIMAP_I, | |||
| UNIMAP_KANA, | |||
| UNIMAP_COMMA, | |||
| UNIMAP_K, | |||
| UNIMAP_NO, | |||
| }, | |||
| // 9 | |||
| { | |||
| UNIMAP_NO, | |||
| UNIMAP_NO, | |||
| UNIMAP_8, | |||
| UNIMAP_U, | |||
| UNIMAP_HENK, | |||
| UNIMAP_M, | |||
| UNIMAP_J, | |||
| UNIMAP_NO, | |||
| }, | |||
| // A | |||
| { | |||
| UNIMAP_NO, | |||
| UNIMAP_NO, | |||
| UNIMAP_7, | |||
| UNIMAP_Y, | |||
| UNIMAP_NO, | |||
| UNIMAP_N, | |||
| UNIMAP_H, | |||
| UNIMAP_NO, | |||
| }, | |||
| // B | |||
| { | |||
| UNIMAP_NO, | |||
| UNIMAP_NO, | |||
| UNIMAP_0, | |||
| UNIMAP_O, | |||
| UNIMAP_RALT, | |||
| UNIMAP_DOT, | |||
| UNIMAP_L, | |||
| UNIMAP_NO, | |||
| }, | |||
| // C | |||
| { | |||
| UNIMAP_NO, | |||
| UNIMAP_NO, | |||
| UNIMAP_BSPACE, | |||
| UNIMAP_NO, | |||
| UNIMAP_RIGHT, | |||
| UNIMAP_RSHIFT, | |||
| UNIMAP_ENTER, | |||
| UNIMAP_NO, | |||
| }, | |||
| // D | |||
| { | |||
| UNIMAP_NO, | |||
| UNIMAP_NO, | |||
| UNIMAP_JYEN, | |||
| UNIMAP_RBRACKET, | |||
| UNIMAP_DOWN, | |||
| UNIMAP_UP, | |||
| UNIMAP_NONUS_HASH, | |||
| UNIMAP_NO, | |||
| }, | |||
| // E | |||
| { | |||
| UNIMAP_NO, | |||
| UNIMAP_NO, | |||
| UNIMAP_MINUS, | |||
| UNIMAP_P, | |||
| UNIMAP_RCTRL, | |||
| UNIMAP_SLASH, | |||
| UNIMAP_SCOLON, | |||
| UNIMAP_NO, | |||
| }, | |||
| // F | |||
| { | |||
| UNIMAP_NO, | |||
| UNIMAP_NO, | |||
| UNIMAP_EQUAL, | |||
| UNIMAP_LBRACKET, | |||
| UNIMAP_LEFT, | |||
| UNIMAP_RO, | |||
| UNIMAP_QUOTE, | |||
| UNIMAP_NO, | |||
| }, | |||
| }; | |||
| #endif | |||
+ 45
- 0
keyboard/hhkb/unimap_jp.c
View File
| @@ -0,0 +1,45 @@ | |||
| /* | |||
| Copyright 2016 Jun Wako <[email protected]> | |||
| This program is free software: you can redistribute it and/or modify | |||
| it under the terms of the GNU General Public License as published by | |||
| the Free Software Foundation, either version 2 of the License, or | |||
| (at your option) any later version. | |||
| This program is distributed in the hope that it will be useful, | |||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| GNU General Public License for more details. | |||
| You should have received a copy of the GNU General Public License | |||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| */ | |||
| #include "unimap_common.h" | |||
| #define AC_FN0 ACTION_LAYER_MOMENTARY(1) | |||
| #ifdef KEYMAP_SECTION_ENABLE | |||
| const action_t actionmaps[][UNIMAP_ROWS][UNIMAP_COLS] __attribute__ ((section (".keymap.keymaps"))) = { | |||
| #else | |||
| const action_t actionmaps[][UNIMAP_ROWS][UNIMAP_COLS] PROGMEM = { | |||
| #endif | |||
| UNIMAP( | |||
| NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, | |||
| ZKHK, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, | |||
| ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, JYEN,BSPC, NO, NO, NO, NO, NO, NO, NO, | |||
| TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC, BSLS, NO, NO, NO, NO, NO, NO, NO, | |||
| LCTL,A, S, D, F, G, H, J, K, L, SCLN,QUOT, NUHS,ENT, NO, NO, NO, NO, | |||
| LSFT,NO, Z, X, C, V, B, N, M, COMM,DOT, SLSH, RO, RSFT, UP, NO, NO, NO, NO, | |||
| FN0, LGUI,LALT,MHEN, SPC, HENK,KANA,RALT,NO, NO, FN0, LEFT,DOWN,RGHT, NO, NO, NO | |||
| ), | |||
| UNIMAP( | |||
| TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, | |||
| TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS, | |||
| PWR, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,TRNS, | |||
| CAPS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PSCR,SLCK,PAUS,UP, TRNS, TRNS, TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,TRNS, | |||
| TRNS,VOLD,VOLU,MUTE,TRNS,TRNS,PAST,PSLS,HOME,PGUP,LEFT,RGHT, TRNS,PENT, TRNS,TRNS,TRNS,TRNS, | |||
| TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PPLS,PMNS,END, PGDN,DOWN, TRNS,TRNS, PGUP, TRNS,TRNS,TRNS,TRNS, | |||
| TRNS,TRNS,TRNS,TRNS, TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, HOME,PGDN,END, TRNS, TRNS,TRNS | |||
| ), | |||
| }; | |||
+ 0
- 1
keyboard/infinity/Makefile
View File
| @@ -9,7 +9,6 @@ OBJDIR = ./build | |||
| OBJECTS = \ | |||
| $(OBJDIR)/matrix.o \ | |||
| $(OBJDIR)/keymap_common.o \ | |||
| $(OBJDIR)/led.o \ | |||
| $(OBJDIR)/main.o | |||
+ 0
- 0
keyboard/infinity/keymap.c
View File
Some files were not shown because too many files changed in this diff
Loading…