aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-08-08 04:15:54 +0000
committerQMK Bot <hello@qmk.fm>2021-08-08 04:15:54 +0000
commit100333818f4868cee811854ccc44e4b9ea39a79d (patch)
treebed6144b65f4b57c19b1c9355693e11aab602cba
parent21b71932f7368b5610c455c7b972d7c90f19b373 (diff)
parentbc2b73f997743a164bfa19541a25209b4f276771 (diff)
downloadqmk_firmware-100333818f4868cee811854ccc44e4b9ea39a79d.tar.gz
qmk_firmware-100333818f4868cee811854ccc44e4b9ea39a79d.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat
-rw-r--r--keyboards/converter/a1200/config.h2
-rw-r--r--keyboards/converter/a1200/info.json110
-rw-r--r--keyboards/converter/a1200/keymaps/default/keymap.c12
-rw-r--r--keyboards/converter/a1200/readme.md7
4 files changed, 114 insertions, 17 deletions
diff --git a/keyboards/converter/a1200/config.h b/keyboards/converter/a1200/config.h
index 52771d70a..19e7ca9b9 100644
--- a/keyboards/converter/a1200/config.h
+++ b/keyboards/converter/a1200/config.h
@@ -24,7 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
24#define PRODUCT_ID 0x0000 24#define PRODUCT_ID 0x0000
25#define DEVICE_VER 0x0001 25#define DEVICE_VER 0x0001
26#define MANUFACTURER 8bits4ever 26#define MANUFACTURER 8bits4ever
27#define PRODUCT MiSS-1200 27#define PRODUCT Amiga-1200
28 28
29/* key matrix size */ 29/* key matrix size */
30#define MATRIX_ROWS 8 30#define MATRIX_ROWS 8
diff --git a/keyboards/converter/a1200/info.json b/keyboards/converter/a1200/info.json
index f3df9c947..03e39b757 100644
--- a/keyboards/converter/a1200/info.json
+++ b/keyboards/converter/a1200/info.json
@@ -4,13 +4,109 @@
4 "width": 22.5, 4 "width": 22.5,
5 "height": 6.5, 5 "height": 6.5,
6 "layouts": { 6 "layouts": {
7 "LAYOUT": { 7 "LAYOUT_default": {
8 "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6, "y":0}, {"label":"F6", "x":8, "y":0}, {"label":"F7", "x":9, "y":0}, {"label":"F8", "x":10, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, 8 "layout": [
9 {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"`", "x":13, "y":1.5}, {"label":"Backspace", "x":14, "y":1.5}, {"label":"Del", "x":15.25, "y":1.5, "w":1.5}, {"label":"Help", "x":16.75, "y":1.5, "w":1.5}, {"label":"Num Lock", "x":18.5, "y":1.5}, {"label":"/", "x":19.5, "y":1.5}, {"label":"*", "x":20.5, "y":1.5}, {"label":"-", "x":21.5, "y":1.5}, 9 {"label":"Esc", "x":0, "y":0},
10 {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"7", "x":18.5, "y":2.5}, {"label":"8", "x":19.5, "y":2.5}, {"label":"9", "x":20.5, "y":2.5}, {"label":"+", "x":21.5, "y":2.5}, 10 {"label":"F1", "x":2, "y":0},
11 {"label":"CTRL", "x":0, "y":3.5}, {"label":"Caps Lock", "x":1, "y":3.5}, {"label":"A", "x":2, "y":3.5}, {"label":"S", "x":3, "y":3.5}, {"label":"D", "x":4, "y":3.5}, {"label":"F", "x":5, "y":3.5}, {"label":"G", "x":6, "y":3.5}, {"label":"H", "x":7, "y":3.5}, {"label":"J", "x":8, "y":3.5}, {"label":"K", "x":9, "y":3.5}, {"label":"L", "x":10, "y":3.5}, {"label":":", "x":11, "y":3.5}, {"label":"\"", "x":12, "y":3.5}, {"label":"~", "x":13, "y":3.5}, {"label":"Enter", "x":14, "y":2.5, "w":1, "h":2}, {"label":"\u2191", "x":16.25, "y":3.5}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, {"label":"6", "x":20.5, "y":3.5}, {"label":"+", "x":21.5, "y":3.5}, 11 {"label":"F2", "x":3, "y":0},
12 {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2190", "x":15.25, "y":4.5}, {"label":"\u2193", "x":16.25, "y":4.5}, {"label":"\u2192", "x":17.25, "y":4.5}, {"label":"1", "x":18.5, "y":4.5}, {"label":"2", "x":19.5, "y":4.5}, {"label":"3", "x":20.5, "y":4.5}, {"label":"Enter", "x":21.5, "y":4.5, "h":2}, 12 {"label":"F3", "x":4, "y":0},
13 {"label":"alt", "x":1, "y":5.5, "w":1.5}, {"label":"Amiga", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Amiga", "x":11, "y":5.5, "w":1.5}, {"label":"Alt", "x":12.5, "y":5.5, "w":1.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}] 13 {"label":"F4", "x":5, "y":0},
14 {"label":"F5", "x":6, "y":0},
15 {"label":"F6", "x":8, "y":0},
16 {"label":"F7", "x":9, "y":0},
17 {"label":"F8", "x":10, "y":0},
18 {"label":"F9", "x":11, "y":0},
19 {"label":"F10", "x":12, "y":0},
20
21 {"label":"~", "x":0, "y":1.5},
22 {"label":"!", "x":1, "y":1.5},
23 {"label":"@", "x":2, "y":1.5},
24 {"label":"#", "x":3, "y":1.5},
25 {"label":"$", "x":4, "y":1.5},
26 {"label":"%", "x":5, "y":1.5},
27 {"label":"^", "x":6, "y":1.5},
28 {"label":"&", "x":7, "y":1.5},
29 {"label":"*", "x":8, "y":1.5},
30 {"label":"(", "x":9, "y":1.5},
31 {"label":")", "x":10, "y":1.5},
32 {"label":"_", "x":11, "y":1.5},
33 {"label":"+", "x":12, "y":1.5},
34 {"label":"`", "x":13, "y":1.5},
35 {"label":"Backspace", "x":14, "y":1.5},
36 {"label":"Del", "x":15.25, "y":1.5, "w":1.5},
37 {"label":"Help", "x":16.75, "y":1.5, "w":1.5},
38 {"label":"Num Lock", "x":18.5, "y":1.5},
39 {"label":"/", "x":19.5, "y":1.5},
40 {"label":"*", "x":20.5, "y":1.5},
41 {"label":"-", "x":21.5, "y":1.5},
42
43 {"label":"Tab", "x":0, "y":2.5, "w":1.5},
44 {"label":"Q", "x":1.5, "y":2.5},
45 {"label":"W", "x":2.5, "y":2.5},
46 {"label":"E", "x":3.5, "y":2.5},
47 {"label":"R", "x":4.5, "y":2.5},
48 {"label":"T", "x":5.5, "y":2.5},
49 {"label":"Y", "x":6.5, "y":2.5},
50 {"label":"U", "x":7.5, "y":2.5},
51 {"label":"I", "x":8.5, "y":2.5},
52 {"label":"O", "x":9.5, "y":2.5},
53 {"label":"P", "x":10.5, "y":2.5},
54 {"label":"{", "x":11.5, "y":2.5},
55 {"label":"}", "x":12.5, "y":2.5},
56 {"label":"7", "x":18.5, "y":2.5},
57 {"label":"8", "x":19.5, "y":2.5},
58 {"label":"9", "x":20.5, "y":2.5},
59 {"label":"+", "x":21.5, "y":2.5},
60
61 {"label":"CTRL", "x":0, "y":3.5},
62 {"label":"Caps Lock", "x":1, "y":3.5},
63 {"label":"A", "x":2, "y":3.5},
64 {"label":"S", "x":3, "y":3.5},
65 {"label":"D", "x":4, "y":3.5},
66 {"label":"F", "x":5, "y":3.5},
67 {"label":"G", "x":6, "y":3.5},
68 {"label":"H", "x":7, "y":3.5},
69 {"label":"J", "x":8, "y":3.5},
70 {"label":"K", "x":9, "y":3.5},
71 {"label":"L", "x":10, "y":3.5},
72 {"label":":", "x":11, "y":3.5},
73 {"label":"\"", "x":12, "y":3.5},
74 {"label":"~", "x":13, "y":3.5},
75 {"label":"Enter", "x":14, "y":2.5, "w":1, "h":2},
76 {"label":"\u2191", "x":16.25, "y":3.5},
77 {"label":"4", "x":18.5, "y":3.5},
78 {"label":"5", "x":19.5, "y":3.5},
79 {"label":"6", "x":20.5, "y":3.5},
80 {"label":"+", "x":21.5, "y":3.5},
81
82 {"label":"Shift", "x":0, "y":4.5, "w":1.25},
83 {"label":"|", "x":1.25, "y":4.5},
84 {"label":"Z", "x":2.25, "y":4.5},
85 {"label":"X", "x":3.25, "y":4.5},
86 {"label":"C", "x":4.25, "y":4.5},
87 {"label":"V", "x":5.25, "y":4.5},
88 {"label":"B", "x":6.25, "y":4.5},
89 {"label":"N", "x":7.25, "y":4.5},
90 {"label":"M", "x":8.25, "y":4.5},
91 {"label":"<", "x":9.25, "y":4.5},
92 {"label":">", "x":10.25, "y":4.5},
93 {"label":"?", "x":11.25, "y":4.5},
94 {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
95 {"label":"\u2190", "x":15.25, "y":4.5},
96 {"label":"\u2193", "x":16.25, "y":4.5},
97 {"label":"\u2192", "x":17.25, "y":4.5},
98 {"label":"1", "x":18.5, "y":4.5},
99 {"label":"2", "x":19.5, "y":4.5},
100 {"label":"3", "x":20.5, "y":4.5},
101 {"label":"Enter", "x":21.5, "y":4.5, "h":2},
102
103 {"label":"Alt", "x":1, "y":5.5, "w":1.5},
104 {"label":"Amiga", "x":2.5, "y":5.5, "w":1.5},
105 {"label":"Space", "x":4, "y":5.5, "w":7},
106 {"label":"Amiga", "x":11, "y":5.5, "w":1.5},
107 {"label":"Alt", "x":12.5, "y":5.5, "w":1.5},
108 {"label":"0", "x":18.5, "y":5.5, "w":2},
109 {"label":".", "x":20.5, "y":5.5}]
14 } 110 }
15 } 111 }
16} 112}
diff --git a/keyboards/converter/a1200/keymaps/default/keymap.c b/keyboards/converter/a1200/keymaps/default/keymap.c
index 0b5713a2e..4f7c7be84 100644
--- a/keyboards/converter/a1200/keymaps/default/keymap.c
+++ b/keyboards/converter/a1200/keymaps/default/keymap.c
@@ -27,13 +27,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
27 ), 27 ),
28 28
29 [1] = LAYOUT( 29 [1] = LAYOUT(
30 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F11, KC_F12, 30 _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F11, KC_F12,
31 31
32 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_BSPC, KC_DEL, KC_TRNS, KC_NLCK, KC_SLCK, KC_PSLS, KC_PSCR, 32 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NLCK, KC_SLCK, _______, KC_PSCR,
33 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, KC_PMNS, 33 _______, _______, _______, _______, RESET,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
34 KC_LCTL, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NO, KC_ENT, KC_UP, KC_P4, KC_P5, KC_P6, KC_PPLS, 34 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, _______, _______, _______, _______, _______, _______,
35 KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_P1, KC_P2, KC_P3, KC_PENT, 35 _______, KC_NO, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
36 KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_P0, KC_PDOT 36 _______, _______, _______, _______, _______, _______, _______
37 ), 37 ),
38}; 38};
39 39
diff --git a/keyboards/converter/a1200/readme.md b/keyboards/converter/a1200/readme.md
index b2094c6a3..927e0805f 100644
--- a/keyboards/converter/a1200/readme.md
+++ b/keyboards/converter/a1200/readme.md
@@ -1,6 +1,9 @@
1# Amiga 1200 Keyboard Converter 1# Amiga 1200 Keyboard Converter
2 2
3Modification of the Model-M 101 membrane adapter (converter/modelm101) to work with Amiga 1200 keyboard (and possibly Amiga 500/600 too). It would be very convenient to manufacture a small PCB adapter to make easier the task of connecting the keyboard membrane and the Teensy 2.0++ board. 3Modification of the Model-M 101 membrane adapter (converter/modelm101) to work with Amiga 1200 keyboard (and possibly Amiga 500/600 too).
4
5A small PCB adapter is needed for connecting the keyboard membrane to the Teensy 2.0++ board. A very simple example of such a board can be seen here:
6https://github.com/8bits4ever/A1200-Keyboard-Adapter
4 7
5This adapter is meant to allow using the original Amiga keyboard as a USB input device, either with a desktop PC or a R-Pi/FPGA board hosted inside the Amiga case. 8This adapter is meant to allow using the original Amiga keyboard as a USB input device, either with a desktop PC or a R-Pi/FPGA board hosted inside the Amiga case.
6 9
@@ -19,8 +22,6 @@ Status LEDs: CapsLock +5V
19Pins: B6 5V 22Pins: B6 5V
20``` 23```
21 24
22Please note that some versions of Model M have LED connected with a ribbon cable, and not with separate wires.
23
24* Keyboard Maintainer: [8bits4ever](https://github.com/8bits4ever) 25* Keyboard Maintainer: [8bits4ever](https://github.com/8bits4ever)
25* Hardware Supported: Teensy 2.0++ board by PJRC 26* Hardware Supported: Teensy 2.0++ board by PJRC
26* Hardware Availability: https://www.pjrc.com/store/teensypp.html 27* Hardware Availability: https://www.pjrc.com/store/teensypp.html
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-27 03:48:13 +0000