Made directories for keyboard and converter projects.
authortmk <nobody@nowhere>
Thu, 7 Jun 2012 15:37:46 +0000 (00:37 +0900)
committertmk <nobody@nowhere>
Fri, 8 Jun 2012 04:32:38 +0000 (13:32 +0900)
99 files changed:
README [deleted file]
README.md [new file with mode: 0644]
converter/adb_usb/Makefile [moved from adb_usb/Makefile with 98% similarity]
converter/adb_usb/README [moved from adb_usb/README with 100% similarity]
converter/adb_usb/config.h [moved from adb_usb/config.h with 100% similarity]
converter/adb_usb/keymap.c [moved from adb_usb/keymap.c with 100% similarity]
converter/adb_usb/led.c [moved from adb_usb/led.c with 100% similarity]
converter/adb_usb/matrix.c [moved from adb_usb/matrix.c with 100% similarity]
converter/m0110_usb/Makefile [moved from m0110_usb/Makefile with 98% similarity]
converter/m0110_usb/README.md [moved from m0110_usb/README.md with 100% similarity]
converter/m0110_usb/config.h [moved from m0110_usb/config.h with 100% similarity]
converter/m0110_usb/doc/m0110.jpg [moved from m0110_usb/doc/m0110.jpg with 100% similarity]
converter/m0110_usb/doc/teensy.jpg [moved from m0110_usb/doc/teensy.jpg with 100% similarity]
converter/m0110_usb/keymap.c [moved from m0110_usb/keymap.c with 100% similarity]
converter/m0110_usb/led.c [moved from m0110_usb/led.c with 100% similarity]
converter/m0110_usb/matrix.c [moved from m0110_usb/matrix.c with 100% similarity]
converter/ps2_usb/Makefile [moved from ps2_usb/Makefile with 98% similarity]
converter/ps2_usb/Makefile.pjrc_usart [moved from ps2_usb/Makefile.pjrc_usart with 98% similarity]
converter/ps2_usb/Makefile.vusb [moved from ps2_usb/Makefile.vusb with 99% similarity]
converter/ps2_usb/README [moved from ps2_usb/README with 100% similarity]
converter/ps2_usb/README.vusb [moved from ps2_usb/README.vusb with 100% similarity]
converter/ps2_usb/config_pjrc.h [moved from ps2_usb/config_pjrc.h with 100% similarity]
converter/ps2_usb/config_pjrc_usart.h [moved from ps2_usb/config_pjrc_usart.h with 100% similarity]
converter/ps2_usb/config_vusb.h [moved from ps2_usb/config_vusb.h with 100% similarity]
converter/ps2_usb/keymap.c [moved from ps2_usb/keymap.c with 100% similarity]
converter/ps2_usb/led.c [moved from ps2_usb/led.c with 100% similarity]
converter/ps2_usb/matrix.c [moved from ps2_usb/matrix.c with 100% similarity]
converter/ps2_usb/usbconfig.h [moved from ps2_usb/usbconfig.h with 100% similarity]
converter/sony_usb/Makefile.pjrc [moved from sony_usb/Makefile.pjrc with 98% similarity]
converter/sony_usb/config_pjrc.h [moved from sony_usb/config_pjrc.h with 100% similarity]
converter/sony_usb/keymap.c [moved from sony_usb/keymap.c with 100% similarity]
converter/sony_usb/led.c [moved from sony_usb/led.c with 100% similarity]
converter/sony_usb/matrix.c [moved from sony_usb/matrix.c with 100% similarity]
converter/sony_usb/news.c [moved from sony_usb/news.c with 100% similarity]
converter/sony_usb/news.h [moved from sony_usb/news.h with 100% similarity]
converter/terminal_usb/Makefile.102_pjrc [moved from terminal_usb/Makefile.102_pjrc with 98% similarity]
converter/terminal_usb/Makefile.122_pjrc [moved from terminal_usb/Makefile.122_pjrc with 98% similarity]
converter/terminal_usb/README [moved from terminal_usb/README with 100% similarity]
converter/terminal_usb/config_102_pjrc.h [moved from terminal_usb/config_102_pjrc.h with 100% similarity]
converter/terminal_usb/config_122_pjrc.h [moved from terminal_usb/config_122_pjrc.h with 100% similarity]
converter/terminal_usb/keymap_102.c [moved from terminal_usb/keymap_102.c with 100% similarity]
converter/terminal_usb/keymap_122.c [moved from terminal_usb/keymap_122.c with 100% similarity]
converter/terminal_usb/led.c [moved from terminal_usb/led.c with 100% similarity]
converter/terminal_usb/matrix.c [moved from terminal_usb/matrix.c with 100% similarity]
converter/x68k_usb/Makefile [moved from x68k_usb/Makefile with 99% similarity]
converter/x68k_usb/README [moved from x68k_usb/README with 100% similarity]
converter/x68k_usb/config_pjrc.h [moved from x68k_usb/config_pjrc.h with 100% similarity]
converter/x68k_usb/keymap.c [moved from x68k_usb/keymap.c with 100% similarity]
converter/x68k_usb/led.c [moved from x68k_usb/led.c with 100% similarity]
converter/x68k_usb/matrix.c [moved from x68k_usb/matrix.c with 100% similarity]
converter/x68k_usb/x68k.c [moved from x68k_usb/x68k.c with 100% similarity]
converter/x68k_usb/x68k.h [moved from x68k_usb/x68k.h with 100% similarity]
keyboard/hbk/Makefile [moved from hbk/Makefile with 99% similarity]
keyboard/hbk/config.h [moved from hbk/config.h with 100% similarity]
keyboard/hbk/controller_teensy.h [moved from hbk/controller_teensy.h with 100% similarity]
keyboard/hbk/keymap.c [moved from hbk/keymap.c with 100% similarity]
keyboard/hbk/led.c [moved from hbk/led.c with 100% similarity]
keyboard/hbk/matrix.c [moved from hbk/matrix.c with 100% similarity]
keyboard/hhkb/Makefile.iwrap [moved from hhkb/Makefile.iwrap with 99% similarity]
keyboard/hhkb/Makefile.pjrc [moved from hhkb/Makefile.pjrc with 98% similarity]
keyboard/hhkb/Makefile.vusb [moved from hhkb/Makefile.vusb with 99% similarity]
keyboard/hhkb/README [moved from hhkb/README with 100% similarity]
keyboard/hhkb/config_iwrap.h [moved from hhkb/config_iwrap.h with 100% similarity]
keyboard/hhkb/config_pjrc.h [moved from hhkb/config_pjrc.h with 100% similarity]
keyboard/hhkb/config_vusb.h [moved from hhkb/config_vusb.h with 100% similarity]
keyboard/hhkb/doc/Bluetooth.txt [moved from hhkb/doc/Bluetooth.txt with 100% similarity]
keyboard/hhkb/doc/Bluetooth_img/.picasa.ini [moved from hhkb/doc/Bluetooth_img/.picasa.ini with 100% similarity]
keyboard/hhkb/doc/Bluetooth_img/BT_circuit.jpg [moved from hhkb/doc/Bluetooth_img/BT_circuit.jpg with 100% similarity]
keyboard/hhkb/doc/HHKB.txt [moved from hhkb/doc/HHKB.txt with 100% similarity]
keyboard/hhkb/doc/HHKB_img/HHKB_TP1684.jpg [moved from hhkb/doc/HHKB_img/HHKB_TP1684.jpg with 100% similarity]
keyboard/hhkb/doc/HHKB_img/HHKB_chart1.jpg [moved from hhkb/doc/HHKB_img/HHKB_chart1.jpg with 100% similarity]
keyboard/hhkb/doc/HHKB_img/HHKB_chart2.jpg [moved from hhkb/doc/HHKB_img/HHKB_chart2.jpg with 100% similarity]
keyboard/hhkb/doc/HHKB_img/HHKB_connector.jpg [moved from hhkb/doc/HHKB_img/HHKB_connector.jpg with 100% similarity]
keyboard/hhkb/doc/HHKB_img/HHKB_controller.jpg [moved from hhkb/doc/HHKB_img/HHKB_controller.jpg with 100% similarity]
keyboard/hhkb/doc/HHKB_img/HHKB_keyswitch.jpg [moved from hhkb/doc/HHKB_img/HHKB_keyswitch.jpg with 100% similarity]
keyboard/hhkb/doc/HHKB_img/connector_contact.jpg [moved from hhkb/doc/HHKB_img/connector_contact.jpg with 100% similarity]
keyboard/hhkb/doc/HHKB_img/logic_analyzer.jpg [moved from hhkb/doc/HHKB_img/logic_analyzer.jpg with 100% similarity]
keyboard/hhkb/doc/HHKB_img/probe_contact.jpg [moved from hhkb/doc/HHKB_img/probe_contact.jpg with 100% similarity]
keyboard/hhkb/doc/HHKB_img/teensy_install.jpg [moved from hhkb/doc/HHKB_img/teensy_install.jpg with 100% similarity]
keyboard/hhkb/doc/HHKB_img/teensy_wiring.jpg [moved from hhkb/doc/HHKB_img/teensy_wiring.jpg with 100% similarity]
keyboard/hhkb/keymap.c [moved from hhkb/keymap.c with 100% similarity]
keyboard/hhkb/led.c [moved from hhkb/led.c with 100% similarity]
keyboard/hhkb/matrix.c [moved from hhkb/matrix.c with 100% similarity]
keyboard/hhkb/usbconfig.h [moved from hhkb/usbconfig.h with 100% similarity]
keyboard/macway/Makefile [moved from macway/Makefile with 98% similarity]
keyboard/macway/config.h [moved from macway/config.h with 100% similarity]
keyboard/macway/doc/back.jpg [moved from macway/doc/back.jpg with 100% similarity]
keyboard/macway/doc/case.jpg [moved from macway/doc/case.jpg with 100% similarity]
keyboard/macway/doc/keys.jpg [moved from macway/doc/keys.jpg with 100% similarity]
keyboard/macway/doc/side.jpg [moved from macway/doc/side.jpg with 100% similarity]
keyboard/macway/doc/switch.jpg [moved from macway/doc/switch.jpg with 100% similarity]
keyboard/macway/doc/teensy.jpg [moved from macway/doc/teensy.jpg with 100% similarity]
keyboard/macway/doc/wiring.jpg [moved from macway/doc/wiring.jpg with 100% similarity]
keyboard/macway/doc/withHHKB.jpg [moved from macway/doc/withHHKB.jpg with 100% similarity]
keyboard/macway/doc/withThinkPad.jpg [moved from macway/doc/withThinkPad.jpg with 100% similarity]
keyboard/macway/keymap.c [moved from macway/keymap.c with 100% similarity]
keyboard/macway/led.c [moved from macway/led.c with 100% similarity]
keyboard/macway/matrix.c [moved from macway/matrix.c with 100% similarity]
protocol.mk [new file with mode: 0644]

