From 5208d3165768f93e23e7b46358e1fed252baa241 Mon Sep 17 00:00:00 2001 From: tmk Date: Sat, 27 Jan 2024 23:55:18 +0900 Subject: [PATCH 1/2] m0110: Add Model ID code Model ID cannot be used to discriminate between Int'l and US layout https://github.com/tmk/tmk_keyboard/issues/771#issuecomment-1909402819 --- tmk_core/protocol/m0110.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/tmk_core/protocol/m0110.c b/tmk_core/protocol/m0110.c index 0f573527..1bc63c36 100644 --- a/tmk_core/protocol/m0110.c +++ b/tmk_core/protocol/m0110.c @@ -494,16 +494,19 @@ RAW CODE: * 0x71, 0x79,DD / 0xF1, 0x79, 0xUU -MODEL NUMBER: - M0110(GS536): 0x03 00000011 : model number 1 (001) - M0110(GS624): 0x09 00001001 : model number 4 (100) - M0110A(M923): 0x0B 00001011 : model number 5 (101) - M0110AJ(M839): 0x0B 00001011 : model number 5 (101) - M0110AJ(A615): 0x0B 00001011 : model number 5 (101) - M0120(BCG9GRM0120): 0x11 00010001 - M0120 & M0110(G536): 0x13 00010011 - M0120 & M0110(G624): 0x19 00011001 - M0120 & M0110A(M923): 0x1B 00011011 +MODEL CODE: + Model Code Layout Made in Desc + --------------------------------------------------------------------- + M0110(GS536) 0x03 US USA + M0110(GS624) 0x09 US USA + M0110F 0x03 French Ireland https://github.com/tmk/tmk_keyboard/issues/771 + M0110A(M923) 0x0B US + M0110AJ(M839) 0x0B US + M0110AJ(A615) 0x0B US + M0120(BCG9GRM0120) 0x11 + M0120 & M0110(G536) 0x13 + M0120 & M0110(G624) 0x19 + M0120 & M0110A(M923) 0x1B Scan Code @@ -578,8 +581,8 @@ Scan Code References ---------- Technical Info for 128K/512K and Plus - ftp://ftp.apple.asimov.net/pub/apple_II/documentation/macintosh/Mac%20Hardware%20Info%20-%20Mac%20128K.pdf - ftp://ftp.apple.asimov.net/pub/apple_II/documentation/macintosh/Mac%20Hardware%20Info%20-%20Mac%20Plus.pdf + https://www.apple.asimov.net/documentation/macintosh/Mac%20Hardware%20Info%20-%20Mac%20128K.pdf + https://www.apple.asimov.net/documentation/macintosh/Mac%20Hardware%20Info%20-%20Mac%20Plus.pdf Protocol: Page 20 of Tech Info for 128K/512K http://www.mac.linux-m68k.org/devel/plushw.php From 5f7769613ac2a74b619683f9a3109c4d181b33ea Mon Sep 17 00:00:00 2001 From: tmk Date: Sun, 28 Jan 2024 00:14:08 +0900 Subject: [PATCH 2/2] m0110_usb: Edit README for International layout --- converter/m0110_usb/README.md | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/converter/m0110_usb/README.md b/converter/m0110_usb/README.md index 668c8526..5aff7403 100644 --- a/converter/m0110_usb/README.md +++ b/converter/m0110_usb/README.md @@ -22,6 +22,7 @@ Update - 2014/06: Change keymaps - 2015/03: Add support for "International"(ISO) keyboard(keymap_intl.c) - 2016/09: Unimap support - keymap editor on web browser +- 2024/01: Add Keymap Editor support for International layout @@ -55,26 +56,37 @@ You may need pull-up resistors on signal lines(`CLOCK`, `DATA`) in particular wh Building Firmware ----------------- -To compile firmware you need AVR GCC. You can edit *Makefile* and *config.h* to change compile options and pin configuration. Also `KEYMAP` option can be used to select keymap. +To compile firmware you need AVR GCC. You can edit *Makefile* and *config.h* to change compile options and pin configuration. $ git clone git://github.com/tmk/tmk_keyboard.git (or download source) $ cd m0110_usb - $ make -f Makefile.rev2 clean - $ make -f Makefile.rev2 [KEYMAP={intl|spacefn}] + $ make -f Makefile.unimap.rev2 clean + $ make -f Makefile.unimap.rev2 -Use `Maefile.rev1` for TMK converter rev.1 and Teensy(ATMega32u4), instead. +Use `Maefile.unimap.rev1` for TMK converter rev.1 and Teensy(ATMega32u4), instead. + + +### Keymap file +To create your own keymap copy `unimap.c` to `unimap_.c` and edit it. You can build firmware like below: + + $ make -f Makefile.unimap.rev2 KEYMAP= -Keymap ------- -To create your own keymap copy existent keymap file to `keymap_.c` and edit it. You can build with `make -f Makefile.rev2 KEYMAP=`. - -Or you can edit keymap on web browser and download firmware. +Keymap Editor +------------- +You can edit your keymap on Keymap Editor and download firmware. http://www.tmk-kbd.com/tmk_keyboard/editor/ +### International layout +[Keymap Editor for International layout](https://www.tmk-kbd.com/tmk_keyboard/editor/unimap/?m0110_usb_intl#456C4oOW4Kmg6biL5oKGcOOOiNeA5rWMxoDjkr/suIDrg6DhjIDqsqTgu4PrlIDng6DinI7Isu6zs+KykuyDjOK8nO2kgOuoue2MtuqFmeu1puSxiu6EoeySl+GKvOSskNuK5I2J4aWS64um7r6564O07bK755et7aK34Kuc45226ree65ym5pCK4Yuo5Z6h5pqE7K2V75GB6qGJ5LGo5L2I5K6K7o6G5IeG5JeG5K+M7Iam5LGG5IWI6rGA5JaX6LGt6Z6X6IGf6YGJ5IOM5q2L6K2B7K2F7K2I6ZaL7K2M5K2B5K2B6q2P5K2E7IOL6IOB7IOF7IOL7IOM5IOE4oig7Iag7LWA7L2A7Iuh6oWd5JGY5aGb6Yq865yu5KmC5Jai5JKy66GI5KCs5qii7Jmx7Jim6ruu54uJ5Jqp5o2x542G7I2M5KWG46mx7KWF75eE76W97qO024XuoaTliojotYvojZDng5TlsbvouIruvIjqhqjjkarmqIfhnIfnhrnqp6jmqKbjlZjspYTkpp3sqLTimIDir63kkqHkooHunaPhv4bpvYzmlp3ioKHhhKXgt6/knbjjjrnnvLrmgLLqj4jml7LppKLpubHskYnvkJborbniianlkrHusK/pl4rosrLqlZTrhZzqvZbqrLXjqo3lqqTlnqntlIrkuYbttbbrvZTivLbprK3pi6vkhqrthazmmJvhtrTonZ3qhZbupbTlt4Xpobfnkrntn6nmgIbrt4Hrvajnh57hrrbkn7Xth5Pkvrbtl63nkKfPnuy9iueYtOqjjemuk+imleS5veOameCym+eMnu+ziOeCtuGirOSaq+WGmuyxruucmOa5p+isqe2Lq+anlO27j+ubm+KWmeWlsuu/nuq4juqPhy/pgIA=) is available. + +See also [issue #771](https://github.com/tmk/tmk_keyboard/issues/771). + + + 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 `+H` simultaneously to get help.