]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
converter/adb_usb Configurator support and adb_usb.h cleanup (#4348)
authornoroadsleft <18669334+noroadsleft@users.noreply.github.com>
Sun, 4 Nov 2018 17:32:42 +0000 (09:32 -0800)
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>
Sun, 4 Nov 2018 17:32:42 +0000 (09:32 -0800)
* converter/adb_usb: Configurator support

Note: LAYOUT_ext_ansi has a blank space between the Spacebar and the
Right Alt/Option key when loaded in the Configurator. This is
deliberate.

Stock Apple Extended Keyboards and AEK IIs send the scan code for Left
Command when either Command key is used. (This is noted already in the
readme.) That being the case, the Command keys cannot be assigned to
different functions. Whichever keycode is placed on Left Command will be
used for both Command keys.

* converter/adb_usb: adb_usb.h cleanup

- replaced KEYMAP_COMMON_H with ADB_USB_H
- white space changes for visual alignment in LAYOUT_ext_ansi macro

keyboards/converter/adb_usb/adb_usb.h
keyboards/converter/adb_usb/info.json [new file with mode: 0644]

index 491db95f1c93f9b4f656b301e358448d4175068a..8691adcc65ea719d7d408c16107de478c10a5ade 100644 (file)
@@ -17,8 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Ported to QMK by Peter Roe <pete@13bit.me>
 */
 
-#ifndef KEYMAP_COMMON_H
-#define KEYMAP_COMMON_H
+#ifndef ADB_USB_H
+#define ADB_USB_H
 
 #include "quantum.h"
 
@@ -58,10 +58,10 @@ Ported to QMK by Peter Roe <pete@13bit.me>
     { KC_NO, KC_NO, KC_NO, K4B, K4C,   KC_NO, K4E,   KC_NO, }, \
     { KC_NO, KC_NO, K52,   K53, K54,   K55,   K56,   K57    }, \
     { K58,   K59,   KC_NO, K5B, K5C,   KC_NO, KC_NO, KC_NO, }, \
-    { K60,   K61,   K62,   K63, K64,   K65, KC_NO,   K67    }, \
-    { KC_NO, K69,   KC_NO, K6B, KC_NO, K6D, KC_NO,   K6F    }, \
-    { KC_NO, K71,   K72,   K73, K74,   K75, K76,     K77    }, \
-    { K78,   K79,   K7A,   K7B, K7C,   K7D, KC_NO,   K7F    }  \
+    { K60,   K61,   K62,   K63, K64,   K65,   KC_NO, K67    }, \
+    { KC_NO, K69,   KC_NO, K6B, KC_NO, K6D,   KC_NO, K6F    }, \
+    { KC_NO, K71,   K72,   K73, K74,   K75,   K76,   K77    }, \
+    { K78,   K79,   K7A,   K7B, K7C,   K7D,   KC_NO, K7F    }  \
 }
 
 /* M0116 Apple Standard Keyboard ANSI
diff --git a/keyboards/converter/adb_usb/info.json b/keyboards/converter/adb_usb/info.json
new file mode 100644 (file)
index 0000000..e06f9c1
--- /dev/null
@@ -0,0 +1,204 @@
+{
+  "keyboard_name": "ADB to USB Keyboard Converter",
+  "url": "",
+  "maintainer": "qmk",
+  "width": 22.5,
+  "height": 7,
+  "layouts": {
+    "LAYOUT_ext_ansi": {
+      "layout": [
+        {"label":"Escape", "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.5, "y":0},
+        {"label":"F6", "x":7.5, "y":0},
+        {"label":"F7", "x":8.5, "y":0},
+        {"label":"F8", "x":9.5, "y":0},
+        {"label":"F9", "x":11, "y":0},
+        {"label":"F10", "x":12, "y":0},
+        {"label":"F11", "x":13, "y":0},
+        {"label":"F12", "x":14, "y":0},
+        {"label":"Print Screen", "x":15.25, "y":0},
+        {"label":"Scroll Lock", "x":16.25, "y":0},
+        {"label":"Pause", "x":17.25, "y":0},
+        {"label":"Eject", "x":21.5, "y":0},
+        {"label":"`", "x":0, "y":2},
+        {"label":"1", "x":1, "y":2},
+        {"label":"2", "x":2, "y":2},
+        {"label":"3", "x":3, "y":2},
+        {"label":"4", "x":4, "y":2},
+        {"label":"5", "x":5, "y":2},
+        {"label":"6", "x":6, "y":2},
+        {"label":"7", "x":7, "y":2},
+        {"label":"8", "x":8, "y":2},
+        {"label":"9", "x":9, "y":2},
+        {"label":"0", "x":10, "y":2},
+        {"label":"-", "x":11, "y":2},
+        {"label":"=", "x":12, "y":2},
+        {"label":"Backspace", "x":13, "y":2, "w":2},
+        {"label":"Insert", "x":15.25, "y":2},
+        {"label":"Home", "x":16.25, "y":2},
+        {"label":"Page Up", "x":17.25, "y":2},
+        {"label":"Num Lock", "x":18.5, "y":2},
+        {"label":"Num =", "x":19.5, "y":2},
+        {"label":"Num /", "x":20.5, "y":2},
+        {"label":"Num *", "x":21.5, "y":2},
+        {"label":"Tab", "x":0, "y":3, "w":1.5},
+        {"label":"Q", "x":1.5, "y":3},
+        {"label":"W", "x":2.5, "y":3},
+        {"label":"E", "x":3.5, "y":3},
+        {"label":"R", "x":4.5, "y":3},
+        {"label":"T", "x":5.5, "y":3},
+        {"label":"Y", "x":6.5, "y":3},
+        {"label":"U", "x":7.5, "y":3},
+        {"label":"I", "x":8.5, "y":3},
+        {"label":"O", "x":9.5, "y":3},
+        {"label":"P", "x":10.5, "y":3},
+        {"label":"[", "x":11.5, "y":3},
+        {"label":"]", "x":12.5, "y":3},
+        {"label":"\\", "x":13.5, "y":3, "w":1.5},
+        {"label":"Delete", "x":15.25, "y":3},
+        {"label":"End", "x":16.25, "y":3},
+        {"label":"Page Down", "x":17.25, "y":3},
+        {"label":"Num 7", "x":18.5, "y":3},
+        {"label":"Num 8", "x":19.5, "y":3},
+        {"label":"Num 9", "x":20.5, "y":3},
+        {"label":"Num -", "x":21.5, "y":3},
+        {"label":"Lcap", "x":0, "y":4, "w":1.75},
+        {"label":"A", "x":1.75, "y":4},
+        {"label":"S", "x":2.75, "y":4},
+        {"label":"D", "x":3.75, "y":4},
+        {"label":"F", "x":4.75, "y":4},
+        {"label":"G", "x":5.75, "y":4},
+        {"label":"H", "x":6.75, "y":4},
+        {"label":"J", "x":7.75, "y":4},
+        {"label":"K", "x":8.75, "y":4},
+        {"label":"L", "x":9.75, "y":4},
+        {"label":";", "x":10.75, "y":4},
+        {"label":"\"", "x":11.75, "y":4},
+        {"label":"Enter", "x":12.75, "y":4, "w":2.25},
+        {"label":"Num 4", "x":18.5, "y":4},
+        {"label":"Num 5", "x":19.5, "y":4},
+        {"label":"Num 6", "x":20.5, "y":4},
+        {"label":"Num +", "x":21.5, "y":4},
+        {"label":"Shift", "x":0, "y":5, "w":2.25},
+        {"label":"Z", "x":2.25, "y":5},
+        {"label":"X", "x":3.25, "y":5},
+        {"label":"C", "x":4.25, "y":5},
+        {"label":"V", "x":5.25, "y":5},
+        {"label":"B", "x":6.25, "y":5},
+        {"label":"N", "x":7.25, "y":5},
+        {"label":"M", "x":8.25, "y":5},
+        {"label":",", "x":9.25, "y":5},
+        {"label":".", "x":10.25, "y":5},
+        {"label":"/", "x":11.25, "y":5},
+        {"label":"Shift", "x":12.25, "y":5, "w":2.75},
+        {"label":"Up", "x":16.25, "y":5},
+        {"label":"Num 1", "x":18.5, "y":5},
+        {"label":"Num 2", "x":19.5, "y":5},
+        {"label":"Num 3", "x":20.5, "y":5},
+        {"label":"Ctrl", "x":0, "y":6, "w":1.5},
+        {"label":"Alt", "x":1.5, "y":6, "w":1.25},
+        {"label":"Command", "x":2.75, "y":6, "w":1.5},
+        {"label":"Space", "x":4.25, "y":6, "w":6.5},
+        {"label":"Alt", "x":12.25, "y":6, "w":1.25},
+        {"label":"Ctrl", "x":13.5, "y":6, "w":1.5},
+        {"label":"Left", "x":15.25, "y":6},
+        {"label":"Down", "x":16.25, "y":6},
+        {"label":"Right", "x":17.25, "y":6},
+        {"label":"Num 0", "x":18.5, "y":6, "w":2},
+        {"label":"Num .", "x":20.5, "y":6},
+        {"label":"Num Enter", "x":21.5, "y":5, "h":2}
+      ]
+    },
+    "LAYOUT_m0116_ansi": {
+      "width": 19.5,
+      "height": 6.25,
+      "layout": [
+        {"label":"Power", "x":5, "y":0, "w":2},
+        {"label":"Esc", "x":0, "y":1.25},
+        {"label":"1", "x":1, "y":1.25},
+        {"label":"2", "x":2, "y":1.25},
+        {"label":"3", "x":3, "y":1.25},
+        {"label":"4", "x":4, "y":1.25},
+        {"label":"5", "x":5, "y":1.25},
+        {"label":"6", "x":6, "y":1.25},
+        {"label":"7", "x":7, "y":1.25},
+        {"label":"8", "x":8, "y":1.25},
+        {"label":"9", "x":9, "y":1.25},
+        {"label":"0", "x":10, "y":1.25},
+        {"label":"-", "x":11, "y":1.25},
+        {"label":"=", "x":12, "y":1.25},
+        {"label":"Delete", "x":13, "y":1.25, "w":1.5},
+        {"label":"Clear", "x":15.5, "y":1.25},
+        {"label":"Num =", "x":16.5, "y":1.25},
+        {"label":"Num /", "x":17.5, "y":1.25},
+        {"label":"Num *", "x":18.5, "y":1.25},
+        {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+        {"label":"Q", "x":1.5, "y":2.25},
+        {"label":"W", "x":2.5, "y":2.25},
+        {"label":"E", "x":3.5, "y":2.25},
+        {"label":"R", "x":4.5, "y":2.25},
+        {"label":"T", "x":5.5, "y":2.25},
+        {"label":"Y", "x":6.5, "y":2.25},
+        {"label":"U", "x":7.5, "y":2.25},
+        {"label":"I", "x":8.5, "y":2.25},
+        {"label":"O", "x":9.5, "y":2.25},
+        {"label":"P", "x":10.5, "y":2.25},
+        {"label":"[", "x":11.5, "y":2.25},
+        {"label":"]", "x":12.5, "y":2.25},
+        {"label":"Num 7", "x":15.5, "y":2.25},
+        {"label":"Num 8", "x":16.5, "y":2.25},
+        {"label":"Num 9", "x":17.5, "y":2.25},
+        {"label":"Num +", "x":18.5, "y":2.25},
+        {"label":"Ctrl", "x":0, "y":3.25, "w":1.75},
+        {"label":"A", "x":1.75, "y":3.25},
+        {"label":"S", "x":2.75, "y":3.25},
+        {"label":"D", "x":3.75, "y":3.25},
+        {"label":"F", "x":4.75, "y":3.25},
+        {"label":"G", "x":5.75, "y":3.25},
+        {"label":"H", "x":6.75, "y":3.25},
+        {"label":"J", "x":7.75, "y":3.25},
+        {"label":"K", "x":8.75, "y":3.25},
+        {"label":"L", "x":9.75, "y":3.25},
+        {"label":";", "x":10.75, "y":3.25},
+        {"label":"'", "x":11.75, "y":3.25},
+        {"label":"Return", "x":12.75, "y":3.25, "w":1.75},
+        {"label":"Num 4", "x":15.5, "y":3.25},
+        {"label":"Num 5", "x":16.5, "y":3.25},
+        {"label":"Num 6", "x":17.5, "y":3.25},
+        {"label":"Num -", "x":18.5, "y":3.25},
+        {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+        {"label":"Z", "x":2.25, "y":4.25},
+        {"label":"X", "x":3.25, "y":4.25},
+        {"label":"C", "x":4.25, "y":4.25},
+        {"label":"V", "x":5.25, "y":4.25},
+        {"label":"B", "x":6.25, "y":4.25},
+        {"label":"N", "x":7.25, "y":4.25},
+        {"label":"M", "x":8.25, "y":4.25},
+        {"label":",", "x":9.25, "y":4.25},
+        {"label":".", "x":10.25, "y":4.25},
+        {"label":"/", "x":11.25, "y":4.25},
+        {"label":"Shift", "x":12.25, "y":4.25, "w":2.25},
+        {"label":"Num 1", "x":15.5, "y":4.25},
+        {"label":"Num 2", "x":16.5, "y":4.25},
+        {"label":"Num 3", "x":17.5, "y":4.25},
+        {"label":"Caps Lock", "x":0, "y":5.25},
+        {"label":"Option", "x":1, "y":5.25},
+        {"label":"Command", "x":2, "y":5.25, "w":1.75},
+        {"label":"`", "x":3.75, "y":5.25},
+        {"label":"Space", "x":4.75, "y":5.25, "w":4.75},
+        {"label":"\\", "x":9.5, "y":5.25},
+        {"label":"Left", "x":10.5, "y":5.25},
+        {"label":"Right", "x":11.5, "y":5.25},
+        {"label":"Down", "x":12.5, "y":5.25},
+        {"label":"Up", "x":13.5, "y":5.25},
+        {"label":"Num 0", "x":15.5, "y":5.25, "w":2},
+        {"label":"Num .", "x":17.5, "y":5.25},
+        {"label":"Num Enter", "x":18.5, "y":4.25, "h":2}
+      ]
+    }
+  }
+}