diff --git a/README b/README
deleted file mode 100644 (file)
index d85f512..0000000
--- 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 <target>
-$ make
-
-The firmware will be compiled as a file tmk_<target>.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
--------------
-<target>/Makefile:
-1. Set target name for your firmware.
-     TARGET = tmk_<target>
-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
-
-<target>/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 <COMMAND> + H to debug menu. 
-(see config.h for <COMMAND> 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 (file)
index 0000000..0361e2a
--- /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: <http://github.com/tmk/tmk_keyboard>
+
+
+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 <project>
+    $ make
+
+The firmware will be compiled as a file tmk_<project>.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. <http://www.pjrc.com/teensy/loader.html>
+
+
+
+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 `<COMMAND> + H` to debug menu. 
+See `config.h` for definition of `<COMMAND>` key combination.
+
+
+Other Keyboard Projects
+-----------------------
+### 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/>
similarity index 98%
rename from adb_usb/Makefile
rename to converter/adb_usb/Makefile
index 97850b0e86c23ea09178e7e6bc547294e4c566b5..64a23d09dc72456a5a6eae4550bc74cedf5dfbab 100644 (file)
@@ -2,7 +2,7 @@
 TARGET = adb_usb
 
 # Directory common source filess exist
-TOP_DIR = ..
+TOP_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
similarity index 100%
rename from adb_usb/README
rename to converter/adb_usb/README
similarity index 100%
rename from adb_usb/config.h
rename to converter/adb_usb/config.h
similarity index 100%
rename from adb_usb/keymap.c
rename to converter/adb_usb/keymap.c
similarity index 100%
rename from adb_usb/led.c
rename to converter/adb_usb/led.c
similarity index 100%
rename from adb_usb/matrix.c
rename to converter/adb_usb/matrix.c
similarity index 98%
rename from m0110_usb/Makefile
rename to converter/m0110_usb/Makefile
index e4fa526c55c6b2fd324342b622f806405b5160e3..4a687b93334e378c951e2eb3c001bf0d5de3027f 100644 (file)
@@ -2,7 +2,7 @@
 TARGET = m0110
 
 # Directory common source filess exist
-TOP_DIR = ..
+TOP_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
similarity index 100%
rename from m0110_usb/led.c
rename to converter/m0110_usb/led.c
similarity index 98%
rename from ps2_usb/Makefile
rename to converter/ps2_usb/Makefile
index 515e6899fe2d7bfe0543369b3a52e910cea83bec..0bba191a38256fb417554430dc768d8be339b286 100644 (file)
@@ -7,7 +7,7 @@
 TARGET = ps2_usb_pjrc
 
 # Directory common source filess exist
-TOP_DIR = ..
+TOP_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
similarity index 98%
rename from ps2_usb/Makefile.pjrc_usart
rename to converter/ps2_usb/Makefile.pjrc_usart
index 2e570e7107f7b72c6e8d54c0e03cd535592d52d7..3dad7e2f8cc25d15de9d6a165c182ca37ce063bc 100644 (file)
@@ -7,7 +7,7 @@
 TARGET = ps2_usb_pjrc_usart
 
 # Directory common source filess exist
-TOP_DIR = ..
+TOP_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
similarity index 99%
rename from ps2_usb/Makefile.vusb
rename to converter/ps2_usb/Makefile.vusb
index d85f1d55d50e5d191e51262c87e47077de49fe72..4d5240c30948f44b20484d3b126945b1b85b0994 100644 (file)
@@ -7,7 +7,7 @@
 TARGET = ps2_usb_vusb
 
 # Directory common source filess exist
-TOP_DIR = ..
+TOP_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
similarity index 100%
rename from ps2_usb/README
rename to converter/ps2_usb/README
similarity index 100%
rename from ps2_usb/keymap.c
rename to converter/ps2_usb/keymap.c
similarity index 100%
rename from ps2_usb/led.c
rename to converter/ps2_usb/led.c
similarity index 100%
rename from ps2_usb/matrix.c
rename to converter/ps2_usb/matrix.c
similarity index 98%
rename from sony_usb/Makefile.pjrc
rename to converter/sony_usb/Makefile.pjrc
index b7e22dfaceb341f0819d2d6a97e80b96726dce8b..376133ad5e32d7756c3dff3ca763f3715338b1f7 100644 (file)
@@ -7,7 +7,7 @@
 TARGET = news_usb_pjrc
 
 # Directory common source filess exist
-TOP_DIR = ..
+TOP_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
similarity index 100%
rename from sony_usb/led.c
rename to converter/sony_usb/led.c
similarity index 100%
rename from sony_usb/news.c
rename to converter/sony_usb/news.c
similarity index 100%
rename from sony_usb/news.h
rename to converter/sony_usb/news.h
similarity index 98%
rename from terminal_usb/Makefile.102_pjrc
rename to converter/terminal_usb/Makefile.102_pjrc
index a02877acfec26affe0053a5481b0826be5310f5a..e9d14e7a05b243fb6b6b4922b49fcc96a0fa9c5f 100644 (file)
@@ -7,7 +7,7 @@
 TARGET = terminal_usb_102_pjrc
 
 # Directory common source filess exist
-TOP_DIR = ..
+TOP_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
similarity index 98%
rename from terminal_usb/Makefile.122_pjrc
rename to converter/terminal_usb/Makefile.122_pjrc
index 1f21d4e6cad02481495b0f348f03c1a30db694b6..bec00510e58ccf220c4485cf2fdd0a67b0d7daf4 100644 (file)
@@ -7,7 +7,7 @@
 TARGET = terminal_usb_122_pjrc
 
 # Directory common source filess exist
-TOP_DIR = ..
+TOP_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
similarity index 99%
rename from x68k_usb/Makefile
rename to converter/x68k_usb/Makefile
index 0127c0bf8409b9f8615c0adb1580f19c19e35d26..c3b5fa29f322c9f5526989cbcc6d122c8e328e5b 100644 (file)
@@ -7,7 +7,7 @@
 TARGET = x68k_usb_pjrc
 
 # Directory common source filess exist
-TOP_DIR = ..
+TOP_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
similarity index 100%
rename from x68k_usb/README
rename to converter/x68k_usb/README
similarity index 100%
rename from x68k_usb/led.c
rename to converter/x68k_usb/led.c
similarity index 100%
rename from x68k_usb/x68k.c
rename to converter/x68k_usb/x68k.c
similarity index 100%
rename from x68k_usb/x68k.h
rename to converter/x68k_usb/x68k.h
similarity index 99%
rename from hbk/Makefile
rename to keyboard/hbk/Makefile
index c441e2d7aeb91da0c2954743af6ee5ee89c65542..26be322e0155e9facd36c4b9086cf4694788c225 100644 (file)
@@ -2,7 +2,7 @@
 TARGET = hbk
 
 # Directory common source filess exist
-TOP_DIR = ..
+TOP_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
similarity index 100%
rename from hbk/config.h
rename to keyboard/hbk/config.h
similarity index 100%
rename from hbk/keymap.c
rename to keyboard/hbk/keymap.c
similarity index 100%
rename from hbk/led.c
rename to keyboard/hbk/led.c
similarity index 100%
rename from hbk/matrix.c
rename to keyboard/hbk/matrix.c
similarity index 99%
rename from hhkb/Makefile.iwrap
rename to keyboard/hhkb/Makefile.iwrap
index d922b0f501395b489a7ffa8aa3a2021232a79128..ef7ad2eac2a7cf34212a266e4768440b68996697 100644 (file)
@@ -7,7 +7,7 @@
 TARGET = hhkb_iwrap
 
 # Directory common source filess exist
-TOP_DIR = ..
+TOP_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
similarity index 98%
rename from hhkb/Makefile.pjrc
rename to keyboard/hhkb/Makefile.pjrc
index 28b6b589dd04d7fac84f44b88a8281f49b435cb3..f6d133eae4c5402ee67137ce1f9537ab89c1b67a 100644 (file)
@@ -7,7 +7,7 @@
 TARGET = hhkb_pjrc
 
 # Directory common source filess exist
-TOP_DIR = ..
+TOP_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
similarity index 99%
rename from hhkb/Makefile.vusb
rename to keyboard/hhkb/Makefile.vusb
index 734b73a029187fd77ded33a07b18b700d078ae00..6dd6288077657e16083b91f8052ebf9f6954901a 100644 (file)
@@ -7,7 +7,7 @@
 TARGET = hhkb_vusb
 
 # Directory common source filess exist
-TOP_DIR = ..
+TOP_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
similarity index 100%
rename from hhkb/README
rename to keyboard/hhkb/README
similarity index 100%
rename from hhkb/doc/HHKB.txt
rename to keyboard/hhkb/doc/HHKB.txt
similarity index 100%
rename from hhkb/keymap.c
rename to keyboard/hhkb/keymap.c
similarity index 100%
rename from hhkb/led.c
rename to keyboard/hhkb/led.c
similarity index 100%
rename from hhkb/matrix.c
rename to keyboard/hhkb/matrix.c
similarity index 100%
rename from hhkb/usbconfig.h
rename to keyboard/hhkb/usbconfig.h
similarity index 98%
rename from macway/Makefile
rename to keyboard/macway/Makefile
index 83d31b67476bf6fad5ed027de224ce0dddf78cb0..afee38b120707f274a15fb81a1649a515f0ad09d 100644 (file)
@@ -2,7 +2,7 @@
 TARGET = macway
 
 # Directory common source filess exist
-TOP_DIR = ..
+TOP_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
similarity index 100%
rename from macway/config.h
rename to keyboard/macway/config.h
similarity index 100%
rename from macway/keymap.c
rename to keyboard/macway/keymap.c
similarity index 100%
rename from macway/led.c
rename to keyboard/macway/led.c
similarity index 100%
rename from macway/matrix.c
rename to keyboard/macway/matrix.c
diff --git a/protocol.mk b/protocol.mk
new file mode 100644 (file)
index 0000000..1442c52
--- /dev/null
@@ -0,0 +1,2 @@
+# Search Path
+VPATH += $(TOP_DIR)/protocol
Imprint / Impressum