max/tmk_keyboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'tmk/master'

Browse source
This commit is contained in:
Mark Sikora 2024-02-04 17:01:11 -05:00
commit be44d01cc6
2 changed files with 36 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
converter/m0110_usb/README.md
View file

@ -22,6 +22,7 @@ Update
- 2014/06: Change keymaps - 2014/06: Change keymaps
- 2015/03: Add support for "International"(ISO) keyboard(keymap_intl.c) - 2015/03: Add support for "International"(ISO) keyboard(keymap_intl.c)
- 2016/09: Unimap support - keymap editor on web browser - 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 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) $ git clone git://github.com/tmk/tmk_keyboard.git (or download source)
$ cd m0110_usb $ cd m0110_usb
$ make -f Makefile.rev2 clean $ make -f Makefile.unimap.rev2 clean
$ make -f Makefile.rev2 [KEYMAP={intl|spacefn}] $ 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_<name>.c` and edit it. You can build firmware like below:
$ make -f Makefile.unimap.rev2 KEYMAP=<name>
Keymap Keymap Editor
------ -------------
To create your own keymap copy existent keymap file to `keymap_<name>.c` and edit it. You can build with `make -f Makefile.rev2 KEYMAP=<name>`. You can edit your keymap on Keymap Editor and download firmware.
Or you can edit keymap on web browser and download firmware.
http://www.tmk-kbd.com/tmk_keyboard/editor/ 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 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 `<Magic>+H` simultaneously to get help. 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 `<Magic>+H` simultaneously to get help.

27
tmk_core/protocol/m0110.c
View file

@ -494,16 +494,19 @@ RAW CODE:
* 0x71, 0x79,DD / 0xF1, 0x79, 0xUU * 0x71, 0x79,DD / 0xF1, 0x79, 0xUU
MODEL NUMBER: MODEL CODE:
M0110(GS536): 0x03 00000011 : model number 1 (001) Model Code Layout Made in Desc
M0110(GS624): 0x09 00001001 : model number 4 (100) ---------------------------------------------------------------------
M0110A(M923): 0x0B 00001011 : model number 5 (101) M0110(GS536) 0x03 US USA
M0110AJ(M839): 0x0B 00001011 : model number 5 (101) M0110(GS624) 0x09 US USA
M0110AJ(A615): 0x0B 00001011 : model number 5 (101) M0110F 0x03 French Ireland https://github.com/tmk/tmk_keyboard/issues/771
M0120(BCG9GRM0120): 0x11 00010001 M0110A(M923) 0x0B US
M0120 & M0110(G536): 0x13 00010011 M0110AJ(M839) 0x0B US
M0120 & M0110(G624): 0x19 00011001 M0110AJ(A615) 0x0B US
M0120 & M0110A(M923): 0x1B 00011011 M0120(BCG9GRM0120) 0x11
M0120 & M0110(G536) 0x13
M0120 & M0110(G624) 0x19
M0120 & M0110A(M923) 0x1B
Scan Code Scan Code
@ -578,8 +581,8 @@ Scan Code
References References
---------- ----------
Technical Info for 128K/512K and Plus Technical Info for 128K/512K and Plus
ftp://ftp.apple.asimov.net/pub/apple_II/documentation/macintosh/Mac%20Hardware%20Info%20-%20Mac%20128K.pdf https://www.apple.asimov.net/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%20Plus.pdf
Protocol: Protocol:
Page 20 of Tech Info for 128K/512K Page 20 of Tech Info for 128K/512K
http://www.mac.linux-m68k.org/devel/plushw.php http://www.mac.linux-m68k.org/devel/plushw.php