summaryrefslogtreecommitdiff
path: root/keyboards/kbdfans/odin
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/kbdfans/odin')
-rw-r--r--keyboards/kbdfans/odin/rgb/config.h6
-rw-r--r--keyboards/kbdfans/odin/rgb/info.json11
-rw-r--r--keyboards/kbdfans/odin/rgb/rules.mk1
-rw-r--r--keyboards/kbdfans/odin/soldered/config.h9
-rw-r--r--keyboards/kbdfans/odin/soldered/info.json8
-rw-r--r--keyboards/kbdfans/odin/soldered/soldered.c16
-rw-r--r--keyboards/kbdfans/odin/v2/config.h9
-rw-r--r--keyboards/kbdfans/odin/v2/info.json8
-rw-r--r--keyboards/kbdfans/odin/v2/v2.c17
9 files changed, 28 insertions, 57 deletions
diff --git a/keyboards/kbdfans/odin/rgb/config.h b/keyboards/kbdfans/odin/rgb/config.h
index 12c5e539da..54794e66be 100644
--- a/keyboards/kbdfans/odin/rgb/config.h
+++ b/keyboards/kbdfans/odin/rgb/config.h
@@ -16,14 +16,8 @@
#pragma once
-#define MATRIX_ROW_PINS { A10, A9, A8, B14, B13, A2 }
-#define MATRIX_COL_PINS { A3, A4, A5, A6, A7, B0, B1, B2, B12, A15, B3, B4, B5, B6, B7, B8, C13, C14, C15, A0}
-
-#define DIODE_DIRECTION COL2ROW
-
#define RGBLED_NUM 104
#define RGB_MATRIX_LED_COUNT 104
-#define RGB_DI_PIN B15
#ifdef RGB_MATRIX_ENABLE
#define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/kbdfans/odin/rgb/info.json b/keyboards/kbdfans/odin/rgb/info.json
index 1de7004739..026458452c 100644
--- a/keyboards/kbdfans/odin/rgb/info.json
+++ b/keyboards/kbdfans/odin/rgb/info.json
@@ -8,6 +8,17 @@
"pid": "0x0102",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "B15"
+ },
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "matrix_pins": {
+ "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B12", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "C13", "C14", "C15", "A0"],
+ "rows": ["A10", "A9", "A8", "B14", "B13", "A2"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"layouts": {
diff --git a/keyboards/kbdfans/odin/rgb/rules.mk b/keyboards/kbdfans/odin/rgb/rules.mk
index 38a6bb6887..b7807ae418 100644
--- a/keyboards/kbdfans/odin/rgb/rules.mk
+++ b/keyboards/kbdfans/odin/rgb/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/kbdfans/odin/soldered/config.h b/keyboards/kbdfans/odin/soldered/config.h
index dcda05b8d0..6fa6d5651b 100644
--- a/keyboards/kbdfans/odin/soldered/config.h
+++ b/keyboards/kbdfans/odin/soldered/config.h
@@ -16,13 +16,6 @@
#pragma once
-#define MATRIX_ROW_PINS { A10, A9, A8, B14, B13, A2 }
-#define MATRIX_COL_PINS { A3, A4, A5, A6, A7, B0, B1, B2, B12, A15, B3, B4, B5, B6, B7, B8, C13, C14, C15, A0}
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B15
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 4
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -40,5 +33,5 @@
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 180
#define RGBLIGHT_SLEEP
-#endif
+
#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/kbdfans/odin/soldered/info.json b/keyboards/kbdfans/odin/soldered/info.json
index 7189d537fe..b073fc9fb7 100644
--- a/keyboards/kbdfans/odin/soldered/info.json
+++ b/keyboards/kbdfans/odin/soldered/info.json
@@ -8,11 +8,19 @@
"pid": "0x0101",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B12", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "C13", "C14", "C15", "A0"],
+ "rows": ["A10", "A9", "A8", "B14", "B13", "A2"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "B10",
"num_lock": "B9",
"on_state": 0
},
+ "ws2812": {
+ "pin": "B15"
+ },
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"debounce": 15,
diff --git a/keyboards/kbdfans/odin/soldered/soldered.c b/keyboards/kbdfans/odin/soldered/soldered.c
deleted file mode 100644
index ddf024efd3..0000000000
--- a/keyboards/kbdfans/odin/soldered/soldered.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 Geekboards ltd. (geekboards.ru / geekboards.de)
- *
- * 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 "soldered.h" \ No newline at end of file
diff --git a/keyboards/kbdfans/odin/v2/config.h b/keyboards/kbdfans/odin/v2/config.h
index 5ed85f0b91..fe645e42a3 100644
--- a/keyboards/kbdfans/odin/v2/config.h
+++ b/keyboards/kbdfans/odin/v2/config.h
@@ -16,14 +16,6 @@
#pragma once
-#define MATRIX_ROW_PINS { A10, A9, A8, B14, B13, A2 }
-#define MATRIX_COL_PINS { A3, A4, A5, A6, A7, B0, B1, B2, B12, A15, B3, B4, B5, B6, B7, B8, C13, C14, C15, A0}
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B15
-
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 4
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -39,4 +31,3 @@
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 180
#define RGBLIGHT_SLEEP
-#endif
diff --git a/keyboards/kbdfans/odin/v2/info.json b/keyboards/kbdfans/odin/v2/info.json
index 29a96330f6..4fc091358b 100644
--- a/keyboards/kbdfans/odin/v2/info.json
+++ b/keyboards/kbdfans/odin/v2/info.json
@@ -8,11 +8,19 @@
"pid": "0x0101",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B12", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "C13", "C14", "C15", "A0"],
+ "rows": ["A10", "A9", "A8", "B14", "B13", "A2"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "B10",
"num_lock": "B9",
"on_state": 0
},
+ "ws2812": {
+ "pin": "B15"
+ },
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"layouts": {
diff --git a/keyboards/kbdfans/odin/v2/v2.c b/keyboards/kbdfans/odin/v2/v2.c
deleted file mode 100644
index 42cbbc301a..0000000000
--- a/keyboards/kbdfans/odin/v2/v2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 lexbrugman
- *
- * 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 "v2.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-21 17:13:04 +0000