summaryrefslogtreecommitdiff
path: root/keyboards/salicylic_acid3/getta25
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/salicylic_acid3/getta25')
-rw-r--r--keyboards/salicylic_acid3/getta25/getta25.c1
-rw-r--r--keyboards/salicylic_acid3/getta25/getta25.h7
-rw-r--r--keyboards/salicylic_acid3/getta25/rev1/config.h10
-rw-r--r--keyboards/salicylic_acid3/getta25/rev1/info.json63
-rw-r--r--keyboards/salicylic_acid3/getta25/rev1/rev1.c1
-rw-r--r--keyboards/salicylic_acid3/getta25/rev1/rev1.h35
6 files changed, 38 insertions, 79 deletions
diff --git a/keyboards/salicylic_acid3/getta25/getta25.c b/keyboards/salicylic_acid3/getta25/getta25.c
deleted file mode 100644
index 4f8cc63b42..0000000000
--- a/keyboards/salicylic_acid3/getta25/getta25.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "getta25.h"
diff --git a/keyboards/salicylic_acid3/getta25/getta25.h b/keyboards/salicylic_acid3/getta25/getta25.h
deleted file mode 100644
index 67632bba4d..0000000000
--- a/keyboards/salicylic_acid3/getta25/getta25.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_salicylic_acid3_getta25_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/salicylic_acid3/getta25/rev1/config.h b/keyboards/salicylic_acid3/getta25/rev1/config.h
index 479aa6c3f7..cdc803a98c 100644
--- a/keyboards/salicylic_acid3/getta25/rev1/config.h
+++ b/keyboards/salicylic_acid3/getta25/rev1/config.h
@@ -18,21 +18,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B2 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
#define RGBLED_NUM 9 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/salicylic_acid3/getta25/rev1/info.json b/keyboards/salicylic_acid3/getta25/rev1/info.json
index 7443540704..c128df0f79 100644
--- a/keyboards/salicylic_acid3/getta25/rev1/info.json
+++ b/keyboards/salicylic_acid3/getta25/rev1/info.json
@@ -8,36 +8,49 @@
"pid": "0x3060",
"device_version": "0.1.3"
},
+ "ws2812": {
+ "pin": "D3"
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+ "rows": ["D4", "C6", "D7", "E6", "B2"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"ESC", "x":0, "y":0},
- {"label":"F2", "x":1, "y":0},
- {"label":"=", "x":2, "y":0},
- {"label":"DEL", "x":3, "y":0},
- {"label":"Num Lock", "x":0, "y":1.25},
- {"label":"/", "x":1, "y":1.25},
- {"label":"*", "x":2, "y":1.25},
- {"label":"-", "x":3, "y":1.25},
- {"label":"7", "x":0, "y":2.25},
- {"label":"8", "x":1, "y":2.25},
- {"label":"9", "x":2, "y":2.25},
- {"label":"ESC", "x":4.25, "y":2.25},
- {"label":"4", "x":0, "y":3.25},
- {"label":"5", "x":1, "y":3.25},
- {"label":"6", "x":2, "y":3.25},
- {"label":"+", "x":3, "y":2.25, "h":2},
- {"label":"F2", "x":4.25, "y":3.25},
- {"label":"1", "x":0, "y":4.25},
- {"label":"2", "x":1, "y":4.25},
- {"label":"3", "x":2, "y":4.25},
- {"label":"DEL", "x":4.25, "y":4.25},
- {"label":"0", "x":0, "y":5.25, "w":2},
- {"label":".", "x":2, "y":5.25},
- {"label":"Enter", "x":3, "y":4.25, "h":2},
- {"label":"BSPC", "x":4.25, "y":5.25}
+ {"matrix": [0, 5], "x": 0, "y": 0},
+ {"matrix": [1, 5], "x": 1, "y": 0},
+ {"matrix": [2, 5], "x": 2, "y": 0},
+ {"matrix": [3, 5], "x": 3, "y": 0},
+
+ {"matrix": [0, 4], "x": 0, "y": 1.25},
+ {"matrix": [1, 4], "x": 1, "y": 1.25},
+ {"matrix": [2, 4], "x": 2, "y": 1.25},
+ {"matrix": [3, 4], "x": 3, "y": 1.25},
+
+ {"matrix": [0, 3], "x": 0, "y": 2.25},
+ {"matrix": [1, 3], "x": 1, "y": 2.25},
+ {"matrix": [2, 3], "x": 2, "y": 2.25},
+ {"matrix": [4, 3], "x": 4.25, "y": 2.25},
+
+ {"matrix": [0, 2], "x": 0, "y": 3.25},
+ {"matrix": [1, 2], "x": 1, "y": 3.25},
+ {"matrix": [2, 2], "x": 2, "y": 3.25},
+ {"matrix": [3, 2], "x": 3, "y": 2.25, "h": 2},
+ {"matrix": [4, 2], "x": 4.25, "y": 3.25},
+
+ {"matrix": [0, 1], "x": 0, "y": 4.25},
+ {"matrix": [1, 1], "x": 1, "y": 4.25},
+ {"matrix": [2, 1], "x": 2, "y": 4.25},
+ {"matrix": [4, 1], "x": 4.25, "y": 4.25},
+
+ {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 2},
+ {"matrix": [2, 0], "x": 2, "y": 5.25},
+ {"matrix": [3, 0], "x": 3, "y": 4.25, "h": 2},
+ {"matrix": [4, 0], "x": 4.25, "y": 5.25}
]
}
}
diff --git a/keyboards/salicylic_acid3/getta25/rev1/rev1.c b/keyboards/salicylic_acid3/getta25/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/salicylic_acid3/getta25/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/salicylic_acid3/getta25/rev1/rev1.h b/keyboards/salicylic_acid3/getta25/rev1/rev1.h
deleted file mode 100644
index 98f4318a6a..0000000000
--- a/keyboards/salicylic_acid3/getta25/rev1/rev1.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-#include "getta25.h"
-
-/*
- * ,-----------------------.
- * | L05 | L15 | L25 | L35 |
- * |-----------------------+
- * | L04 | L14 | L24 | L34 |
- * |-----------------------------+
- * | L03 | L13 | L23 | | L43 |
- * |-----------------------------+
- * | L02 | L12 | L22 | L32 | L42 |
- * |-----------------------------+
- * | L01 | L11 | L21 | | L41 |
- * |-----------------------------+
- * | L00 | | L20 | L30 | L40 |
- * ,-----------------------------'
- */
-
-#define LAYOUT( \
- L05, L15, L25, L35, \
- L04, L14, L24, L34, \
- L03, L13, L23, L43, \
- L02, L12, L22, L32, L42, \
- L01, L11, L21, L41, \
- L00, L20, L30, L40 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- {KC_NO, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30,KC_NO, L32,KC_NO, L34, L35 }, \
- { L40, L41, L42, L43,KC_NO,KC_NO } \
- }
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 00:31:25 +0000