From fa10d5fda2844fd3757f552be6002ad8db381c70 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Tue, 18 Apr 2023 14:12:25 -0700 Subject: [PATCH] Koolertron AMAG23 Touch-Up (#20496) * Update Product Links for AMAG23 * info.json: apply friendly formatting * rename LAYOUT_all to LAYOUT --- keyboards/amag23/info.json | 53 ++++++++++++----------- keyboards/amag23/keymaps/default/keymap.c | 4 +- keyboards/amag23/keymaps/qwert/keymap.c | 4 +- keyboards/amag23/keymaps/via/keymap.c | 8 ++-- keyboards/amag23/readme.md | 3 +- 5 files changed, 38 insertions(+), 34 deletions(-) diff --git a/keyboards/amag23/info.json b/keyboards/amag23/info.json index 4230740ab0..9ee25d06d8 100644 --- a/keyboards/amag23/info.json +++ b/keyboards/amag23/info.json @@ -1,7 +1,7 @@ { "keyboard_name": "AMAG23", "manufacturer": "Koolertron", - "url": "http://www.koolertron.com/koolertron-one-handed-macro-mechanical-keyboard-rgb-led-backlit-portable-mini-onehanded-mechanical-gaming-keypad-23-fully-programmable-keys-blue-switches-p-874.html", + "url": "http://www.koolertron.com/koolertron-one-handed-macro-mechanical-keyboard-with-23-fully-programmable-keys-portable-mini-one-handed-mechanical-gaming-keypad-black-blue-switches-rgb-led.html", "maintainer": "ianmclinden", "usb": { "vid": "0x4B54", @@ -18,35 +18,38 @@ "diode_direction": "ROW2COL", "processor": "atmega32a", "bootloader": "bootloadhid", + "layout_aliases": { + "LAYOUT_all": "LAYOUT" + }, "layouts": { - "LAYOUT_all": { + "LAYOUT": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, - {"matrix": [1, 3], "x": 3, "y": 1}, - {"matrix": [1, 4], "x": 4, "y": 1}, - {"matrix": [1, 5], "x": 5, "y": 1}, + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "Q", "matrix": [1, 1], "x": 1, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4, "y": 1}, + {"label": "Y", "matrix": [1, 5], "x": 5, "y": 1}, - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2}, - {"matrix": [2, 3], "x": 3, "y": 2}, - {"matrix": [2, 4], "x": 4, "y": 2}, - {"matrix": [2, 5], "x": 5, "y": 2}, + {"label": "Fn", "matrix": [2, 0], "x": 0, "y": 2}, + {"label": "A", "matrix": [2, 1], "x": 1, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5, "y": 2}, - {"matrix": [3, 0], "x": 0, "y": 3}, - {"matrix": [3, 1], "x": 1, "y": 3}, - {"matrix": [3, 2], "x": 2, "y": 3}, - {"matrix": [3, 3], "x": 3, "y": 3}, - {"matrix": [3, 5], "x": 4, "y": 3, "w": 2} + {"label": "Z", "matrix": [3, 0], "x": 0, "y": 3}, + {"label": "X", "matrix": [3, 1], "x": 1, "y": 3}, + {"label": "C", "matrix": [3, 2], "x": 2, "y": 3}, + {"label": "B", "matrix": [3, 3], "x": 3, "y": 3}, + {"label": "Space", "matrix": [3, 5], "x": 4, "y": 3, "w": 2} ] } } diff --git a/keyboards/amag23/keymaps/default/keymap.c b/keyboards/amag23/keymaps/default/keymap.c index 6d36198849..eefdd35db3 100644 --- a/keyboards/amag23/keymaps/default/keymap.c +++ b/keyboards/amag23/keymaps/default/keymap.c @@ -23,13 +23,13 @@ enum layer_names { // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [BASE] = LAYOUT_all( /* Base Layer */ + [BASE] = LAYOUT( /* Base Layer */ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_Y, MO(FN1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_Z, KC_X, KC_C, KC_B, KC_SPC ), - [FN1] = LAYOUT_all( /* Function Layer */ + [FN1] = LAYOUT( /* Function Layer */ KC_NO, KC_NO, KC_NO, RGB_MOD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, diff --git a/keyboards/amag23/keymaps/qwert/keymap.c b/keyboards/amag23/keymaps/qwert/keymap.c index 4cb2e4736d..0b29c46072 100644 --- a/keyboards/amag23/keymaps/qwert/keymap.c +++ b/keyboards/amag23/keymaps/qwert/keymap.c @@ -23,13 +23,13 @@ enum layer_names { // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [BASE] = LAYOUT_all( /* Base Layer */ + [BASE] = LAYOUT( /* Base Layer */ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, MO(FN1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSFT, KC_Z, KC_X, KC_C, KC_SPC ), - [FN1] = LAYOUT_all( /* Function Layer */ + [FN1] = LAYOUT( /* Function Layer */ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, RGB_TOG, RGB_VAI, RGB_MOD, RGB_HUI, _______, _______, _______, RGB_VAD, RGB_RMOD,RGB_HUD, _______, diff --git a/keyboards/amag23/keymaps/via/keymap.c b/keyboards/amag23/keymaps/via/keymap.c index aa248a039c..9c97ace737 100644 --- a/keyboards/amag23/keymaps/via/keymap.c +++ b/keyboards/amag23/keymaps/via/keymap.c @@ -25,25 +25,25 @@ enum layer_names { // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [BASE] = LAYOUT_all( + [BASE] = LAYOUT( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, MO(FN1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_LSFT, KC_Z, KC_X, KC_C, KC_SPC ), - [FN1] = LAYOUT_all( + [FN1] = LAYOUT( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, RGB_TOG, RGB_VAI, RGB_MOD, RGB_HUI, _______, _______, _______, RGB_VAD, RGB_RMOD,RGB_HUD, _______, _______, _______, _______, _______, _______ ), - [FN2] = LAYOUT_all( + [FN2] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [FN3] = LAYOUT_all( + [FN3] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/amag23/readme.md b/keyboards/amag23/readme.md index 6ffd64f879..30791a5cfb 100644 --- a/keyboards/amag23/readme.md +++ b/keyboards/amag23/readme.md @@ -5,10 +5,11 @@ One Handed Macro Mechanical Keyboard, 23 Key with optional RGB backlighting. - Keyboard Maintainer: [ianmclinden](https://github.com/ianmclinden) -- Hardware Supported: AMAG23 (ATmega32A) +- Hardware Supported: AMAG23 (AE-AMAG23-BKC) (ATmega32A) - Hardware Availability: - [Newegg](https://www.newegg.com/p/32K-00H1-00001) - [Amazon](https://www.amazon.com/Koolertron-Mechanical-Keyboard-One-Handed-Programmable/dp/B07RM1TBR8) + - [Koolertron](http://www.koolertron.com/koolertron-one-handed-macro-mechanical-keyboard-with-23-fully-programmable-keys-portable-mini-one-handed-mechanical-gaming-keypad-black-blue-switches-rgb-led.html) Make example for this keyboard (after setting up your build environment):