summaryrefslogtreecommitdiffstats
path: root/keyboards/25keys
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/25keys')
-rw-r--r--keyboards/25keys/aleth42/rev0/config.h10
-rw-r--r--keyboards/25keys/aleth42/rev0/info.json5
-rw-r--r--keyboards/25keys/aleth42/rev0/rev0.c17
-rw-r--r--keyboards/25keys/aleth42/rev1/config.h10
-rw-r--r--keyboards/25keys/aleth42/rev1/info.json5
-rw-r--r--keyboards/25keys/aleth42/rev1/rev1.c17
-rw-r--r--keyboards/25keys/cassette42/common/oled_helper.c8
-rw-r--r--keyboards/25keys/cassette42/common/oled_helper.h2
-rw-r--r--keyboards/25keys/cassette42/config.h2
-rw-r--r--keyboards/25keys/cassette42/info.json12
-rw-r--r--keyboards/25keys/zinc/rev1/config.h5
-rw-r--r--keyboards/25keys/zinc/rev1/info.json5
-rw-r--r--keyboards/25keys/zinc/rev1/rev1.c1
-rw-r--r--keyboards/25keys/zinc/reva/config.h5
-rw-r--r--keyboards/25keys/zinc/reva/info.json5
-rw-r--r--keyboards/25keys/zinc/reva/reva.c1
-rw-r--r--keyboards/25keys/zinc/zinc.c1
-rw-r--r--keyboards/25keys/zinc/zinc.h10
18 files changed, 33 insertions, 88 deletions
diff --git a/keyboards/25keys/aleth42/rev0/config.h b/keyboards/25keys/aleth42/rev0/config.h
index eb8bd97b59..26a56a6373 100644
--- a/keyboards/25keys/aleth42/rev0/config.h
+++ b/keyboards/25keys/aleth42/rev0/config.h
@@ -17,16 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, C2, C4, C5, C6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -43,7 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/25keys/aleth42/rev0/info.json b/keyboards/25keys/aleth42/rev0/info.json
index 18023c847e..cd86f9ddf8 100644
--- a/keyboards/25keys/aleth42/rev0/info.json
+++ b/keyboards/25keys/aleth42/rev0/info.json
@@ -2,6 +2,11 @@
"usb": {
"device_version": "0.0.0"
},
+ "matrix_pins": {
+ "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "C2", "C4", "C5", "C6"],
+ "rows": ["B0", "B1", "B2", "B3"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B6", "pin_b": "B7"},
diff --git a/keyboards/25keys/aleth42/rev0/rev0.c b/keyboards/25keys/aleth42/rev0/rev0.c
deleted file mode 100644
index ce91e83804..0000000000
--- a/keyboards/25keys/aleth42/rev0/rev0.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 monksoffunk
- *
- * 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 "rev0.h" \ No newline at end of file
diff --git a/keyboards/25keys/aleth42/rev1/config.h b/keyboards/25keys/aleth42/rev1/config.h
index e0799e65a1..af95a5657d 100644
--- a/keyboards/25keys/aleth42/rev1/config.h
+++ b/keyboards/25keys/aleth42/rev1/config.h
@@ -17,16 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B4, B0, B2, B1 }
-#define MATRIX_COL_PINS { D5, D3, D2, D1, D0, D6, D4, F7, F0, F1, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define RGB_DI_PIN B3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -43,7 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/25keys/aleth42/rev1/info.json b/keyboards/25keys/aleth42/rev1/info.json
index 9d70daf01f..c7e5658ec4 100644
--- a/keyboards/25keys/aleth42/rev1/info.json
+++ b/keyboards/25keys/aleth42/rev1/info.json
@@ -2,6 +2,11 @@
"usb": {
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D5", "D3", "D2", "D1", "D0", "D6", "D4", "F7", "F0", "F1", "F4"],
+ "rows": ["B4", "B0", "B2", "B1"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B5", "pin_b": "B6"},
diff --git a/keyboards/25keys/aleth42/rev1/rev1.c b/keyboards/25keys/aleth42/rev1/rev1.c
deleted file mode 100644
index 360cf8e7f1..0000000000
--- a/keyboards/25keys/aleth42/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 monksoffunk
- *
- * 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 "rev1.h" \ No newline at end of file
diff --git a/keyboards/25keys/cassette42/common/oled_helper.c b/keyboards/25keys/cassette42/common/oled_helper.c
index 8800699a85..1c4148a7d9 100644
--- a/keyboards/25keys/cassette42/common/oled_helper.c
+++ b/keyboards/25keys/cassette42/common/oled_helper.c
@@ -1,7 +1,9 @@
+#include "oled_helper.h"
+#include "quantum.h"
+#include <stdio.h>
+#include <string.h>
+
#ifdef OLED_ENABLE
-# include QMK_KEYBOARD_H
-# include <stdio.h>
-# include <string.h>
void render_logo(void) {
static const char PROGMEM logo[] = {0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0};
diff --git a/keyboards/25keys/cassette42/common/oled_helper.h b/keyboards/25keys/cassette42/common/oled_helper.h
index daeb7bfa4d..d677c2a872 100644
--- a/keyboards/25keys/cassette42/common/oled_helper.h
+++ b/keyboards/25keys/cassette42/common/oled_helper.h
@@ -1,3 +1,5 @@
+#pragma once
+
#ifdef OLED_ENABLE
void render_logo(void);
diff --git a/keyboards/25keys/cassette42/config.h b/keyboards/25keys/cassette42/config.h
index 686eea8fc7..bc4f1ab4aa 100644
--- a/keyboards/25keys/cassette42/config.h
+++ b/keyboards/25keys/cassette42/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 5
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -35,6 +34,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
#define OLED_FONT_H "keyboards/25keys/cassette42/common/glcdfont.c"
diff --git a/keyboards/25keys/cassette42/info.json b/keyboards/25keys/cassette42/info.json
index f791a83e48..2b33220ad9 100644
--- a/keyboards/25keys/cassette42/info.json
+++ b/keyboards/25keys/cassette42/info.json
@@ -24,12 +24,12 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0.5, "y":0.75, "matrix": [0, 4]},
- {"x":2.5, "y":0.75, "matrix": [0, 5]},
- {"x":0, "y":1.75, "matrix": [0, 0]},
- {"x":1, "y":1.75, "matrix": [0, 1]},
- {"x":2, "y":1.75, "matrix": [0, 2]},
- {"x":3, "y":1.75, "matrix": [0, 3]}
+ {"x":0.5, "y":0, "matrix": [0, 4]},
+ {"x":2.5, "y":0, "matrix": [0, 5]},
+ {"x":0, "y":1, "matrix": [0, 0]},
+ {"x":1, "y":1, "matrix": [0, 1]},
+ {"x":2, "y":1, "matrix": [0, 2]},
+ {"x":3, "y":1, "matrix": [0, 3]}
]
}
}
diff --git a/keyboards/25keys/zinc/rev1/config.h b/keyboards/25keys/zinc/rev1/config.h
index 776f7f3138..b537056e6b 100644
--- a/keyboards/25keys/zinc/rev1/config.h
+++ b/keyboards/25keys/zinc/rev1/config.h
@@ -25,11 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define MASTER_RIGHT
//#define EE_HANDS
-#define MATRIX_ROW_PINS { F6, F7, B1, B3 }
-#define MATRIX_COL_PINS { F4, D4, C6, D7, E6, B4 }
-
-#define DIODE_DIRECTION COL2ROW
-
/* ws2812 RGB LED */
#define RGB_DI_PIN D3
diff --git a/keyboards/25keys/zinc/rev1/info.json b/keyboards/25keys/zinc/rev1/info.json
index fa41ed213f..5d9ec2d7d4 100644
--- a/keyboards/25keys/zinc/rev1/info.json
+++ b/keyboards/25keys/zinc/rev1/info.json
@@ -1,5 +1,10 @@
{
"keyboard_name": "Zinc rev.1",
+ "matrix_pins": {
+ "cols": ["F4", "D4", "C6", "D7", "E6", "B4"],
+ "rows": ["F6", "F7", "B1", "B3"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D2"
}
diff --git a/keyboards/25keys/zinc/rev1/rev1.c b/keyboards/25keys/zinc/rev1/rev1.c
deleted file mode 100644
index 139919d5a6..0000000000
--- a/keyboards/25keys/zinc/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "zinc.h"
diff --git a/keyboards/25keys/zinc/reva/config.h b/keyboards/25keys/zinc/reva/config.h
index 0a7e29a9a6..b537056e6b 100644
--- a/keyboards/25keys/zinc/reva/config.h
+++ b/keyboards/25keys/zinc/reva/config.h
@@ -25,11 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define MASTER_RIGHT
//#define EE_HANDS
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3}
-
-#define DIODE_DIRECTION COL2ROW
-
/* ws2812 RGB LED */
#define RGB_DI_PIN D3
diff --git a/keyboards/25keys/zinc/reva/info.json b/keyboards/25keys/zinc/reva/info.json
index ec98ea65a9..3bf44bfe8f 100644
--- a/keyboards/25keys/zinc/reva/info.json
+++ b/keyboards/25keys/zinc/reva/info.json
@@ -1,5 +1,10 @@
{
"keyboard_name": "Zinc rev.A",
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+ "rows": ["D4", "C6", "D7", "E6"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D2"
}
diff --git a/keyboards/25keys/zinc/reva/reva.c b/keyboards/25keys/zinc/reva/reva.c
deleted file mode 100644
index 139919d5a6..0000000000
--- a/keyboards/25keys/zinc/reva/reva.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "zinc.h"
diff --git a/keyboards/25keys/zinc/zinc.c b/keyboards/25keys/zinc/zinc.c
deleted file mode 100644
index 139919d5a6..0000000000
--- a/keyboards/25keys/zinc/zinc.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "zinc.h"
diff --git a/keyboards/25keys/zinc/zinc.h b/keyboards/25keys/zinc/zinc.h
deleted file mode 100644
index 8a80538e4c..0000000000
--- a/keyboards/25keys/zinc/zinc.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#ifdef KEYBOARD_25keys_zinc_reva
- #include "reva.h"
-#endif
-#ifdef KEYBOARD_25keys_zinc_rev1
- #include "rev1.h"
-#endif
-
-#include "quantum.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 02:34:24 +0000