summaryrefslogtreecommitdiff
path: root/m0110_usb
diff options
context:
space:
mode:
authortmk2012-05-24 14:21:52 +0900
committertmk2012-05-24 14:21:52 +0900
commit660ea5a2cd6aaf26eb584ae6cfbf777bdf62f0b2 (patch)
tree8544b39b00bb7b7706b2548a86ac27ee39b14193 /m0110_usb
parentf4bff66e9124fae26129e294c525ec6ce3cea4ef (diff)
parent805ce3c1309421df6166b085b70f53c494f9946b (diff)
Merge branch 'm0110a'
Diffstat (limited to 'm0110_usb')
-rw-r--r--m0110_usb/README55
-rw-r--r--m0110_usb/README.md126
-rw-r--r--m0110_usb/config.h7
-rw-r--r--[-rwxr-xr-x]m0110_usb/doc/m0110.jpgbin49360 -> 49360 bytes
-rw-r--r--[-rwxr-xr-x]m0110_usb/doc/teensy.jpgbin50081 -> 50081 bytes
-rw-r--r--m0110_usb/keymap.c161
-rw-r--r--m0110_usb/matrix.c40
7 files changed, 245 insertions, 144 deletions
diff --git a/m0110_usb/README b/m0110_usb/README
deleted file mode 100644
index 6ef98757a..000000000
--- a/m0110_usb/README
+++ /dev/null
@@ -1,55 +0,0 @@
-M0110 to USB keyboard converter
-===============================
-This firmware converts the protocol of Apple Macintosh keyboard M0110 into USB.
-
-
-Connection
-----------
-You need 4P4C plug and cable to connect Teensy into M0110.
-Teensy port F0 is assigned for CLOCK line and F1 for DATA by default, you can change pin configuration with editing config.h..
-
-Plug:
- http://en.wikipedia.org/wiki/Modular_connector#4P4C
-
-Pinout:
- http://www.kbdbabel.org/conn/kbd_connector_macplus.png
- 1(Black): GND
- 2(Red): CLOCK
- 3(Green): DATA
- 4(Yellow): +5V
-
-
-
-Build Frimware
---------------
-Optionally edit Makefile and config.h for build options, pin configuration or MCU.
-
-$ cd m0110_usb
-$ make
-and program your Teensy with loader.
-
-
-
-Keymap
-------
-You can change a keymap by editing code of keymap.c like following.
-How to define the keymap is probably obvious. You can find key symbols in usb_keycodes.h.
-
-This is a default keymap for M0110.
-,---------------------------------------------------------.
-| `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Bacpa|
-|---------------------------------------------------------|
-|Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \|
-|---------------------------------------------------------|
-|CapsLo| A| S| D| F| G| H| J| K| L| ;| '|Return|
-|---------------------------------------------------------|
-|Shift | Z| X| C| V| B| N| M| ,| ,| /|Shift |
-`---------------------------------------------------------'
- |Opt|Alt | Space |Alt |Opt|
- `-----------------------------------------------'
-
-
-Notes
------
-
-EOF
diff --git a/m0110_usb/README.md b/m0110_usb/README.md
new file mode 100644
index 000000000..92b58f684
--- /dev/null
+++ b/m0110_usb/README.md
@@ -0,0 +1,126 @@
+M0110/M0110A to USB keyboard converter
+======================================
+This firmware converts the protocol of Apple Macintosh keyboard M0110/M0110A into USB.
+Target board of this project is [PJRC Teensy](http://www.pjrc.com/teensy/), though,
+you can use other board with USB AVR like `ATmega32U4` and `AT90USB`.
+
+![M0110](https://github.com/tmk/tmk_keyboard/raw/master/m0110_usb/doc/m0110.jpg)
+
+M0110A support was contributed by [skagon@github](https://github.com/skagon).
+
+
+
+Connection
+----------
+You need 4P4C plug and cable to connect Teensy or other AVR dev board into the keyboard.
+Teensy port `PF0` is assigned for `CLOCK` line and `PF1` for `DATA` by default,
+you can change pin configuration with editing *config.h*.
+
+You can find 4P4C plugs on telephone handset cable. Note that it is *crossover* connection
+while Macintosh keyboard cable is *straight*.
+
+[![Conection](http://i.imgur.com/vJoVOm.jpg)](http://i.imgur.com/vJoVO.jpg)
+
+In this pic:
+
+1. `GND`(Black)
+2. `CLOCK`(Red)
+3. `DATA`(Green)
+4. `+5V`(Yellow)
+
+Not that wire colors may vary in your cable.
+
+
+### Pinout
+- <http://pinouts.ru/Inputs/MacKeyboard_pinout.shtml>
+- <http://en.wikipedia.org/wiki/Modular_connector#4P4C>
+
+![Jack fig](http://www.kbdbabel.org/conn/kbd_connector_macplus.png)
+
+
+### Pull-up Registor
+You may need pull-up registors on signal lines(`CLOCK`, `DATA`) in particular
+when you have long or coiled cable. 1k-10k Ohm will be OK for this purpose.
+In some cases MCU can't read signal from keyboard correctly without pull-up resistors.
+
+
+
+Building Frimware
+-----------------
+To compile firmware you need AVR GCC. You can use [WinAVR](http://winavr.sourceforge.net/) on Windows.
+You can edit *Makefile* and *config.h* to change compile options and pin configuration.
+
+ $ git clone ... (or download source)
+ $ cd m0110_usb
+ $ make
+
+and program your Teensy with [PJRC Teensy loader](http://www.pjrc.com/teensy/loader.html).
+
+
+
+Keymap
+------
+You can change keymaps by editing *keymap.c*.
+
+### M0110
+#### *Default*
+ ,---------------------------------------------------------.
+ | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backs|
+ |---------------------------------------------------------|
+ |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \|
+ |---------------------------------------------------------|
+ |Fn0 | A| S| D| F| G| H| J| K| L| ;| '|Return|
+ |---------------------------------------------------------|
+ |Shift | Z| X| C| V| B| N| M| ,| ,| /|Shift |
+ `---------------------------------------------------------'
+ |Ctr|Alt | Space |Gui |Ctr|
+ `-----------------------------------------------'
+ You can register Esc by hitting(press&release) Fn0 quickly.
+
+#### *HHKB/WASD cursor Layer(Fn0)*
+ ,---------------------------------------------------------.
+ |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delet|
+ |---------------------------------------------------------|
+ |Caps |Hom| Up|PgU| | | | |Psc|Slk|Pau|Up |Ins| \|
+ |---------------------------------------------------------|
+ |Fn0 |Lef|Dow|Rig| | | | |Hom|PgU|Lef|Rig|Return|
+ |---------------------------------------------------------|
+ |Shift |End| |PgD| |VoD|VoU|Mut|End|PgD|Dow|Shift |
+ `---------------------------------------------------------'
+ |Ctr|Alt | Space |Gui |Ctr|
+ `-----------------------------------------------'
+
+### M0110A
+#### *Default*
+ ,---------------------------------------------------------. ,---------------.
+ | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backs| |Gui| =| /| *|
+ |---------------------------------------------------------| |---------------|
+ |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| | | 7| 8| 9| -|
+ |-----------------------------------------------------' | |---------------|
+ |Fn0 | A| S| D| F| G| H| J| K| L| ;| '|Return| | 4| 5| 6| +|
+ |---------------------------------------------------------| |---------------|
+ |Shift | Z| X| C| V| B| N| M| ,| ,| /|Shft|Up | | 1| 2| 3| |
+ |---------------------------------------------------------| |-----------|Ent|
+ |Ctrl |Alt | Space | \|Lft|Rgt|Dn | | 0| .| |
+ `---------------------------------------------------------' `---------------'
+#### *HHKB/WASD cursor Layer(Fn0)*
+ ,---------------------------------------------------------. ,---------------.
+ |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delet| |Nlk|Mb1|Mb3|Mb2|
+ |---------------------------------------------------------| |---------------|
+ |Caps |Hom| Up|PgU| | | | |Psc|Slk|Pau|Up |Ins| | |MwD|McU|MwU|MwU|
+ |-----------------------------------------------------' | |---------------|
+ |Fn0 |Lef|Dow|Rig| | | | |Hom|PgU|Lef|Rig|Return| |McL|McD|McR|MwD|
+ |---------------------------------------------------------| |---------------|
+ |Shift |End| |PgD| |VoD|VoU|Mut|End|PgD|Dow|Shif|Up | |MwL|McD|MwR| |
+ |---------------------------------------------------------| |-----------|Mb2|
+ |Ctrl |Alt | Space |Gui | \|Lft|Rgt|Dn | | Mb1|Mb3| |
+ `---------------------------------------------------------' `---------------'
+
+
+
+Debug
+-----
+You can use [PJRC HID listen](http://www.pjrc.com/teensy/hid_listen.html) to see debug output.
+
+The converter has some functions for debug, press `Alt+Gui+H` simultaneously to get help.
+These function is totally undocumented, tentative, inconsistent and buggy.
diff --git a/m0110_usb/config.h b/m0110_usb/config.h
index c12e0738d..4563d6da5 100644
--- a/m0110_usb/config.h
+++ b/m0110_usb/config.h
@@ -1,5 +1,5 @@
/*
-Copyright 2011 Jun Wako <wakojun@gmail.com>
+Copyright 2011,2012 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* matrix size */
-#define MATRIX_ROWS 8
+#define MATRIX_ROWS 14
#define MATRIX_COLS 8
/* Locking Caps Lock support */
@@ -38,8 +38,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* key combination for command */
#define IS_COMMAND() ( \
- keyboard_report->mods == (MOD_BIT(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)) \
+ keyboard_report->mods == (MOD_BIT(KB_LALT) | MOD_BIT(KB_LGUI)) \
)
diff --git a/m0110_usb/doc/m0110.jpg b/m0110_usb/doc/m0110.jpg
index ef9a123ab..ef9a123ab 100755..100644
--- a/m0110_usb/doc/m0110.jpg
+++ b/m0110_usb/doc/m0110.jpg
Binary files differ
diff --git a/m0110_usb/doc/teensy.jpg b/m0110_usb/doc/teensy.jpg
index 96e93e7e2..96e93e7e2 100755..100644
--- a/m0110_usb/doc/teensy.jpg
+++ b/m0110_usb/doc/teensy.jpg
Binary files differ
diff --git a/m0110_usb/keymap.c b/m0110_usb/keymap.c
index bbb699a9a..939010c6d 100644
--- a/m0110_usb/keymap.c
+++ b/m0110_usb/keymap.c
@@ -1,5 +1,5 @@
/*
-Copyright 2011 Jun Wako <wakojun@gmail.com>
+Copyright 2011,2012 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -14,10 +14,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+/* M0110A Support was contributed by skagon@github */
-/*
- * Keymap for ADB keyboard
- */
#include <stdint.h>
#include <stdbool.h>
#include <avr/pgmspace.h>
@@ -31,16 +29,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#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.
-// TODO: layout for M0110A
-/* M0110 */
#define KEYMAP( \
- K32,K12,K13,K14,K15,K17,K16,K1A,K1C,K19,K1D,K1B,K18,K33, \
- K30,K0C,K0D,K0E,K0F,K11,K10,K20,K22,K1F,K23,K21,K1E,K2A, \
- K39,K00,K01,K02,K03,K05,K04,K26,K28,K25,K29,K27, K24, \
- K38,K06,K07,K08,K09,K0B,K2D,K2E,K2B,K2F,K2C, \
- K3A,K37, K31, K34 \
+ K32,K12,K13,K14,K15,K17,K16,K1A,K1C,K19,K1D,K1B,K18,K33, K47,K68,K6D,K62, \
+ K30,K0C,K0D,K0E,K0F,K11,K10,K20,K22,K1F,K23,K21,K1E, K59,K5B,K5C,K4E, \
+ K39,K00,K01,K02,K03,K05,K04,K26,K28,K25,K29,K27, K24, K56,K57,K58,K66, \
+ K38,K06,K07,K08,K09,K0B,K2D,K2E,K2B,K2F,K2C, K4D, K53,K54,K55,K4C, \
+ K3A,K37, K31, K34,K2A,K46,K42,K48, K52, K41 \
) { \
{ 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 }, \
@@ -49,7 +43,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
{ 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_##K34, KB_NO, KB_NO, KB_##K37 }, \
- { KB_##K38, KB_##K39, KB_##K3A, KB_NO, KB_NO, KB_NO, KB_NO, KB_NO } \
+ { KB_##K38, KB_##K39, KB_##K3A, KB_NO, KB_NO, KB_NO, KB_NO, KB_NO }, \
+ { KB_NO, KB_##K41, KB_##K42, KB_NO, KB_NO, KB_NO, KB_##K46, KB_##K47 }, \
+ { KB_##K48, KB_NO, KB_NO, KB_NO, KB_##K4C, KB_##K4D, KB_##K4E, KB_NO }, \
+ { KB_NO, KB_NO, 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_NO, KB_NO, KB_##K62, KB_NO, KB_NO, KB_NO, KB_##K66, KB_NO }, \
+ { KB_##K68, KB_NO, KB_NO, KB_NO, KB_NO, KB_##K6D, KB_NO, KB_NO }, \
}
@@ -58,7 +58,7 @@ static const uint8_t PROGMEM fn_layer[] = {
1, // Fn0
2, // Fn1
3, // Fn2
- 0, // Fn3
+ 1, // Fn3
0, // Fn4
0, // Fn5
0, // Fn6
@@ -68,10 +68,17 @@ static const uint8_t PROGMEM fn_layer[] = {
// Assign Fn key(0-7) to a keycode sent when release Fn key without use of the layer.
// See layer.c for details.
static const uint8_t PROGMEM fn_keycode[] = {
- KB_SCOLON, // Fn0
- KB_SLASH, // Fn1
+#ifndef HASU
+ KB_ESC, // Fn0
+ KB_NO, // Fn1
KB_NO, // Fn2
KB_NO, // Fn3
+#else
+ KB_NO, // Fn0
+ KB_SCOLON, // Fn1
+ KB_SLASH, // Fn2
+ KB_UP, // Fn3
+#endif
KB_NO, // Fn4
KB_NO, // Fn5
KB_NO, // Fn6
@@ -79,52 +86,100 @@ static const uint8_t PROGMEM fn_keycode[] = {
};
static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- // LShift and RShift are logically same one button.
- // LOption and ROption are logically same one button.
- /* Default Layer: plain keymap
- * ,---------------------------------------------------------.
- * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Bacpa|
- * |---------------------------------------------------------|
- * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \|
- * |---------------------------------------------------------|
- * |Contro| A| S| D| F| G| H| J| K| L|Fn0| '|Return|
- * |---------------------------------------------------------|
- * |Shift | Z| X| C| V| B| N| M| ,| ,|Fn1| Shift|
- * `---------------------------------------------------------'
- * |Fn2|Alt | Space |Gui |Fn2|
- * `-----------------------------------------------'
+ /*
+ * The keymap works with both M0110 and M0110A keyboards. As you can see, the M0110A is a superset
+ * of the M0110 keyboard, with only one exception: 'Enter' in M0110 does not exist
+ * on the M0110A, but since it generates a unique scan code which is not used for some other key in
+ * the M0110A, they are totally interchangeable. In fact, the M0110A is functionally (almost)
+ * identical to the combination of the M0110 along with the M0120 keypad. The only difference
+ * (which is causing some problems as you will read below) is that the M0110+M0120 don't have
+ * dedicated arrow keys, while the M0110A does. However, the M0120 did have arrow keys, which
+ * doubled as the [comma], [/], [*] and [+] keys, when used with the [Shift] key. The M0110A has
+ * substituted the [comma] key with the [=] key, however its scancode is the same.
+ *
+ * Default:
+ * ,---------------------------------------------------------. ,---------------.
+ * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backs| |Gui| =| /| *|
+ * |---------------------------------------------------------| |---------------|
+ * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| | | 7| 8| 9| -|
+ * |-----------------------------------------------------' | |---------------|
+ * |Fn0 | A| S| D| F| G| H| J| K| L| ;| '|Return| | 4| 5| 6| +|
+ * |---------------------------------------------------------| |---------------|
+ * |Shift | Z| X| C| V| B| N| M| ,| ,| /|Shft|Up | | 1| 2| 3| |
+ * |---------------------------------------------------------| |-----------|Ent|
+ * |Ctrl |Alt | Space |Gui| \|Lft|Rgt|Dn | | 0| .| |
+ * `---------------------------------------------------------' `---------------'
+ *
+ * HHKB/WASD/Mouse Layer(Fn0):
+ * ,---------------------------------------------------------. ,---------------.
+ * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delet| |Nlk|Mb1|Mb3|Mb2|
+ * |---------------------------------------------------------| |---------------|
+ * |Caps |Hom| Up|PgU| | | | |Psc|Slk|Pau|Up |Ins| | |MwD|McU|MwU|MwU|
+ * |-----------------------------------------------------' | |---------------|
+ * |Fn0 |Lef|Dow|Rig| | | | |Hom|PgU|Lef|Rig|Return| |McL|McD|McR|MwD|
+ * |---------------------------------------------------------| |---------------|
+ * |Shift |End| |PgD| |VoD|VoU|Mut|End|PgD|Dow|Shif|Up | |MwL|McD|MwR| |
+ * |---------------------------------------------------------| |-----------|Mb2|
+ * |Ctrl |Alt | Space |Gui | \|Lft|Rgt|Dn | | Mb1|Mb3| |
+ * `---------------------------------------------------------' `---------------'
+ * Mb: Mouse Button / Mc: Mouse Cursor / Mw: Mouse Wheel
+ *
+ * NOTE: You can register Esc by hitting(press&release) Fn0 quickly.
+ * NOTE: Gui between Space and \ is Enter on M0110 not exists on M0110A.
+ * NOTE: LShift and RShift are logically same key. (M0110, M0110A)
+ * NOTE: LOption and ROption are logically same key. (M0110)
*/
+#ifndef HASU
KEYMAP(
- GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC,
- TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS,
- LCTL,A, S, D, F, G, H, J, K, L, FN0, QUOT, ENT,
- LSFT,Z, X, C, V, B, N, M, COMM,DOT, FN1,
- FN2, LALT, SPC, LGUI
+ GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, LGUI,EQL, PSLS,PAST,
+ TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC, P7, P8, P9, PMNS,
+ FN0, 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, UP, P1, P2, P3, PENT,
+ LCTL,LALT, SPC, LGUI,BSLS,LEFT,RGHT,DOWN, P0, PDOT
),
- // vi mousekeys
+ // HHKB & WASD
KEYMAP(
- ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, DEL,
- CAPS,NO, NO, NO, NO, NO, WH_L,WH_D,WH_U,WH_R,NO, NO, NO, NO,
- LCTL,VOLD,VOLU,MUTE,NO, NO, MS_L,MS_D,MS_U,MS_R,FN0, NO, ENT,
- LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,NO, NO, NO,
- NO, LALT, BTN1, LGUI
+ ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, DEL, NLCK,BTN1,BTN3,BTN2,
+ CAPS,HOME,UP, PGUP,NO, NO, NO, NO, PSCR,SLCK,BRK, UP, INS, WH_D,MS_U,WH_U,WH_U,
+ FN0, LEFT,DOWN,RGHT,NO, NO, NO, NO, HOME,PGUP,LEFT,RGHT, ENT, MS_L,MS_D,MS_R,WH_D,
+ LSFT,END, NO, PGDN,NO, VOLD,VOLU,MUTE,END, PGDN,DOWN, UP, WH_L,MS_D,WH_R,BTN2,
+ LCTL,LALT, SPC, LGUI,BSLS,LEFT,RGHT,DOWN, BTN1, BTN3
),
- // vi cusorkeys
+#else
+ // hasu's keymap
+ // To enable use this 'make' option: make EXTRAFLAGS=-DHASU
KEYMAP(
- ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, DEL,
- CAPS,NO, NO, NO, NO, NO, HOME,PGDN,PGUP,END, NO, NO, NO, NO,
- LCTL,NO, NO, NO, NO, NO, LEFT,DOWN,UP, RGHT,NO, NO, ENT,
- LSFT,NO, NO, NO, NO, NO, HOME,PGDN,PGUP,END, FN1,
- NO, LALT, SPC, LGUI
+ ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, LGUI,EQL, PSLS,PAST,
+ TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC, P7, P8, P9, PMNS,
+ LCTL,A, S, D, F, G, H, J, K, L, FN1, QUOT, ENT, P4, P5, P6, PPLS,
+ LSFT,Z, X, C, V, B, N, M, COMM,DOT, FN2, FN3, P1, P2, P3, PENT,
+ LCTL,LALT, SPC, LGUI,BSLS,LEFT,RGHT,DOWN, LGUI, PDOT
),
// HHKB & WASD
KEYMAP(
- ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, DEL,
- CAPS,HOME,UP, PGUP,NO, NO, NO, NO, PSCR,SLCK,BRK, UP, NO, NO,
- LCTL,LEFT,DOWN,RGHT,NO, NO, NO, NO, HOME,PGUP,LEFT,RGHT, ENT,
- LSFT,END, NO, PGDN,NO, VOLD,VOLU,MUTE,END, PGDN,DOWN,
- FN2, LALT, SPC, LGUI
+ GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, DEL, NLCK,EQL, PSLS,PAST,
+ CAPS,HOME,UP, PGUP,NO, NO, NO, NO, PSCR,SLCK,BRK, UP, INS, P7, P8, P9, PMNS,
+ LCTL,LEFT,DOWN,RGHT,NO, NO, NO, NO, HOME,PGUP,LEFT,RGHT, ENT, P4, P5, P6, PPLS,
+ LSFT,END, NO, PGDN,NO, VOLD,VOLU,MUTE,END, PGDN,DOWN, FN3, P1, P2, P3, PENT,
+ LCTL,LALT, SPC, LGUI,BSLS,LEFT,RGHT,DOWN, P0, PDOT
+ ),
+ // vi mousekeys
+ KEYMAP(
+ GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, DEL, NLCK,EQL, PSLS,PAST,
+ CAPS,NO, NO, NO, NO, NO, WH_L,WH_D,WH_U,WH_R,NO, NO, NO, P7, P8, P9, PMNS,
+ NO, VOLD,VOLU,MUTE,NO, NO, MS_L,MS_D,MS_U,MS_R,FN1, NO, ENT, P4, P5, P6, PPLS,
+ LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,NO, NO, NO, UP, P1, P2, P3, PENT,
+ LCTL,LALT, BTN1, LGUI,BSLS,LEFT,RGHT,DOWN, P0, PDOT
+ ),
+ // vi cusorkeys
+ KEYMAP(
+ GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, DEL, NLCK,EQL, PSLS,PAST,
+ CAPS,NO, NO, NO, NO, NO, HOME,PGDN,PGUP,END, NO, NO, NO, P7, P8, P9, PMNS,
+ NO, NO, NO, NO, NO, NO, LEFT,DOWN,UP, RGHT,NO, NO, ENT, P4, P5, P6, PPLS,
+ LSFT,NO, NO, NO, NO, NO, HOME,PGDN,PGUP,END, FN2, UP, P1, P2, P3, PENT,
+ LCTL,LALT, SPC, LGUI,BSLS,LEFT,RGHT,DOWN, P0, PDOT
),
+#endif
};
diff --git a/m0110_usb/matrix.c b/m0110_usb/matrix.c
index f045920cc..1ca6894c4 100644
--- a/m0110_usb/matrix.c
+++ b/m0110_usb/matrix.c
@@ -1,5 +1,5 @@
/*
-Copyright 2011 Jun Wako <wakojun@gmail.com>
+Copyright 2011,2012 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define CAPS 0x39
-#define CAPS_UP (CAPS | 0x80)
+#define CAPS_BREAK (CAPS | 0x80)
#define ROW(key) ((key)>>3&0x0F)
#define COL(key) ((key)&0x07)
@@ -43,9 +43,6 @@ static bool is_modified = false;
static uint8_t *matrix;
static uint8_t _matrix0[MATRIX_ROWS];
-#ifdef MATRIX_HAS_GHOST
-static bool matrix_has_ghost_in_row(uint8_t row);
-#endif
static void register_key(uint8_t key);
@@ -88,11 +85,13 @@ uint8_t matrix_scan(void)
// Send Caps key up event
if (matrix_is_on(ROW(CAPS), COL(CAPS))) {
is_modified = true;
- register_key(CAPS_UP);
+ register_key(CAPS_BREAK);
}
#endif
if (key == M0110_NULL) {
return 0;
+ } else if (key == M0110_ERROR) {
+ return 0;
} else {
#ifdef MATRIX_HAS_LOCKING_CAPS
if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) {
@@ -100,11 +99,11 @@ uint8_t matrix_scan(void)
// Ignore LockingCaps key down event
if (key == CAPS) return 0;
// Convert LockingCaps key up event into down event
- if (key == CAPS_UP) key = CAPS;
+ if (key == CAPS_BREAK) key = CAPS;
} else {
// CAPS LOCK off:
// Ignore LockingCaps key up event
- if (key == CAPS_UP) return 0;
+ if (key == CAPS_BREAK) return 0;
}
#endif
is_modified = true;
@@ -112,7 +111,7 @@ uint8_t matrix_scan(void)
}
if (debug_enable) {
- print("key: "); phex(key); print("\n");
+ print("["); phex(key); print("]\n");
}
return 1;
}
@@ -125,12 +124,6 @@ bool matrix_is_modified(void)
inline
bool matrix_has_ghost(void)
{
-#ifdef MATRIX_HAS_GHOST
- for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
- if (matrix_has_ghost_in_row(i))
- return true;
- }
-#endif
return false;
}
@@ -165,23 +158,6 @@ uint8_t matrix_key_count(void)
return count;
}
-#ifdef MATRIX_HAS_GHOST
-inline
-static bool matrix_has_ghost_in_row(uint8_t row)
-{
- // no ghost exists in case less than 2 keys on
- if (((matrix[row] - 1) & matrix[row]) == 0)
- return false;
-
- // ghost exists in case same state as other row
- for (uint8_t i=0; i < MATRIX_ROWS; i++) {
- if (i != row && (matrix[i] & matrix[row]) == matrix[row])
- return true;
- }
- return false;
-}
-#endif
-
inline
static void register_key(uint8_t key)
{