From afb08462085132acf7a1962522952f7dbf064519 Mon Sep 17 00:00:00 2001 From: tmk Date: Fri, 8 Jun 2012 00:37:46 +0900 Subject: Made directories for keyboard and converter projects. --- README | 151 -------- README.md | 175 +++++++++ adb_usb/Makefile | 54 --- adb_usb/README | 70 ---- adb_usb/config.h | 72 ---- adb_usb/keymap.c | 150 -------- adb_usb/led.c | 26 -- adb_usb/matrix.c | 241 ------------ converter/adb_usb/Makefile | 54 +++ converter/adb_usb/README | 70 ++++ converter/adb_usb/config.h | 72 ++++ converter/adb_usb/keymap.c | 150 ++++++++ converter/adb_usb/led.c | 26 ++ converter/adb_usb/matrix.c | 241 ++++++++++++ converter/m0110_usb/Makefile | 57 +++ converter/m0110_usb/README.md | 124 +++++++ converter/m0110_usb/config.h | 61 +++ converter/m0110_usb/doc/m0110.jpg | Bin 0 -> 49360 bytes converter/m0110_usb/doc/teensy.jpg | Bin 0 -> 50081 bytes converter/m0110_usb/keymap.c | 214 +++++++++++ converter/m0110_usb/led.c | 24 ++ converter/m0110_usb/matrix.c | 169 +++++++++ converter/ps2_usb/Makefile | 58 +++ converter/ps2_usb/Makefile.pjrc_usart | 58 +++ converter/ps2_usb/Makefile.vusb | 92 +++++ converter/ps2_usb/README | 116 ++++++ converter/ps2_usb/README.vusb | 37 ++ converter/ps2_usb/config_pjrc.h | 59 +++ converter/ps2_usb/config_pjrc_usart.h | 91 +++++ converter/ps2_usb/config_vusb.h | 133 +++++++ converter/ps2_usb/keymap.c | 379 +++++++++++++++++++ converter/ps2_usb/led.c | 33 ++ converter/ps2_usb/matrix.c | 452 +++++++++++++++++++++++ converter/ps2_usb/usbconfig.h | 378 +++++++++++++++++++ converter/sony_usb/Makefile.pjrc | 58 +++ converter/sony_usb/config_pjrc.h | 66 ++++ converter/sony_usb/keymap.c | 125 +++++++ converter/sony_usb/led.c | 26 ++ converter/sony_usb/matrix.c | 141 +++++++ converter/sony_usb/news.c | 168 +++++++++ converter/sony_usb/news.h | 51 +++ converter/terminal_usb/Makefile.102_pjrc | 58 +++ converter/terminal_usb/Makefile.122_pjrc | 58 +++ converter/terminal_usb/README | 47 +++ converter/terminal_usb/config_102_pjrc.h | 58 +++ converter/terminal_usb/config_122_pjrc.h | 58 +++ converter/terminal_usb/keymap_102.c | 208 +++++++++++ converter/terminal_usb/keymap_122.c | 143 +++++++ converter/terminal_usb/led.c | 33 ++ converter/terminal_usb/matrix.c | 226 ++++++++++++ converter/x68k_usb/Makefile | 87 +++++ converter/x68k_usb/README | 129 +++++++ converter/x68k_usb/config_pjrc.h | 66 ++++ converter/x68k_usb/keymap.c | 140 +++++++ converter/x68k_usb/led.c | 26 ++ converter/x68k_usb/matrix.c | 141 +++++++ converter/x68k_usb/x68k.c | 75 ++++ converter/x68k_usb/x68k.h | 47 +++ hbk/Makefile | 56 --- hbk/config.h | 52 --- hbk/controller_teensy.h | 27 -- hbk/keymap.c | 231 ------------ hbk/led.c | 24 -- hbk/matrix.c | 270 -------------- hhkb/Makefile.iwrap | 93 ----- hhkb/Makefile.pjrc | 60 --- hhkb/Makefile.vusb | 91 ----- hhkb/README | 151 -------- hhkb/config_iwrap.h | 55 --- hhkb/config_pjrc.h | 62 ---- hhkb/config_vusb.h | 49 --- hhkb/doc/Bluetooth.txt | 4 - hhkb/doc/Bluetooth_img/.picasa.ini | 2 - hhkb/doc/Bluetooth_img/BT_circuit.jpg | Bin 502118 -> 0 bytes hhkb/doc/HHKB.txt | 199 ---------- hhkb/doc/HHKB_img/HHKB_TP1684.jpg | Bin 149082 -> 0 bytes hhkb/doc/HHKB_img/HHKB_chart1.jpg | Bin 155342 -> 0 bytes hhkb/doc/HHKB_img/HHKB_chart2.jpg | Bin 148225 -> 0 bytes hhkb/doc/HHKB_img/HHKB_connector.jpg | Bin 193900 -> 0 bytes hhkb/doc/HHKB_img/HHKB_controller.jpg | Bin 135100 -> 0 bytes hhkb/doc/HHKB_img/HHKB_keyswitch.jpg | Bin 171469 -> 0 bytes hhkb/doc/HHKB_img/connector_contact.jpg | Bin 192830 -> 0 bytes hhkb/doc/HHKB_img/logic_analyzer.jpg | Bin 169564 -> 0 bytes hhkb/doc/HHKB_img/probe_contact.jpg | Bin 208477 -> 0 bytes hhkb/doc/HHKB_img/teensy_install.jpg | Bin 135851 -> 0 bytes hhkb/doc/HHKB_img/teensy_wiring.jpg | Bin 154695 -> 0 bytes hhkb/keymap.c | 221 ----------- hhkb/led.c | 26 -- hhkb/matrix.c | 294 --------------- hhkb/usbconfig.h | 388 ------------------- keyboard/hbk/Makefile | 56 +++ keyboard/hbk/config.h | 52 +++ keyboard/hbk/controller_teensy.h | 27 ++ keyboard/hbk/keymap.c | 231 ++++++++++++ keyboard/hbk/led.c | 24 ++ keyboard/hbk/matrix.c | 270 ++++++++++++++ keyboard/hhkb/Makefile.iwrap | 93 +++++ keyboard/hhkb/Makefile.pjrc | 60 +++ keyboard/hhkb/Makefile.vusb | 91 +++++ keyboard/hhkb/README | 151 ++++++++ keyboard/hhkb/config_iwrap.h | 55 +++ keyboard/hhkb/config_pjrc.h | 62 ++++ keyboard/hhkb/config_vusb.h | 49 +++ keyboard/hhkb/doc/Bluetooth.txt | 4 + keyboard/hhkb/doc/Bluetooth_img/.picasa.ini | 2 + keyboard/hhkb/doc/Bluetooth_img/BT_circuit.jpg | Bin 0 -> 502118 bytes keyboard/hhkb/doc/HHKB.txt | 199 ++++++++++ keyboard/hhkb/doc/HHKB_img/HHKB_TP1684.jpg | Bin 0 -> 149082 bytes keyboard/hhkb/doc/HHKB_img/HHKB_chart1.jpg | Bin 0 -> 155342 bytes keyboard/hhkb/doc/HHKB_img/HHKB_chart2.jpg | Bin 0 -> 148225 bytes keyboard/hhkb/doc/HHKB_img/HHKB_connector.jpg | Bin 0 -> 193900 bytes keyboard/hhkb/doc/HHKB_img/HHKB_controller.jpg | Bin 0 -> 135100 bytes keyboard/hhkb/doc/HHKB_img/HHKB_keyswitch.jpg | Bin 0 -> 171469 bytes keyboard/hhkb/doc/HHKB_img/connector_contact.jpg | Bin 0 -> 192830 bytes keyboard/hhkb/doc/HHKB_img/logic_analyzer.jpg | Bin 0 -> 169564 bytes keyboard/hhkb/doc/HHKB_img/probe_contact.jpg | Bin 0 -> 208477 bytes keyboard/hhkb/doc/HHKB_img/teensy_install.jpg | Bin 0 -> 135851 bytes keyboard/hhkb/doc/HHKB_img/teensy_wiring.jpg | Bin 0 -> 154695 bytes keyboard/hhkb/keymap.c | 221 +++++++++++ keyboard/hhkb/led.c | 26 ++ keyboard/hhkb/matrix.c | 294 +++++++++++++++ keyboard/hhkb/usbconfig.h | 388 +++++++++++++++++++ keyboard/macway/Makefile | 53 +++ keyboard/macway/config.h | 65 ++++ keyboard/macway/doc/back.jpg | Bin 0 -> 122135 bytes keyboard/macway/doc/case.jpg | Bin 0 -> 146003 bytes keyboard/macway/doc/keys.jpg | Bin 0 -> 116365 bytes keyboard/macway/doc/side.jpg | Bin 0 -> 109755 bytes keyboard/macway/doc/switch.jpg | Bin 0 -> 115526 bytes keyboard/macway/doc/teensy.jpg | Bin 0 -> 165814 bytes keyboard/macway/doc/wiring.jpg | Bin 0 -> 165569 bytes keyboard/macway/doc/withHHKB.jpg | Bin 0 -> 152832 bytes keyboard/macway/doc/withThinkPad.jpg | Bin 0 -> 118993 bytes keyboard/macway/keymap.c | 195 ++++++++++ keyboard/macway/led.c | 24 ++ keyboard/macway/matrix.c | 271 ++++++++++++++ m0110_usb/Makefile | 57 --- m0110_usb/README.md | 124 ------- m0110_usb/config.h | 61 --- m0110_usb/doc/m0110.jpg | Bin 49360 -> 0 bytes m0110_usb/doc/teensy.jpg | Bin 50081 -> 0 bytes m0110_usb/keymap.c | 214 ----------- m0110_usb/led.c | 24 -- m0110_usb/matrix.c | 169 --------- macway/Makefile | 53 --- macway/config.h | 65 ---- macway/doc/back.jpg | Bin 122135 -> 0 bytes macway/doc/case.jpg | Bin 146003 -> 0 bytes macway/doc/keys.jpg | Bin 116365 -> 0 bytes macway/doc/side.jpg | Bin 109755 -> 0 bytes macway/doc/switch.jpg | Bin 115526 -> 0 bytes macway/doc/teensy.jpg | Bin 165814 -> 0 bytes macway/doc/wiring.jpg | Bin 165569 -> 0 bytes macway/doc/withHHKB.jpg | Bin 152832 -> 0 bytes macway/doc/withThinkPad.jpg | Bin 118993 -> 0 bytes macway/keymap.c | 195 ---------- macway/led.c | 24 -- macway/matrix.c | 271 -------------- protocol.mk | 2 + ps2_usb/Makefile | 58 --- ps2_usb/Makefile.pjrc_usart | 58 --- ps2_usb/Makefile.vusb | 92 ----- ps2_usb/README | 116 ------ ps2_usb/README.vusb | 37 -- ps2_usb/config_pjrc.h | 59 --- ps2_usb/config_pjrc_usart.h | 91 ----- ps2_usb/config_vusb.h | 133 ------- ps2_usb/keymap.c | 379 ------------------- ps2_usb/led.c | 33 -- ps2_usb/matrix.c | 452 ----------------------- ps2_usb/usbconfig.h | 378 ------------------- sony_usb/Makefile.pjrc | 58 --- sony_usb/config_pjrc.h | 66 ---- sony_usb/keymap.c | 125 ------- sony_usb/led.c | 26 -- sony_usb/matrix.c | 141 ------- sony_usb/news.c | 168 --------- sony_usb/news.h | 51 --- terminal_usb/Makefile.102_pjrc | 58 --- terminal_usb/Makefile.122_pjrc | 58 --- terminal_usb/README | 47 --- terminal_usb/config_102_pjrc.h | 58 --- terminal_usb/config_122_pjrc.h | 58 --- terminal_usb/keymap_102.c | 208 ----------- terminal_usb/keymap_122.c | 143 ------- terminal_usb/led.c | 33 -- terminal_usb/matrix.c | 226 ------------ x68k_usb/Makefile | 87 ----- x68k_usb/README | 129 ------- x68k_usb/config_pjrc.h | 66 ---- x68k_usb/keymap.c | 140 ------- x68k_usb/led.c | 26 -- x68k_usb/matrix.c | 141 ------- x68k_usb/x68k.c | 75 ---- x68k_usb/x68k.h | 47 --- 195 files changed, 8523 insertions(+), 8497 deletions(-) delete mode 100644 README create mode 100644 README.md delete mode 100644 adb_usb/Makefile delete mode 100644 adb_usb/README delete mode 100644 adb_usb/config.h delete mode 100644 adb_usb/keymap.c delete mode 100644 adb_usb/led.c delete mode 100644 adb_usb/matrix.c create mode 100644 converter/adb_usb/Makefile create mode 100644 converter/adb_usb/README create mode 100644 converter/adb_usb/config.h create mode 100644 converter/adb_usb/keymap.c create mode 100644 converter/adb_usb/led.c create mode 100644 converter/adb_usb/matrix.c create mode 100644 converter/m0110_usb/Makefile create mode 100644 converter/m0110_usb/README.md create mode 100644 converter/m0110_usb/config.h create mode 100644 converter/m0110_usb/doc/m0110.jpg create mode 100644 converter/m0110_usb/doc/teensy.jpg create mode 100644 converter/m0110_usb/keymap.c create mode 100644 converter/m0110_usb/led.c create mode 100644 converter/m0110_usb/matrix.c create mode 100644 converter/ps2_usb/Makefile create mode 100644 converter/ps2_usb/Makefile.pjrc_usart create mode 100644 converter/ps2_usb/Makefile.vusb create mode 100644 converter/ps2_usb/README create mode 100644 converter/ps2_usb/README.vusb create mode 100644 converter/ps2_usb/config_pjrc.h create mode 100644 converter/ps2_usb/config_pjrc_usart.h create mode 100644 converter/ps2_usb/config_vusb.h create mode 100644 converter/ps2_usb/keymap.c create mode 100644 converter/ps2_usb/led.c create mode 100644 converter/ps2_usb/matrix.c create mode 100644 converter/ps2_usb/usbconfig.h create mode 100644 converter/sony_usb/Makefile.pjrc create mode 100644 converter/sony_usb/config_pjrc.h create mode 100644 converter/sony_usb/keymap.c create mode 100644 converter/sony_usb/led.c create mode 100644 converter/sony_usb/matrix.c create mode 100644 converter/sony_usb/news.c create mode 100644 converter/sony_usb/news.h create mode 100644 converter/terminal_usb/Makefile.102_pjrc create mode 100644 converter/terminal_usb/Makefile.122_pjrc create mode 100644 converter/terminal_usb/README create mode 100644 converter/terminal_usb/config_102_pjrc.h create mode 100644 converter/terminal_usb/config_122_pjrc.h create mode 100644 converter/terminal_usb/keymap_102.c create mode 100644 converter/terminal_usb/keymap_122.c create mode 100644 converter/terminal_usb/led.c create mode 100644 converter/terminal_usb/matrix.c create mode 100644 converter/x68k_usb/Makefile create mode 100644 converter/x68k_usb/README create mode 100644 converter/x68k_usb/config_pjrc.h create mode 100644 converter/x68k_usb/keymap.c create mode 100644 converter/x68k_usb/led.c create mode 100644 converter/x68k_usb/matrix.c create mode 100644 converter/x68k_usb/x68k.c create mode 100644 converter/x68k_usb/x68k.h delete mode 100644 hbk/Makefile delete mode 100644 hbk/config.h delete mode 100644 hbk/controller_teensy.h delete mode 100644 hbk/keymap.c delete mode 100644 hbk/led.c delete mode 100644 hbk/matrix.c delete mode 100644 hhkb/Makefile.iwrap delete mode 100644 hhkb/Makefile.pjrc delete mode 100644 hhkb/Makefile.vusb delete mode 100644 hhkb/README delete mode 100644 hhkb/config_iwrap.h delete mode 100644 hhkb/config_pjrc.h delete mode 100644 hhkb/config_vusb.h delete mode 100644 hhkb/doc/Bluetooth.txt delete mode 100755 hhkb/doc/Bluetooth_img/.picasa.ini delete mode 100644 hhkb/doc/Bluetooth_img/BT_circuit.jpg delete mode 100644 hhkb/doc/HHKB.txt delete mode 100644 hhkb/doc/HHKB_img/HHKB_TP1684.jpg delete mode 100644 hhkb/doc/HHKB_img/HHKB_chart1.jpg delete mode 100644 hhkb/doc/HHKB_img/HHKB_chart2.jpg delete mode 100644 hhkb/doc/HHKB_img/HHKB_connector.jpg delete mode 100644 hhkb/doc/HHKB_img/HHKB_controller.jpg delete mode 100644 hhkb/doc/HHKB_img/HHKB_keyswitch.jpg delete mode 100644 hhkb/doc/HHKB_img/connector_contact.jpg delete mode 100644 hhkb/doc/HHKB_img/logic_analyzer.jpg delete mode 100644 hhkb/doc/HHKB_img/probe_contact.jpg delete mode 100644 hhkb/doc/HHKB_img/teensy_install.jpg delete mode 100644 hhkb/doc/HHKB_img/teensy_wiring.jpg delete mode 100644 hhkb/keymap.c delete mode 100644 hhkb/led.c delete mode 100644 hhkb/matrix.c delete mode 100644 hhkb/usbconfig.h create mode 100644 keyboard/hbk/Makefile create mode 100644 keyboard/hbk/config.h create mode 100644 keyboard/hbk/controller_teensy.h create mode 100644 keyboard/hbk/keymap.c create mode 100644 keyboard/hbk/led.c create mode 100644 keyboard/hbk/matrix.c create mode 100644 keyboard/hhkb/Makefile.iwrap create mode 100644 keyboard/hhkb/Makefile.pjrc create mode 100644 keyboard/hhkb/Makefile.vusb create mode 100644 keyboard/hhkb/README create mode 100644 keyboard/hhkb/config_iwrap.h create mode 100644 keyboard/hhkb/config_pjrc.h create mode 100644 keyboard/hhkb/config_vusb.h create mode 100644 keyboard/hhkb/doc/Bluetooth.txt create mode 100755 keyboard/hhkb/doc/Bluetooth_img/.picasa.ini create mode 100644 keyboard/hhkb/doc/Bluetooth_img/BT_circuit.jpg create mode 100644 keyboard/hhkb/doc/HHKB.txt create mode 100644 keyboard/hhkb/doc/HHKB_img/HHKB_TP1684.jpg create mode 100644 keyboard/hhkb/doc/HHKB_img/HHKB_chart1.jpg create mode 100644 keyboard/hhkb/doc/HHKB_img/HHKB_chart2.jpg create mode 100644 keyboard/hhkb/doc/HHKB_img/HHKB_connector.jpg create mode 100644 keyboard/hhkb/doc/HHKB_img/HHKB_controller.jpg create mode 100644 keyboard/hhkb/doc/HHKB_img/HHKB_keyswitch.jpg create mode 100644 keyboard/hhkb/doc/HHKB_img/connector_contact.jpg create mode 100644 keyboard/hhkb/doc/HHKB_img/logic_analyzer.jpg create mode 100644 keyboard/hhkb/doc/HHKB_img/probe_contact.jpg create mode 100644 keyboard/hhkb/doc/HHKB_img/teensy_install.jpg create mode 100644 keyboard/hhkb/doc/HHKB_img/teensy_wiring.jpg create mode 100644 keyboard/hhkb/keymap.c create mode 100644 keyboard/hhkb/led.c create mode 100644 keyboard/hhkb/matrix.c create mode 100644 keyboard/hhkb/usbconfig.h create mode 100644 keyboard/macway/Makefile create mode 100644 keyboard/macway/config.h create mode 100644 keyboard/macway/doc/back.jpg create mode 100644 keyboard/macway/doc/case.jpg create mode 100644 keyboard/macway/doc/keys.jpg create mode 100644 keyboard/macway/doc/side.jpg create mode 100644 keyboard/macway/doc/switch.jpg create mode 100644 keyboard/macway/doc/teensy.jpg create mode 100644 keyboard/macway/doc/wiring.jpg create mode 100644 keyboard/macway/doc/withHHKB.jpg create mode 100644 keyboard/macway/doc/withThinkPad.jpg create mode 100644 keyboard/macway/keymap.c create mode 100644 keyboard/macway/led.c create mode 100644 keyboard/macway/matrix.c delete mode 100644 m0110_usb/Makefile delete mode 100644 m0110_usb/README.md delete mode 100644 m0110_usb/config.h delete mode 100644 m0110_usb/doc/m0110.jpg delete mode 100644 m0110_usb/doc/teensy.jpg delete mode 100644 m0110_usb/keymap.c delete mode 100644 m0110_usb/led.c delete mode 100644 m0110_usb/matrix.c delete mode 100644 macway/Makefile delete mode 100644 macway/config.h delete mode 100644 macway/doc/back.jpg delete mode 100644 macway/doc/case.jpg delete mode 100644 macway/doc/keys.jpg delete mode 100644 macway/doc/side.jpg delete mode 100644 macway/doc/switch.jpg delete mode 100644 macway/doc/teensy.jpg delete mode 100644 macway/doc/wiring.jpg delete mode 100644 macway/doc/withHHKB.jpg delete mode 100644 macway/doc/withThinkPad.jpg delete mode 100644 macway/keymap.c delete mode 100644 macway/led.c delete mode 100644 macway/matrix.c create mode 100644 protocol.mk delete mode 100644 ps2_usb/Makefile delete mode 100644 ps2_usb/Makefile.pjrc_usart delete mode 100644 ps2_usb/Makefile.vusb delete mode 100644 ps2_usb/README delete mode 100644 ps2_usb/README.vusb delete mode 100644 ps2_usb/config_pjrc.h delete mode 100644 ps2_usb/config_pjrc_usart.h delete mode 100644 ps2_usb/config_vusb.h delete mode 100644 ps2_usb/keymap.c delete mode 100644 ps2_usb/led.c delete mode 100644 ps2_usb/matrix.c delete mode 100644 ps2_usb/usbconfig.h delete mode 100644 sony_usb/Makefile.pjrc delete mode 100644 sony_usb/config_pjrc.h delete mode 100644 sony_usb/keymap.c delete mode 100644 sony_usb/led.c delete mode 100644 sony_usb/matrix.c delete mode 100644 sony_usb/news.c delete mode 100644 sony_usb/news.h delete mode 100644 terminal_usb/Makefile.102_pjrc delete mode 100644 terminal_usb/Makefile.122_pjrc delete mode 100644 terminal_usb/README delete mode 100644 terminal_usb/config_102_pjrc.h delete mode 100644 terminal_usb/config_122_pjrc.h delete mode 100644 terminal_usb/keymap_102.c delete mode 100644 terminal_usb/keymap_122.c delete mode 100644 terminal_usb/led.c delete mode 100644 terminal_usb/matrix.c delete mode 100644 x68k_usb/Makefile delete mode 100644 x68k_usb/README delete mode 100644 x68k_usb/config_pjrc.h delete mode 100644 x68k_usb/keymap.c delete mode 100644 x68k_usb/led.c delete mode 100644 x68k_usb/matrix.c delete mode 100644 x68k_usb/x68k.c delete mode 100644 x68k_usb/x68k.h diff --git a/README b/README deleted file mode 100644 index d85f512c71..0000000000 --- a/README +++ /dev/null @@ -1,151 +0,0 @@ -t.m.k. Keyboard Firmware -======================== -This is keyboard firmware for Teensy(AVR USB MCU) and V-USB board. - -source code repository: -http://github.com/tmk/tmk_keyboard - -This firmware is used in following projects: -HHKB mod: http://geekhack.org/showwiki.php?title=Island:12047 -Macway mod: http://geekhack.org/showwiki.php?title=Island:11930 -PS2 to USB: http://geekhack.org/showwiki.php?title=Island:14618 -ADB to USB: http://geekhack.org/showwiki.php?title=Island:14290 - -The project is heavily based on PJRC USB Keyboard/Mouse Example and -owes a debt to preceding keyboard firmware projects. -http://www.pjrc.com/teensy - - -Features --------- -Mouse key - control mouse cursor from keyboard. -System Control Key - Power Down, Sleep, Wake Up & USB Remote Wake up -Media Control Key - Volume Down/Up, Mute -USB NKRO - send 120 keys(+ 8 modifiers) at most simultaneously. -PS/2 mouse support - integrate PS/2 mouse(TrackPoint) into keyboard as composite device. - - -Limitations ------------ - - -Files & Directories -------------------- -Target: -hhkb/ keyboard controller for PFU HHKB pro -macway/ keyboard controller for Macway mod -ps2_usb/ PS2 to USB keyboard converter -adb_usb/ ADB to USB keyboard converter - -USB Protocol Stack: -pjrc/ PJRC USB stack -vusb/ V-USB USB stack -ps2.[ch] PS/2 protocol -adb.[ch] ADB protocol - - -Build ------ -To compile needs AVR GCC, AVR Libc and GNU make. -You can use WinAVR on Windows. http://winavr.sourceforge.net/ - -$ cd -$ make - -The firmware will be compiled as a file tmk_.hex. - - -Build your own firmware ------------------------ -Copying exsistent target(macway) is easy way. -1. Copy contens of macway/ to your own target directory. -2. Edit Makefile. See next section. -3. Edit config.h. See next section. -4. Edit matrix.c. You will need to fix followings at least. - matrix_init() - matrix_scan() - read_col() - unselect_rows() - select_row() -5. Edit keymap.c. NOTE: It is not final design and a bit messy. - You will need to fix followings at least. - KEYMAP - fn_layer[] - fn_keycode[] - keymaps[] -6. Build. - -If you have a build error like following, comment out "--relax" option in Makefile.common. - (.vectors+0x30): relocation truncated to fit: R_AVR_13_PCREL against symbol `__vector_12' - - -Build Options -------------- -/Makefile: -1. Set target name for your firmware. - TARGET = tmk_ -2. Choose a MCU and its frequency. - MCU = atmega32u4 # Teensy 2.0 - #MCU = at90usb1286 # Teensy++ 2.0 - F_CPU = 16000000 -3. Choose optional modules as needed. Comment out to disable optional modules. - MOUSEKEY_ENABLE = yes # Mouse keys - PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support - EXTRAKEY_ENABLE = yes # Enhanced feature for Windows(Audio control and System control) - NKRO_ENABLE = yes # USB Nkey Rollover - -/config.h: -1. USB vendor/product ID and device description - #define VENDOR_ID 0xFEED - #define PRODUCT_ID 0xBEEF - /* device description */ - #define MANUFACTURER t.m.k. - #define PRODUCT Macway mod - #define DESCRIPTION t.m.k. keyboard firmware for Macway mod -2. Keyboard matrix configuration - #define MATRIX_ROWS 8 - #define MATRIX_COLS 8 - #define MATRIX_HAS_GHOST -3. Mouse keys configuration if needed. -4. PS/2 mouse configuration if needed. - - -Debuging & Rescue ------------------ -Use PJRC's hid_listen.exe to see debug messages. -Press + H to debug menu. -(see config.h for key combination.) - -Pressing any 3 keys when connected enables debug output. -Pressing any 4 keys when connected makes bootloader comes up. - - -Projects related ----------------- -PJRC USB Keyboard/Mouse Example - http://www.pjrc.com/teensy/usb_keyboard.html - http://www.pjrc.com/teensy/usb_mouse.html -kbupgrade - http://github.com/rhomann/kbupgrade - http://geekhack.org/showwiki.php?title=Island:8406 -c64key - http://symlink.dk/projects/c64key/ -rump - http://mg8.org/rump/ - http://github.com/clee/rump -dulcimer - http://www.schatenseite.de/dulcimer.html -humblehacker-keyboard - http://github.com/humblehacker - http://www.humblehacker.com/keyboard/ - http://geekhack.org/showwiki.php?title=Island:6292 -ps2avr - http://sourceforge.net/projects/ps2avr/ - - -EOF diff --git a/README.md b/README.md new file mode 100644 index 0000000000..0361e2ad99 --- /dev/null +++ b/README.md @@ -0,0 +1,175 @@ +t.m.k. Keyboard Firmware Collection +==================================== +This is a keyboard firmware with some features for Atmel AVR controller. + +Source code is available here: + + +Features +-------- +* Mouse key - Mouse control by 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 - Can send 120 keys(+ 8 modifiers) simultaneously. +* PS/2 mouse support - integrate PS/2 mouse(TrackPoint) into keyboard as composite device. + + +Projects +-------- +### converter +* ps2_usb - PS/2 keyboard to USB +* adb_usb - ADB keyboard to USB +* m0110_usb - Machintosh 128K/512K/Plus keyboard to USB +* terminal_usb - IBM Model M terminal keyboard(PS/2 scancode set3) to USB +* sony_usb - Sony NEWS keyboard to USB +* x68k_usb - Sharp X68000 keyboard to USB + +### keyboard +* hhkb - Happy Hacking Keyboard professional +* macway - Compact keyboard mod +* hbk - Happy Buckling sprint keyboard(IBM Model M mod) + +[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 +[GH_hhkb_bt]: http://geekhack.org/showwiki.php?title=Island:20851 +[GH_m0110]: http://geekhack.org/showwiki.php?title=Island:24965 +[GH_sony]: http://geekhack.org/showwiki.php?title=Island:25759 +[GH_terminal]: http://geekhack.org/showwiki.php?title=Island:27272 +[GH_x68k]: http://geekhack.org/showwiki.php?title=Island:29060 +[GH_hbk]: http://geekhack.org/showwiki.php?title=Island:29483 + + + +Files & Directories +------------------- +### Top +* common/ common codes +* protocol/ keyboard protocol support +* keyboard/ keyboard projects +* converter/ protocol converter projects +* doc/ documents + +### Keyboard Protocols +* pjrc/ PJRC USB stack +* vusb/ Objective Development V-USB +* iwrap/ Bluetooth HID for Bluegiga iWRAP +* ps2 PS/2 protocol +* adb Apple Desktop Bus protocol +* m0110 Macintosh 128K/512K/Plus keyboard protocol +* news Sony NEWS keyboard protocol +* x68k Sharp X68000 keyboard protocol + + +Build & Program +--------------- +### Build firmware +To compile you need `AVR GCC`, `AVR Libc` and `GNU make`. +You can use [WinAVR][1] on Windows and [CrossPack][2] on Mac. + + $ cd + $ make + +The firmware will be compiled as a file tmk_.hex. + +[1]: http://winavr.sourceforge.net/ +[2]: http://www.obdev.at/products/crosspack/index.html + +### Program Controller +If you have proper program command in Makefile just type this. + + $ make program + +As for `Teensy` you can use `PJRC's loader` to program hex file. + + + +Build Options +------------- +### `Makefile` +#### 1. MCU and Frequency. + MCU = atmega32u4 # Teensy 2.0 + #MCU = at90usb1286 # Teensy++ 2.0 + F_CPU = 16000000 + +#### 2. Features +Note that ***comment out*** to disable them. + MOUSEKEY_ENABLE = yes # Mouse keys + PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support + EXTRAKEY_ENABLE = yes # Enhanced feature for Windows(Audio control and System control) + NKRO_ENABLE = yes # USB Nkey Rollover + +#### 3. Programmer +Set proper command for your controller, bootloader and programmer. + # for PJRC Teensy + PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex + + # for Atmel AT90USBKEY + PROGRAM_CMD = dfu-programmer $(MCU) flash $(TARGET).hex + + # avrdude + PROGRAM_CMD = avrdude -p $(MCU) -c avrispmkII -P USB -U flash:w:$(TARGET).hex + PROGRAM_CMD = avrdude -p $(MCU) -c usbasp -U flash:w:$(TARGET).hex + PROGRAM_CMD = avrdude -p $(MCU) -c arduino -P COM1 -b 57600 -U flash:w:$(TARGET).hex + +### `config.h` +#### 1. USB vendor/product ID and device description + #define VENDOR_ID 0xFEED + #define PRODUCT_ID 0xBEEF + /* device description */ + #define MANUFACTURER t.m.k. + #define PRODUCT Macway mod + #define DESCRIPTION t.m.k. keyboard firmware for Macway mod + +#### 2. Keyboard matrix configuration + #define MATRIX_ROWS 8 + #define MATRIX_COLS 8 + #define MATRIX_HAS_GHOST + +### 3. Mouse keys configuration + +### 4. PS/2 mouse configuration + + +Keymap +------ + + +Build your own firmware +----------------------- + + +Debuging +-------- +Use PJRC's `hid_listen` to see debug messages and press ` + H` to debug menu. +See `config.h` for definition of `` key combination. + + +Other Keyboard Projects +----------------------- +### PJRC USB Keyboard/Mouse Example +- +- + +### kbupgrade +- +- + +### c64key +- + +### rump +- +- + +### dulcimer +- + +### humblehacker-keyboard +- +- +- + +### ps2avr +- diff --git a/adb_usb/Makefile b/adb_usb/Makefile deleted file mode 100644 index 97850b0e86..0000000000 --- a/adb_usb/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# Target file name (without extension). -TARGET = adb_usb - -# Directory common source filess exist -TOP_DIR = .. - -# Directory keyboard dependent files exist -TARGET_DIR = . - -# keyboard dependent files -SRC = main.c \ - keymap.c \ - matrix.c \ - led.c \ - adb.c - -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. -# -#MOUSEKEY_ENABLE = yes # Mouse keys -#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support -EXTRAKEY_ENABLE = yes # Audio control and System control -#NKRO_ENABLE = yes # USB Nkey Rollover - - - -#---------------- Programming Options -------------------------- -PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex - - - -include $(TOP_DIR)/protocol/pjrc.mk -include $(TOP_DIR)/protocol.mk -include $(TOP_DIR)/common.mk -include $(TOP_DIR)/rules.mk diff --git a/adb_usb/README b/adb_usb/README deleted file mode 100644 index 5d0e1bc86b..0000000000 --- a/adb_usb/README +++ /dev/null @@ -1,70 +0,0 @@ -ADB to USB keyboard converter -============================= -http://geekhack.org/showwiki.php?title=Island:14290 - -This firmware converts ADB keyboard protocol to USB. - - -Build ------ -0. Connect ADB keyboard to Teensy by 3 lines(Vcc, GND, Data). - You need a external pull-up resistor on DATA line in most case, - in particular when you want to use a long or coiled cable. - This converter uses AVR's internal pull-up, but it seems to be too weak. - The external pull-up resistor is strongly recommended. - PSW line is optional. See ADB.txt for details. -1. Define following macros for ADB connection in config.h: - ADB_PORT - ADB_PIN - ADB_DDR - ADB_DATA_BIT - ADB_PSW_BIT -2. make -3. program Teensy. - - -Keymap ------- -You can change a keymap by editing code of keymap.c like following. -This is a keymap for AEK, however, also used for other keyboards. -How to define the keymap is probably obvious. You can find key -symbols in usb_keycodes.h. -If you want to define some keymaps than just one, see hhkb/keymap.c and -macway/keymap.c as examples. Keymap(layer) switching may needs a bit of -effort at this time. - - /* Default Layer: plain keymap - * ,---. ,---------------. ,---------------. ,---------------. ,-----------. ,---. - * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| |Pwr| - * `---' `---------------' `---------------' `---------------' `-----------' `---' - * ,-----------------------------------------------------------. ,-----------. ,---------------. - * | `| 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| +| - * |-----------------------------------------------------------| ,---. |---------------| - * |Shift | Z| X| C| V| B| N| M| ,| ,| /|Shift | |Up | | 1| 2| 3| | - * |-----------------------------------------------------------| ,-----------. |-----------|Ent| - * |Ctrl |Gui |Alt | Space | | | | |Lef|Dow|Rig| | 0| .| | - * `-----------------------------------------------------------' `-----------' `---------------' - */ - KEYMAP( - ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK, PWR, - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME,PGUP, NLCK,EQL, PSLS,PAST, - TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS, DEL, END, PGDN, P7, P8, P9, PMNS, - CAPS,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, - LCTL,LGUI,LALT, SPC, LEFT,DOWN,RGHT, P0, PDOT,PENT - ), - - -Notes ------ -Many ADB keyboards has no discrimination between right modifier and left one, -you will always see left control even if you press right control key. -Apple Extended Keyboard and Apple Extended Keyboard II are the examples. -Though ADB protocol itsef has the ability of distinction between right and left. -And most ADB keyboard has no NKRO functionality, though ADB protocol itsef has that. - -EOF diff --git a/adb_usb/config.h b/adb_usb/config.h deleted file mode 100644 index 52d5925a50..0000000000 --- a/adb_usb/config.h +++ /dev/null @@ -1,72 +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 - -/* controller configuration */ -#include "controller_teensy.h" - -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0ADB -#define DEVICE_VER 0x0101 -#define MANUFACTURER t.m.k. -#define PRODUCT ADB keyboard converter -#define DESCRIPTION convert ADB keyboard to USB - -/* matrix size */ -#define MATRIX_ROWS 16 // keycode bit: 3-0 -#define MATRIX_COLS 8 // keycode bit: 6-4 - -/* Locking Caps Lock support */ -#define MATRIX_HAS_LOCKING_CAPS - - -/* key combination for command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KB_LSHIFT) | MOD_BIT(KB_LCTRL) | MOD_BIT(KB_LALT) | MOD_BIT(KB_LGUI)) || \ - keyboard_report->mods == (MOD_BIT(KB_LSHIFT) | MOD_BIT(KB_RSHIFT)) \ -) - - -/* mouse keys */ -#ifdef MOUSEKEY_ENABLE -# define MOUSEKEY_DELAY_TIME 192 -#endif - - -/* PS/2 mouse */ -#ifdef PS2_MOUSE_ENABLE -# define PS2_CLOCK_PORT PORTF -# define PS2_CLOCK_PIN PINF -# define PS2_CLOCK_DDR DDRF -# define PS2_CLOCK_BIT 0 -# define PS2_DATA_PORT PORTF -# define PS2_DATA_PIN PINF -# define PS2_DATA_DDR DDRF -# define PS2_DATA_BIT 1 -#endif - - -/* ADB port setting */ -#define ADB_PORT PORTF -#define ADB_PIN PINF -#define ADB_DDR DDRF -#define ADB_DATA_BIT 0 -//#define ADB_PSW_BIT 1 // optional - -#endif diff --git a/adb_usb/keymap.c b/adb_usb/keymap.c deleted file mode 100644 index cdaa935d32..0000000000 --- a/adb_usb/keymap.c +++ /dev/null @@ -1,150 +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 . -*/ - -/* - * Keymap for ADB keyboard - */ -#include -#include -#include -#include "usb_keyboard.h" -#include "usb_keycodes.h" -#include "print.h" -#include "debug.h" -#include "util.h" -#include "keymap.h" - - -#define KEYCODE(layer, row, col) (pgm_read_byte(&keymaps[(layer)][(row)][(col)])) - -// Convert physical keyboard layout to matrix array. -// This is a macro to define keymap easily in keyboard layout form. -/* Apple Extended Keyboard */ -#define KEYMAP( \ - K35, K7A,K78,K63,K76, K60,K61,K62,K64, K65,K6D,K67,K6F, K69,K6B,K71, K7F, \ - K32,K12,K13,K14,K15,K17,K16,K1A,K1C,K19,K1D,K1B,K18,K33, K72,K73,K74, K47,K51,K4B,K43, \ - K30,K0C,K0D,K0E,K0F,K11,K10,K20,K22,K1F,K23,K21,K1E,K2A, K75,K77,K79, K59,K5B,K5C,K4E, \ - K39,K00,K01,K02,K03,K05,K04,K26,K28,K25,K29,K27, K24, K56,K57,K58,K45, \ - K38,K06,K07,K08,K09,K0B,K2D,K2E,K2B,K2F,K2C, K7B, K3E, K53,K54,K55, \ - K36,K3A,K37, K31, K3B,K3D,K3C, K52, K41,K4C \ -) { \ - { KB_##K00, KB_##K01, KB_##K02, KB_##K03, KB_##K04, KB_##K05, KB_##K06, KB_##K07 }, \ - { KB_##K08, KB_##K09, KB_NO, KB_##K0B, KB_##K0C, KB_##K0D, KB_##K0E, KB_##K0F }, \ - { KB_##K10, KB_##K11, KB_##K12, KB_##K13, KB_##K14, KB_##K15, KB_##K16, KB_##K17 }, \ - { KB_##K18, KB_##K19, KB_##K1A, KB_##K1B, KB_##K1C, KB_##K1D, KB_##K1E, KB_##K1F }, \ - { KB_##K20, KB_##K21, KB_##K22, KB_##K23, KB_##K24, KB_##K25, KB_##K26, KB_##K27 }, \ - { KB_##K28, KB_##K29, KB_##K2A, KB_##K2B, KB_##K2C, KB_##K2D, KB_##K2E, KB_##K2F }, \ - { KB_##K30, KB_##K31, KB_##K32, KB_##K33, KB_NO, KB_##K35, KB_##K36, KB_##K37 }, \ - { KB_##K38, KB_##K39, KB_##K3A, KB_##K3B, KB_##K3C, KB_##K3D, KB_##K3E, KB_NO }, \ - { KB_NO, KB_##K41, KB_NO, KB_##K43, KB_NO, KB_##K45, KB_NO, KB_##K47 }, \ - { KB_NO, KB_NO, KB_NO, KB_##K4B, KB_##K4C, KB_NO, KB_##K4E, KB_NO }, \ - { KB_NO, KB_##K51, KB_##K52, KB_##K53, KB_##K54, KB_##K55, KB_##K56, KB_##K57 }, \ - { KB_##K58, KB_##K59, KB_NO, KB_##K5B, KB_##K5C, KB_NO, KB_NO, KB_NO }, \ - { KB_##K60, KB_##K61, KB_##K62, KB_##K63, KB_##K64, KB_##K65, KB_NO, KB_##K67 }, \ - { KB_NO, KB_##K69, KB_NO, KB_##K6B, KB_NO, KB_##K6D, KB_NO, KB_##K6F }, \ - { KB_NO, KB_##K71, KB_##K72, KB_##K73, KB_##K74, KB_##K75, KB_##K76, KB_##K77 }, \ - { KB_##K78, KB_##K79, KB_##K7A, KB_##K7B, KB_NO, KB_NO, KB_NO, KB_##K7F } \ -} -/* plain keymap - { - { KB_A, KB_S, KB_D, KB_F, KB_H, KB_G, KB_Z, KB_X }, // 00-07 - { KB_C, KB_V, KB_NO, KB_B, KB_Q, KB_W, KB_E, KB_R }, // 08-0F - { KB_Y, KB_T, KB_1, KB_2, KB_3, KB_4, KB_6, KB_5 }, // 10-17 - { KB_EQL, KB_9, KB_7, KB_MINS,KB_8, KB_0, KB_RBRC,KB_O }, // 18-1F - { KB_U, KB_LBRC,KB_I, KB_P, KB_ENT, KB_L, KB_J, KB_QUOT}, // 20-27 - { KB_K, KB_SCLN,KB_BSLS,KB_COMM,KB_SLSH,KB_N, KB_M, KB_DOT }, // 28-2F - { KB_TAB, KB_SPC, KB_GRV, KB_BSPC,KB_NO, KB_ESC, KB_LCTL,KB_LGUI}, // 30-37 - { KB_LSFT,KB_CAPS,KB_LALT,KB_LEFT,KB_RGHT,KB_DOWN,KB_UP, KB_NO }, // 38-3F - { KB_NO, KB_PDOT,KB_NO, KB_PAST,KB_NO, KB_PPLS,KB_NO, KB_NLCK}, // 40-47 - { KB_NO, KB_NO, KB_NO, KB_PSLS,KB_PENT,KB_NO, KB_PMNS,KB_NO }, // 48-4F - { KB_NO, KB_PEQL,KB_P0, KB_P1, KB_P2, KB_P3, KB_P4, KB_P5 }, // 50-57 - { KB_P6, KB_P7, KB_NO, KB_P8, KB_P9, KB_NO, KB_NO, KB_NO }, // 58-5F - { KB_F5, KB_F6, KB_F7, KB_F3, KB_F8, KB_F9, KB_NO, KB_F11 }, // 60-67 - { KB_NO, KB_PSCR,KB_NO, KB_SLCK,KB_NO, KB_F10, KB_NO, KB_F12 }, // 68-6F - { KB_NO, KB_BRK, KB_INS, KB_HOME,KB_PGUP,KB_DEL, KB_F4, KB_END }, // 70-77 - { KB_F2, KB_PGDN,KB_F1, KB_RSFT,KB_NO, KB_NO, KB_NO, KB_PWR }, // 78-7F - }, -*/ - - -// Assign Fn key(0-7) to a layer to which switch with the Fn key pressed. -static const uint8_t PROGMEM fn_layer[] = { - 0, // Fn0 - 0, // Fn1 - 0, // Fn2 - 0, // Fn3 - 0, // Fn4 - 0, // Fn5 - 0, // Fn6 - 0 // Fn7 -}; - -// Assign Fn key(0-7) to a keycode sent when release Fn key without use of the layer. -// See layer.c for details. -static const uint8_t PROGMEM fn_keycode[] = { - KB_NO, // Fn0 - KB_NO, // Fn1 - KB_NO, // Fn2 - KB_NO, // Fn3 - KB_NO, // Fn4 - KB_NO, // Fn5 - KB_NO, // Fn6 - KB_NO // Fn7 -}; - -static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Default Layer: plain keymap - * ,---. ,---------------. ,---------------. ,---------------. ,-----------. ,---. - * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| |Pwr| - * `---' `---------------' `---------------' `---------------' `-----------' `---' - * ,-----------------------------------------------------------. ,-----------. ,---------------. - * | `| 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| +| - * |-----------------------------------------------------------| ,---. |---------------| - * |Shift | Z| X| C| V| B| N| M| ,| ,| /|Shift | |Up | | 1| 2| 3| | - * |-----------------------------------------------------------| ,-----------. |-----------|Ent| - * |Ctrl |Gui |Alt | Space | | | | |Lef|Dow|Rig| | 0| .| | - * `-----------------------------------------------------------' `-----------' `---------------' - */ - KEYMAP( - ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK, PWR, - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME,PGUP, NLCK,EQL, PSLS,PAST, - TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS, DEL, END, PGDN, P7, P8, P9, PMNS, - CAPS,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, - LCTL,LGUI,LALT, SPC, LEFT,DOWN,RGHT, P0, PDOT,PENT - ), -}; - - -uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col) -{ - return KEYCODE(layer, row, col); -} - -uint8_t keymap_fn_layer(uint8_t fn_bits) -{ - return pgm_read_byte(&fn_layer[biton(fn_bits)]); -} - -uint8_t keymap_fn_keycode(uint8_t fn_bits) -{ - return pgm_read_byte(&fn_keycode[(biton(fn_bits))]); -} diff --git a/adb_usb/led.c b/adb_usb/led.c deleted file mode 100644 index 0e162f379b..0000000000 --- a/adb_usb/led.c +++ /dev/null @@ -1,26 +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 . -*/ - -#include "stdint.h" -#include "adb.h" -#include "led.h" - - -void led_set(uint8_t usb_led) -{ - adb_host_kbd_led(~usb_led); -} diff --git a/adb_usb/matrix.c b/adb_usb/matrix.c deleted file mode 100644 index a2367af56a..0000000000 --- a/adb_usb/matrix.c +++ /dev/null @@ -1,241 +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 . -*/ - -/* - * scan matrix - */ -#include -#include -#include -#include -#include "print.h" -#include "util.h" -#include "debug.h" -#include "host.h" -#include "led.h" -#include "adb.h" -#include "matrix.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 - -#define CAPS 0x39 -#define CAPS_UP (CAPS | 0x80) -#define ROW(key) ((key)>>3&0x0F) -#define COL(key) ((key)&0x07) - - -static bool _matrix_is_modified = false; - -// matrix state buffer(1:on, 0:off) -#if (MATRIX_COLS <= 8) -static uint8_t *matrix; -static uint8_t _matrix0[MATRIX_ROWS]; -#else -static uint16_t *matrix; -static uint16_t _matrix0[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) -{ - adb_host_init(); - - // initialize matrix state: all keys off - for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix0[i] = 0x00; - matrix = _matrix0; - - print_enable = true; - debug_enable = true; - debug_matrix = true; - debug_keyboard = true; - debug_mouse = true; - print("debug enabled.\n"); - return; -} - -uint8_t matrix_scan(void) -{ - uint16_t codes; - uint8_t key0, key1; - - _matrix_is_modified = false; - codes = adb_host_kbd_recv(); - key0 = codes>>8; - key1 = codes&0xFF; - -#ifdef MATRIX_HAS_LOCKING_CAPS - // Send Caps key up event - if (matrix_is_on(ROW(CAPS), COL(CAPS))) { - _matrix_is_modified = true; - _register_key(CAPS_UP); - } -#endif - if (codes == 0) { // no keys - return 0; - } else if (key0 == 0xFF && key1 != 0xFF) { // error - return codes&0xFF; - } else { -#ifdef MATRIX_HAS_LOCKING_CAPS - if (host_keyboard_leds() & (1<>3)&0x0F; - if (key&0x80) { - matrix[row] &= ~(1< + +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 + +/* controller configuration */ +#include "controller_teensy.h" + +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x0ADB +#define DEVICE_VER 0x0101 +#define MANUFACTURER t.m.k. +#define PRODUCT ADB keyboard converter +#define DESCRIPTION convert ADB keyboard to USB + +/* matrix size */ +#define MATRIX_ROWS 16 // keycode bit: 3-0 +#define MATRIX_COLS 8 // keycode bit: 6-4 + +/* Locking Caps Lock support */ +#define MATRIX_HAS_LOCKING_CAPS + + +/* key combination for command */ +#define IS_COMMAND() ( \ + keyboard_report->mods == (MOD_BIT(KB_LSHIFT) | MOD_BIT(KB_LCTRL) | MOD_BIT(KB_LALT) | MOD_BIT(KB_LGUI)) || \ + keyboard_report->mods == (MOD_BIT(KB_LSHIFT) | MOD_BIT(KB_RSHIFT)) \ +) + + +/* mouse keys */ +#ifdef MOUSEKEY_ENABLE +# define MOUSEKEY_DELAY_TIME 192 +#endif + + +/* PS/2 mouse */ +#ifdef PS2_MOUSE_ENABLE +# define PS2_CLOCK_PORT PORTF +# define PS2_CLOCK_PIN PINF +# define PS2_CLOCK_DDR DDRF +# define PS2_CLOCK_BIT 0 +# define PS2_DATA_PORT PORTF +# define PS2_DATA_PIN PINF +# define PS2_DATA_DDR DDRF +# define PS2_DATA_BIT 1 +#endif + + +/* ADB port setting */ +#define ADB_PORT PORTF +#define ADB_PIN PINF +#define ADB_DDR DDRF +#define ADB_DATA_BIT 0 +//#define ADB_PSW_BIT 1 // optional + +#endif diff --git a/converter/adb_usb/keymap.c b/converter/adb_usb/keymap.c new file mode 100644 index 0000000000..cdaa935d32 --- /dev/null +++ b/converter/adb_usb/keymap.c @@ -0,0 +1,150 @@ +/* +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 . +*/ + +/* + * Keymap for ADB keyboard + */ +#include +#include +#include +#include "usb_keyboard.h" +#include "usb_keycodes.h" +#include "print.h" +#include "debug.h" +#include "util.h" +#include "keymap.h" + + +#define KEYCODE(layer, row, col) (pgm_read_byte(&keymaps[(layer)][(row)][(col)])) + +// Convert physical keyboard layout to matrix array. +// This is a macro to define keymap easily in keyboard layout form. +/* Apple Extended Keyboard */ +#define KEYMAP( \ + K35, K7A,K78,K63,K76, K60,K61,K62,K64, K65,K6D,K67,K6F, K69,K6B,K71, K7F, \ + K32,K12,K13,K14,K15,K17,K16,K1A,K1C,K19,K1D,K1B,K18,K33, K72,K73,K74, K47,K51,K4B,K43, \ + K30,K0C,K0D,K0E,K0F,K11,K10,K20,K22,K1F,K23,K21,K1E,K2A, K75,K77,K79, K59,K5B,K5C,K4E, \ + K39,K00,K01,K02,K03,K05,K04,K26,K28,K25,K29,K27, K24, K56,K57,K58,K45, \ + K38,K06,K07,K08,K09,K0B,K2D,K2E,K2B,K2F,K2C, K7B, K3E, K53,K54,K55, \ + K36,K3A,K37, K31, K3B,K3D,K3C, K52, K41,K4C \ +) { \ + { KB_##K00, KB_##K01, KB_##K02, KB_##K03, KB_##K04, KB_##K05, KB_##K06, KB_##K07 }, \ + { KB_##K08, KB_##K09, KB_NO, KB_##K0B, KB_##K0C, KB_##K0D, KB_##K0E, KB_##K0F }, \ + { KB_##K10, KB_##K1