.gitignore

@@ -12,5 +12,3 @@ tags
 build/
 *.bak
 .DS_Store
-!converter/*/binary/*.hex
-!keyboard/*/binary/*.hex

README.md

@@ -1,22 +1,12 @@
 TMK Keyboard Firmware Collection
 ================================
-This repository includes keyboard and converter firmware projects built with [`tmk_core`][tmk_core] keyboard library.
+This is a keyboard firmware with some useful features for Atmel AVR controller.
 
-The latest source code is available here: <http://github.com/tmk/tmk_keyboard>
+Source code is available here: <http://github.com/tmk/tmk_keyboard>
 
 
 Updates
 -------
-#### 2017/01/11
-Changed action code for `ACTION_LAYER_MODS` and this may cause incompatibility with existent shared URL and downloaded firmwware of keymap editor. If you are using the action you just have to redefine it on keymap editor. Existent keymap code should not suffer.
-
-#### 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>
-
 #### 2016/02/10
 core: flabbergast's Chibios protocol was merged from <https://github.com/flabbergast/tmk_keyboard/tree/chibios> (@72b1668). See [tmk_core/protocol/chibios/README.md](tmk_core/protocol/chibios/README.md). Chibios protocol supports Cortex-M such as STM32 and Kinetis.
 
@@ -29,6 +19,28 @@ In `Makefile` you need to set `TMK_DIR` to indicate core library location now.
 
 
 
+Features
+--------
+These features can be used in your keyboard.
+
+* Multi-layer Keymap  - Multiple keyboard layouts with layer switching
+* Mouse key           - Mouse control with keyboard
+* System Control Key  - Power Down, Sleep, Wake Up and USB Remote Wake up
+* Media Control Key   - Volume Down/Up, Mute, Next/Prev track, Play, Stop and etc
+* USB NKRO            - 120 keys(+ 8 modifiers) simultaneously
+* PS/2 mouse support  - PS/2 mouse(TrackPoint) as composite device
+* Keyboard protocols  - PS/2, ADB, M0110, Sun and other old keyboard protocols
+* User Function       - Customizable function of key with writing code
+* Macro               - Very primitive at this time
+* Keyboard Tricks     - Oneshot modifier and modifier with tapping feature
+* Debug Console       - Messages for debug and interaction with firmware
+* Virtual DIP Switch  - Configurations stored EEPROM(Boot Magic)
+* Locking CapsLock    - Mechanical switch support for CapsLock
+* Breathing Sleep LED - Sleep indicator with charm during USB suspend
+* Backlight           - Control backlight levels
+
+
+
 Projects
 --------
 You can find some keyboard specific projects under `converter` and `keyboard` directory.
@@ -42,23 +54,32 @@ You can find some keyboard specific projects under `converter` and `keyboard` di
 * [x68k_usb](converter/x68k_usb/)           - [Sharp X68000 keyboard to USB][GH_x68k]
 * [sun_usb](converter/sun_usb/)             - [Sun] to USB(type4, 5 and 3?)
 * [pc98_usb](converter/pc98_usb/)           - [PC98] to USB
-* [usb_usb](converter/usb_usb/)             - [USB to USB][GH_usb]
-* [ibm4704_usb](converter/ibm4704_usb)      - [IBM 4704 keyboard to USB][GH_ibm4704]
-* [next_usb](converter/next_usb)            - NeXT(Non-ADB) to USB, contributed by [BCG](https://github.com/bgould) and based on [Adafruit's work](https://learn.adafruit.com/usb-next-keyboard-with-arduino-micro/overview)
+* [usb_usb](converter/usb_usb/)             - USB to USB(experimental)
+* [ascii_usb](converter/ascii_usb/)         - ASCII(Serial console terminal) to USB
+* [ibm4704_usb](converter/ibm4704_usb)      - [IBM 4704 keyboard Converter][GH_ibm4704]
 
 ### keyboard
 * [hhkb](keyboard/hhkb/)                    - [Happy Hacking Keyboard pro][GH_hhkb] **my main board**
-* [alps64](keyboard/alps64/)                - [Alps64 PCB](https://geekhack.org/index.php?topic=69740.0)
-* [hbkb](keyboard/hbkb/)                    - [Happy Buckling spring keyboard][GH_hbkb](IBM Model M 60% mod)
-* [Infinity](keyboard/infinity/)            - Massdrop [Infinity keyboard][Infinity]
 * [gh60](keyboard/gh60/)                    - [GH60] DIY 60% keyboard [prototype][GH60_proto] **my second board**
-* [onekey](keyboard/onekey/)                - Simple one key keyboard example
-
-
-### Projects based tmk_keyboard or tmk_core
-https://github.com/tmk/tmk_keyboard/wiki/TMK-Based-Projects
+* [hbkb](keyboard/hbkb/)                    - [Happy Buckling spring keyboard][GH_hbkb](IBM Model M 60% mod)
+* [hid_liber](keyboard/hid_liber/)          - [HID liberation][HID_liber] controller (by alaricljs)
+* [phantom](keyboard/phantom/)              - [Phantom] keyboard (by Tranquilite)
+* [IIgs_Standard](keyboard/IIgs/)           - Apple [IIGS] keyboard mod(by JeffreySung)
+* [macway](keyboard/macway/)                - [Compact keyboard mod][GH_macway] [retired]
+* [KMAC](keyboard/kmac/)                    - Korean custom keyboard
+* [Lightsaber](keyboard/lightsaber/)        - Korean custom keyboard
+* [Infinity](keyboard/infinity/)            - Massdrop [Infinity keyboard][Infinity]
+* [NerD](keyboard/nerd/)                    - Korean custom keyboard
+* [KittenPaw](keyboard/kitten_paw)          - Custom Majestouch controller
+* [Lightpad](keyboard/lightpad)             - Korean custom keypad
+* [ghost_squid](keyboard/ghost_squid/)      - [The Ghost Squid][ghost_squid] controller for [Cooler Master QuickFire XT][cmxt]
+
+### External projects using tmk_keyboard
+* [ErgoDox_cub-uanic][cub-uanic]            - Split Ergonomic Keyboard [ErgoDox][ergodox_org]
+* [mcdox][mcdox_tmk]                        - [mcdox][mcdox]
 
 
+[GH_macway]:    http://geekhack.org/showwiki.php?title=Island:11930
 [GH_hhkb]:      http://geekhack.org/showwiki.php?title=Island:12047
 [GH_ps2]:       http://geekhack.org/showwiki.php?title=Island:14618
 [GH_adb]:       http://geekhack.org/showwiki.php?title=Island:14290
@@ -69,12 +90,20 @@ https://github.com/tmk/tmk_keyboard/wiki/TMK-Based-Projects
 [GH_x68k]:      http://geekhack.org/showwiki.php?title=Island:29060
 [GH_hbkb]:      http://geekhack.org/showwiki.php?title=Island:29483
 [GH_ibm4704]:   http://geekhack.org/index.php?topic=54706.0
+[HID_liber]:    http://deskthority.net/wiki/HID_Liberation_Device_-_DIY_Instructions
+[Phantom]:      http://geekhack.org/index.php?topic=26742
 [GH60]:         http://geekhack.org/index.php?topic=34959
 [GH60_proto]:   http://geekhack.org/index.php?topic=37570.0
 [PC98]:         http://en.wikipedia.org/wiki/NEC_PC-9801
 [Sun]:          http://en.wikipedia.org/wiki/Sun-3
+[IIGS]:         http://en.wikipedia.org/wiki/Apple_IIGS
 [Infinity]:     https://www.massdrop.com/buy/infinity-keyboard-kit
-[tmk_core]:     https://github.com/tmk/tmk_core
+[ghost_squid]:  http://deskthority.net/wiki/Costar_replacement_controllers#The_Ghost_Squid
+[cmxt]:         http://gaming.coolermaster.com/en/products/keyboards/quickfirext/
+[ergodox_org]:  http://ergodox.org/
+[cub-uanic]:    https://github.com/cub-uanic/tmk_keyboard/tree/master/keyboard/ergodox
+[mcdox]:        https://github.com/DavidMcEwan/mcdox
+[mcdox_tmk]:    https://github.com/DavidMcEwan/tmk_keyboard/tree/master/keyboard/mcdox
 
 
 
@@ -102,7 +131,7 @@ Magic Commands
 --------------
 To see help press `Magic` + `H`.
 
-`Magic` key combination is `LShift` + `RShift` in many projects, but `Power` key on ADB converter.
+`Magic` key combination is `LShift` + `RShift` in many project, but `Power` key on ADB converter. 
 `Magic` keybind can be vary on each project, check `config.h` in project directory.
 
 Following commands can be also executed with `Magic` + key. In console mode `Magic` keybind is not needed.
@@ -185,21 +214,15 @@ ync option tries to keep switch state consistent with keyboard LED state.
 
 Start Your Own Project
 -----------------------
-1. Add `tmk_core` into your repository using `git submodule` or `git subtree`.
-2. Copy files from `tmk_keybaord` or other project similar to yours
-3. Edit those files to support your keyboard.
-
-See these as examples.
-- https://github.com/tmk/infinity_ergodox
-- https://github.com/tmk/whitefox
+**TBD**
 
 
 
 Debugging
 --------
-Use PJRC's `hid_listen` to see debug messages. You can use xprintf() to display debug info, see `tmk_core/common/xprintf.h`.
+Use PJRC's `hid_listen` to see debug messages. You can use the tool for debug even if firmware use LUFA stack.
 
-- https://www.pjrc.com/teensy/hid_listen.html
+You can use xprintf() to display debug info on `hid_listen`, see `tmk_core/common/xprintf.h`.
 
 
 
@@ -213,13 +236,6 @@ Files and Directories
 
 
 
-Contribution
-------------
-- Report bugs in github **[Issues](https://github.com/tmk/tmk_keyboard/issues)**.
-- Pull requets are also welcomed.
-
-
-
 Coding Style
 -------------
 - Doesn't use Tab to indent, use 4-spaces instead.

converter/adb_usb/Makefile

@@ -1,17 +1,64 @@
+#----------------------------------------------------------------------------
+# 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
+TARGET = adb_usb_lufa
 
 # 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 ?=	matrix.c \
+SRC =	keymap_common.c \
+	matrix.c \
 	led.c \
 	adb.c
 
+ifdef KEYMAP
+    SRC := keymap_$(KEYMAP).c $(SRC)
+else
+    SRC := keymap_plain.c $(SRC)
+endif
+
 CONFIG_H = config.h
 
 
@@ -19,7 +66,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
@@ -32,14 +79,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
@@ -52,7 +99,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
@@ -78,9 +125,6 @@ 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
@@ -89,26 +133,6 @@ 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)

converter/adb_usb/Makefile.rev1

@@ -1,3 +1,143 @@
-TARGET = adb_usb_rev1
+#----------------------------------------------------------------------------
+# 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
 MCU = atmega32u4
-include Makefile
+
+# 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

converter/adb_usb/Makefile.teensy

@@ -1,3 +1,143 @@
-TARGET = adb_usb_teensy
+#----------------------------------------------------------------------------
+# 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
 MCU = atmega32u4
-include Makefile
+
+# 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

converter/adb_usb/Makefile.unimap.rev1

@@ -1,5 +0,0 @@
-TARGET = adb_usb_rev1_unimap
-UNIMAP_ENABLE = yes
-KEYMAP_SECTION_ENABLE = yes
-MCU = atmega32u4
-include Makefile

converter/adb_usb/Makefile.unimap.rev2

@@ -1,5 +0,0 @@
-TARGET = adb_usb_rev2_unimap
-UNIMAP_ENABLE = yes
-KEYMAP_SECTION_ENABLE = yes
-MCU = atmega32u2
-include Makefile

converter/adb_usb/README.md

@@ -1,10 +1,10 @@
 ADB to USB keyboard converter
 =============================
-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.
+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.
 
-Discuss here: http://geekhack.org/showwiki.php?title=Island:14290
+Discuss: http://geekhack.org/showwiki.php?title=Island:14290
 
-You can buy a TMK converter here: https://geekhack.org/index.php?topic=72052.0
+TMK Converter: https://geekhack.org/index.php?topic=72052.0
 
 
 

converter/adb_usb/config.h

@@ -40,6 +40,10 @@ 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

converter/adb_usb/keymap_ansi.c

@@ -12,5 +12,5 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 };
 
-const action_t PROGMEM fn_actions[] = {
+const uint16_t PROGMEM fn_actions[] = {
 };

converter/adb_usb/keymap_common.h

@@ -19,6 +19,7 @@ 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"
@@ -28,6 +29,10 @@ 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|
@@ -225,7 +230,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    K36,K3A,K37,            K31,                K3B,K3C,K3D, K52,    K41,K4C  \
 ) { \
   { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07 }, \
-  { KC_##K08, KC_##K09, KC_##K0A, KC_##K0B, KC_##K0C, KC_##K0D, KC_##K0E, KC_##K0F }, \
+  { KC_##K08, KC_##K09, KC_##K0A  KC_##K0B, KC_##K0C, KC_##K0D, KC_##K0E, KC_##K0F }, \
   { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17 }, \
   { KC_##K18, KC_##K19, KC_##K1A, KC_##K1B, KC_##K1C, KC_##K1D, KC_##K1E, KC_##K1F }, \
   { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27 }, \

converter/adb_usb/keymap_hasu.c

@@ -53,6 +53,6 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 };
 
-const action_t PROGMEM fn_actions[] = {
+const uint16_t PROGMEM fn_actions[] = {
     [0] = ACTION_LAYER_TAP_KEY(1, KC_BSLS),
 };

converter/adb_usb/keymap_iso.c

@@ -12,5 +12,5 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 };
 
-const action_t PROGMEM fn_actions[] = {
+const uint16_t PROGMEM fn_actions[] = {
 };

converter/adb_usb/keymap_plain.c

@@ -36,7 +36,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 };
 
-const action_t PROGMEM fn_actions[] = {
+const uint16_t PROGMEM fn_actions[] = {
     [0] = ACTION_LAYER_TAP_KEY(1, KC_GRV),
     [1] = ACTION_LAYER_TAP_KEY(1, KC_BSLS),
 };

converter/adb_usb/matrix.c

@@ -29,21 +29,46 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "matrix.h"
 #include "report.h"
 #include "host.h"
-#include "led.h"
 
 
+#if (MATRIX_COLS > 16)
+#   error "MATRIX_COLS must not exceed 16"
+#endif
+#if (MATRIX_ROWS > 255)
+#   error "MATRIX_ROWS must not exceed 255"
+#endif
 
 
 static bool has_media_keys = false;
 static bool is_iso_layout = false;
+static bool is_modified = false;
 static report_mouse_t mouse_report = {};
 
 // matrix state buffer(1:on, 0:off)
-static matrix_row_t matrix[MATRIX_ROWS];
+#if (MATRIX_COLS <= 8)
+static uint8_t matrix[MATRIX_ROWS];
+#else
+static uint16_t matrix[MATRIX_ROWS];
+#endif
 
+#ifdef MATRIX_HAS_GHOST
+static bool matrix_has_ghost_in_row(uint8_t row);
+#endif
 static void register_key(uint8_t key);
 
 
+inline
+uint8_t matrix_rows(void)
+{
+    return MATRIX_ROWS;
+}
+
+inline
+uint8_t matrix_cols(void)
+{
+    return MATRIX_COLS;
+}
+
 void matrix_init(void)
 {
     // LED on
@@ -65,7 +90,7 @@ void matrix_init(void)
 
     // Determine ISO keyboard by handler id
     // http://lxr.free-electrons.com/source/drivers/macintosh/adbhid.c?v=4.4#L815
-    uint8_t handler_id = (uint8_t) adb_host_talk(ADB_ADDR_KEYBOARD, ADB_REG_3);
+    uint16_t handler_id = adb_host_talk(ADB_ADDR_KEYBOARD, ADB_REG_3);
     switch (handler_id) {
     case 0x04: case 0x05: case 0x07: case 0x09: case 0x0D:
     case 0x11: case 0x14: case 0x19: case 0x1D: case 0xC1:
@@ -102,8 +127,6 @@ void matrix_init(void)
     // initialize matrix state: all keys off
     for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
 
-    led_set(host_keyboard_leds());
-
     debug_enable = true;
     //debug_matrix = true;
     //debug_keyboard = true;
@@ -185,6 +208,8 @@ uint8_t matrix_scan(void)
     uint16_t codes;
     uint8_t key0, key1;
 
+    is_modified = false;
+
     codes = extra_key;
     extra_key = 0xFFFF;
 
@@ -303,12 +328,93 @@ uint8_t matrix_scan(void)
     return 1;
 }
 
+bool matrix_is_modified(void)
+{
+    return is_modified;
+}
+
 inline
-matrix_row_t matrix_get_row(uint8_t row)
+bool matrix_has_ghost(void)
+{
+#ifdef MATRIX_HAS_GHOST
+    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+        if (matrix_has_ghost_in_row(i))
+            return true;
+    }
+#endif
+    return false;
+}
+
+inline
+bool matrix_is_on(uint8_t row, uint8_t col)
+{
+    return (matrix[row] & (1<<col));
+}
+
+inline
+#if (MATRIX_COLS <= 8)
+uint8_t matrix_get_row(uint8_t row)
+#else
+uint16_t matrix_get_row(uint8_t row)
+#endif
 {
     return matrix[row];
 }
 
+void matrix_print(void)
+{
+    if (!debug_matrix) return;
+#if (MATRIX_COLS <= 8)
+    print("r/c 01234567\n");
+#else
+    print("r/c 0123456789ABCDEF\n");
+#endif
+    for (uint8_t row = 0; row < matrix_rows(); row++) {
+        phex(row); print(": ");
+#if (MATRIX_COLS <= 8)
+        pbin_reverse(matrix_get_row(row));
+#else
+        pbin_reverse16(matrix_get_row(row));
+#endif
+#ifdef MATRIX_HAS_GHOST
+        if (matrix_has_ghost_in_row(row)) {
+            print(" <ghost");
+        }
+#endif
+        print("\n");
+    }
+}
+
+uint8_t matrix_key_count(void)
+{
+    uint8_t count = 0;
+    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+#if (MATRIX_COLS <= 8)
+        count += bitpop(matrix[i]);
+#else
+        count += bitpop16(matrix[i]);
+#endif
+    }
+    return count;
+}
+
+#ifdef MATRIX_HAS_GHOST
+inline
+static bool matrix_has_ghost_in_row(uint8_t row)
+{
+    // no ghost exists in case less than 2 keys on
+    if (((matrix[row] - 1) & matrix[row]) == 0)
+        return false;
+
+    // ghost exists in case same state as other row
+    for (uint8_t i=0; i < MATRIX_ROWS; i++) {
+        if (i != row && (matrix[i] & matrix[row]) == matrix[row])
+            return true;
+    }
+    return false;
+}
+#endif
+
 inline
 static void register_key(uint8_t key)
 {
@@ -320,4 +426,5 @@ static void register_key(uint8_t key)
     } else {
         matrix[row] |=  (1<<col);
     }
+    is_modified = true;
 }

converter/adb_usb/unimap_common.h

@@ -1,213 +0,0 @@
-/*
-Copyright 2016 Jun Wako <wakojun@gmail.com>
-
-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

converter/adb_usb/unimap_plain.c

@@ -1,47 +0,0 @@
-/*
-Copyright 2016 Jun Wako <wakojun@gmail.com>
-
-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)
-#define AC_PKEY ACTION_MODS_TAP_KEY(MOD_NONE, KC_POWER)
-
-#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(
-              MPLY,NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  PKEY,
-    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,  PENT,
-    LCTL,LGUI,LALT,NO,            SPC,           NO,  NO,  RALT,RGUI,NO,  RCTL,     LEFT,DOWN,RGHT,    P0,       PDOT,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,
-    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
-    ),
-};

converter/ibm4704_usb/Makefile

@@ -1,36 +1,25 @@
 # Target file name (without extension).
-TARGET ?= ibm4704_usb
+TARGET = ibm4704_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 ?=	matrix.c \
+SRC =	keymap_common.c \
+	matrix.c \
 	led.c \
 	protocol/ibm4704.c
 
-#
-# 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)
+    SRC := keymap_$(KEYMAP).c $(SRC)
 else
-    SRC := $(KEYMAP_FILE)_plain.c $(SRC)
+    SRC := keymap_plain.c $(SRC)
 endif
 
-CONFIG_H ?= config.h
+CONFIG_H = config.h
 
 
 # MCU name
@@ -48,14 +37,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
@@ -68,7 +57,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
@@ -80,19 +69,18 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 #   Atmel DFU loader 4096
 #   LUFA bootloader  4096
 #   USBaspLoader     2048
-BOOTLOADER_SIZE ?= 4096
-OPT_DEFS += -DBOOTLOADER_SIZE=$(BOOTLOADER_SIZE)
+OPT_DEFS += -DBOOTLOADER_SIZE=4096
 
 
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE ?= no	# 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
-NKRO_ENABLE ?= no	# USB Nkey Rollover
+#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
+#NKRO_ENABLE = yes	# USB Nkey Rollover - not yet supported in LUFA
 
 
 # Search Path

converter/ibm4704_usb/Makefile.tmk_rev1

@@ -1,6 +1,5 @@
 # TMK Converter rev.1
 # which looks like this:
 # https://github.com/tmk/keyboard_converter#pcb-rev1
-TARGET = ibm4704_usb_rev1
 MCU = atmega32u4
 include Makefile

converter/ibm4704_usb/Makefile.tmk_rev2

@@ -1,6 +1,6 @@
 # TMK Converter rev.2
 # which looks like this:
 # https://github.com/tmk/keyboard_converter#pcb-rev2
-TARGET = ibm4704_usb_rev2
 MCU = atmega32u2
 include Makefile
+

converter/ibm4704_usb/Makefile.unimap.alps.rev1

@@ -1,7 +0,0 @@
-TARGET = ibm4704_usb_rev1_alps_unimap
-MCU = atmega32u4
-UNIMAP_ENABLE = yes
-KEYMAP_SECTION_ENABLE = yes
-OPT_DEFS += -DIBM4704_ALPS
-
-include Makefile

converter/ibm4704_usb/Makefile.unimap.alps.rev2

@@ -1,7 +0,0 @@
-TARGET = ibm4704_usb_rev2_alps_unimap
-MCU = atmega32u2
-UNIMAP_ENABLE = yes
-KEYMAP_SECTION_ENABLE = yes
-OPT_DEFS += -DIBM4704_ALPS
-
-include Makefile

converter/ibm4704_usb/Makefile.unimap.rev1

@@ -1,7 +0,0 @@
-TARGET = ibm4704_usb_rev1_unimap
-MCU = atmega32u4
-UNIMAP_ENABLE = yes
-KEYMAP_SECTION_ENABLE = yes
-#OPT_DEFS += -DIBM4704_ALPS
-
-include Makefile

converter/ibm4704_usb/Makefile.unimap.rev2

@@ -1,7 +0,0 @@
-TARGET = ibm4704_usb_rev2_unimap
-MCU = atmega32u2
-UNIMAP_ENABLE = yes
-KEYMAP_SECTION_ENABLE = yes
-#OPT_DEFS += -DIBM4704_ALPS
-
-include Makefile

converter/ibm4704_usb/README.md

@@ -1,14 +1,12 @@
 IBM 4704 to USB keyboard converter
 ==================================
 This firmware converts IBM 4704 keyboard protocol to USB HID.
-Keyboard initialization process takes a few seconds at start up. **You may need to plug USB cable after hooking up your keyboard to the converter.**
 
-TMK Converter for IBM4704 is available here: https://geekhack.org/index.php?topic=72052.0
+Keyboard initialization process takes a few seconds at start up. During that you will hear buzzer from the keyboard. **You need to plug USB cable after hooking up your keyboard to the converter.**
 
 
 Update
 ------
-- 2016/09/30  Unimap editor support
 - 2015/09/07  Added keymap for Alps 102-key. Thanks, tai @ geekhack!
 - 2015/05/05  Added keymaps for 107-key, 77-key and 50-key. Thanks, orihalcon @ geekhack!
 - 2015/05/19  Fixed a protocol handling bug.
@@ -65,17 +63,17 @@ Just run `make`:
 
     $ make -f <makefile>
 
-For TMK Converter rev.1 use `Makefile.rev1` as makefile:
+For TMK Converter rev.1 use `Makefile.tmk_rev1` as makefile:
 
-    $ make -f Makefile.rev1
+    $ make -f Makefile.tmk_rev1
 
-For TMK Converter rev.2 use `Makefile.rev2` as makefile:
+For TMK Converter rev.2 use `Makefile.tmk_rev2` as makefile:
 
-    $ make -f Makefile.rev2
+    $ make -f Makefile.tmk_rev2
 
 To select keymap:
 
-    $ make -f <makefile> KEYMAP=[plain|alsp102key|...]
+    $ make -f <makefile> KEYMAP=[plain|...]
 
 To indentify your TMK Converter revision see [this](https://github.com/tmk/keyboard_converter#pcb-revisions).
 

converter/ibm4704_usb/keymap_50key.c

@@ -11,7 +11,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 };
 
-const action_t PROGMEM fn_actions[] = {
+const uint16_t PROGMEM fn_actions[] = {
 };
 
 

converter/ibm4704_usb/keymap_alps102key.c

@@ -45,6 +45,6 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 };
 
-const action_t PROGMEM fn_actions[] = {
+const uint16_t PROGMEM fn_actions[] = {
     [0] = ACTION_LAYER_MOMENTARY(1),
 };

converter/ibm4704_usb/keymap_common.c

@@ -0,0 +1,30 @@
+/*
+Copyright 2011,2012,2013 Jun Wako <wakojun@gmail.com>
+
+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)]) };
+}

converter/ibm4704_usb/keymap_common.h

@@ -19,6 +19,7 @@ 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"
@@ -28,6 +29,11 @@ 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, \

converter/ibm4704_usb/keymap_hasu.c

@@ -60,7 +60,7 @@ enum macro_id {
     ALT_TAB,
 };
 
-const action_t PROGMEM fn_actions[] = {
+const uint16_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),

converter/ibm4704_usb/keymap_plain.c

@@ -45,6 +45,6 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 };
 
-const action_t PROGMEM fn_actions[] = {
+const uint16_t PROGMEM fn_actions[] = {
     [0] = ACTION_LAYER_MOMENTARY(1),
 };

converter/ibm4704_usb/matrix.c

@@ -29,6 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 static void matrix_make(uint8_t code);
 static void matrix_break(uint8_t code);
+static void matrix_clear(void);
 
 
 /*
@@ -52,6 +53,18 @@ static uint8_t matrix[MATRIX_ROWS];
 #define COL(code)      (code&0x07)
 
 
+inline
+uint8_t matrix_rows(void)
+{
+    return MATRIX_ROWS;
+}
+
+inline
+uint8_t matrix_cols(void)
+{
+    return MATRIX_COLS;
+}
+
 static void enable_break(void)
 {
     print("Enable break: ");
@@ -108,12 +121,28 @@ uint8_t matrix_scan(void)
     return 1;
 }
 
+inline
+bool matrix_is_on(uint8_t row, uint8_t col)
+{
+    return (matrix[row] & (1<<col));
+}
+
 inline
 uint8_t matrix_get_row(uint8_t row)
 {
     return matrix[row];
 }
 
+void matrix_print(void)
+{
+    print("\nr/c 01234567\n");
+    for (uint8_t row = 0; row < matrix_rows(); row++) {
+        xprintf("%02X: %08b\n", row, bitrev(matrix_get_row(row)));
+    }
+}
+
+
+
 inline
 static void matrix_make(uint8_t code)
 {
@@ -126,7 +155,8 @@ static void matrix_break(uint8_t code)
     matrix[ROW(code)] &= ~(1<<COL(code));
 }
 
-void matrix_clear(void)
+inline
+static void matrix_clear(void)
 {
     for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
 }

converter/ibm4704_usb/unimap_plain.c

@@ -1,45 +0,0 @@
-/*
-Copyright 2016 Jun Wako <wakojun@gmail.com>
-
-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_trans.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(
-              F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24,
-    ESC,      F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12,           PSCR,SLCK,PAUS,         VOLD,VOLU,MUTE,
-    GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, JYEN,BSPC,     INS, HOME,PGUP,    NLCK,PSLS,PAST,PMNS,
-    TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,     BSLS,     DEL, END, PGDN,    P7,  P8,  P9,  PPLS,
-    CAPS,A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,     NUHS,ENT,                         P4,  P5,  P6,  PCMM,
-    LSFT,NUBS,Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, SLSH,     RO,  RSFT,          UP,           P1,  P2,  P3,  PENT,
-    LCTL,LGUI,LALT,MHEN,          SPC,           HENK,KANA,RALT,RGUI,APP, FN0,      LEFT,DOWN,RGHT,    P0,       PDOT,PEQL
-    ),
-    UNIMAP(
-              TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
-    GRV,      F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24,           TRNS,TRNS,TRNS,         TRNS,TRNS,TRNS,
-    ESC, 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,  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
-    ),
-};

converter/ibm4704_usb/unimap_trans.h

@@ -1,113 +0,0 @@
-/*
-Copyright 2016 Jun Wako <wakojun@gmail.com>
-
-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_TRNAS_H
-#define UNIMAP_TRNAS_H
-
-#include <stdint.h>
-#include <avr/pgmspace.h>
-#include "unimap.h"
-
-
-const uint8_t PROGMEM unimap_trans[MATRIX_ROWS][MATRIX_COLS] = { // 16*8
-#ifndef IBM4704_ALPS
-    /* IBM4740 Capcitive models(62-key/77-key/107-key)
-     * ,-------. ,-----------------------------------------------------------. ,-----------. ,---------------.
-     * | F1| F2| |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|JPY|BSp| |Ins|Hom|PgU| |NmL|  /|  *|  -|
-     * |-------| |-----------------------------------------------------------| |-----------| |---------------|
-     * | F3| F4| |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \| |Del|End|PgD| |  7|  8|  9|  +|
-     * |-------| |-----------------------------------------------------------| |-----------| |---------------|
-     * | F5| F6| |Caps  |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  #|Retn| |PrS|ScL|Pau| |  4|  5|  6|KP,|
-     * |-------| |-----------------------------------------------------------| |-----------| |---------------|
-     * | F7| F8| |Shif|  <|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /| RO|Shift | |F11| Up|F12| |  1|  2|  3|Ent|
-     * |-------| |-----------------------------------------------------------| |-----------| |---------------|
-     * | F9|F10| |Ctrl |Gui|Alt  |         Space             |Alt* |Gui|Ctrl | |Lef|Dow|Rig| |Esc|  0|KP.|KP=|
-     * `-------' `-----------------------------------------------------------' `-----------' `---------------'
-     * scan codes
-     * ,-------. ,-----------------------------------------------------------. ,-----------. ,---------------.
-     * | 46| 64| | 00| 18| 19| 1A| 10| 11| 12| 08| 09| 0A| 0F| 1F| 0D| 0C| 0E| | 6A| 6B| 6C| | 47| 48| 49| 4A|
-     * |-------| |-----------------------------------------------------------| |-----------| |---------------|
-     * | 56| 66| | 04  | 05| 06| 13| 14| 15| 16| 17| 01| 02| 03| 1B| 1C|   1D| | 6D| 6E| 6F| | 4B| 4C| 4D| 4E|
-     * |-------| |-----------------------------------------------------------| |-----------| |---------------|
-     * | 71| 77| | 20   | 21| 22| 23| 24| 25| 26| 27| 28| 29| 2A| 2B| 2C|  2D| | 70| 65| 72| | 50| 51| 52| 53|
-     * |-------| |-----------------------------------------------------------| |-----------| |---------------|
-     * | 44| 45| | 30 | 3E| 32| 33| 34| 35| 36| 37| 38| 39| 3A| 3B| 3C|    3D| | 74| 75| 76| | 5E| 58| 59| 5A|
-     * |-------| |-----------------------------------------------------------| |-----------| |---------------|
-     * | 54| 55| |  31 | 41|  3F |          40               | *3F | 42|  2F | | 78| 67| 79| | 5B| 5C| 5D| 57|
-     * `-------' `-----------------------------------------------------------' `-----------' `---------------'
-     * Both Alt keys spit same scan code 3F.
-     */
-    { UNIMAP_GRV,  UNIMAP_I,    UNIMAP_O,    UNIMAP_P,    UNIMAP_TAB,  UNIMAP_Q,    UNIMAP_W,    UNIMAP_NO   }, // 00-07
-    { UNIMAP_7,    UNIMAP_8,    UNIMAP_9,    UNIMAP_NO,   UNIMAP_JYEN, UNIMAP_EQL,  UNIMAP_BSPC, UNIMAP_0    }, // 08-0F
-    { UNIMAP_4,    UNIMAP_5,    UNIMAP_6,    UNIMAP_E,    UNIMAP_R,    UNIMAP_T,    UNIMAP_Y,    UNIMAP_U    }, // 10-17
-    { UNIMAP_1,    UNIMAP_2,    UNIMAP_3,    UNIMAP_LBRC, UNIMAP_RBRC, UNIMAP_BSLS, UNIMAP_NO,   UNIMAP_MINS }, // 18-1F
-    { UNIMAP_CAPS, UNIMAP_A,    UNIMAP_S,    UNIMAP_D,    UNIMAP_F,    UNIMAP_G,    UNIMAP_H,    UNIMAP_J    }, // 20-27
-    { UNIMAP_K,    UNIMAP_L,    UNIMAP_SCLN, UNIMAP_QUOT, UNIMAP_NUHS, UNIMAP_ENT,  UNIMAP_NO,   UNIMAP_RCTL }, // 28-2F
-    { UNIMAP_LSFT, UNIMAP_LCTL, UNIMAP_Z,    UNIMAP_X,    UNIMAP_C,    UNIMAP_V,    UNIMAP_B,    UNIMAP_N,   }, // 30-37
-    { UNIMAP_M,    UNIMAP_COMM, UNIMAP_DOT,  UNIMAP_SLSH, UNIMAP_RO,   UNIMAP_RSFT, UNIMAP_NUBS, UNIMAP_LALT }, // 38-3F
-    { UNIMAP_SPC,  UNIMAP_LGUI, UNIMAP_RGUI, UNIMAP_NO,   UNIMAP_F7,   UNIMAP_F8,   UNIMAP_F1,   UNIMAP_NLCK }, // 40-47
-    { UNIMAP_PSLS, UNIMAP_PAST, UNIMAP_PMNS, UNIMAP_P7,   UNIMAP_P8,   UNIMAP_P9,   UNIMAP_PPLS, UNIMAP_NO   }, // 48-4F
-    { UNIMAP_P4,   UNIMAP_P5,   UNIMAP_P6,   UNIMAP_PCMM, UNIMAP_F9,   UNIMAP_F10,  UNIMAP_F3,   UNIMAP_PEQL }, // 50-57
-    { UNIMAP_P2,   UNIMAP_P3,   UNIMAP_PENT, UNIMAP_ESC,  UNIMAP_P0,   UNIMAP_PDOT, UNIMAP_P1,   UNIMAP_NO   }, // 58-5F
-    { UNIMAP_NO,   UNIMAP_NO,   UNIMAP_NO,   UNIMAP_NO,   UNIMAP_F2,   UNIMAP_SLCK, UNIMAP_F4,   UNIMAP_DOWN }, // 60-67
-    { UNIMAP_NO,   UNIMAP_NO,   UNIMAP_INS,  UNIMAP_HOME, UNIMAP_PGUP, UNIMAP_DEL,  UNIMAP_END,  UNIMAP_PGDN }, // 68-6F
-    { UNIMAP_PSCR, UNIMAP_F5,   UNIMAP_PAUS, UNIMAP_NO,   UNIMAP_F11,  UNIMAP_UP,   UNIMAP_F12,  UNIMAP_F6   }, // 70-77
-    { UNIMAP_LEFT, UNIMAP_RGHT, UNIMAP_NO,   UNIMAP_NO,   UNIMAP_NO,   UNIMAP_NO,   UNIMAP_NO,   UNIMAP_NO   }  // 78-7F
-#else
-    /* IBM4740 Alps models(102-key)
-     * ,---------------------------------------------------------------. ,-----------. ,---------------.
-     * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|JPY|BSp| F1| |Ins|Hom|PgU| |NmL|  /|  *|  -|
-     * |---------------------------------------------------------------| |-----------| |---------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \| F2| |Del|End|PgD| |  7|  8|  9|  +|
-     * |---------------------------------------------------------------| |-----------| |---------------|
-     * |Caps  |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  #|Retn| F3| |PrS|ScL|Pau| |  4|  5|  6|KP,|
-     * |---------------------------------------------------------------| |-----------| |---------------|
-     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /| RO|Shift | F4| |F11| Up|F12| |  1|  2|  3|Ent|
-     * |---------------------------------------------------------------| |-----------| |---------------|
-     * |Ctrl |Gui|Alt  |         Space             |Alt  |Gui|  Ctrl   | |Lef|Dow|Rig| |Esc|  0|KP.|KP=|
-     * `---------------------------------------------------------------' `-----------' `---------------'
-     * ,---------------------------------------------------------------. ,-----------. ,---------------.
-     * | 00| 0F| 01| 02| 03| 04| 05| 06| 07| 08| 09| 0A| 0B| 0C| 0D| 0E| | 44| 45| 46| | 43| 41| 42| 4A|
-     * |---------------------------------------------------------------| |-----------| |---------------|
-     * |  10 | 11| 12| 13| 14| 15| 16| 17| 18| 19| 1A| 1B| 1C|  1D | 1E| | 54| 55| 56| | 50| 51| 52| 5A|
-     * |---------------------------------------------------------------| |-----------| |---------------|
-     * | 20   | 21| 22| 23| 24| 25| 26| 27| 28| 29| 2A| 2B| 2C| 2D | 2E| | 64| 65| 66| | 60| 61| 62| 6B|
-     * |---------------------------------------------------------------| |-----------| |---------------|
-     * |   30   | 32| 33| 34| 35| 36| 37| 38| 39| 3A| 3B| 3C|  3D  | 3E| | 74| 75| 76| | 70| 71| 72| 7B|
-     * |---------------------------------------------------------------| |-----------| |---------------|
-     * |  31 | 47|  3F |          40               | 4F  | 48|     2F  | | 77| 67| 57| | 73| 63| 53| 4E|
-     * `---------------------------------------------------------------' `-----------' `---------------'
-     */
-    { UNIMAP_GRV,  UNIMAP_2,    UNIMAP_3,    UNIMAP_4,    UNIMAP_5,    UNIMAP_6,    UNIMAP_7,    UNIMAP_8    }, // 00-07
-    { UNIMAP_9,    UNIMAP_0,    UNIMAP_MINS, UNIMAP_EQL,  UNIMAP_JYEN, UNIMAP_BSPC, UNIMAP_F1,   UNIMAP_1    }, // 08-0F
-    { UNIMAP_TAB,  UNIMAP_Q,    UNIMAP_W,    UNIMAP_E,    UNIMAP_R,    UNIMAP_T,    UNIMAP_Y,    UNIMAP_U    }, // 10-17
-    { UNIMAP_I,    UNIMAP_O,    UNIMAP_P,    UNIMAP_LBRC, UNIMAP_RBRC, UNIMAP_BSLS, UNIMAP_F2,   UNIMAP_NO   }, // 18-1F
-    { UNIMAP_CAPS, UNIMAP_A,    UNIMAP_S,    UNIMAP_D,    UNIMAP_F,    UNIMAP_G,    UNIMAP_H,    UNIMAP_J    }, // 20-27
-    { UNIMAP_K,    UNIMAP_L,    UNIMAP_SCLN, UNIMAP_QUOT, UNIMAP_NUHS, UNIMAP_ENT,  UNIMAP_F3,   UNIMAP_RCTL }, // 28-2F
-    { UNIMAP_LSFT, UNIMAP_LCTL, UNIMAP_Z,    UNIMAP_X,    UNIMAP_C,    UNIMAP_V,    UNIMAP_B,    UNIMAP_N    }, // 30-37
-    { UNIMAP_M,    UNIMAP_COMM, UNIMAP_DOT,  UNIMAP_SLSH, UNIMAP_RO,   UNIMAP_RSFT, UNIMAP_F4,   UNIMAP_LALT }, // 38-3F
-    { UNIMAP_SPC,  UNIMAP_PSLS, UNIMAP_PAST, UNIMAP_NLCK, UNIMAP_INS,  UNIMAP_HOME, UNIMAP_PGUP, UNIMAP_LGUI }, // 40-47
-    { UNIMAP_RGUI, UNIMAP_NO,   UNIMAP_PMNS, UNIMAP_NO,   UNIMAP_NO,   UNIMAP_NO,   UNIMAP_PEQL, UNIMAP_RALT }, // 48-4F
-    { UNIMAP_P7,   UNIMAP_P8,   UNIMAP_P9,   UNIMAP_PDOT, UNIMAP_DEL,  UNIMAP_END,  UNIMAP_PGDN, UNIMAP_RGHT }, // 50-57
-    { UNIMAP_NO,   UNIMAP_NO,   UNIMAP_PPLS, UNIMAP_NO,   UNIMAP_NO,   UNIMAP_NO,   UNIMAP_NO,   UNIMAP_NO,  }, // 58-5F
-    { UNIMAP_P4,   UNIMAP_P5,   UNIMAP_P6,   UNIMAP_P0,   UNIMAP_PSCR, UNIMAP_SLCK, UNIMAP_PAUS, UNIMAP_DOWN }, // 60-67
-    { UNIMAP_NO,   UNIMAP_NO,   UNIMAP_NO,   UNIMAP_PCMM, UNIMAP_NO,   UNIMAP_NO,   UNIMAP_NO,   UNIMAP_NO,  }, // 68-6F
-    { UNIMAP_P1,   UNIMAP_P2,   UNIMAP_P3,   UNIMAP_ESC,  UNIMAP_F11,  UNIMAP_UP,   UNIMAP_F12,  UNIMAP_LEFT }, // 70-77
-    { UNIMAP_NO,   UNIMAP_NO,   UNIMAP_NO,   UNIMAP_PENT, UNIMAP_NO,   UNIMAP_NO,   UNIMAP_NO,   UNIMAP_NO,  }  // 78-7F
-#endif
-};
-
-#endif

