summaryrefslogtreecommitdiff
path: root/keyboards/amag23
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/amag23')
-rw-r--r--keyboards/amag23/amag23.c17
-rw-r--r--keyboards/amag23/amag23.h32
-rw-r--r--keyboards/amag23/config.h7
-rw-r--r--keyboards/amag23/info.json64
-rw-r--r--keyboards/amag23/keymaps/default/keymap.c4
-rw-r--r--keyboards/amag23/keymaps/qwert/keymap.c4
-rw-r--r--keyboards/amag23/keymaps/via/keymap.c8
-rw-r--r--keyboards/amag23/readme.md3
-rw-r--r--keyboards/amag23/rules.mk1
9 files changed, 49 insertions, 91 deletions
diff --git a/keyboards/amag23/amag23.c b/keyboards/amag23/amag23.c
deleted file mode 100644
index 5fda69e999..0000000000
--- a/keyboards/amag23/amag23.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include "amag23.h"
-
diff --git a/keyboards/amag23/amag23.h b/keyboards/amag23/amag23.h
deleted file mode 100644
index a737dde63c..0000000000
--- a/keyboards/amag23/amag23.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-// clang-format off
-#define LAYOUT_all( \
- K00, K01, K02, K03, K04, K05, \
- K10, K11, K12, K13, K14, K15, \
- K20, K21, K22, K23, K24, K25, \
- K30, K31, K32, K33, K34 \
-) { \
- { K00, K01, K02, K03, K04, K05 }, \
- { K10, K11, K12, K13, K14, K15 }, \
- { K20, K21, K22, K23, K24, K25 }, \
- { K30, K31, K32, K33, KC_NO, K34 } \
-}
-// clang-format on
diff --git a/keyboards/amag23/config.h b/keyboards/amag23/config.h
index 82e82fc469..34e622bfb3 100644
--- a/keyboards/amag23/config.h
+++ b/keyboards/amag23/config.h
@@ -15,13 +15,6 @@
*/
#pragma once
-
-#define MATRIX_ROW_PINS { A0, A1, A2, A3 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, B4, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
#define RGBLED_NUM 7
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/amag23/info.json b/keyboards/amag23/info.json
index 822f18c906..9ee25d06d8 100644
--- a/keyboards/amag23/info.json
+++ b/keyboards/amag23/info.json
@@ -1,41 +1,55 @@
{
"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",
"pid": "0x2323",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "driver": "i2c"
+ },
+ "matrix_pins": {
+ "cols": ["B0", "B1", "B2", "B3", "B4", "B5"],
+ "rows": ["A0", "A1", "A2", "A3"]
+ },
+ "diode_direction": "ROW2COL",
"processor": "atmega32a",
"bootloader": "bootloadhid",
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT"
+ },
"layouts": {
- "LAYOUT_all": {
+ "LAYOUT": {
"layout": [
- {"label":"K00", "x":0, "y":0},
- {"label":"K01", "x":1, "y":0},
- {"label":"K02", "x":2, "y":0},
- {"label":"K03", "x":3, "y":0},
- {"label":"K04", "x":4, "y":0},
- {"label":"K05", "x":5, "y":0},
- {"label":"K10", "x":0, "y":1},
- {"label":"K11", "x":1, "y":1},
- {"label":"K12", "x":2, "y":1},
- {"label":"K13", "x":3, "y":1},
- {"label":"K14", "x":4, "y":1},
- {"label":"K15", "x":5, "y":1},
- {"label":"K20", "x":0, "y":2},
- {"label":"K21", "x":1, "y":2},
- {"label":"K22", "x":2, "y":2},
- {"label":"K23", "x":3, "y":2},
- {"label":"K24", "x":4, "y":2},
- {"label":"K25", "x":5, "y":2},
- {"label":"K30", "x":0, "y":3},
- {"label":"K31", "x":1, "y":3},
- {"label":"K32", "x":2, "y":3},
- {"label":"K33", "x":3, "y":3},
- {"label":"K34", "x":4, "y":3, "w":2}
+ {"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},
+
+ {"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},
+
+ {"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},
+
+ {"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):
diff --git a/keyboards/amag23/rules.mk b/keyboards/amag23/rules.mk
index 6cab98a640..8bee1e931e 100644
--- a/keyboards/amag23/rules.mk
+++ b/keyboards/amag23/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-WS2812_DRIVER = i2c
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-14 06:58:30 +0000