Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Koolertron AMAG23 Touch-Up #20496

Merged
merged 3 commits into from
Apr 18, 2023
Merged

Koolertron AMAG23 Touch-Up #20496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b693194
Update Product Links for AMAG23
noroadsleft Jan 22, 2023
60b7ace
info.json: apply friendly formatting
noroadsleft Apr 16, 2023
4df5b88
rename LAYOUT_all to LAYOUT
noroadsleft Apr 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 28 additions & 25 deletions keyboards/amag23/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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}
]
}
}
Expand Down
4 changes: 2 additions & 2 deletions keyboards/amag23/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions keyboards/amag23/keymaps/qwert/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, _______,
Expand Down
8 changes: 4 additions & 4 deletions keyboards/amag23/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
_______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______,
Expand Down
3 changes: 2 additions & 1 deletion keyboards/amag23/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):

Expand Down