converter/m0110_usb/Makefile

@@ -1,41 +1,32 @@
 # Target file name (without extension).
-TARGET ?= m0110_usb
+TARGET = m0110_lufa
 
 # Directory common source filess exist
-TMK_DIR ?= ../../tmk_core
+TMK_DIR = ../../tmk_core
 
 # Directory keyboard dependent files exist
-TARGET_DIR ?= .
+TARGET_DIR = .
 
 # keyboard dependent files
-SRC ?=	matrix.c \
+SRC =	matrix.c \
 	led.c \
+	keymap_common.c \
 	m0110.c
 
-#
-# Keymap file
-#
-ifdef UNIMAP_ENABLE
-    KEYMAP_FILE = unimap
-else
-    ifdef ACTIONMAP_ENABLE
-	KEYMAP_FILE = actionmap
-    else
-	KEYMAP_FILE = keymap
-    endif
-endif
+# To use own keymap file run make like: make keymap=hasu
 ifdef KEYMAP
-    SRC := $(KEYMAP_FILE)_$(KEYMAP).c $(SRC)
+    SRC += keymap_$(KEYMAP).c
 else
-    SRC := $(KEYMAP_FILE).c $(SRC)
+    SRC += keymap_default.c
 endif
 
-CONFIG_H ?= config.h
+CONFIG_H = config.h
 
 
 # MCU name, you MUST set this to match the board you are using
 # type "make clean" after changing this, so all files will be rebuilt
