From d06e940a179b2e81563cf6123461cfcad35f9045 Mon Sep 17 00:00:00 2001 From: Erez Zukerman Date: Tue, 24 May 2016 23:55:29 -0400 Subject: [Erez & Jack] Removes keyboards which are not active on qmk --- keyboard/hhkb/Makefile | 85 ++-- keyboard/hhkb/Makefile.jp | 2 - keyboard/hhkb/Makefile.pjrc | 68 ---- keyboard/hhkb/Makefile.rn42 | 155 -------- keyboard/hhkb/README.md | 206 +++++++--- keyboard/hhkb/config.h | 44 +-- keyboard/hhkb/config_rn42.h | 112 ------ keyboard/hhkb/doc/Bluetooth.txt | 39 -- keyboard/hhkb/doc/Bluetooth_img/BT_circuit.jpg | Bin 502118 -> 0 bytes keyboard/hhkb/doc/HHKB.txt | 204 ---------- keyboard/hhkb/doc/HHKB_img/HHKB_TP1684.jpg | Bin 149082 -> 0 bytes keyboard/hhkb/doc/HHKB_img/HHKB_chart1.jpg | Bin 155342 -> 0 bytes keyboard/hhkb/doc/HHKB_img/HHKB_chart2.jpg | Bin 148225 -> 0 bytes keyboard/hhkb/doc/HHKB_img/HHKB_connector.jpg | Bin 193900 -> 0 bytes keyboard/hhkb/doc/HHKB_img/HHKB_controller.jpg | Bin 135100 -> 0 bytes keyboard/hhkb/doc/HHKB_img/HHKB_keyswitch.jpg | Bin 171469 -> 0 bytes keyboard/hhkb/doc/HHKB_img/connector_contact.jpg | Bin 192830 -> 0 bytes keyboard/hhkb/doc/HHKB_img/logic_analyzer.jpg | Bin 169564 -> 0 bytes keyboard/hhkb/doc/HHKB_img/probe_contact.jpg | Bin 208477 -> 0 bytes keyboard/hhkb/doc/HHKB_img/teensy_install.jpg | Bin 135851 -> 0 bytes keyboard/hhkb/doc/HHKB_img/teensy_wiring.jpg | Bin 154695 -> 0 bytes keyboard/hhkb/doc/HHKB_keycodes.txt | 69 ---- keyboard/hhkb/doc/Power.txt | 48 --- keyboard/hhkb/doc/V-USB.md | 39 -- keyboard/hhkb/hhkb_qmk.c | 29 ++ keyboard/hhkb/hhkb_qmk.h | 30 ++ keyboard/hhkb/keymap_common.c | 33 -- keyboard/hhkb/keymap_common.h | 84 ---- keyboard/hhkb/keymaps/default.c | 78 ++++ keyboard/hhkb/keymaps/hasu.c | 282 ------------- keyboard/hhkb/keymaps/hhkb.c | 95 ----- keyboard/hhkb/keymaps/jp.c | 50 --- keyboard/hhkb/keymaps/lxol.c | 208 ++++++++++ keyboard/hhkb/keymaps/spacefn.c | 116 ------ keyboard/hhkb/led.c | 33 -- keyboard/hhkb/not_supported/Makefile.iwrap | 103 ----- keyboard/hhkb/not_supported/Makefile.vusb | 97 ----- keyboard/hhkb/not_supported/config_iwrap.h | 54 --- keyboard/hhkb/not_supported/config_vusb.h | 38 -- keyboard/hhkb/not_supported/iwrap.txt | 32 -- keyboard/hhkb/not_supported/usbconfig.h | 388 ------------------ keyboard/hhkb/rn42.mk | 12 - keyboard/hhkb/rn42/MEMO.txt | 255 ------------ keyboard/hhkb/rn42/PowerSave.txt | 88 ----- keyboard/hhkb/rn42/RN42.txt | 408 ------------------- keyboard/hhkb/rn42/battery.c | 130 ------ keyboard/hhkb/rn42/battery.h | 35 -- keyboard/hhkb/rn42/main.c | 111 ------ keyboard/hhkb/rn42/rn42.c | 237 ----------- keyboard/hhkb/rn42/rn42.h | 23 -- keyboard/hhkb/rn42/rn42_task.c | 478 ----------------------- keyboard/hhkb/rn42/rn42_task.h | 10 - keyboard/hhkb/rn42/suart.S | 156 -------- keyboard/hhkb/rn42/suart.h | 8 - 54 files changed, 546 insertions(+), 4226 deletions(-) delete mode 100644 keyboard/hhkb/Makefile.jp delete mode 100644 keyboard/hhkb/Makefile.pjrc delete mode 100644 keyboard/hhkb/Makefile.rn42 delete mode 100644 keyboard/hhkb/config_rn42.h delete mode 100644 keyboard/hhkb/doc/Bluetooth.txt delete mode 100644 keyboard/hhkb/doc/Bluetooth_img/BT_circuit.jpg delete mode 100644 keyboard/hhkb/doc/HHKB.txt delete mode 100644 keyboard/hhkb/doc/HHKB_img/HHKB_TP1684.jpg delete mode 100644 keyboard/hhkb/doc/HHKB_img/HHKB_chart1.jpg delete mode 100644 keyboard/hhkb/doc/HHKB_img/HHKB_chart2.jpg delete mode 100644 keyboard/hhkb/doc/HHKB_img/HHKB_connector.jpg delete mode 100644 keyboard/hhkb/doc/HHKB_img/HHKB_controller.jpg delete mode 100644 keyboard/hhkb/doc/HHKB_img/HHKB_keyswitch.jpg delete mode 100644 keyboard/hhkb/doc/HHKB_img/connector_contact.jpg delete mode 100644 keyboard/hhkb/doc/HHKB_img/logic_analyzer.jpg delete mode 100644 keyboard/hhkb/doc/HHKB_img/probe_contact.jpg delete mode 100644 keyboard/hhkb/doc/HHKB_img/teensy_install.jpg delete mode 100644 keyboard/hhkb/doc/HHKB_img/teensy_wiring.jpg delete mode 100644 keyboard/hhkb/doc/HHKB_keycodes.txt delete mode 100644 keyboard/hhkb/doc/Power.txt delete mode 100644 keyboard/hhkb/doc/V-USB.md create mode 100644 keyboard/hhkb/hhkb_qmk.c create mode 100644 keyboard/hhkb/hhkb_qmk.h delete mode 100644 keyboard/hhkb/keymap_common.c delete mode 100644 keyboard/hhkb/keymap_common.h create mode 100644 keyboard/hhkb/keymaps/default.c delete mode 100644 keyboard/hhkb/keymaps/hasu.c delete mode 100644 keyboard/hhkb/keymaps/hhkb.c delete mode 100644 keyboard/hhkb/keymaps/jp.c create mode 100644 keyboard/hhkb/keymaps/lxol.c delete mode 100644 keyboard/hhkb/keymaps/spacefn.c delete mode 100644 keyboard/hhkb/led.c delete mode 100644 keyboard/hhkb/not_supported/Makefile.iwrap delete mode 100644 keyboard/hhkb/not_supported/Makefile.vusb delete mode 100644 keyboard/hhkb/not_supported/config_iwrap.h delete mode 100644 keyboard/hhkb/not_supported/config_vusb.h delete mode 100644 keyboard/hhkb/not_supported/iwrap.txt delete mode 100644 keyboard/hhkb/not_supported/usbconfig.h delete mode 100644 keyboard/hhkb/rn42.mk delete mode 100644 keyboard/hhkb/rn42/MEMO.txt delete mode 100644 keyboard/hhkb/rn42/PowerSave.txt delete mode 100644 keyboard/hhkb/rn42/RN42.txt delete mode 100644 keyboard/hhkb/rn42/battery.c delete mode 100644 keyboard/hhkb/rn42/battery.h delete mode 100644 keyboard/hhkb/rn42/main.c delete mode 100644 keyboard/hhkb/rn42/rn42.c delete mode 100644 keyboard/hhkb/rn42/rn42.h delete mode 100644 keyboard/hhkb/rn42/rn42_task.c delete mode 100644 keyboard/hhkb/rn42/rn42_task.h delete mode 100644 keyboard/hhkb/rn42/suart.S delete mode 100644 keyboard/hhkb/rn42/suart.h (limited to 'keyboard/hhkb') diff --git a/keyboard/hhkb/Makefile b/keyboard/hhkb/Makefile index d434246cef..21ba261a23 100644 --- a/keyboard/hhkb/Makefile +++ b/keyboard/hhkb/Makefile @@ -27,7 +27,7 @@ # 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, +# 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. @@ -39,27 +39,30 @@ #---------------------------------------------------------------------------- # Target file name (without extension). -TARGET = hhkb_lufa +TARGET = hhkb_qmk + # Directory common source filess exist +TOP_DIR = ../.. TMK_DIR = ../../tmk_core # Directory keyboard dependent files exist TARGET_DIR = . +# # project specific files +SRC = hhkb_qmk.c \ + matrix.c -# List C source files here. (C dependencies are automatically generated.) -SRC += keymap_common.c \ - matrix.c \ - led.c +ifdef KEYMAP + SRC := keymaps/keymaps/$(KEYMAP).c $(SRC) +else + SRC := keymaps/keymaps/default.c $(SRC) +endif CONFIG_H = config.h - # MCU name -# PJRC Teensy++ 2.0 -#MCU = at90usb1286 -# TMK Alt Controller or PJRC Teensy 2.0 +#MCU = at90usb1287 MCU = atmega32u4 # Processor frequency. @@ -95,66 +98,52 @@ 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 -#OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT +# 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 (TMK Alt Controller) +# Atmel DFU loader 4096 # LUFA bootloader 4096 # USBaspLoader 2048 -OPT_DEFS += -DBOOTLOADER_SIZE=4096 +#OPT_DEFS += -DBOOTLOADER_SIZE=4096 +# as per original hasu settings +OPT_DEFS += -DBOOTLOADER_SIZE=512 # Build Options # comment out to disable the options. # -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # USB Nkey Rollover -#KEYMAP_SECTION_ENABLE = yes # fixed address keymap for keymap editor -#HHKB_JP = yes # HHKB JP support +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 +CUSTOM_MATRIX = yes # Custom matrix file for the HHKB +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +# SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend +# NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality +# MIDI_ENABLE = YES # MIDI controls +# UNICODE_ENABLE = YES # Unicode +# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID -#OPT_DEFS += -DNO_ACTION_TAPPING -#OPT_DEFS += -DNO_ACTION_LAYER -#OPT_DEFS += -DNO_ACTION_MACRO - - -# -# Keymap file -# -ifdef KEYMAP - SRC := keymaps/$(KEYMAP).c $(SRC) -else - ifdef HHKB_JP - SRC := keymaps/jp.c $(SRC) - else - SRC := keymaps/hhkb.c $(SRC) - endif -endif - - -ifneq (, $(or $(findstring jp.c, $(SRC)), $(findstring yes, $(HHKB_JP)))) - OPT_DEFS += -DHHKB_JP -endif +# Optimize size but this may cause error "relocation truncated to fit" +#EXTRALDFLAGS = -Wl,--relax # Search Path VPATH += $(TARGET_DIR) +VPATH += $(TOP_DIR) VPATH += $(TMK_DIR) -include $(TMK_DIR)/protocol/lufa.mk -include $(TMK_DIR)/common.mk -include $(TMK_DIR)/rules.mk - debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION debug-on: all debug-off: EXTRAFLAGS += -DNO_DEBUG -DNO_PRINT debug-off: OPT_DEFS := $(filter-out -DCONSOLE_ENABLE,$(OPT_DEFS)) debug-off: all + +include $(TOP_DIR)/quantum/quantum.mk diff --git a/keyboard/hhkb/Makefile.jp b/keyboard/hhkb/Makefile.jp deleted file mode 100644 index e04dbb2424..0000000000 --- a/keyboard/hhkb/Makefile.jp +++ /dev/null @@ -1,2 +0,0 @@ -HHKB_JP = yes -include Makefile diff --git a/keyboard/hhkb/Makefile.pjrc b/keyboard/hhkb/Makefile.pjrc deleted file mode 100644 index 403a8ec60a..0000000000 --- a/keyboard/hhkb/Makefile.pjrc +++ /dev/null @@ -1,68 +0,0 @@ -# -# Makefile for PJRC Teensy -# - - -# Target file name (without extension). -TARGET = hhkb_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 := keymaps/$(KEYMAP).c $(SRC) -else - SRC := keymaps/hasu.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 - - -# Build Options -# comment out to disable the options. -# -BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # USB Nkey Rollover - - - -#---------------- 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/pjrc.mk -include $(TMK_DIR)/common.mk -include $(TMK_DIR)/rules.mk diff --git a/keyboard/hhkb/Makefile.rn42 b/keyboard/hhkb/Makefile.rn42 deleted file mode 100644 index a730442af0..0000000000 --- a/keyboard/hhkb/Makefile.rn42 +++ /dev/null @@ -1,155 +0,0 @@ -#---------------------------------------------------------------------------- -# 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 = hhkb_rn42 - -# Directory common source filess exist -TMK_DIR = ../../tmk_core - -# Directory keyboard dependent files exist -TARGET_DIR = . - - -# List C source files here. (C dependencies are automatically generated.) -SRC += keymap_common.c \ - matrix.c \ - led.c - -CONFIG_H = config_rn42.h - - -# MCU name -MCU = atmega32u4 - -# Processor frequency. -# This will define a symbol, F_CPU, in all source code files equal to the -# processor frequency in Hz. You can then use this symbol in your source code to -# calculate timings. Do NOT tack on a 'UL' at the end, this will be done -# automatically to create a 32-bit value in your source code. -# -# This will be an integer division of F_USB below, as it is sourced by -# F_USB after it has run through any CPU prescalers. Note that this value -# does not *change* the processor frequency - it should merely be updated to -# reflect the processor speed set externally so that the code can use accurate -# software delays. -F_CPU = 16000000 - - -# -# LUFA specific -# -# Target architecture (see library "Board Types" documentation). -ARCH = AVR8 - -# Input clock frequency. -# This will define a symbol, F_USB, in all source code files equal to the -# input clock frequency (before any prescaling is performed) in Hz. This value may -# differ from F_CPU if prescaling is used on the latter, and is required as the -# raw input clock is fed directly to the PLL sections of the AVR for high speed -# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' -# at the end, this will be done automatically to create a 32-bit value in your -# source code. -# -# If no clock division is performed on the input clock inside the AVR (via the -# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. -F_USB = $(F_CPU) - -# Interrupt driven control endpoint task -#OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT - - -# Boot Section Size in *bytes* -# Teensy halfKay 512 -# Teensy++ halfKay 1024 -# Atmel DFU loader 4096 (TMK Alt Controller) -# 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 -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -#NKRO_ENABLE = yes # USB Nkey Rollover -#KEYMAP_SECTION_ENABLE = yes # fixed address keymap for keymap editor -#HHKB_JP = yes # HHKB JP support - - -# -# Keymap file -# -ifdef KEYMAP - SRC := keymaps/$(KEYMAP).c $(SRC) -else - ifdef HHKB_JP - SRC := keymaps/jp.c $(SRC) - else - SRC := keymaps/hhkb.c $(SRC) - endif -endif - - -ifneq (, $(or $(findstring jp.c, $(SRC)), $(findstring yes, $(HHKB_JP)))) - OPT_DEFS += -DHHKB_JP -endif - - -# Search Path -VPATH += $(TARGET_DIR) -VPATH += $(TMK_DIR) - -include rn42.mk -include $(TMK_DIR)/protocol.mk -include $(TMK_DIR)/protocol/lufa.mk -include $(TMK_DIR)/common.mk -include $(TMK_DIR)/rules.mk - -debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION -debug-on: all - -debug-off: EXTRAFLAGS += -DNO_DEBUG -DNO_PRINT -debug-off: OPT_DEFS := $(filter-out -DCONSOLE_ENABLE,$(OPT_DEFS)) -debug-off: all diff --git a/keyboard/hhkb/README.md b/keyboard/hhkb/README.md index e20c23d823..389407b3aa 100644 --- a/keyboard/hhkb/README.md +++ b/keyboard/hhkb/README.md @@ -1,102 +1,180 @@ -Alternative Controller for HHKB Pro -=================================== -I wanted to add some features like vi cursor and mouse keys to my [HHKB][HHKB] but its controller is not programmable and firmware source code is not open, of course. This means customizing this keyboard needs to replace original controller with programmable one. +hhkb_qmk keyboard firmware +====================== -This controller can work with HHKB **Professional**, **Professional** 2, **JP** and **Type-S**. +## Quantum MK Firmware -See [this thread][AltController] in geekhack.org. +You have access to a bunch of goodies! Check out the Makefile to enable/disable some of the features. Uncomment the `#` to enable them. Setting them to `no` does nothing and will only confuse future you. -[HHKB]: http://www.pfu.fujitsu.com/hhkeyboard/ -[AltController]: http://geekhack.org/index.php?topic=12047.0 + BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality + MIDI_ENABLE = yes # MIDI controls + # UNICODE_ENABLE = yes # Unicode support - this is commented out, just as an example. You have to use #, not // + BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID +## Quick aliases to common actions -## Update -* Bluetooth module RN-42 is supported.(2015/01) -* V-USB and iWRAP are no longer supported now, but still it'll works with a little fix. See not_supported directory.(2015/01) +Your keymap can include shortcuts to common operations (called "function actions" in tmk). +### Switching and toggling layers -##Features -* Customizable keymap -* More keymap layers(more Fn keys) -* Mouse keys -* USB NKRO -* Bluetooth(RN-42) +`MO(layer)` - momentary switch to *layer*. As soon as you let go of the key, the layer is deactivated and you pop back out to the previous layer. When you apply this to a key, that same key must be set as `KC_TRNS` on the destination layer. Otherwise, you won't make it back to the original layer when you release the key (and you'll get a keycode sent). You can only switch to layers *above* your current layer. If you're on layer 0 and you use `MO(1)`, that will switch to layer 1 just fine. But if you include `MO(3)` on layer 5, that won't do anything for you -- because layer 3 is lower than layer 5 on the stack. -See README of [tmk_keyboard] for more. +`LT(layer, kc)` - momentary switch to *layer* when held, and *kc* when tapped. Like `MO()`, this only works upwards in the layer stack (`layer` must be higher than the current layer). -[tmk_keyboard]: http://github.com/tmk/tmk_keyboard - -###Pros -* No risks: Everything is all reversible -* No need for PCB trace patching, case cutting or any other destructive mod -* Can keep original controller intact -* Can change all HHKB behavior as you like +`TG(layer)` - toggles a layer on or off. As with `MO()`, you should set this key as `KC_TRNS` in the destination layer so that tapping it again actually toggles back to the original layer. Only works upwards in the layer stack. + +### Fun with modifier keys + +* `LSFT(kc)` - applies left Shift to *kc* (keycode) - `S(kc)` is an alias +* `RSFT(kc)` - applies right Shift to *kc* +* `LCTL(kc)` - applies left Control to *kc* +* `RCTL(kc)` - applies right Control to *kc* +* `LALT(kc)` - applies left Alt to *kc* +* `RALT(kc)` - applies right Alt to *kc* +* `LGUI(kc)` - applies left GUI (command/win) to *kc* +* `RGUI(kc)` - applies right GUI (command/win) to *kc* + +You can also chain these, like this: + + LALT(LCTL(KC_DEL)) -- this makes a key that sends Alt, Control, and Delete in a single keypress. + +The following shortcuts automatically add `LSFT()` to keycodes to get commonly used symbols. Their long names are also available and documented in `/quantum/keymap_common.h`. + + KC_TILD ~ + KC_EXLM ! + KC_AT @ + KC_HASH # + KC_DLR $ + KC_PERC % + KC_CIRC ^ + KC_AMPR & + KC_ASTR * + KC_LPRN ( + KC_RPRN ) + KC_UNDS _ + KC_PLUS + + KC_LCBR { + KC_RCBR } + KC_PIPE | + KC_COLN : + +`MT(mod, kc)` - is *mod* (modifier key - MOD_LCTL, MOD_LSFT) when held, and *kc* when tapped. In other words, you can have a key that sends Esc (or the letter O or whatever) when you tap it, but works as a Control key or a Shift key when you hold it down. + +These are the values you can use for the `mod` in `MT()` (right-hand modifiers are not available): + + * MOD_LCTL + * MOD_LSFT + * MOD_LALT + * MOD_LGUI -###Cons -* Void your warranty -* Lose USB hub function of Pro2 +These can also be combined like `MOD_LCTL | MOD_LSFT` e.g. `MT(MOD_LCTL | MOD_LSFT, KC_ESC)` which would activate Control and Shift when held, and send Escape when tapped. -##DISCLAIMER -I'm not a professional of electronics nor MCU programming. This may damage your HHKB. -And my English writing is poor, I'm not sure I can convey my notions accurately. +We've added shortcuts to make common modifier/tap (mod-tap) mappings more compact: + * `CTL_T(kc)` - is LCTL when held and *kc* when tapped + * `SFT_T(kc)` - is LSFT when held and *kc* when tapped + * `ALT_T(kc)` - is LALT when held and *kc* when tapped + * `GUI_T(kc)` - is LGUI when held and *kc* when tapped + * `ALL_T(kc)` - is Hyper (all mods) when held and *kc* when tapped. To read more about what you can do with a Hyper key, see [this blog post by Brett Terpstra](http://brettterpstra.com/2012/12/08/a-useful-caps-lock-key/) -##Documents -See [doc/HHKB.txt](doc/HHKB.txt) and files under [doc/](doc/) for internal of HHKB and this controller. +### Temporarily setting the default layer +`DF(layer)` - sets default layer to *layer*. The default layer is the one at the "bottom" of the layer stack - the ultimate fallback layer. This currently does not persist over power loss. When you plug the keyboard back in, layer 0 will always be the default. It is theoretically possible to work around that, but that's not what `DF` does. -##Build Firmware & Program -See [this document](../../doc/build.md) first. +### Remember: These are just aliases -### Configuration -If your target is **HHKB JP** you need to set `HHKB_JP` build option in `Makefile` or use `Makefile.jp` instead of `Makefile`. +These functions work the same way that their `ACTION_*` functions do - they're just quick aliases. To dig into all of the tmk ACTION_* functions, please see the [TMK documentation](https://github.com/jackhumbert/qmk_firmware/blob/master/tmk_core/doc/keymap.md#2-action). -If you use other than **TMK Alt Controller Board** set proper `MCU`, `BOOTLOADER_SIZE` and other build options in `Makefile` and `config.h`. At least PJRC Teensy requires changing `BOOTLOADER_SIZE` to 512. +Instead of using `FNx` when defining `ACTION_*` functions, you can use `F(x)` - the benefit here is being able to use more than 32 function actions (up to 4096), if you happen to need them. -### Build -Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. Just `make` with `KEYMAP` option like: +## Macro shortcuts: Send a whole string when pressing just one key - $ make -f Makefile. KEYMAP=(hasu|hhkb|spacefn|) +Instead of using the `ACTION_MACRO` function, you can simply use `M(n)` to access macro *n* - *n* will get passed into the `action_get_macro` as the `id`, and you can use a switch statement to trigger it. This gets called on the keydown and keyup, so you'll need to use an if statement testing `record->event.pressed` (see keymap_default.c). -You can omit `-f` option when you use `Makefile`. `Makefile` is used for **Pro2 and Pro**, `Makefile.jp` fits for **JP** model and `Makefile.rn42` supports Bluetooth module **RN-42**. `Makefile.pjrc` uses **PJRC** as output protocol instead of **LUFA**. +```c +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) // this is the function signature -- just copy/paste it into your keymap file as it is. +{ + switch(id) { + case 0: // this would trigger when you hit a key mapped as M(0) + if (record->event.pressed) { + return MACRO( I(255), T(H), T(E), T(L), T(L), W(255), T(O), END ); // this sends the string 'hello' when the macro executes + } + break; + } + return MACRO_NONE; +}; +``` +A macro can include the following commands: + +* I() change interval of stroke in milliseconds. +* D() press key. +* U() release key. +* T() type key(press and release). +* W() wait (milliseconds). +* END end mark. + +So above you can see the stroke interval changed to 255ms between each keystroke, then a bunch of keys being typed, waits a while, then the macro ends. + +Note: Using macros to have your keyboard send passwords for you is a bad idea. + +### Additional keycode aliases for software-implemented layouts (Colemak, Dvorak, etc) + +Everything is assuming you're in Qwerty (in software) by default, but there is built-in support for using a Colemak or Dvorak layout by including this at the top of your keymap: + + #include "keymap_.h" + +Where is "colemak" or "dvorak". After including this line, you will get access to: + + * `CM_*` for all of the Colemak-equivalent characters + * `DV_*` for all of the Dvorak-equivalent characters + +These implementations assume you're using Colemak or Dvorak on your OS, not on your keyboard - this is referred to as a software-implemented layout. If your computer is in Qwerty and your keymap is in Colemak or Dvorak, this is referred to as a firmware-implemented layout, and you won't need these features. +To give an example, if you're using software-implemented Colemak, and want to get an `F`, you would use `CM_F` - `KC_F` under these same circumstances would result in `T`. -### Program -First, push reset button on board to start bootloader. +## Additional language support -This command programs the controller with [dfu-programmer] if the tool is installed and configured properly. +In `quantum/keymap_extras/`, you'll see various language files - these work the same way as the alternative layout ones do. Most are defined by their two letter country/language code followed by an underscore and a 4-letter abbreviation of its name. `FR_UGRV` which will result in a `ù` when using a software-implemented AZERTY layout. It's currently difficult to send such characters in just the firmware (but it's being worked on - see Unicode support). - $ make -f Makefile. KEYMAP= dfu +## Unicode support -Or you can also use [FLIP] command to program. Also the tool should be installed and configured properly. FLIP GUI application is also available. +You can currently send 4 hex digits with your OS-specific modifier key (RALT for OSX with the "Unicode Hex Input" layout) - this is currently limited to supporting one OS at a time, and requires a recompile for switching. 8 digit hex codes are being worked on. The keycode function is `UC(n)`, where *n* is a 4 digit hexidecimal. Enable from the Makefile. - $ make -f Makefile. KEYMAP= flip +## Other firmware shortcut keycodes -Use [Teensy Loader] if your controller is Teensy/Teensy++. +* `RESET` - puts the MCU in DFU mode for flashing new firmware (with `make dfu`) +* `DEBUG` - the firmware into debug mode - you'll need hid_listen to see things +* `BL_ON` - turns the backlight on +* `BL_OFF` - turns the backlight off +* `BL_` - sets the backlight to level *n* +* `BL_INC` - increments the backlight level by one +* `BL_DEC` - decrements the backlight level by one +* `BL_TOGG` - toggles the backlight +* `BL_STEP` - steps through the backlight levels +Enable the backlight from the Makefile. -##Keymap -To define your own keymap create a file in the keymaps folder named `.c` and see keymap document (you can find in top README.md) and existent keymap files. +## MIDI functionalty +This is still a WIP, but check out `quantum/keymap_midi.c` to see what's happening. Enable from the Makefile. -##Hardware -You have some options for hardware. Development boards with USB AVR family(ATMega32U4, AT90USB1286) like Teensy will work while MegaAVR with [V-USB] library is also cheaper option for DIY. +## Bluetooth functionality -###1. TMK Alt Controller Board -Design files are available at [Keyboard Controller Board for HHKB(KiCad project)](https://github.com/tmk/HHKB_controller) and see [Controller Distribution thread](http://geekhack.org/index.php?topic=56494.0) if you get an assembled one. +This requires [some hardware changes](https://www.reddit.com/r/MechanicalKeyboards/comments/3psx0q/the_planck_keyboard_with_bluetooth_guide_and/?ref=search_posts), but can be enabled via the Makefile. The firmware will still output characters via USB, so be aware of this when charging via a computer. It would make sense to have a switch on the Bluefruit to turn it off at will. +## Building -###2. PJRC Teensy -See [this thread](http://geekhack.org/index.php?topic=57008.0). +Download or clone the whole firmware and navigate to the keyboard/planck folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use `make dfu` to program your PCB once you hit the reset button. +Depending on which keymap you would like to use, you will have to compile slightly differently. -###3. V-USB version -See [V-USB controller for HHKB](doc/V-USB.md). +### Default +To build with the default keymap, simply run `make`. +### Other Keymaps +Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create a file in the keymaps folder named `.c` and see keymap document (you can find in top README.md) and existent keymap files. -[LUFA]: http://www.fourwalledcubicle.com/LUFA.php -[PJRC]: http://www.pjrc.com/teensy/usb_keyboard.html -[dfu-programmer]: http://dfu-programmer.sourceforge.net/ -[FLIP]: http://www.atmel.com/tools/FLIP.aspx -[Teensy Loader]: http://www.pjrc.com/teensy/loader.html -[V-USB]: http://www.obdev.at/products/vusb/index.html +To build the firmware binary hex file with a keymap just do `make` with `KEYMAP` option like: +``` +$ make KEYMAP=[default|jack|] +``` +Keymaps follow the format **__\.c__** and are stored in the `keymaps` folder. diff --git a/keyboard/hhkb/config.h b/keyboard/hhkb/config.h index c0acc0a7ed..ee66e44571 100644 --- a/keyboard/hhkb/config.h +++ b/keyboard/hhkb/config.h @@ -1,5 +1,5 @@ /* -Copyright 2011 Jun Wako +Copyright 2012 Jun Wako 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 @@ -18,43 +18,43 @@ along with this program. If not, see . #ifndef CONFIG_H #define CONFIG_H +#include "config_common.h" +/* USB Device descriptor parameter */ #define VENDOR_ID 0xFEED #define PRODUCT_ID 0xCAFE #define DEVICE_VER 0x0104 -#define MANUFACTURER t.m.k. +#define MANUFACTURER q.m.k #define PRODUCT HHKB mod -#define DESCRIPTION t.m.k. keyboard firmware for HHKB mod +#define DESCRIPTION q.m.k keyboard firmware for HHKB - -/* matrix size */ -#ifdef HHKB_JP -# define MATRIX_ROWS 16 -#else -# define MATRIX_ROWS 8 -#endif +/* key matrix size */ +#define MATRIX_ROWS 8 #define MATRIX_COLS 8 +#define TAPPING_TERM 200 -/* key combination for command */ -#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) - +/* number of backlight levels */ +#define BACKLIGHT_LEVELS 3 -/* period of tapping(ms) */ -#define TAPPING_TERM 300 -/* tap count needed for toggling a feature */ -#define TAPPING_TOGGLE 5 -/* Oneshot timeout(ms) */ -#define ONESHOT_TIMEOUT 300 +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCE 5 -/* Boot Magic salt key: Space */ -#define BOOTMAGIC_KEY_SALT KC_SPACE +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +//#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +//#define LOCKING_RESYNC_ENABLE +/* key combination for command */ +#define IS_COMMAND() ( \ + keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ +) /* * Feature disable options * These options are also useful to firmware size reduction. - */ +*/ + /* disable debug print */ //#define NO_DEBUG diff --git a/keyboard/hhkb/config_rn42.h b/keyboard/hhkb/config_rn42.h deleted file mode 100644 index 21e73f1c53..0000000000 --- a/keyboard/hhkb/config_rn42.h +++ /dev/null @@ -1,112 +0,0 @@ -/* -Copyright 2011 Jun Wako - -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 . -*/ - -#ifndef CONFIG_H -#define CONFIG_H - - -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x4242 -#define DEVICE_VER 0x0104 -#define MANUFACTURER t.m.k. -#define PRODUCT HHKB mod -#define DESCRIPTION t.m.k. keyboard firmware for HHKB mod - - -/* matrix size */ -#ifdef HHKB_JP -# define MATRIX_ROWS 16 -#else -# define MATRIX_ROWS 8 -#endif -#define MATRIX_COLS 8 - - -/* key combination for command */ -#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) - - -/* period of tapping(ms) */ -#define TAPPING_TERM 300 -/* tap count needed for toggling a feature */ -#define TAPPING_TOGGLE 5 -/* Oneshot timeout(ms) */ -#define ONESHOT_TIMEOUT 300 - -/* Boot Magic salt key: Space */ -#define BOOTMAGIC_KEY_SALT KC_FN6 - -/* power control of key switch board */ -#define HHKB_POWER_SAVING - -/* - * Hardware Serial(UART) - * Baud rate are calculated with round off(+0.5). - */ -#ifdef __AVR_ATmega32U4__ - /* iom32u4.h has no definition of UCSR1D. copy from iom32u2.h */ - #define UCSR1D _SFR_MEM8(0xCB) - #define RTSEN 0 - #define CTSEN 1 - - #define SERIAL_UART_BAUD 115200 - #define SERIAL_UART_DATA UDR1 - #define SERIAL_UART_UBRR ((F_CPU/(16.0*SERIAL_UART_BAUD)-1+0.5)) - #define SERIAL_UART_RXD_VECT USART1_RX_vect - #define SERIAL_UART_TXD_READY (UCSR1A&(1<>8); /* baud rate */ \ - UCSR1B |= (1< select row 0-7 PB1 output - 7 7 8 HC4051 C(bit2)/ PB2 output - 8 8 9 LS145 A(bit0)\ PB3 output - 9 9 10 LS145 B(bit1) > select column 0-7 PB4 output - 10 10 11 LS145 C(bit2)/ PB5 output - 11 11 12 LS145 ~D(enable) Low(0) enables selected column PB6 output - 12 12 13 GND GND - 13 13 14 GND GND - 15 GND - 14 HC4051(Z2) ~Enable of Z2 row0-7 PC6 - 15 HC4051(Z3) ~Enable of Z3 row8-15 PC7 - - NOTE: Probably HYS changes threshold for upstroke and makes hysteresis in the result. - NOTE: HYS should be given High(1) when previous KEY state is Low(0). - NOTE: 1KOhm didn't work as pullup resistor on KEY. AVR internal pullup or 10KOhm resistor was OK. - NOTE: JP has two HC4051(Z2,Z3) and line 5, 6 and 7 are connected to both of them. - - (HHKB_connector.jpg) - - -Keyswitch matrix ----------------- -HHKB switch matrix is ghost-free and bounce-free. - - Pro/Pro2(8x8): - COL 0 1 2 3 4 5 6 7 - ROW --------------------------------------------------------------- - 0| 2 q w s a z x c - 1| 3 4 r e d f v b - 2| 5 6 y t g h n _NONE_ - 3| 1 Esc Tab Control LShift LAlt LMeta Space - 4| 7 8 u i k j m _NONE_ - 5| \ ` Delete Return Fn RShift RAlt RMeta - 6| 9 0 o p ; l , _NONE_ - 7| - + ] [ ' / . _NONE_ - - - JP(16x8): - COL 0 1 2 3 4 5 6 7 - ROW --------------------------------------------------------------- - 0| ESC TAB LFn LShift LCtrl - 1| 4 E MuHKN C D - 2| 3 W LAlt X S - 3| 1 HHK - 4| - 5| 5 R V F - 6| 2 Q LGui Z A - 7| 6 T Space B G - 8| 9 I Kana , K - 9| 8 U Henkan M J - A| 7 Y N H - B| 0 O RAlt . L - C| BS Right RShift Enter - D| \ [ Down Up ] - E| - P RFn / ; - F| ~ @ Left Ro : - - -Matrix diagram: - - Pro/Pro2: - +-------------------------+-+-+-+-+-+-+-+ Vcc - |bias control? - - - - - - - - --- - | 3.9K*8 R R R R R R R R | - +--------^+ +--------+ - - - - - - - - | - | 2| | HC4051 <0-------|-|-|-|-|-|-|-|--|R|-+ - | |capa. | <1-------|-|-|-|-|-|-|-|--|R|-+ - | TP1684 |sense | <2-------|-|-|-|-|-|-|-|--|R|-+ - | 11<------| <3-------|-|-|-|-|-|-|-|--|R|-+ - | | | <4-------|-|-|-|-|-|-|-|--|R|-+ - | | | <5-------|-|-|-|-|-|-|-|--|R|-+ - | <-+ | <6-------|-|-|-|-|-|-|-|--|R|-+ - | 1 4 | | | <7-------|-|-|-|-|-|-|-|--|R|-+ - +---V---^-+ | +-^-^-^--+ 0 1 2 3 4 5 6 7 33K*8 - KEY HYS | A B C +-----------------+ - | | +-^----+ | | | | LS145 | - Vcc | | |BU9831| | | | +-^--^--^--^------+ - --- | | +------+ | | | A B C D +-------+ - | | | | | | | | | | | | - 1-3 4 5 6 7 8 9 10 11 12 13-15 Pro | - 1-2 3 4 5 6 7 8 9 10 11 12-13 Pro2| - +--------------------------------------------------+ | - | connector | --- - +--------------------------------------------------+ GND - - - JP: - +-----------------------------+-+-+-+-+ Vcc - |bias control? - - - - - --- - | 3.9K*5 R R R R R | - +--------^+ +--------+ - - - - - | - | | | HC4051 <0-----------|-|-|-|-|----|R|-+ - | |capa. | Z2 <1-----------|-|-|-|-|----|R|-+ - | TP1684 |sense | <2-----------|-|-|-|-|----|R|-+ - | <---+--| <3-----------|-|-|-|-|----|R|-+ - | | | | <4-----------|-|-|-|-|----|R|-+ - | | ~En| <5-----------|-|-|-|-|----|R|-+ - | | +----> <6-----------|-|-|-|-|----|R|-+ - | | | | | A B C <7-----------|-|-|-|-|----|R|-+ - +---V---^-+ | | +-^-^-^--+ | | | | | | - KEY HYS | | | | | | | | | | | - | | | | +--------+ | | | | | | - | | | | | HC4051 <8-----------|-|-|-|-|----|R|-+ - | | | | | Z3 <9-----------|-|-|-|-|----|R|-+ - | | | +--| Prescaler-------> System Clock - | - +---------------------> USB PLL - -Design Decision: Install 16MHz crystal on board with using clock rescaler. diff --git a/keyboard/hhkb/doc/V-USB.md b/keyboard/hhkb/doc/V-USB.md deleted file mode 100644 index 7ae86f452f..0000000000 --- a/keyboard/hhkb/doc/V-USB.md +++ /dev/null @@ -1,39 +0,0 @@ -V-USB controller for HHKB -========================= -Not supported actively any more. - -## Build -Use `Makefile.vusb` for [V-USB] controller. - $ make -f Makefile.vusb - -##Hardware -###3. V-USB connection - +---+ +---------------+ - USB GND | | ATmega328p | - ~~~ C3 | | - 5V <-------+--------+---|Vcc,AVCC | HHKB pro pro2 - R1 | | ~~~~~~~~ ~~~~ - D- <----+--+-----R2-----|INT1 PB2-4|------->ROW (6-8) (5-7) - D+ <----|---+----R3-----|INT0 PC0-2|------->COL (9-11) (8-10) - Z1 Z2 | PC3|------->ENABLE (12) (11) - GND<----+---+-----------|GND PB0|<-------KEY (4) (3) - | PB1|------->PREV (5) (4) - | | - GND+-C2--+--|XTAL1 RXD|------->Debug Console - X1 | TXD|<-------Debug Console - GND+-C3--+--|XTAL2 RST|---SW--+GND - +---------------+ - R1: 1.5K Ohm - R2,R3: 68 Ohm - Z1,Z2: Zener 3.6V - C1,C2: 22pF - C3: 0.1uF - X1: Crystal 12MHz - SW: Push Switch(for bootloader) - -- NOTE: See [V-USB] documentation for more detail of hardware and the USB stack. -- NOTE: [USBaspLoader] is very useful for firmware update. - - -[V-USB]: http://www.obdev.at/products/vusb/index.html -[USBaspLoader]: http://www.obdev.at/products/vusb/usbasploader.html diff --git a/keyboard/hhkb/hhkb_qmk.c b/keyboard/hhkb/hhkb_qmk.c new file mode 100644 index 0000000000..36dc3f29db --- /dev/null +++ b/keyboard/hhkb/hhkb_qmk.c @@ -0,0 +1,29 @@ +#include "hhkb_qmk.h" + +__attribute__ ((weak)) +void matrix_init_user(void) { + // leave these blank +}; + +__attribute__ ((weak)) +void matrix_scan_user(void) { + // leave these blank +}; + +void matrix_init_kb(void) { + // put your keyboard start-up code here + // runs once when the firmware starts up + + if (matrix_init_user) { + (*matrix_init_user)(); + } +}; + +void matrix_scan_kb(void) { + // put your looping keyboard code here + // runs every cycle (a lot) + + if (matrix_scan_user) { + (*matrix_scan_user)(); + } +}; diff --git a/keyboard/hhkb/hhkb_qmk.h b/keyboard/hhkb/hhkb_qmk.h new file mode 100644 index 0000000000..1bac33c2de --- /dev/null +++ b/keyboard/hhkb/hhkb_qmk.h @@ -0,0 +1,30 @@ +#ifndef HHKB_QMK_H +#define HHKB_QMK_H + +#include "matrix.h" +#include "keymap_common.h" +//#include "backlight.h" +#include + +#define KEYMAP( \ + K31, K30, K00, K10, K11, K20, K21, K40, K41, K60, K61, K70, K71, K50, K51, \ + K32, K01, K02, K13, K12, K23, K22, K42, K43, K62, K63, K73, K72, K52, \ + K33, K04, K03, K14, K15, K24, K25, K45, K44, K65, K64, K74, K53, \ + K34, K05, K06, K07, K16, K17, K26, K46, K66, K76, K75, K55, K54, \ + K35, K36, K37, K57, K56) \ + \ +{ \ + { K00, K01, K02, K03, K04, K05, K06, K07 }, \ + { K10, K11, K12, K13, K14, K15, K16, K17 }, \ + { K20, K21, K22, K23, K24, K25, K26, KC_NO }, \ + { K30, K31, K32, K33, K34, K35, K36, K37 }, \ + { K40, K41, K42, K43, K44, K45, K46, KC_NO }, \ + { K50, K51, K52, K53, K54, K55, K56, K57 }, \ + { K60, K61, K62, K63, K64, K65, K66, KC_NO }, \ + { K70, K71, K72, K73, K74, K75, K76, KC_NO } \ +} + +void matrix_init_user(void); +void matrix_scan_user(void); + +#endif diff --git a/keyboard/hhkb/keymap_common.c b/keyboard/hhkb/keymap_common.c deleted file mode 100644 index e938fb6270..0000000000 --- a/keyboard/hhkb/keymap_common.c +++ /dev/null @@ -1,33 +0,0 @@ -/* -Copyright 2012,2013 Jun Wako - -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 . -*/ -#include -#include "action.h" -#include -#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)]) }; -} diff --git a/keyboard/hhkb/keymap_common.h b/keyboard/hhkb/keymap_common.h deleted file mode 100644 index 3622665f3a..0000000000 --- a/keyboard/hhkb/keymap_common.h +++ /dev/null @@ -1,84 +0,0 @@ -/* -Copyright 2012,2013 Jun Wako - -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 . -*/ -#ifndef KEYMAP_COMMON_H -#define KEYMAP_COMMON_H - -#include -#include -#include "keycode.h" -#include "action.h" -#include "action_code.h" -#include "action_layer.h" -#include "action_macro.h" -#include "action_util.h" -#include "report.h" -#include "host.h" -#include "print.h" -#include "debug.h" -#include "keymap.h" - - -extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; -extern const uint16_t fn_actions[]; - - -#define KEYMAP( \ - K31, K30, K00, K10, K11, K20, K21, K40, K41, K60, K61, K70, K71, K50, K51, \ - K32, K01, K02, K13, K12, K23, K22, K42, K43, K62, K63, K73, K72, K52, \ - K33, K04, K03, K14, K15, K24, K25, K45, K44, K65, K64, K74, K53, \ - K34, K05, K06, K07, K16, K17, K26, K46, K66, K76, K75, K55, K54, \ - K35, K36, K37,