diff options
| author | tmk <nobody@nowhere> | 2013-07-23 10:57:12 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2013-07-23 10:57:37 +0900 |
| commit | 7e5081b5a8f2c6e0c3c8d2dc73717c0b3597ef84 (patch) | |
| tree | 421f2d6bdaad59fb338b1dbaffe38b5468aa66bb /converter | |
| parent | 5b425731c5b662d107ba0f970a7ae7c7fe97d01b (diff) | |
| parent | 2721022078c30dd00c1063e4a2f8199b2b53e0d5 (diff) | |
Merge branch 'lockkey_fix'(Fix issue #46)
Diffstat (limited to 'converter')
| -rw-r--r-- | converter/adb_usb/README.md | 4 | ||||
| -rw-r--r-- | converter/adb_usb/config.h | 14 | ||||
| -rw-r--r-- | converter/m0110_usb/config.h | 8 |
3 files changed, 13 insertions, 13 deletions
diff --git a/converter/adb_usb/README.md b/converter/adb_usb/README.md index 3033cfa620..5301557d43 100644 --- a/converter/adb_usb/README.md +++ b/converter/adb_usb/README.md @@ -9,10 +9,10 @@ Discuss: http://geekhack.org/showwiki.php?title=Island:14290 Build ----- -0. Connect ADB keyboard to Teensy by 3 lines(Vcc, GND, Data). By default Data line uses port F0. +0. Connect ADB keyboard to Teensy by 3 lines(Vcc, GND, Data). By default Data line uses port D0. This converter uses AVR's internal pull-up, but it seems to be too weak, in particular when you want to use a long or coiled cable. The external pull-up resistor(1K-10K Ohm) on Data is strongly recommended. -1. Define following macros for ADB connection in config.h if you use other than port F0. +1. Define following macros for ADB connection in config.h if you use other than port D0. ADB_PORT, ADB_PIN, ADB_DDR, ADB_DATA_BIT 2. make 3. program Teensy diff --git a/converter/adb_usb/config.h b/converter/adb_usb/config.h index 7e2372edff..4ce27bbfeb 100644 --- a/converter/adb_usb/config.h +++ b/converter/adb_usb/config.h @@ -34,10 +34,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_COL(code) ((code)&0x07) -/* Mechanical locking CapsLock support. Use KC_LCAP instead of KC_CAPS in keymap */ -#define CAPSLOCK_LOCKING_ENABLE -/* Locking CapsLock resynchronize hack */ -#define CAPSLOCK_LOCKING_RESYNC_ENABLE +/* 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 /* legacy keymap support */ @@ -51,9 +51,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* ADB port setting */ -#define ADB_PORT PORTF -#define ADB_PIN PINF -#define ADB_DDR DDRF +#define ADB_PORT PORTD +#define ADB_PIN PIND +#define ADB_DDR DDRD #define ADB_DATA_BIT 0 //#define ADB_PSW_BIT 1 // optional diff --git a/converter/m0110_usb/config.h b/converter/m0110_usb/config.h index ac1c40a38e..dc446414b5 100644 --- a/converter/m0110_usb/config.h +++ b/converter/m0110_usb/config.h @@ -36,10 +36,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define USE_LEGACY_KEYMAP -/* Mechanical locking CapsLock support. Use KC_LCAP instead of KC_CAPS in keymap */ -#define CAPSLOCK_LOCKING_ENABLE -/* Locking CapsLock resynchronize hack */ -#define CAPSLOCK_LOCKING_RESYNC_ENABLE +/* 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 /* magic key */ |