-MCU ?= atmega32u2
+MCU = atmega32u2       # TMK converter rev2
+#MCU = atmega32u4       # TMK converter rev1
 
 
 # Processor frequency.
@@ -43,14 +34,14 @@ MCU ?= atmega32u2
 #   so your program will run at the correct speed.  You should also set this
 #   variable to same clock speed.  The _delay_ms() macro uses this, and many
 #   examples use this variable to calculate timings.  Do not add a "UL" here.
-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
@@ -63,7 +54,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
 OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
@@ -79,19 +70,19 @@ 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
-#KEYMAP_SECTION_ENABLE ?= yes	# fixed address keymap for keymap editor
+#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 - not yet supported in LUFA
+#KEYMAP_SECTION_ENABLE = yes	# fixed address keymap for keymap editor
 
 
 
 #---------------- Programming Options --------------------------
-PROGRAM_CMD ?= teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
+PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
 
 
 # Search Path

converter/m0110_usb/Makefile.rev1

@@ -1,3 +0,0 @@
-TARGET = m0110_usb_rev1
-MCU = atmega32u4
-include Makefile

converter/m0110_usb/Makefile.rev2

@@ -1,3 +0,0 @@
-TARGET = m0110_usb_rev2
-MCU = atmega32u2
-include Makefile

converter/m0110_usb/Makefile.teensy

@@ -0,0 +1,98 @@
+# Target file name (without extension).
+TARGET = m0110_lufa
+
+# Directory common source filess exist
+TMK_DIR = ../../tmk_core
+
+# Directory keyboard dependent files exist
+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
+ifdef KEYMAP
+    SRC += keymap_$(KEYMAP).c
+else
+    SRC += keymap_default.c
+endif
+
+CONFIG_H = config.h
+
+
+# MCU name, you MUST set this to match the board you are using
+# type "make clean" after changing this, so all files will be rebuilt
+#MCU = at90usb162       # Teensy 1.0
+MCU = atmega32u4       # Teensy 2.0
+#MCU = at90usb646       # Teensy++ 1.0
+#MCU = at90usb1286      # Teensy++ 2.0
+
+
+# Processor frequency.
+#   Normally the first thing your program should do is set the clock prescaler,
+#   so your program will run at the correct speed.  You should also set this
+#   variable to same clock speed.  The _delay_ms() macro uses this, and many
+#   examples use this variable to calculate timings.  Do not add a "UL" here.
+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
+OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
+
+
+# Boot Section Size in bytes
+#   Teensy halfKay   512
+#   Atmel DFU loader 4096
+#   LUFA bootloader  4096
+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 - not yet supported in LUFA
+#KEYMAP_SECTION_ENABLE = yes	# fixed address keymap for keymap editor
+
+
+
+#---------------- Programming Options --------------------------
+PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
+
+
+# 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

converter/m0110_usb/Makefile.tmk_rev1

@@ -0,0 +1,96 @@
+# Target file name (without extension).
+TARGET = m0110_lufa
+
+# Directory common source filess exist
+TMK_DIR = ../../tmk_core
+
+# Directory keyboard dependent files exist
+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
+ifdef KEYMAP
+    SRC += keymap_$(KEYMAP).c
+else
+    SRC += keymap_default.c
+endif
+
+CONFIG_H = config.h
+
+
+# MCU name, you MUST set this to match the board you are using
+# type "make clean" after changing this, so all files will be rebuilt
+#MCU = atmega32u2       # TMK converter rev2
+MCU = atmega32u4       # TMK converter rev1
+
+
+# Processor frequency.
+#   Normally the first thing your program should do is set the clock prescaler,
+#   so your program will run at the correct speed.  You should also set this
+#   variable to same clock speed.  The _delay_ms() macro uses this, and many
+#   examples use this variable to calculate timings.  Do not add a "UL" here.
+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
+OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
+
+
+# Boot Section Size in bytes
+#   Teensy halfKay   512
+#   Atmel DFU loader 4096
+#   LUFA bootloader  4096
+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 - not yet supported in LUFA
+#KEYMAP_SECTION_ENABLE = yes	# fixed address keymap for keymap editor
+
+
+
+#---------------- Programming Options --------------------------
+PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
+
+
+# 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

converter/m0110_usb/Makefile.tmk_rev2

@@ -0,0 +1,96 @@
+# Target file name (without extension).
+TARGET = m0110_lufa
+
+# Directory common source filess exist
+TMK_DIR = ../../tmk_core
+
+# Directory keyboard dependent files exist
+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
+ifdef KEYMAP
+    SRC += keymap_$(KEYMAP).c
+else
+    SRC += keymap_default.c
+endif
+
+CONFIG_H = config.h
+
+
+# MCU name, you MUST set this to match the board you are using
+# type "make clean" after changing this, so all files will be rebuilt
+MCU = atmega32u2       # TMK converter rev2
+#MCU = atmega32u4       # TMK converter rev1
+
+
+# Processor frequency.
+#   Normally the first thing your program should do is set the clock prescaler,
+#   so your program will run at the correct speed.  You should also set this
+#   variable to same clock speed.  The _delay_ms() macro uses this, and many
+#   examples use this variable to calculate timings.  Do not add a "UL" here.
+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
+OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
+
+
+# Boot Section Size in bytes
+#   Teensy halfKay   512
+#   Atmel DFU loader 4096
+#   LUFA bootloader  4096
+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 - not yet supported in LUFA
+#KEYMAP_SECTION_ENABLE = yes	# fixed address keymap for keymap editor
+
+
+
+#---------------- Programming Options --------------------------
+PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
+
+
+# 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

converter/m0110_usb/Makefile.unimap.rev1

@@ -1,6 +0,0 @@
-TARGET = m0110_usb_rev1_unimap
-UNIMAP_ENABLE = yes
-KEYMAP_SECTION_ENABLE = yes
-MCU = atmega32u4
-#OPT_DEFS = -DM0110_INTL
-include Makefile

converter/m0110_usb/Makefile.unimap.rev2

@@ -1,6 +0,0 @@
-TARGET = m0110_usb_rev2_unimap
-UNIMAP_ENABLE = yes
-KEYMAP_SECTION_ENABLE = yes
-MCU = atmega32u2
-#OPT_DEFS = -DM0110_INTL
-include Makefile

converter/m0110_usb/README.md

@@ -4,7 +4,7 @@ This firmware converts the protocol of Apple Macintosh keyboard **M0110**, **M01
 
 Read README of top directory too.
 
-Pictures of **M0110 + M0120** and **M0110A** with [TMK converter].
+Pictures of **M0110 + M0120** and **M0110A**.
 
 ![M0110+M0120](http://i.imgur.com/dyvXb2Tm.jpg)
 ![M0110A](http://i.imgur.com/HuHOEoHm.jpg)
@@ -21,25 +21,25 @@ Update
 - 2013/09: Change port again, it uses inversely `PD0` for data and `PD1` for clock line now.
 - 2014/06: Change keymaps
 - 2015/03: Add support for "International"(ISO) keyboard(keymap_intl.c)
-- 2016/09: Unimap support - keymap editor on web browser
 
 
 
-Hardware
---------
-You can buy preassembled [TMK converter] or make yourown with AVR dev board like PJRC [Teensy].
+Building Hardware
+-----------------
+You need [TMK converter] or AVR dev board like PJRC [Teensy]. Port of the MCU `PD1` is assigned to `CLOCK` line and `PD0` to `DATA` by default, you can change pin configuration with editing `config.h`.
 
-Port of the MCU `PD1` is assigned to `CLOCK` line and `PD0` to `DATA` by default, you can change pin configuration with editing `config.h`.
-
-[![M0110 Converter](http://i.imgur.com/yEp2eRim.jpg)](http://i.imgur.com/yEp2eRi.jpg)
+[![M0110 Converter](http://i.imgur.com/4G2ZOegm.jpg)](http://i.imgur.com/4G2ZOeg.jpg)
 
 ### 4P4C phone handset cable
 Note that original cable used with Mac is **straight** while phone handset cable is **crossover**.
 
 <http://en.wikipedia.org/wiki/Modular_connector#4P4C>
 
+Close-up picture of handset cable. You can see one end of plug has reverse color codes against the other. Click to enlarge.
+[![4P4C cable](http://i.imgur.com/3S9P1mYm.jpg?1)](http://i.imgur.com/3S9P1mY.jpg?1)
+
 [Teensy]: http://www.pjrc.com/teensy/
-[TMK converter]: https://geekhack.org/index.php?topic=72052.0
+[TMK converter]: https://github.com/tmk/keyboard_converter
 
 
 ### Socket Pinout
@@ -60,19 +60,16 @@ To compile firmware you need AVR GCC. You can edit *Makefile* and *config.h* to
     $ git clone git://github.com/tmk/tmk_keyboard.git (or download source)
     $ cd m0110_usb
     $ make -f Makefile.rev2 clean
-    $ make -f Makefile.rev2 [KEYMAP={intl|spacefn}]
+    $ make -f Makefile.rev2 [KEYMAP={default|intl|spacefn|hasu}]
 
-Use `Maefile.rev1` for TMK converter rev.1 and Teensy(ATMega32u4), instead.
+Use `Maefile.tmk_rev1` for TMK converter Rev.1, `Makefile.teensy` for Teensy instead.
 
 
 
 Keymap
 ------
-To create your own keymap copy existent keymap file to `keymap_<name>.c` and edit it. You can build with `make -f Makefile.rev2 KEYMAP=<name>`.
+To create your own keymap copy existent keymap file to `keymap_name.c` and edit it.
 
-Or you can edit keymap on web browser and download firmware.
-
-http://www.tmk-kbd.com/tmk_keyboard/editor/
 
 
 Debug

converter/m0110_usb/keymap_common.c

@@ -0,0 +1,37 @@
+/*
+Copyright 2011,2012,2014 Jun Wako <wakojun@gmail.com>
+
+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;
+}

converter/m0110_usb/keymap_common.h

@@ -15,10 +15,15 @@ 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
@@ -40,7 +45,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * ,---------------------------------------------------------. ,---------------.
  * | 32| 12| 13| 14| 15| 17| 16| 1A| 1C| 19| 1D| 1B| 18|   33| | 47| 68| 6D| 62|
  * |---------------------------------------------------------| |---------------|
- * |   30| 0C| 0D| 0E| 0F| 11| 10| 20| 22| 1F| 23| 21| 1E|   | | 59| 5B| 5C| 4E|
+ * |   30| 0C| 0D| 0E| 0F| 10| 11| 20| 22| 1F| 23| 21| 1E|   | | 59| 5B| 5C| 4E|
  * |-----------------------------------------------------'   | |---------------|
  * |    39| 00| 01| 02| 03| 05| 04| 26| 28| 25| 29| 27|    24| | 56| 57| 58| 66|
  * |---------------------------------------------------------| |---------------|
@@ -53,7 +58,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * ,---------------------------------------------------------. ,---------------.
  * | 32| 12| 13| 14| 15| 17| 16| 1A| 1C| 19| 1D| 1B| 18|   33| | 47| 68| 6D| 62|
  * |---------------------------------------------------------| |---------------|
- * |   30| 0C| 0D| 0E| 0F| 11| 10| 20| 22| 1F| 23| 21| 1E| 2A| | 59| 5B| 5C| 4E|
+ * |   30| 0C| 0D| 0E| 0F| 10| 11| 20| 22| 1F| 23| 21| 1E| 2A| | 59| 5B| 5C| 4E|
  * |---------------------------------------------------------| |---------------|
  * |    39| 00| 01| 02| 03| 05| 04| 26| 28| 25| 29| 27|    24| | 56| 57| 58| 66|
  * |---------------------------------------------------------| |---------------|
@@ -94,7 +99,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * ,---------------------------------------------------------. ,---------------.
  * | 32| 12| 13| 14| 15| 17| 16| 1A| 1C| 19| 1D| 1B| 18|   33| | 47| 68| 6D| 62|
  * |---------------------------------------------------------| |---------------|
- * |   30| 0C| 0D| 0E| 0F| 11| 10| 20| 22| 1F| 23| 21| 1E| 2A| | 59| 5B| 5C| 4E|
+ * |   30| 0C| 0D| 0E| 0F| 10| 11| 20| 22| 1F| 23| 21| 1E| 2A| | 59| 5B| 5C| 4E|
  * |------------------------------------------------------,  | |---------------|
  * |    39| 00| 01| 02| 03| 05| 04| 26| 28| 25| 29| 27| 24|  | | 56| 57| 58| 66|
  * |---------------------------------------------------------| |---------------|

converter/m0110_usb/keymap_default.c

@@ -98,9 +98,9 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
  * Fn action definition
  */
 #ifdef KEYMAP_SECTION_ENABLE
-const action_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = {
+const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = {
 #else
-const action_t fn_actions[] PROGMEM = {
+const uint16_t fn_actions[] PROGMEM = {
 #endif
     [0]  = ACTION_LAYER_MOMENTARY(1),
     [1]  = ACTION_LAYER_MOMENTARY(2),

converter/m0110_usb/keymap_hasu.c

@@ -0,0 +1,87 @@
+/*
+Copyright 2014 Jun Wako <wakojun@gmail.com>
+
+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 "keycode.h"
+#include "keymap_common.h"
+
+
+const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Default:
+     * M0110
+     * ,---------------------------------------------------------.
+     * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backs|
+     * |---------------------------------------------------------|
+     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \|
+     * |---------------------------------------------------------|
+     * |Ctrl  |  A|  S|  D|  F|  G|  H|  J|  K|  L| Fn|  '|Return|
+     * |---------------------------------------------------------|
+     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  ,| Fn|Shift   |
+     * `---------------------------------------------------------'
+     *      |Fn |alt |           Fn                |Gui |Fn |
+     *      `-----------------------------------------------'
+     */
+    [0] = KEYMAP(
+    ESC, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSPC,    NLCK,EQL, PSLS,PAST,
+    TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,         P7,  P8,  P9,  PMNS,
+    LCTL,A,   S,   D,   F,   G,   H,   J,   K,   L,   FN3, QUOT,     ENT,     P4,  P5,  P6,  PPLS,
+    LSFT,Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, FN1,           UP,      P1,  P2,  P3,  PENT,
+    FN0, LALT,               FN2,                LGUI,BSLS,LEFT,RGHT,DOWN,    P0,       PDOT
+    ),
+    // IJKL cursor
+    [1] = KEYMAP(
+    GRV, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, DEL,     NLCK,EQL, PSLS,PAST,
+    CAPS,NO,  NO,  NO,  NO,  NO,  HOME,PGDN,UP,  PGUP,END, NO,  NO,           P7,  P8,  P9,  PMNS,
+    LCTL,VOLD,VOLU,MUTE,NO,  NO,  HOME,LEFT,DOWN,RGHT,END, NO,       ENT,     P4,  P5,  P6,  PPLS,
+    LSFT,NO,  NO,  NO,  NO,  NO,  HOME,PGDN,PGUP,END, NO,            PGUP,    P1,  P2,  P3,  PENT,
+    TRNS,LALT,               SPC,                LGUI,BSLS,HOME,END, PGDN,    P0,       PDOT
+    ),
+    // HJKL cursor
+    [2] = KEYMAP(
+    GRV, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, DEL,     NLCK,EQL, PSLS,PAST,
+    CAPS,NO,  NO,  NO,  NO,  NO,  HOME,PGDN,UP,  PGUP,END, NO,  NO,           P7,  P8,  P9,  PMNS,
+    LCTL,VOLD,VOLU,MUTE,NO,  NO,  LEFT,DOWN,UP,  RGHT,NO,  NO,       ENT,     P4,  P5,  P6,  PPLS,
+    LSFT,NO,  NO,  NO,  NO,  NO,  HOME,PGDN,PGUP,END, TRNS,          PGUP,    P1,  P2,  P3,  PENT,
+    TRNS,LALT,               SPC,                LGUI,BSLS,HOME,END, PGDN,    P0,       PDOT
+    ),
+    // Mousekey
+    [3] = KEYMAP(
+    GRV, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, DEL,     NLCK,EQL, PSLS,PAST,
+    CAPS,Q,   W,   E,   R,   T,   WH_L,WH_D,MS_U,WH_U,WH_R,WBAK,WFWD,         P7,  P8,  P9,  PMNS,
+    LCTL,VOLD,VOLU,MUTE,NO,  NO,  BTN2,MS_L,MS_D,MS_R,BTN1,NO,       ENT,     P4,  P5,  P6,  PPLS,
+    LSFT,Z,   X,   C,   V,   B,   BTN2,BTN1,BTN4,BTN5,NO,            PGUP,    P1,  P2,  P3,  PENT,
+    NO,  LALT,               TRNS,               LGUI,BSLS,HOME,END, PGDN,    P0,       PDOT
+    ),
+    // Mousekey
+    [4] = KEYMAP(
+    GRV, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, DEL,     NLCK,EQL, PSLS,PAST,
+    CAPS,Q,   W,   E,   R,   T,   WH_L,WH_D,MS_U,WH_U,WH_R,WBAK,WFWD,         P7,  P8,  P9,  PMNS,
+    LCTL,VOLD,VOLU,MUTE,NO,  NO,  BTN2,MS_L,MS_D,MS_R,TRNS,NO,       ENT,     P4,  P5,  P6,  PPLS,
+    LSFT,Z,   X,   C,   V,   B,   BTN2,BTN1,BTN4,BTN5,NO,            PGUP,    P1,  P2,  P3,  PENT,
+    NO,  LALT,               BTN1,               LGUI,BSLS,HOME,END, PGDN,    P0,       PDOT
+    ),
+};
+
+
+/*
+ * Fn action definition
+ */
+const uint16_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),
+    [3]  = ACTION_LAYER_TAP_KEY(4, KC_SCOLON),
+};

converter/m0110_usb/keymap_intl.c

@@ -68,6 +68,6 @@ const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
 /*
  * Fn action definition
  */
-const action_t fn_actions[] PROGMEM = {
+const uint16_t fn_actions[] PROGMEM = {
     [0]  = ACTION_LAYER_MOMENTARY(1),
 };

converter/m0110_usb/keymap_spacefn.c

@@ -65,7 +65,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /*
  * Fn action definition
  */
-const action_t fn_actions[] PROGMEM = {
+const uint16_t fn_actions[] PROGMEM = {
     [0] = ACTION_LAYER_TAP_KEY(1, KC_SPACE),
     [1] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV),    // tilde
 };

converter/m0110_usb/matrix.c

@@ -46,6 +46,18 @@ static uint8_t _matrix0[MATRIX_ROWS];
 static void register_key(uint8_t key);
 
 
+inline
+uint8_t matrix_rows(void)
+{
+    return MATRIX_ROWS;
+}
+
+inline
+uint8_t matrix_cols(void)
+{
+    return MATRIX_COLS;
+}
+
 void matrix_init(void)
 {
     m0110_init();
@@ -83,12 +95,48 @@ uint8_t matrix_scan(void)
     return 1;
 }
 
+bool matrix_is_modified(void)
+{
+    return is_modified;
+}
+
+inline
+bool matrix_has_ghost(void)
+{
+    return false;
+}
+
+inline
+bool matrix_is_on(uint8_t row, uint8_t col)
+{
+    return (matrix[row] & (1<<col));
+}
+
 inline
 uint8_t matrix_get_row(uint8_t row)
 {
     return matrix[row];
 }
 
+void matrix_print(void)
+{
+    print("\nr/c 01234567\n");
+    for (uint8_t row = 0; row < matrix_rows(); row++) {
+        phex(row); print(": ");
+        pbin_reverse(matrix_get_row(row));
+        print("\n");
+    }
+}
+
+uint8_t matrix_key_count(void)
+{
+    uint8_t count = 0;
+    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+        count += bitpop(matrix[i]);
+    }
+    return count;
+}
+
 inline
 static void register_key(uint8_t key)
 {

converter/m0110_usb/unimap.c

@@ -1,48 +0,0 @@
-/*
-Copyright 2016 Jun Wako <wakojun@gmail.com>
-
-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_trans.h"
-
-
-#define AC_FN0 ACTION_LAYER_MOMENTARY(1)
-#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(
-              NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,
-    NO,       NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,            NO,  NO,  NO,           NO,  NO,  NO,
-    GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, NO,  BSPC,     NO,  NO,  NO,      NLCK,PEQL,PSLS,PAST,
-    TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,     FN1,      NO,  NO,  NO,      P7,  P8,  P9,  PMNS,
-    LCTL,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,  NO,            UP,           P1,  P2,  P3,  PENT,
-    NO,  LGUI,LALT,NO,            SPC,           NO,  NO,  NO,  FN0, NO,  NO,       LEFT,DOWN,RGHT,    P0,       PDOT,NO
-    ),
-    UNIMAP(
-              TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
-    NO,       TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,          TRNS,TRNS,TRNS,         TRNS,TRNS,TRNS,
-    ESC, 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
-    ),
-};
-

converter/m0110_usb/unimap_trans.h

@@ -1,244 +0,0 @@
-/*
-Copyright 2016 Jun Wako <wakojun@gmail.com>
-
-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"
-
-
-/* M0110A scan codes
- * ,---------------------------------------------------------. ,---------------.
- * | 32| 12| 13| 14| 15| 17| 16| 1A| 1C| 19| 1D| 1B| 18|   33| | 47| 68| 6D| 62|
- * |---------------------------------------------------------| |---------------|
- * |   30| 0C| 0D| 0E| 0F| 11| 10| 20| 22| 1F| 23| 21| 1E|   | | 59| 5B| 5C| 4E|
- * |-----------------------------------------------------'   | |---------------|
- * |    39| 00| 01| 02| 03| 05| 04| 26| 28| 25| 29| 27|    24| | 56| 57| 58| 66|
- * |---------------------------------------------------------| |---------------|
- * |      38| 06| 07| 08| 09| 0B| 2D| 2E| 2B| 2F| 2C|  38| 4D| | 53| 54| 55|   |
- * `---------------------------------------------------------' |-----------| 4C|
- * |   3A|     37|             31            | 2A| 46| 42| 48| |     52| 41|   |
- * `---------------------------------------------------------' `---------------'
- *
- * M0110 + M0120 scan codes
- * ,---------------------------------------------------------. ,---------------.
- * | 32| 12| 13| 14| 15| 17| 16| 1A| 1C| 19| 1D| 1B| 18|   33| | 47| 68| 6D| 62|
- * |---------------------------------------------------------| |---------------|
- * |   30| 0C| 0D| 0E| 0F| 11| 10| 20| 22| 1F| 23| 21| 1E| 2A| | 59| 5B| 5C| 4E|
- * |---------------------------------------------------------| |---------------|
- * |    39| 00| 01| 02| 03| 05| 04| 26| 28| 25| 29| 27|    24| | 56| 57| 58| 66|
- * |---------------------------------------------------------| |---------------|
- * |      38| 06| 07| 08| 09| 0B| 2D| 2E| 2B| 2F| 2C|      38| | 53| 54| 55|   |
- * `---------------------------------------------------------' |-----------| 4C|
- *      | 3A|  37|             31              |   34| 3A|     |     52| 41|   |
- *      `------------------------------------------------'     `---------------'
- *
- * International M0110
- * https://en.wikipedia.org/wiki/File:Apple_Macintosh_Plus_Keyboard.jpg
- * Probably International keyboard layout of M0110A doesn't exist.
- * ,---------------------------------------------------------.
- * | 32| 12| 13| 14| 15| 17| 16| 1A| 1C| 19| 1D| 1B| 18|   33|
- * |---------------------------------------------------------|
- * |   30| 0C| 0D| 0E| 0F| 11| 10| 20| 22| 1F| 23| 21| 1E| 2A|
- * |------------------------------------------------------,  |
- * |    39| 00| 01| 02| 03| 05| 04| 26| 28| 25| 29| 27| 24|  |
- * |---------------------------------------------------------|
- * |  38| 06| 07| 08| 09| 0B| 2D| 2E| 2B| 2F| 2C| 0A|      38|
- * `---------------------------------------------------------'
- *      | 3A|  37|             34              |   31| 3A|
- *      `------------------------------------------------'
- */
-const uint8_t PROGMEM unimap_trans[MATRIX_ROWS][MATRIX_COLS] = {
-        //  Position(unimap)        scan code(matrix)
-        //  ---------------------------------------------
-        {
-            UNIMAP_A,               // 0x00
-            UNIMAP_S,               // 0x01
-            UNIMAP_D,               // 0x02
-            UNIMAP_F,               // 0x03
-            UNIMAP_H,               // 0x04
-            UNIMAP_G,               // 0x05
-#ifdef M0110_INTL
-            UNIMAP_NONUS_BSLASH,    // 0x06
-            UNIMAP_Z,               // 0x07
-        },
-        {
-            UNIMAP_X,               // 0x08
-            UNIMAP_C,               // 0x09
-            UNIMAP_SLASH,           // 0x0A
-            UNIMAP_V,               // 0x0B
-#else
-            UNIMAP_Z,               // 0x06
-            UNIMAP_X,               // 0x07
-        },
-        {
-            UNIMAP_C,               // 0x08
-            UNIMAP_V,               // 0x09
-            UNIMAP_NO,              // 0x0A
-            UNIMAP_B,               // 0x0B
-#endif
-            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
-#ifdef M0110_INTL
-            UNIMAP_NONUS_HASH,      // 0x24
-#else
-            UNIMAP_ENTER,           // 0x24
-#endif
-            UNIMAP_L,               // 0x25
-            UNIMAP_J,               // 0x26
-            UNIMAP_QUOTE,           // 0x27
-        },
-        {
-            UNIMAP_K,               // 0x28
-            UNIMAP_SCOLON,          // 0x29
-#ifdef M0110_INTL
-            UNIMAP_ENTER,           // 0x2A
-            UNIMAP_M,               // 0x2B
-            UNIMAP_DOT,             // 0x2C
-            UNIMAP_B,               // 0x2D
-            UNIMAP_N,               // 0x2E
-            UNIMAP_COMMA,           // 0x2F
-#else
-            UNIMAP_BSLASH,          // 0x2A
-            UNIMAP_COMMA,           // 0x2B
-            UNIMAP_SLASH,           // 0x2C
-            UNIMAP_N,               // 0x2D
-            UNIMAP_M,               // 0x2E
-            UNIMAP_DOT,             // 0x2F
-#endif
-        },
-        {
-            UNIMAP_TAB,             // 0x30
-#ifdef M0110_INTL
-            UNIMAP_RGUI,            // 0x31
-#else
-            UNIMAP_SPACE,           // 0x31
-#endif
-            UNIMAP_GRAVE,           // 0x32
-            UNIMAP_BSPACE,          // 0x33
-#ifdef M0110_INTL
-            UNIMAP_SPACE,           // 0x34
-#else
-            UNIMAP_RGUI,            // 0x34
-#endif
-            UNIMAP_NO,              // 0x35
-            UNIMAP_NO,              // 0x36
-            UNIMAP_LGUI,            // 0x37
-        },
-        {
-            UNIMAP_LSHIFT,          // 0x38
-            UNIMAP_CAPSLOCK,        // 0x39
-            UNIMAP_LALT,            // 0x3A
-            UNIMAP_NO,              // 0x3B
-            UNIMAP_NO,              // 0x3C
-            UNIMAP_NO,              // 0x3D
-            UNIMAP_NO,              // 0x3E
-            UNIMAP_NO,              // 0x3F
-        },
-        {
-            UNIMAP_NO,              // 0x40
-            UNIMAP_KP_DOT,          // 0x41
-            UNIMAP_RIGHT,           // 0x42
-            UNIMAP_NO,              // 0x43
-            UNIMAP_NO,              // 0x44
-            UNIMAP_NO,              // 0x45
-            UNIMAP_LEFT,            // 0x46
-            UNIMAP_NUMLOCK,         // 0x47
-        },
-        {
-            UNIMAP_DOWN,            // 0x48
-            UNIMAP_NO,              // 0x49
-            UNIMAP_NO,              // 0x4A
-            UNIMAP_NO,              // 0x4B
-            UNIMAP_KP_ENTER,        // 0x4C
-            UNIMAP_UP,              // 0x4D
-            UNIMAP_KP_PLUS,         // 0x4E     keypad minus
-            UNIMAP_NO,              // 0x4F
-        },
-        {
-            UNIMAP_NO,              // 0x50
-            UNIMAP_NO,              // 0x51
-            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_NO,              // 0x5A
-            UNIMAP_KP_8,            // 0x5B
-            UNIMAP_KP_9,            // 0x5C
-            UNIMAP_NO,              // 0x5D
-            UNIMAP_NO,              // 0x5E
-            UNIMAP_NO,              // 0x5F
-        },
-        {
-            UNIMAP_NO,              // 0x60
-            UNIMAP_NO,              // 0x61
-            UNIMAP_KP_MINUS,        // 0x62     keypad asterisk
-            UNIMAP_NO,              // 0x63
-            UNIMAP_NO,              // 0x64
-            UNIMAP_NO,              // 0x65
-            UNIMAP_KP_COMMA,        // 0x66
-            UNIMAP_NO,              // 0x67
-        },
-        {
-            UNIMAP_KP_SLASH,        // 0x68     keypad equal
-            UNIMAP_NO,              // 0x69
-            UNIMAP_NO,              // 0x6A
-            UNIMAP_NO,              // 0x6B
-            UNIMAP_NO,              // 0x6C
-            UNIMAP_KP_ASTERISK,     // 0x6D     keypad slash
-            UNIMAP_NO,              // 0x6E     compose
-            UNIMAP_NO,              // 0x6F
-        },
-};
-
-#endif
-

converter/news_usb/keymap.c

@@ -17,6 +17,7 @@ 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"
@@ -55,7 +56,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.
-const uint8_t PROGMEM fn_layer[] = {
+static const uint8_t PROGMEM fn_layer[] = {
     0,              // Fn0
     0,              // Fn1
     0,              // Fn2
@@ -68,7 +69,7 @@ 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.
-const uint8_t PROGMEM fn_keycode[] = {
+static const uint8_t PROGMEM fn_keycode[] = {
     KC_NO,          // Fn0
     KC_NO,          // Fn1
     KC_NO,          // Fn2
@@ -80,7 +81,7 @@ const uint8_t PROGMEM fn_keycode[] = {
 };
 
 
-const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* 0: default
      * ,---.   ,------------------------, ,------------------------. ,---------.
      * |Pow|   | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10| | F11| F12| ,-----------.
@@ -106,3 +107,19 @@ 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]);
+}

converter/news_usb/matrix.c

@@ -47,6 +47,20 @@ static uint8_t matrix[MATRIX_ROWS];
 #define ROW(code)      ((code>>3)&0xF)
 #define COL(code)      (code&0x07)
 
+static bool is_modified = false;
+
+
+inline
+uint8_t matrix_rows(void)
+{
+    return MATRIX_ROWS;
+}
+
+inline
+uint8_t matrix_cols(void)
+{
+    return MATRIX_COLS;
+}
 
 void matrix_init(void)
 {
@@ -60,6 +74,8 @@ void matrix_init(void)
 
 uint8_t matrix_scan(void)
 {
+    is_modified = false;
+
     uint8_t code;
     code = news_recv();
     if (code == 0) {
@@ -71,18 +87,56 @@ uint8_t matrix_scan(void)
         // break code
         if (matrix_is_on(ROW(code), COL(code))) {
             matrix[ROW(code)] &= ~(1<<COL(code));
+            is_modified = true;
         }
     } else {
         // make code
         if (!matrix_is_on(ROW(code), COL(code))) {
             matrix[ROW(code)] |=  (1<<COL(code));
+            is_modified = true;
         }
     }
     return code;
 }
 
+bool matrix_is_modified(void)
+{
+    return is_modified;
+}
+
+inline
+bool matrix_has_ghost(void)
+{
+    return false;
+}
+
+inline
+bool matrix_is_on(uint8_t row, uint8_t col)
+{
+    return (matrix[row] & (1<<col));
+}
+
 inline
 uint8_t matrix_get_row(uint8_t row)
 {
     return matrix[row];
 }
+
+void matrix_print(void)
+{
+    print("\nr/c 01234567\n");
+    for (uint8_t row = 0; row < matrix_rows(); row++) {
+        phex(row); print(": ");
+        pbin_reverse(matrix_get_row(row));
+        print("\n");
+    }
+}
+
+uint8_t matrix_key_count(void)
+{
+    uint8_t count = 0;
+    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+        count += bitpop(matrix[i]);
+    }
+    return count;
+}

converter/next_usb/Makefile

@@ -1,36 +1,18 @@
 # Target file name (without extension).
-TARGET ?= next_usb
+TARGET = next_usb
 
 # Directory common source filess exist
-TMK_DIR ?= ../../tmk_core
+TMK_DIR = ../../tmk_core
 
 # Directory keyboard dependent files exist
-TARGET_DIR ?= .
+TARGET_DIR = .
 
 # keyboard dependent files
-SRC ?=  matrix.c \
+SRC =   keymap.c \
+	matrix.c \
 	led.c
 
-CONFIG_H ?= config.h
-
-#
-# Keymap file
-#
-ifeq (yes,$(strip $(UNIMAP_ENABLE)))
-    KEYMAP_FILE = unimap
-else
-    ifeq (yes,$(strip $(ACTIONMAP_ENABLE)))
-        KEYMAP_FILE = actionmap
-    else
-        KEYMAP_FILE = keymap
-    endif
-endif
-ifdef KEYMAP
-    SRC := $(KEYMAP_FILE)_$(KEYMAP).c $(SRC)
-else
-    SRC := $(KEYMAP_FILE).c $(SRC)
-endif
-
+CONFIG_H = config.h
 
 # MCU name, you MUST set this to match the board you are using
 # type "make clean" after changing this, so all files will be rebuilt
@@ -38,7 +20,7 @@ endif
 #MCU = atmega32u4       # Teensy 2.0
 #MCU = at90usb646       # Teensy++ 1.0
 #MCU = at90usb1286      # Teensy++ 2.0
-MCU ?= atmega32u2       # TMK converter
+MCU = atmega32u2       # TMK converter
 
 
 # Processor frequency.
@@ -46,14 +28,14 @@ MCU ?= atmega32u2       # TMK converter
 #   so your program will run at the correct speed.  You should also set this
 #   variable to same clock speed.  The _delay_ms() macro uses this, and many
 #   examples use this variable to calculate timings.  Do not add a "UL" here.
-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
@@ -66,7 +48,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
@@ -85,11 +67,11 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
 #   *Comment out* to disable the options.
 #
 #BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE ?= yes	# Mouse keys
-EXTRAKEY_ENABLE ?= yes	# Audio control and System control
-CONSOLE_ENABLE ?= yes	# Console for debug(+400)
-COMMAND_ENABLE ?= yes	# Commands for debug and configuration
-#NKRO_ENABLE ?= yes	# USB Nkey Rollover
+MOUSEKEY_ENABLE = yes	# Mouse keys
+EXTRAKEY_ENABLE = yes	# Audio control and System control
+CONSOLE_ENABLE = yes	# Console for debug(+400)
+COMMAND_ENABLE = yes    # Commands for debug and configuration
+#NKRO_ENABLE = yes	# USB Nkey Rollover
 
 SRC += next_kbd.c
 

converter/next_usb/Makefile.unimap

@@ -1,4 +0,0 @@
-TARGET = next_usb_unimap
-UNIMAP_ENABLE = yes
-KEYMAP_SECTION_ENABLE = yes
-include Makefile

converter/next_usb/keymap.c

@@ -50,6 +50,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include <stdint.h>
 #include <stdbool.h>
+#include <avr/pgmspace.h>
 #include "keycode.h"
 #include "print.h"
 #include "debug.h"
@@ -58,7 +59,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "keycode.h"
 
 // 32*8(256) byte array which converts PS/2 code into USB code
-const action_t PROGMEM fn_actions[] = {
+static const uint16_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
@@ -115,50 +116,62 @@ const action_t PROGMEM fn_actions[] = {
 }
 
 
-const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     
     /* Layer 0: default
      * ,-----------------------------------------------------------. ,-----------. ,---------------.
-     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|   BS  | |VoU|Mut|PgU| |  `|  \|  /|  *|
+     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|   BS  | |Ins|Ref|Hom| |`  |  =|  /|  *|
      * |-----------------------------------------------------------| |-----------| |---------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|     | |VoD|   |PgD| |  7|  8|  9|  -|
+     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|     | |Del|   |End| |  7|  8|  9|  -|
      * |-----------------------------------------------------'     | `---'   `---' |-----------|---|
      * |Ctrl  |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  Return|               |  4|  5|  6|  +|
      * |-----------------------------------------------------------|     ,---.     |---------------|
      * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |     |Up |     |  1|  2|  3|   |
      * |-----------------------------------------------------------| ,-----------. |-----------|Ent|
-     * |LAlt |LGui |              Space                |FN0  |RAlt | |Lef|Dow|Rig| |      0|  .|   |
+     * |Fn0  |Alt  |              Space                |LGui |Fn1  | |Lef|Dow|Rig| |      0|  .|   |
      * `-----------------------------------------------------------' `-----------' `---------------'
      */
     KEYMAP(
-    ESC, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSPC,  VOLU,MUTE,PGUP,  GRV, BSLS,PSLS,PAST,
-    TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,BSLS,  VOLD,     PGDN,  P7,  P8,  P9,  PMNS,
+    ESC, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSPC,  INS, WREF,HOME,  GRV, FN3, FN2, PAST,
+    TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,NO,    DEL,      END,   P7,  P8,  P9,  PMNS,
     LCTL,A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,     ENT,                    P4,  P5,  P6,  PPLS,
     LSFT,     Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, SLSH,     RSFT,       UP,         P1,  P2,  P3,  
-    LALT,LGUI,                    SPC,                          FN0, RALT,  LEFT,DOWN,RGHT,  P0,       PDOT,PENT
+    FN0, LALT,                    SPC,                          LGUI,FN1,  LEFT,DOWN,RGHT,  P0,       PDOT,PENT
     
     ),
 
-    /* Layer 1: HHKB like
+    /* Layer 1: extra keys
      * ,-----------------------------------------------------------. ,-----------. ,---------------.
-     * |  `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|  Del  | |   |   |   | |Num|   |   |   |
+     * |Grv| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|   BS  | |VUp|VMu|PgU| |`  |  =|  /|  *|
      * |-----------------------------------------------------------| |-----------| |---------------|
-     * |Caps |  \|   |   |   |   |   |   |Psc|Slk|Pau|Up |Ins|     | |   |   |   | |   |   |   |   |
+     * |Tab  |Pau|  W|  E|  R|  T|  Y|  U|  I|  O|PSc|  \|  ]|     | |VDn|   |PgD| |  7|  8|  9|  -|
      * |-----------------------------------------------------'     | `---'   `---' |-----------|---|
-     * |      |VoD|VoU|Mut|   |   |  *|  /|Hom|PgU|Lef|Rig|        |               |   |   |   |   |
+     * |Ctrl  |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  Return|               |  4|  5|  6|  +|
      * |-----------------------------------------------------------|     ,---.     |---------------|
-     * |        |UND|CUT|COP|PST|   |  +|  -|End|PgD|Dow|          |     |PgU|     |   |   |   |   |
-     * |-----------------------------------------------------------| ,-----------. |-----------|   |
-     * |     |     |                                   |     |     | |Hom|PgD|End| |       |   |   |
+     * |Shift   |UND|CUT|COP|PST|  B|  N|  M|  ,|  .|  /|Shift     |     |Up |     |  1|  2|  3|   |
+     * |-----------------------------------------------------------| ,-----------. |-----------|Ent|
+     * |Fn0  |Alt  |              Space                |RGui |Fn1  | |Lef|Dow|Rig| |      0|  .|   |
      * `-----------------------------------------------------------' `-----------' `---------------'
      */
     KEYMAP(
     
-    GRV, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, DEL,   TRNS,TRNS,TRNS,  NLCK,TRNS,TRNS,TRNS,
-    CAPS,BSLS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PSCR,SLCK,PAUS,UP,  INS, TRNS,  TRNS,     TRNS,  TRNS,TRNS,TRNS,TRNS,
-    TRNS,VOLD,VOLU,MUTE,TRNS,TRNS,PAST,PSLS,HOME,PGUP,LEFT,RGHT,     TRNS,                   TRNS,TRNS,TRNS,TRNS,
-    TRNS,     FN4, FN5, FN6, FN7, TRNS,PPLS,PMNS,END, PGDN,DOWN,     TRNS,       PGUP,       TRNS,TRNS,TRNS,  
-    TRNS,TRNS,                    TRNS,                         TRNS,TRNS,  HOME,PGDN,END,   TRNS,     TRNS,TRNS
+    GRV, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, TRNS,  VOLU,MUTE,PGUP,  TRNS,TRNS,TRNS,TRNS,
+    TRNS,PAUS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PSCR,FN3, BSLS,TRNS,  VOLD,     PGDN,  BTN1,MS_U,BTN2,WH_U,
+    TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,     TRNS,                   MS_L,MS_D,MS_R,WH_D,
+    TRNS,     FN4, FN5, FN6, FN7, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,     TRNS,       TRNS,       TRNS,TRNS,TRNS,  
+    TRNS,TRNS,                    TRNS,                         TRNS,TRNS,  TRNS,TRNS,TRNS,  TRNS,     TRNS,TRNS
     
     )
 };
+
+/* 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)]) };
+}

converter/next_usb/matrix.c

@@ -66,6 +66,20 @@ static uint8_t matrix[MATRIX_ROWS];
 
 static bool is_modified = false;
 
+/* number of matrix rows */
+inline
+uint8_t matrix_rows(void)
+{
+    return MATRIX_ROWS;
+}
+
+/* number of matrix columns */
+inline
+uint8_t matrix_cols(void)
+{
+    return MATRIX_COLS;
+}
+
 #ifndef NEXT_KBD_LED1_ON
 #define NEXT_KBD_LED1_ON
 #endif
@@ -213,6 +227,19 @@ uint8_t matrix_scan(void)
     return 1;
 }
 
+/* whether modified from previous scan. used after matrix_scan. */
+bool matrix_is_modified()
+{
+    return is_modified;
+}
+
+/* whether a switch is on */
+inline
+bool matrix_is_on(uint8_t row, uint8_t col)
+{
+    return (matrix[row] & (1<<col));
+}
+
 /* matrix state on row */
 inline
 uint8_t matrix_get_row(uint8_t row)
@@ -220,6 +247,11 @@ uint8_t matrix_get_row(uint8_t row)
     return matrix[row];
 }
 
+/* print matrix for debug */
+void matrix_print(void)
+{
+}
+
 inline
 static void matrix_make(uint8_t code)
 {

converter/next_usb/unimap.c

@@ -1,50 +0,0 @@
-/*
-Copyright 2016 Jun Wako <wakojun@gmail.com>
-
-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_trans.h"
-
-
-#define AC_FN0  ACTION_LAYER_MOMENTARY(1)
-// Undo, Cut, Copy and Paste
-#define AC__UND ACTION_MODS_KEY(MOD_LCTL, KC_Z)
-#define AC__CUT ACTION_MODS_KEY(MOD_LCTL, KC_X)
-#define AC__CPY ACTION_MODS_KEY(MOD_LCTL, KC_C)
-#define AC__PST ACTION_MODS_KEY(MOD_LCTL, KC_V)
-
-#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,  
-    NO,       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, NO,  BSPC,     VOLU,MUTE,PGUP,    GRV, BSLS,PSLS,PAST,
-    TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,     BSLS,     VOLD,NO,  PGDN,    P7,  P8,  P9,  PMNS,
-    LCTL,A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,     NO,  ENT,                         P4,  P5,  P6,  PPLS,
-    LSFT,NO,  Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, SLSH,     NO,  RSFT,          UP,           P1,  P2,  P3,  PENT,
-    LALT,LGUI,NO,  NO,            SPC,           NO,  NO,  NO,  NO,  FN0, RALT,     LEFT,DOWN,RGHT,    P0,       PDOT,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,
-    GRV, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, TRNS,DEL,      TRNS,TRNS,TRNS,    NLCK,TRNS,TRNS,TRNS,
-    CAPS,BSLS,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,PAST,PSLS,HOME,PGUP,LEFT,RGHT,     TRNS,TRNS,                        TRNS,TRNS,TRNS,TRNS,
-    TRNS,TRNS,_UND,_CUT,_CPY,_PST,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
-    ),
-};

converter/next_usb/unimap_trans.h

@@ -1,86 +0,0 @@
-/*
-Copyright 2016 Jun Wako <wakojun@gmail.com>
-
-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"
-
-
-/* Mapping to Universal keyboard layout
- *
- * Universal keyboard layout
- *         ,-----------------------------------------------.
- *         |F13|F14|F15|F16|F17|F18|F19|F20|F21|F22|F23|F24|
- * ,---.   |-----------------------------------------------|     ,-----------.     ,-----------.
- * |Esc|   |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|     |PrS|ScL|Pau|     |VDn|VUp|Mut|
- * `---'   `-----------------------------------------------'     `-----------'     `-----------'
- * ,-----------------------------------------------------------. ,-----------. ,---------------.
- * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|JPY|Bsp| |Ins|Hom|PgU| |NmL|  /|  *|  -|
- * |-----------------------------------------------------------| |-----------| |---------------|
- * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  | |Del|End|PgD| |  7|  8|  9|  +|
- * |-----------------------------------------------------------| `-----------' |---------------|
- * |CapsL |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  #|Retn|               |  4|  5|  6|KP,|
- * |-----------------------------------------------------------|     ,---.     |---------------|
- * |Shft|  <|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /| RO|Shift |     |Up |     |  1|  2|  3|Ent|
- * |-----------------------------------------------------------| ,-----------. |---------------|
- * |Ctl|Gui|Alt|MHEN|     Space      |HENK|KANA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| |  0    |  .|KP=|
- * `-----------------------------------------------------------' `-----------' `---------------'
- *
- * NeXT Matrix(Scan code)
- * ,-----------------------------------------------------------. ,-----------. ,---------------.
- * | 49| 4A| 4B| 4C| 4D| 50| 4F| 4E| 1E| 1F| 20| 1D| 1C|   1B  | | 1A| 58| 19| | 26| 27| 28| 25|
- * |-----------------------------------------------------------| |-----------| |---------------|
- * | 41  | 42| 43| 44| 45| 48| 47| 46| 06| 07| 08| 05| 04| 03  | | 02|   | 01| | 21| 22| 23| 24|
- * |-----------------------------------------------------------| `---'   `---' |-----------|---|
- * | 57   | 39| 3A| 3B| 3C| 3D| 40| 3F| 3E| 2D| 2C| 2B|   2A   |               | 12| 18| 13| 15|
- * |-----------------------------------------------------------|     ,---.     |---------------|
- * | 56     | 31| 32| 33| 34| 35| 37| 36| 2E| 2F| 30|  55      |     | 16|     | 11| 17| 14|   |
- * |-----------------------------------------------------------| ,-----------. |-----------|   |
- * | 52  | 54  |                38                 | 53  | 51  | | 09| 0F| 10| |0B     | 0C| 0D|
- * `-----------------------------------------------------------' `-----------' `---------------'
- * ,-----------------------------------------------------------. ,-----------. ,---------------.
- * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =| BSpc  | |Ins|Hom|PgU| |NmL|  /|  *|  -|
- * |-----------------------------------------------------------| |-----------| |---------------|
- * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  | |Del|   |PgD| |  7|  8|  9|  +|
- * |-----------------------------------------------------------| `---'   `---' |---------------|
- * |CapsL |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  Return|               |  4|  5|  6|KP,|
- * |-----------------------------------------------------------|     ,---.     |---------------|
- * |Shft|  <|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|    Shift |     |Up |     |  1|  2|  3|   |
- * |-----------------------------------------------------------| ,-----------. |-----------|   |
- * |LCtl |Gui  |              Space                | App | RCtl| |Lef|Dow|Rig| |  0    |  .|Ent|
- * `-----------------------------------------------------------' `-----------' `---------------'
- */
-
-// Matrix 12 * 8
-const uint8_t PROGMEM unimap_trans[MATRIX_ROWS][MATRIX_COLS] = {
-    { UNIMAP_NO,   UNIMAP_PGDN, UNIMAP_DEL,  UNIMAP_BSLS, UNIMAP_RBRC, UNIMAP_LBRC, UNIMAP_I,    UNIMAP_O },    // 0x00-07
-    { UNIMAP_P,    UNIMAP_LEFT, UNIMAP_NO,   UNIMAP_P0,   UNIMAP_PDOT, UNIMAP_PENT, UNIMAP_NO,   UNIMAP_DOWN }, // 0x08-0F
-    { UNIMAP_RGHT, UNIMAP_P1,   UNIMAP_P4,   UNIMAP_P6,   UNIMAP_P3,   UNIMAP_PCMM, UNIMAP_UP,   UNIMAP_P2 },   // 0x10-17
-    { UNIMAP_P5,   UNIMAP_PGUP, UNIMAP_INS,  UNIMAP_BSPC, UNIMAP_EQL,  UNIMAP_MINS, UNIMAP_8,    UNIMAP_9 },    // 0x18-1f
-    { UNIMAP_0,    UNIMAP_P7,   UNIMAP_P8,   UNIMAP_P9,   UNIMAP_PPLS, UNIMAP_PMNS, UNIMAP_NLCK, UNIMAP_PSLS }, // 0x20-27
-    { UNIMAP_PAST, UNIMAP_NO,   UNIMAP_ENT,  UNIMAP_QUOT, UNIMAP_SCLN, UNIMAP_L,    UNIMAP_COMM, UNIMAP_DOT },  // 0x28-2f
-    { UNIMAP_SLSH, UNIMAP_Z,    UNIMAP_X,    UNIMAP_C,    UNIMAP_V,    UNIMAP_B,    UNIMAP_M,    UNIMAP_N },    // 0x30-37
-    { UNIMAP_SPC,  UNIMAP_A,    UNIMAP_S,    UNIMAP_D,    UNIMAP_F,    UNIMAP_G,    UNIMAP_K,    UNIMAP_J },    // 0x38-3f
-    { UNIMAP_H,    UNIMAP_TAB,  UNIMAP_Q,    UNIMAP_W,    UNIMAP_E,    UNIMAP_R,    UNIMAP_U,    UNIMAP_Y },    // 0x40-47
-    { UNIMAP_T,    UNIMAP_GRV,  UNIMAP_1,    UNIMAP_2,    UNIMAP_3,    UNIMAP_4,    UNIMAP_7,    UNIMAP_6 },    // 0x48-4f
-    { UNIMAP_5,    UNIMAP_RCTL, UNIMAP_LCTL, UNIMAP_APP,  UNIMAP_LGUI, UNIMAP_RSFT, UNIMAP_LSFT, UNIMAP_CAPS }, // 0x50-57
-    { UNIMAP_HOME, UNIMAP_NO,   UNIMAP_NO,   UNIMAP_NO,   UNIMAP_NO,   UNIMAP_NO,   UNIMAP_NO,   UNIMAP_NO }    // 0x58-5f
-};
-
-#endif

converter/pc98_usb/keymap.c

@@ -17,6 +17,7 @@ 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"
@@ -71,7 +72,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 
-const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+static 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|
@@ -113,6 +114,7 @@ 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
@@ -161,7 +163,7 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt)
 /*
  * Fn actions
  */
-const action_t PROGMEM fn_actions[] = {
+static const uint16_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
@@ -170,3 +172,37 @@ const action_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;
+}

converter/pc98_usb/matrix.c

@@ -46,6 +46,20 @@ static uint8_t matrix[MATRIX_ROWS];
 #define ROW(code)      ((code>>3)&0xF)
 #define COL(code)      (code&0x07)
 
+static bool is_modified = false;
+
+
+inline
+uint8_t matrix_rows(void)
+{
+    return MATRIX_ROWS;
+}
+
+inline
+uint8_t matrix_cols(void)
+{
+    return MATRIX_COLS;
+}
 
 static void pc98_inhibit_repeat(void)
 {
@@ -114,6 +128,8 @@ void matrix_init(void)
 
 uint8_t matrix_scan(void)
 {
+    is_modified = false;
+
     uint16_t code;
     PC98_RDY_PORT |= (1<<PC98_RDY_BIT);
     _delay_us(30);
@@ -140,18 +156,56 @@ if (code == 0x60) {
         // break code
         if (matrix_is_on(ROW(code), COL(code))) {
             matrix[ROW(code)] &= ~(1<<COL(code));
+            is_modified = true;
         }
     } else {
         // make code
         if (!matrix_is_on(ROW(code), COL(code))) {
             matrix[ROW(code)] |=  (1<<COL(code));
+            is_modified = true;
         }
     }
     return code;
 }
 
+bool matrix_is_modified(void)
+{
+    return is_modified;
+}
+
+inline
+bool matrix_has_ghost(void)
+{
+    return false;
+}
+
+inline
+bool matrix_is_on(uint8_t row, uint8_t col)
+{
+    return (matrix[row] & (1<<col));
+}
+
 inline
 uint8_t matrix_get_row(uint8_t row)
 {
     return matrix[row];
 }
+
+void matrix_print(void)
+{
+    print("\nr/c 01234567\n");
+    for (uint8_t row = 0; row < matrix_rows(); row++) {
+        phex(row); print(": ");
+        pbin_reverse(matrix_get_row(row));
+        print("\n");
+    }
+}
+
+uint8_t matrix_key_count(void)
+{
+    uint8_t count = 0;
+    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+        count += bitpop(matrix[i]);
+    }
+    return count;
+}

converter/ps2_usb/Makefile

@@ -1,39 +1,32 @@
+# 
+# Makefile for Teensy
+#
 # Target file name (without extension).
-TARGET ?= ps2_usb
+TARGET = ps2_usb_lufa
 
 # 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 ?=	matrix.c \
+SRC =	keymap_common.c \
+	matrix.c \
 	led.c
 
-#
-# 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)
+    SRC := keymap_$(KEYMAP).c $(SRC)
 else
-    SRC := $(KEYMAP_FILE)_plain.c $(SRC)
+    SRC := keymap_plain.c $(SRC)
 endif
 
-CONFIG_H ?= config.h
+CONFIG_H = config.h
 
 
 # MCU name
-MCU ?= atmega32u2
+#MCU = at90usb1287
+MCU = atmega32u4
 
 # Processor frequency.
 #     This will define a symbol, F_CPU, in all source code files equal to the
@@ -46,14 +39,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
@@ -66,14 +59,11 @@ 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
-# Not work with suart debug
+# Interrupt driven control endpoint task(+60)
 #OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 
-# This improves response of keyboard when wakeup
-OPT_DEFS += -DSUSPEND_MODE_STANDBY
 
 # Boot Section Size in *bytes*
 #   Teensy halfKay   512
@@ -81,26 +71,25 @@ OPT_DEFS += -DSUSPEND_MODE_STANDBY
 #   Atmel DFU loader 4096
 #   LUFA bootloader  4096
 #   USBaspLoader     2048
-BOOTLOADER_SIZE ?= 4096
-OPT_DEFS += -DBOOTLOADER_SIZE=$(BOOTLOADER_SIZE)
+OPT_DEFS += -DBOOTLOADER_SIZE=512
 
 
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE ?= no	# Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE ?= no	# 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
-NKRO_ENABLE ?= yes	# USB Nkey Rollover
+#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
+NKRO_ENABLE = yes	# USB Nkey Rollover - not yet supported in LUFA
 
 
 # PS/2 Options
 #
-#PS2_USE_USART ?= yes	# uses hardware USART engine for PS/2 signal receive(recomened)
-PS2_USE_INT ?= yes	# uses external interrupt for falling edge of PS/2 clock pin
-#PS2_USE_BUSYWAIT ?= yes	# uses primitive reference code
+#PS2_USE_USART = yes	# uses hardware USART engine for PS/2 signal receive(recomened)
+PS2_USE_INT = yes	# uses external interrupt for falling edge of PS/2 clock pin
+#PS2_USE_BUSYWAIT = yes	# uses primitive reference code
 
 
 # Optimize size but this may cause error "relocation truncated to fit"

converter/ps2_usb/Makefile.mbed

@@ -10,6 +10,7 @@ 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

converter/ps2_usb/Makefile.pjrc

@@ -0,0 +1,75 @@
+# Target file name (without extension).
+TARGET = ps2_usb_pjrc
+
+# Directory common source filess exist
+TMK_DIR = ../../tmk_core
+
+# Directory keyboard dependent files exist
+TARGET_DIR = .
+
+# keyboard dependent files
+SRC =   keymap_common.c \
+	matrix.c \
+	led.c
+
+ifdef KEYMAP
+    SRC := keymap_$(KEYMAP).c $(SRC)
+else
+    SRC := keymap_plain.c $(SRC)
+endif
+
+CONFIG_H = config.h
+
+
+# MCU name, you MUST set this to match the board you are using
+# type "make clean" after changing this, so all files will be rebuilt
+#MCU = at90usb162       # Teensy 1.0
+MCU = atmega32u4       # Teensy 2.0
+#MCU = at90usb646       # Teensy++ 1.0
+#MCU = at90usb1286      # Teensy++ 2.0
+
+
+# Processor frequency.
+#   Normally the first thing your program should do is set the clock prescaler,
+#   so your program will run at the correct speed.  You should also set this
+#   variable to same clock speed.  The _delay_ms() macro uses this, and many
+#   examples use this variable to calculate timings.  Do not add a "UL" here.
+F_CPU = 16000000
+
+
+# Boot Section Size in *bytes*
+#   Teensy halfKay   512
+#   Teensy++ halfKay 1024
+#   Atmel DFU loader 4096
+#   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
+EXTRAKEY_ENABLE = yes	# Audio control and System control
+CONSOLE_ENABLE = yes	# Console for debug(+400)
+COMMAND_ENABLE = yes    # Commands for debug and configuration
+NKRO_ENABLE = yes	# USB Nkey Rollover
+
+
+# PS/2 Options
+#
+#PS2_USE_USART = yes	# uses hardware USART engine for PS/2 signal receive(recomened)
+#PS2_USE_INT = yes	# uses external interrupt for falling edge of PS/2 clock pin
+PS2_USE_BUSYWAIT = yes	# uses primitive reference code
+
+
+# Search Path
+VPATH += $(TARGET_DIR)
+VPATH += $(TMK_DIR)
+
+
+include $(TMK_DIR)/protocol.mk
+include $(TMK_DIR)/protocol/pjrc.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

converter/ps2_usb/Makefile.rev1

@@ -1,17 +0,0 @@
-TARGET ?= ps2_usb_rev1
-MCU = atmega32u4
-CONFIG_H = config_rev1.h
-BOOTLOADER_SIZE = 4096
-
-BOOTMAGIC_ENABLE ?= no
-MOUSEKEY_ENABLE ?= yes
-EXTRAKEY_ENABLE ?= yes
-CONSOLE_ENABLE ?= yes
-COMMAND_ENABLE ?= yes
-NKRO_ENABLE ?= yes
-
-PS2_USE_USART = yes
-PS2_USE_INT = no
-PS2_USE_BUSYWAIT = no
-
-include Makefile

converter/ps2_usb/Makefile.rev2

@@ -1,17 +0,0 @@
-TARGET ?= ps2_usb_rev2
-MCU = atmega32u2
-CONFIG_H = config_rev2.h
-BOOTLOADER_SIZE = 4096
-
-BOOTMAGIC_ENABLE ?= no
-MOUSEKEY_ENABLE ?= no
-EXTRAKEY_ENABLE ?= yes
-CONSOLE_ENABLE ?= yes
-COMMAND_ENABLE ?= yes
-NKRO_ENABLE ?= yes
-
-PS2_USE_USART = no
-PS2_USE_INT = yes
-PS2_USE_BUSYWAIT = no
-
-include Makefile

converter/ps2_usb/Makefile.tmk_rev1

@@ -1,24 +1,32 @@
+# 
+# Makefile for TMK keyboard converter rev2
+#     https://github.com/tmk/keyboard_converter#pcb-rev1
+#
 # Target file name (without extension).
-TARGET ?= luddite
+TARGET = ps2_usb_tmk_rev1
 
 # 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 ?=	matrix.c \
-       led.c \
-       backlight.c \
-       rgblight.c \
-       light_ws2812.c
+SRC =	keymap_common.c \
+	matrix.c \
+	led.c
 
-CONFIG_H ?= config.h
+ifdef KEYMAP
+    SRC := keymap_$(KEYMAP).c $(SRC)
+else
+    SRC := keymap_plain.c $(SRC)
+endif
+
+CONFIG_H = config_tmk_rev1.h
 
 
 # MCU name
-MCU ?= atmega32u4
+MCU = atmega32u4
 
 # Processor frequency.
 #     This will define a symbol, F_CPU, in all source code files equal to the
@@ -31,14 +39,14 @@ MCU ?= atmega32u4
 #     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
@@ -51,10 +59,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)
-
-# Interrupt driven control endpoint task(+60)
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
+F_USB = $(F_CPU)
 
 
 # Boot Section Size in *bytes*
@@ -63,49 +68,31 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 #   Atmel DFU loader 4096
 #   LUFA bootloader  4096
 #   USBaspLoader     2048
-BOOTLOADER_SIZE ?= 4096
-OPT_DEFS += -DBOOTLOADER_SIZE=$(BOOTLOADER_SIZE)
+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
-#ACTIONMAP_ENABLE ?= yes	# Use 16bit action codes in keymap instead of 8bit keycodes
-BACKLIGHT_ENABLE = yes
+#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
+#NKRO_ENABLE = yes	# USB Nkey Rollover - not yet supported in LUFA
 
+
+# PS/2 Options
 #
-# Keymap file
-#
-ifeq (yes,$(strip $(UNIMAP_ENABLE)))
-    KEYMAP_FILE = unimap
-else
-    ifeq (yes,$(strip $(ACTIONMAP_ENABLE)))
-        KEYMAP_FILE = actionmap
-    else
-        KEYMAP_FILE = keymap
-    endif
-endif
-ifdef KEYMAP
-    SRC := $(KEYMAP_FILE)_$(KEYMAP).c $(SRC)
-else
-    SRC := $(KEYMAP_FILE)_luddite.c $(SRC)
-endif
+PS2_USE_USART = yes	# uses hardware USART engine for PS/2 signal receive(recomened)
+#PS2_USE_BUSYWAIT = yes	# uses primitive reference code
 
 
-# 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.mk
 include $(TMK_DIR)/protocol/lufa.mk
 include $(TMK_DIR)/common.mk
 include $(TMK_DIR)/rules.mk

converter/ps2_usb/Makefile.tmk_rev2

@@ -1,45 +1,9 @@
-#----------------------------------------------------------------------------
-# On command line:
 # 
-# make all = Make software.
+# Makefile for TMK keyboard converter rev2
+#     https://github.com/tmk/keyboard_converter#pcb-rev2
 #
-# 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 = 5x5
+TARGET = ps2_usb_tmk_rev2
 
 # Directory common source filess exist
 TMK_DIR = ../../tmk_core
@@ -48,21 +12,21 @@ TMK_DIR = ../../tmk_core
 TARGET_DIR = .
 
 # project specific files
-SRC =	matrix.c \
+SRC =	keymap_common.c \
+	matrix.c \
 	led.c
 
 ifdef KEYMAP
     SRC := keymap_$(KEYMAP).c $(SRC)
 else
-    SRC := keymap_5x5.c $(SRC)
+    SRC := keymap_plain.c $(SRC)
 endif
 
-CONFIG_H = config.h
+CONFIG_H = config_tmk_rev2.h
 
 
 # MCU name
-#MCU = at90usb1287
-MCU = atmega32u4
+MCU = atmega32u2
 
 # Processor frequency.
 #     This will define a symbol, F_CPU, in all source code files equal to the
@@ -97,9 +61,6 @@ ARCH = AVR8
 #     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
@@ -113,22 +74,25 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration(+1000)
+#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 - not yet supported in LUFA
+#NKRO_ENABLE = yes	# USB Nkey Rollover - not yet supported in LUFA
 
 
-# Optimize size but this may cause error "relocation truncated to fit"
-#EXTRALDFLAGS = -Wl,--relax
+# PS/2 Options
+#
+PS2_USE_INT = yes	# uses external interrupt for falling edge of PS/2 clock pin
+#PS2_USE_BUSYWAIT = yes	# uses primitive reference code
+
 
 # Search Path
 VPATH += $(TARGET_DIR)
 VPATH += $(TMK_DIR)
 
+include $(TMK_DIR)/protocol.mk
 include $(TMK_DIR)/protocol/lufa.mk
 include $(TMK_DIR)/common.mk
 include $(TMK_DIR)/rules.mk

converter/ps2_usb/Makefile.unimap.rev1

@@ -1,5 +0,0 @@
-TARGET = ps2_usb_rev1_unimap
-UNIMAP_ENABLE = yes
-KEYMAP_SECTION_ENABLE = yes
-
-include Makefile.rev1

converter/ps2_usb/Makefile.unimap.rev2

@@ -1,6 +0,0 @@
-TARGET = ps2_usb_rev2_unimap
-UNIMAP_ENABLE = yes
-KEYMAP_SECTION_ENABLE = yes
-#LUFA_DEBUG_SUART = yes
-
-include Makefile.rev2

converter/ps2_usb/Makefile.vusb

@@ -8,7 +8,8 @@ TMK_DIR = ../../tmk_core
 TARGET_DIR = .
 
 # keyboard dependent files
-SRC = 	matrix.c \
+SRC = keymap_common.c \
+	matrix.c \
 	led.c
 
 ifdef KEYMAP

converter/ps2_usb/README.md

@@ -5,30 +5,36 @@ This firmware converts PS/2 keyboard protocol to USB.(It supports Scan Code Set
 
 Connect Wires
 -------------
+In case of Teensy2.0(ATMega32U4):
+
 1. Connect **Vcc** and **GND**.
 2. Connect **Clock** and **Data** line. 
     - **Interrupt**:   **Clock** is on `PD1` and **Data** on `PD0`.(Recommended. Soarer's converter compatible)
     - **Busywait**:    **Clock** is on `PD1` and **Data** on `PD0`.
     - **USART**:       **Clock** is on `PD5` and **Data** on `PD2`.
-3. You need pull-up resistors. 1K-10K Ohm would be fine.
+3. Optionally you need pull-up resistor. 1K-10K Ohm is OK.
 
 To change pin configuration edit **config.h** and **Makefile**.
 
 
 Build Firmware
 --------------
-For **TMK converter Rev.2**:
+For **PJRC Teensy** just run `make`:
 
-    $ make -f Makefile.rev2 clean
-    $ make -f Makefile.rev2 KEYMAP=plain
+    $ make clean
+    $ make
 
-To program firmware push the button on converter and run:
+To select keymap:
 
-    $ make -f Makefile.rev2 KEYMAP=plain dfu
+    $ make clean
+    $ make KEYMAP=[plain|jis|spacefn|...]
+
+After that you will find HEX file `ps2_usb_lufa.hex` in current directory.
 
 
-- For **TMK converter Rev.1** use `make -f Makefile.rev1` instead.
-- To select keymap use `jis`, `spacefn` or your own in place of `plain`.
+- For **TMK converter Rev.1** use `make -f Makefile.tmk_rev1` instead of `make` and HEX file is `ps2_usb_tmk_rev1.hex`.
+
+- For **TMK converter Rev.2** use `make -f Makefile.tmk_rev2` instead of `make` and HEX file is `ps2_usb_tmk_rev2.hex`.
 
 
 Keymap

converter/ps2_usb/config.h

@@ -36,7 +36,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key combination for command */
 #define IS_COMMAND() ( \
     keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) || \
-    keyboard_report->mods == (MOD_BIT(KC_LALT) | MOD_BIT(KC_RALT)) \
+    keyboard_report->mods == (MOD_BIT(KC_LCTRL) | MOD_BIT(KC_RSHIFT)) \
 )
 
 
@@ -61,7 +61,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * PS/2 Pin interrupt
  */
 #ifdef PS2_USE_INT
-#if defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__) || defined(__AVR_ATmega32U2__)
+#if defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__)
 /* uses INT1 for clock line(ATMega32U4) */
 #define PS2_CLOCK_PORT  PORTD
 #define PS2_CLOCK_PIN   PIND

converter/ps2_usb/config_tmk_rev1.h

@@ -36,7 +36,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key combination for command */
 #define IS_COMMAND() ( \
     keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) || \
-    keyboard_report->mods == (MOD_BIT(KC_LALT) | MOD_BIT(KC_RALT)) \
+    keyboard_report->mods == (MOD_BIT(KC_LCTRL) | MOD_BIT(KC_RSHIFT)) \
 )
 
 

converter/ps2_usb/config_tmk_rev2.h

@@ -35,8 +35,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* key combination for command */
 #define IS_COMMAND() ( \
-    keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) || \
-    keyboard_report->mods == (MOD_BIT(KC_LALT) | MOD_BIT(KC_RALT)) \
+    keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
 )
 
 
@@ -83,13 +82,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define PS2_INT_VECT    INT1_vect
 #endif
 
-#ifdef LUFA_DEBUG_SUART
-#   define SUART_OUT_DDR   DDRD
-#   define SUART_OUT_PORT  PORTD
-#   define SUART_OUT_BIT   4
-#   define SUART_IN_DDR    DDRD
-#   define SUART_IN_PIN    PIND
-#   define SUART_IN_BIT    4
-#endif
-
 #endif

converter/ps2_usb/keymap_common.c

@@ -0,0 +1,31 @@
+/*
+Copyright 2011,2012,2013 Jun Wako <wakojun@gmail.com>
+
+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)]) };
+}

converter/ps2_usb/keymap_common.h

@@ -28,55 +28,25 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "keymap.h"
 
 
-/*         ,-----------------------------------------------.
- *         |F13|F14|F15|F16|F17|F18|F19|F20|F21|F22|F23|F24|
- * ,---.   |-----------------------------------------------|     ,-----------.     ,-----------.
- * |Esc|   |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|     |PrS|ScL|Pau|     |VDn|VUp|Mut|
- * `---'   `-----------------------------------------------'     `-----------'     `-----------'
- * ,-----------------------------------------------------------. ,-----------. ,---------------.
- * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|JPY|Bsp| |Ins|Hom|PgU| |NmL|  /|  *|  -|
- * |-----------------------------------------------------------| |-----------| |---------------|
- * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  | |Del|End|PgD| |  7|  8|  9|  +|
- * |-----------------------------------------------------------| `-----------' |---------------|
- * |CapsL |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '| ^a|Entr|               |  4|  5|  6|KP,|
- * |-----------------------------------------------------------|     ,---.     |---------------|
- * |Shft|  <|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /| RO|Shift |     |Up |     |  1|  2|  3|Ent|
- * |-----------------------------------------------------------| ,-----------. |---------------|
- * |Ctl|Gui|Alt|MHEN|     Space      |HENK|KANA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| |  #|  0|  .|KP=|
- * `-----------------------------------------------------------' `-----------' `---------------'
- *
- * PS/2 scan codes
- * http://download.microsoft.com/download/1/6/1/161ba512-40e2-4cc9-843a-923143f3456c/translate.pdf
- *         ,-----------------------------------------------.
- *         | 08| 10| 18| 20| 28| 30| 38| 40| 48| 50| 57| 5F|
- * ,---.   |-----------------------------------------------|     ,-----------.     ,-----------.
- * | 76|   | 05| 06| 04| 0C| 03| 0B| 83| 0A| 01| 09| 78| 07|     | FC| 7E| FE|     | A1| B2| A3|
- * `---'   `-----------------------------------------------'     `-----------'     `-----------'
- * ,-----------------------------------------------------------. ,-----------. ,---------------.
- * | 0E| 16| 1E| 26| 25| 2E| 36| 3D| 3E| 46| 45| 4E| 55| 6A| 66| | F0| EC| FD| | 77| CA| 7C| 7B|
- * |-----------------------------------------------------------| |-----------| |---------------|
- * | 0D  | 15| 1D| 24| 2D| 2C| 35| 3C| 43| 44| 4D| 54| 5B|  5D | | F1| E9| FA| | 6C| 75| 7D| 79|
- * |-----------------------------------------------------------| `-----------' |---------------|
- * | 58   | 1C| 1B| 23| 2B| 34| 33| 3B| 42| 4B| 4C| 52| ^a| 5A |               | 6B| 73| 74| 6D|
- * |-----------------------------------------------------------|     ,---.     |---------------|
- * | 12 | 61| 1A| 22| 21| 2A| 32| 31| 3A| 41| 49| 4A| 51|  59  |     | F5|     | 69| 72| 7A| DA|
- * |-----------------------------------------------------------| ,-----------. |---------------|
- * | 14| 9F| 11| 67 |     29         | 64 | 13 | 91| A7| AF| 94| | EB| F2| F4| | 68|70 | 71| 63|
- * `-----------------------------------------------------------' `-----------' `---------------'
- * ^a ISO hash key uses identical scancode 5D to US backslash.
- * 51, 63, 68, 6D: hidden keys in IBM model M
- */
+// 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( \
-        K08,K10,K18,K20,K28,K30,K38,K40,K48,K50,K57,K5F,                                        \
-    K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07,         KFC,K7E,KFE,      KA1,KB2,KA3, \
-    K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K6A,K66, KF0,KEC,KFD,  K77,KCA,K7C,K7B, \
-    K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,    K5D, KF1,KE9,KFA,  K6C,K75,K7D,K79, \
-    K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52,        K5A,               K6B,K73,K74,K6D, \
-    K12,K61,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A,    K51,K59,     KF5,      K69,K72,K7A,KDA, \
-    K14,K9F,K11,K67,    K29,            K64,K13,K91,KA7,KAF,K94, KEB,KF2,KF4,  K68,K70,K71,K63, \
+    K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07,     KFC,K7E,KFE,                   \
+    K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K66, KF0,KEC,KFD,  K77,KCA,K7C,K7B, \
+    K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,K5D, KF1,KE9,KFA,  K6C,K75,K7D,     \
+    K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52,    K5A,               K6B,K73,K74,K79, \
+    K12,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A,        K59,     KF5,      K69,K72,K7A,     \
+    K14,K9F,K11,        K29,                K91,KA7,KAF,K94, KEB,KF2,KF4,  K70,    K71,KDA, \
                                                                                             \
+    K61,                     /* for European ISO */                                         \
+    K51, K13, K6A, K64, K67, /* for Japanese JIS */                                         \
+    K08, K10, K18, K20, K28, K30, K38, K40, K48, K50, K57, K5F, /* F13-24 */                \
     KB7, KBF, KDE,           /* System Power, Sleep, Wake */                                \
+    KA3, KB2, KA1,           /* Mute, Volume Up, Volume Down */                             \
     KCD, K95, KBB, KB4, KD0, /* Next, Previous, Stop, Pause, Media Select */                \
     KC8, KAB, KC0,           /* Mail, Calculator, My Computer */                            \
     K90, KBA, KB8, KB0,      /* WWW Search, Home, Back, Forward */                          \
@@ -94,8 +64,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { KC_##K48, KC_##K49, KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D, KC_##K4E, KC_NO    }, \
     { KC_##K50, KC_##K51, KC_##K52, KC_NO,    KC_##K54, KC_##K55, KC_NO,    KC_##K57 }, \
     { KC_##K58, KC_##K59, KC_##K5A, KC_##K5B, KC_NO,    KC_##K5D, KC_NO,    KC_##K5F }, \
-    { KC_NO,    KC_##K61, KC_NO,    KC_##K63, KC_##K64, KC_NO,    KC_##K66, KC_##K67 }, \
-    { KC_##K68, KC_##K69, KC_##K6A, KC_##K6B, KC_##K6C, KC_##K6D, KC_NO,    KC_NO    }, \
+    { KC_NO,    KC_##K61, KC_NO,    KC_NO,    KC_##K64, KC_NO,    KC_##K66, KC_##K67 }, \
+    { KC_NO,    KC_##K69, KC_##K6A, KC_##K6B, KC_##K6C, KC_NO,    KC_NO,    KC_NO    }, \
     { KC_##K70, KC_##K71, KC_##K72, KC_##K73, KC_##K74, KC_##K75, KC_##K76, KC_##K77 }, \
     { KC_##K78, KC_##K79, KC_##K7A, KC_##K7B, KC_##K7C, KC_##K7D, KC_##K7E, KC_NO    }, \
     { KC_NO,    KC_NO,    KC_NO,    KC_##K83, KC_NO,    KC_NO,    KC_NO,    KC_NO    }, \
@@ -116,31 +86,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { KC_NO,    KC_NO,    KC_##KFA, KC_NO,    KC_##KFC, KC_##KFD, KC_##KFE, KC_NO    }, \
 }
 
-#define KEYMAP_FULL( \
-        K08,K10,K18,K20,K28,K30,K38,K40,K48,K50,K57,K5F,                                        \
-    K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07,         KFC,K7E,KFE,      KA1,KB2,KA3, \
-    K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K6A,K66, KF0,KEC,KFD,  K77,KCA,K7C,K7B, \
-    K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,    K5D, KF1,KE9,KFA,  K6C,K75,K7D,K79, \
-    K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52,        K5A,               K6B,K73,K74,K6D, \
-    K12,K61,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A,    K51,K59,     KF5,      K69,K72,K7A,KDA, \
-    K14,K9F,K11,K67,    K29,            K64,K13,K91,KA7,KAF,K94, KEB,KF2,KF4,  K68,K70,K71,K63  \
-) \
-KEYMAP_ALL( \
-        K08,K10,K18,K20,K28,K30,K38,K40,K48,K50,K57,K5F,                                        \
-    K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07,         KFC,K7E,KFE,      KA1,KB2,KA3, \
-    K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K6A,K66, KF0,KEC,KFD,  K77,KCA,K7C,K7B, \
-    K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,    K5D, KF1,KE9,KFA,  K6C,K75,K7D,K79, \
-    K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52,        K5A,               K6B,K73,K74,K6D, \
-    K12,K61,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A,    K51,K59,     KF5,      K69,K72,K7A,KDA, \
-    K14,K9F,K11,K67,    K29,            K64,K13,K91,KA7,KAF,K94, KEB,KF2,KF4,  K68,K70,K71,K63, \
-                                                                                                \
-    SYSTEM_POWER, SYSTEM_SLEEP, SYSTEM_WAKE,                                                    \
-    MEDIA_NEXT_TRACK, MEDIA_PREV_TRACK, MEDIA_STOP, MEDIA_PLAY_PAUSE, MEDIA_SELECT,             \
-    MAIL, CALCULATOR, MY_COMPUTER,                                                              \
-    WWW_SEARCH, WWW_HOME, WWW_BACK, WWW_FORWARD,                                                \
-    WWW_STOP, WWW_REFRESH, WWW_FAVORITES                                                        \
-)
-
 /* US layout */
 #define KEYMAP( \
     K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07,     KFC,K7E,KFE,                   \
@@ -150,14 +95,23 @@ KEYMAP_ALL( \
     K12,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A,        K59,     KF5,      K69,K72,K7A,     \
     K14,K9F,K11,        K29,                K91,KA7,KAF,K94, KEB,KF2,KF4,  K70,    K71,KDA  \
 ) \
-KEYMAP_FULL( \
-        F13,F14,F15,F16,F17,F18,F19,F20,F21,F22,F23,F24,                                        \
-    K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07,         KFC,K7E,KFE,  VOLD,VOLU,MUTE,  \
-    K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,JPY,K66, KF0,KEC,KFD,  K77,KCA,K7C,K7B, \
-    K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,    K5D, KF1,KE9,KFA,  K6C,K75,K7D,K79, \
-    K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52,        K5A,               K6B,K73,K74,PCMM,\
-    K12,NUBS,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A,   RO, K59,     KF5,      K69,K72,K7A,KDA, \
-    K14,K9F,K11,MHEN,   K29,          HENK,KANA,K91,KA7,KAF,K94, KEB,KF2,KF4,  PWR,K70,K71,PEQL \
+KEYMAP_ALL( \
+    K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07,     KFC,K7E,KFE,                   \
+    K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K66, KF0,KEC,KFD,  K77,KCA,K7C,K7B, \
+    K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,K5D, KF1,KE9,KFA,  K6C,K75,K7D,     \
+    K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52,    K5A,               K6B,K73,K74,K79, \
+    K12,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A,        K59,     KF5,      K69,K72,K7A,     \
+    K14,K9F,K11,        K29,                K91,KA7,KAF,K94, KEB,KF2,KF4,  K70,    K71,KDA, \
+                                                                                            \
+    NUBS,                                                                                   \
+    RO, KANA, JYEN, HENK, MHEN,                                                             \
+    F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24,                             \
+    SYSTEM_POWER, SYSTEM_SLEEP, SYSTEM_WAKE,                                                \
+    AUDIO_MUTE, AUDIO_VOL_UP, AUDIO_VOL_DOWN,                                               \
+    MEDIA_NEXT_TRACK, MEDIA_PREV_TRACK, MEDIA_STOP, MEDIA_PLAY_PAUSE, MEDIA_SELECT,         \
+    MAIL, CALCULATOR, MY_COMPUTER,                                                          \
+    WWW_SEARCH, WWW_HOME, WWW_BACK, WWW_FORWARD,                                            \
+    WWW_STOP, WWW_REFRESH, WWW_FAVORITES                                                    \
 )
 
 /* ISO layout */
@@ -169,14 +123,23 @@ KEYMAP_FULL( \
     K12,K61,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A,    K59,     KF5,      K69,K72,K7A,     \
     K14,K9F,K11,        K29,                K91,KA7,KAF,K94, KEB,KF2,KF4,  K70,    K71,KDA  \
 ) \
-KEYMAP_FULL( \
-        F13,F14,F15,F16,F17,F18,F19,F20,F21,F22,F23,F24,                                        \
-    K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07,         KFC,K7E,KFE,  VOLD,VOLU,MUTE,  \
-    K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,JPY,K66, KF0,KEC,KFD,  K77,KCA,K7C,K7B, \
-    K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,    K5D, KF1,KE9,KFA,  K6C,K75,K7D,K79, \
-    K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52,        K5A,               K6B,K73,K74,PCMM,\
-    K12,K61,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A,    RO, K59,     KF5,      K69,K72,K7A,KDA, \
-    K14,K9F,K11,MHEN,   K29,          HENK,KANA,K91,KA7,KAF,K94, KEB,KF2,KF4,  PWR,K70,K71,PEQL \
+KEYMAP_ALL( \
+    K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07,     KFC,K7E,KFE,                   \
+    K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K66, KF0,KEC,KFD,  K77,KCA,K7C,K7B, \
+    K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,K5D, KF1,KE9,KFA,  K6C,K75,K7D,     \
+    K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52,    K5A,               K6B,K73,K74,K79, \
+    K12,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A,        K59,     KF5,      K69,K72,K7A,     \
+    K14,K9F,K11,        K29,                K91,KA7,KAF,K94, KEB,KF2,KF4,  K70,    K71,KDA, \
+                                                                                            \
+    K61,                                                                                    \
+    RO, KANA, JYEN, HENK, MHEN,                                                             \
+    F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24,                             \
+    SYSTEM_POWER, SYSTEM_SLEEP, SYSTEM_WAKE,                                                \
+    AUDIO_MUTE, AUDIO_VOL_UP, AUDIO_VOL_DOWN,                                               \
+    MEDIA_NEXT_TRACK, MEDIA_PREV_TRACK, MEDIA_STOP, MEDIA_PLAY_PAUSE, MEDIA_SELECT,         \
+    MAIL, CALCULATOR, MY_COMPUTER,                                                          \
+    WWW_SEARCH, WWW_HOME, WWW_BACK, WWW_FORWARD,                                            \
+    WWW_STOP, WWW_REFRESH, WWW_FAVORITES                                                    \
 )
 
 /* JIS layout */
@@ -188,14 +151,23 @@ KEYMAP_FULL( \
     K12,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A,K51,        K59,     KF5,      K69,K72,K7A,     \
     K14,K9F,K11,    K67,K29,K64,K13,            K91,KA7,KAF,K94, KEB,KF2,KF4,  K70,    K71,KDA  \
 ) \
-KEYMAP_FULL( \
-        F13,F14,F15,F16,F17,F18,F19,F20,F21,F22,F23,F24,                                        \
-    K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07,         KFC,K7E,KFE,  VOLD,VOLU,MUTE,  \
-    K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K6A,K66, KF0,KEC,KFD,  K77,KCA,K7C,K7B, \
-    K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,    K5D, KF1,KE9,KFA,  K6C,K75,K7D,K79, \
-    K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52,        K5A,               K6B,K73,K74,PCMM,\
-    K12,NUBS,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A,   K51,K59,     KF5,      K69,K72,K7A,KDA, \
-    K14,K9F,K11,K67,    K29,            K64,K13,K91,KA7,KAF,K94, KEB,KF2,KF4,  PWR,K70,K71,PEQL \
+KEYMAP_ALL( \
+    K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07,     KFC,K7E,KFE,                   \
+    K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K66, KF0,KEC,KFD,  K77,KCA,K7C,K7B, \
+    K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,K5D, KF1,KE9,KFA,  K6C,K75,K7D,     \
+    K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52,    K5A,               K6B,K73,K74,K79, \
+    K12,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A,        K59,     KF5,      K69,K72,K7A,     \
+    K14,K9F,K11,        K29,                K91,KA7,KAF,K94, KEB,KF2,KF4,  K70,    K71,KDA, \
+                                                                                            \
+    NUBS,                                                                                   \
+    K51, K13, K6A, K64, K67,                                                                \
+    F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24,                             \
+    SYSTEM_POWER, SYSTEM_SLEEP, SYSTEM_WAKE,                                                \
+    AUDIO_MUTE, AUDIO_VOL_UP, AUDIO_VOL_DOWN,                                               \
+    MEDIA_NEXT_TRACK, MEDIA_PREV_TRACK, MEDIA_STOP, MEDIA_PLAY_PAUSE, MEDIA_SELECT,         \
+    MAIL, CALCULATOR, MY_COMPUTER,                                                          \
+    WWW_SEARCH, WWW_HOME, WWW_BACK, WWW_FORWARD,                                            \
+    WWW_STOP, WWW_REFRESH, WWW_FAVORITES                                                    \
 )
 
 #endif

converter/ps2_usb/keymap_jis.c

@@ -30,5 +30,5 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 };
 
-const action_t PROGMEM fn_actions[] = {
+const uint16_t PROGMEM fn_actions[] = {
 };

converter/ps2_usb/keymap_plain.c

@@ -28,5 +28,5 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 };
 
-const action_t PROGMEM fn_actions[] = {
+const uint16_t PROGMEM fn_actions[] = {
 };

converter/ps2_usb/keymap_spacefn.c

@@ -54,7 +54,7 @@ const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 };
 
-const action_t PROGMEM fn_actions[] = {
+const uint16_t PROGMEM fn_actions[] = {
     [0] = ACTION_LAYER_TAP_KEY(1, KC_SPACE),
     [1] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV),    // tilde
 };

converter/ps2_usb/matrix.c

@@ -22,13 +22,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "util.h"
 #include "debug.h"
 #include "ps2.h"
-#include "host.h"
-#include "led.h"
 #include "matrix.h"
 
 
 static void matrix_make(uint8_t code);
 static void matrix_break(uint8_t code);
+static void matrix_clear(void);
+#ifdef MATRIX_HAS_GHOST
+static bool matrix_has_ghost_in_row(uint8_t row);
+#endif
 
 
 /*
@@ -67,6 +69,18 @@ static uint8_t matrix[MATRIX_ROWS];
 static bool is_modified = false;
 
 
+inline
+uint8_t matrix_rows(void)
+{
+    return MATRIX_ROWS;
+}
+
+inline
+uint8_t matrix_cols(void)
+{
+    return MATRIX_COLS;
+}
+
 void matrix_init(void)
 {
     debug_enable = true;
@@ -201,12 +215,6 @@ uint8_t matrix_scan(void)
                         print("Overrun\n");
                         state = INIT;
                         break;
-                    case 0xAA:  // Self-test passed
-                    case 0xFC:  // Self-test failed
-                        printf("BAT %s\n", (code == 0xAA) ? "OK" : "NG");
-                        led_set(host_keyboard_leds());
-                        state = INIT;
-                        break;
                     default:    // normal key make
                         if (code < 0x80) {
                             matrix_make(code);
@@ -382,6 +390,23 @@ uint8_t matrix_scan(void)
     return 1;
 }
 
+bool matrix_is_modified(void)
+{
+    return is_modified;
+}
+
+inline
+bool matrix_has_ghost(void)
+{
+#ifdef MATRIX_HAS_GHOST
+    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+        if (matrix_has_ghost_in_row(i))
+            return true;
+    }
+#endif
+    return false;
+}
+
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
@@ -394,6 +419,21 @@ uint8_t matrix_get_row(uint8_t row)
     return matrix[row];
 }
 
+void matrix_print(void)
+{
+    print("\nr/c 01234567\n");
+    for (uint8_t row = 0; row < matrix_rows(); row++) {
+        phex(row); print(": ");
+        pbin_reverse(matrix_get_row(row));
+#ifdef MATRIX_HAS_GHOST
+        if (matrix_has_ghost_in_row(row)) {
+            print(" <ghost");
+        }
+#endif
+        print("\n");
+    }
+}
+
 uint8_t matrix_key_count(void)
 {
     uint8_t count = 0;
@@ -403,6 +443,23 @@ uint8_t matrix_key_count(void)
     return count;
 }
 
+#ifdef MATRIX_HAS_GHOST
+inline
+static bool matrix_has_ghost_in_row(uint8_t row)
+{
+    // no ghost exists in case less than 2 keys on
+    if (((matrix[row] - 1) & matrix[row]) == 0)
+        return false;
+
+    // ghost exists in case same state as other row
+    for (uint8_t i=0; i < MATRIX_ROWS; i++) {
+        if (i != row && (matrix[i] & matrix[row]) == matrix[row])
+            return true;
+    }
+    return false;
+}
+#endif
+
 
 inline
 static void matrix_make(uint8_t code)
@@ -422,7 +479,8 @@ static void matrix_break(uint8_t code)
     }
 }
 
-void matrix_clear(void)
+inline
+static void matrix_clear(void)
 {
     for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
 }