summaryrefslogtreecommitdiffstats
path: root/keyboards/helix
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/helix')
-rw-r--r--keyboards/helix/helix.c1
-rw-r--r--keyboards/helix/helix.h19
-rw-r--r--keyboards/helix/pico/config.h3
-rw-r--r--keyboards/helix/pico/info.json3
-rw-r--r--keyboards/helix/pico/pico.c2
-rw-r--r--keyboards/helix/pico/pico.h2
-rw-r--r--keyboards/helix/rev2/config.h3
-rw-r--r--keyboards/helix/rev2/info.json3
-rw-r--r--keyboards/helix/rev2/keymaps/edvorakjp/config.h1
-rw-r--r--keyboards/helix/rev2/rev2.c2
-rw-r--r--keyboards/helix/rev2/rev2.h2
-rw-r--r--keyboards/helix/rev3_4rows/config.h1
-rw-r--r--keyboards/helix/rev3_4rows/info.json6
-rw-r--r--keyboards/helix/rev3_4rows/rev3_4rows.c2
-rw-r--r--keyboards/helix/rev3_4rows/rules.mk1
-rw-r--r--keyboards/helix/rev3_5rows/config.h1
-rw-r--r--keyboards/helix/rev3_5rows/info.json6
-rw-r--r--keyboards/helix/rev3_5rows/rev3_5rows.c2
-rw-r--r--keyboards/helix/rev3_5rows/rules.mk1
19 files changed, 24 insertions, 37 deletions
diff --git a/keyboards/helix/helix.c b/keyboards/helix/helix.c
deleted file mode 100644
index 539abd5349..0000000000
--- a/keyboards/helix/helix.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "helix.h"
diff --git a/keyboards/helix/helix.h b/keyboards/helix/helix.h
deleted file mode 100644
index b900d975d2..0000000000
--- a/keyboards/helix/helix.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_helix_rev1
- #include "rev1.h"
-#endif
-#ifdef KEYBOARD_helix_rev2
- #include "rev2.h"
-#endif
-#ifdef KEYBOARD_helix_rev3_5rows
- #include "rev3_5rows.h"
-#endif
-#ifdef KEYBOARD_helix_rev3_4rows
- #include "rev3_4rows.h"
-#endif
-#ifdef KEYBOARD_helix_pico
- #include "pico.h"
-#endif
diff --git a/keyboards/helix/pico/config.h b/keyboards/helix/pico/config.h
index 77048b5a0f..cf4e9f4ffe 100644
--- a/keyboards/helix/pico/config.h
+++ b/keyboards/helix/pico/config.h
@@ -48,9 +48,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define AUDIO_PIN B5
#endif
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
//#define RGBLED_NUM 12 // Number of LEDs. see ./keymaps/default/config.h
// Helix keyboard RGB LED support
diff --git a/keyboards/helix/pico/info.json b/keyboards/helix/pico/info.json
index 51c5e3c9e3..0b4c933ffa 100644
--- a/keyboards/helix/pico/info.json
+++ b/keyboards/helix/pico/info.json
@@ -11,6 +11,9 @@
"split": {
"soft_serial_pin": "D2"
},
+ "ws2812": {
+ "pin": "D3"
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
diff --git a/keyboards/helix/pico/pico.c b/keyboards/helix/pico/pico.c
index 4cd1953632..cc98fe8f61 100644
--- a/keyboards/helix/pico/pico.c
+++ b/keyboards/helix/pico/pico.c
@@ -13,7 +13,7 @@
* 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 "helix.h"
+#include "pico.h"
// Each keymap.c should use is_keyboard_master() instead of 'is_master'.
// But keep 'is_master' for a while for backwards compatibility
diff --git a/keyboards/helix/pico/pico.h b/keyboards/helix/pico/pico.h
index 3e51d54d84..e555691583 100644
--- a/keyboards/helix/pico/pico.h
+++ b/keyboards/helix/pico/pico.h
@@ -15,7 +15,7 @@
*/
#pragma once
-#include "helix.h"
+#include "quantum.h"
// Each keymap.c should use is_keyboard_master() instead of 'is_master', 'has_usb()'.
// But keep 'is_master' for a while for backwards compatibility
diff --git a/keyboards/helix/rev2/config.h b/keyboards/helix/rev2/config.h
index b4103d407c..491675d45d 100644
--- a/keyboards/helix/rev2/config.h
+++ b/keyboards/helix/rev2/config.h
@@ -54,9 +54,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
//#define RGBLED_NUM 12 // Number of LEDs. see ./keymaps/default/config.h
// Helix keyboard RGB LED support
diff --git a/keyboards/helix/rev2/info.json b/keyboards/helix/rev2/info.json
index 0ffce4f17a..3924af33aa 100644
--- a/keyboards/helix/rev2/info.json
+++ b/keyboards/helix/rev2/info.json
@@ -11,6 +11,9 @@
"split": {
"soft_serial_pin": "D2"
},
+ "ws2812": {
+ "pin": "D3"
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/config.h b/keyboards/helix/rev2/keymaps/edvorakjp/config.h
index 6854249be0..0dff4b59ca 100644
--- a/keyboards/helix/rev2/keymaps/edvorakjp/config.h
+++ b/keyboards/helix/rev2/keymaps/edvorakjp/config.h
@@ -5,7 +5,6 @@
#undef QUICK_TAP_TERM
#undef TAPPING_TERM
#define TAPPING_TERM 300
-#define IGNORE_MOD_TAP_INTERRUPT
// If you need more program area, try select and reduce rgblight modes to use.
diff --git a/keyboards/helix/rev2/rev2.c b/keyboards/helix/rev2/rev2.c
index 2bbe9a28e2..ded22bbe93 100644
--- a/keyboards/helix/rev2/rev2.c
+++ b/keyboards/helix/rev2/rev2.c
@@ -13,7 +13,7 @@
* 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 "helix.h"
+#include "rev2.h"
// Each keymap.c should use is_keyboard_master() instead of 'is_master'.
// But keep 'is_master' for a while for backwards compatibility
diff --git a/keyboards/helix/rev2/rev2.h b/keyboards/helix/rev2/rev2.h
index fccbaf1ac4..dd1d74a298 100644
--- a/keyboards/helix/rev2/rev2.h
+++ b/keyboards/helix/rev2/rev2.h
@@ -15,7 +15,7 @@
*/
#pragma once
-#include "helix.h"
+#include "quantum.h"
bool is_mac_mode(void);
void set_mac_mode_kb(bool macmode);
diff --git a/keyboards/helix/rev3_4rows/config.h b/keyboards/helix/rev3_4rows/config.h
index 97b4ed3f48..9af8d14d10 100644
--- a/keyboards/helix/rev3_4rows/config.h
+++ b/keyboards/helix/rev3_4rows/config.h
@@ -46,7 +46,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Dip switch on matrix grid */
#define DIP_SWITCH_MATRIX_GRID { {0,6}, {1,6}, {5,6}, {6,6} }
-#define RGB_DI_PIN D3
#define RGBLED_NUM 50 // Number of LEDs
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/helix/rev3_4rows/info.json b/keyboards/helix/rev3_4rows/info.json
index 45945f8871..db9d760692 100644
--- a/keyboards/helix/rev3_4rows/info.json
+++ b/keyboards/helix/rev3_4rows/info.json
@@ -8,6 +8,9 @@
"pid": "0x0004",
"device_version": "0.0.1"
},
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
"encoder": {
"rotary": [
{"pin_a": "B6", "pin_b": "B5"}
@@ -16,6 +19,9 @@
"split": {
"soft_serial_pin": "D2"
},
+ "ws2812": {
+ "pin": "D3"
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
diff --git a/keyboards/helix/rev3_4rows/rev3_4rows.c b/keyboards/helix/rev3_4rows/rev3_4rows.c
index 704f915510..ff61027a96 100644
--- a/keyboards/helix/rev3_4rows/rev3_4rows.c
+++ b/keyboards/helix/rev3_4rows/rev3_4rows.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "helix.h"
+#include "rev3_4rows.h"
bool is_mac_mode(void) {
return keymap_config.swap_lalt_lgui == false;
diff --git a/keyboards/helix/rev3_4rows/rules.mk b/keyboards/helix/rev3_4rows/rules.mk
index f29deaf586..23b73845f0 100644
--- a/keyboards/helix/rev3_4rows/rules.mk
+++ b/keyboards/helix/rev3_4rows/rules.mk
@@ -2,7 +2,6 @@ EXTRAKEY_ENABLE = yes # Audio control and System control
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
SPLIT_KEYBOARD = yes
RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
OLED_ENABLE = yes
OLED_DRIVER = SSD1306
ENCODER_ENABLE = yes
diff --git a/keyboards/helix/rev3_5rows/config.h b/keyboards/helix/rev3_5rows/config.h
index a047bd7d87..4f7ca7480c 100644
--- a/keyboards/helix/rev3_5rows/config.h
+++ b/keyboards/helix/rev3_5rows/config.h
@@ -46,7 +46,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Dip switch on matrix grid */
#define DIP_SWITCH_MATRIX_GRID { {0,6}, {1,6}, {5,6}, {6,6} }
-#define RGB_DI_PIN D3
#define RGBLED_NUM 64 // Number of LEDs
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/helix/rev3_5rows/info.json b/keyboards/helix/rev3_5rows/info.json
index 9709708d68..abd4f64ab1 100644
--- a/keyboards/helix/rev3_5rows/info.json
+++ b/keyboards/helix/rev3_5rows/info.json
@@ -8,6 +8,9 @@
"pid": "0x0003",
"device_version": "0.0.1"
},
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
"encoder": {
"rotary": [
{"pin_a": "B6", "pin_b": "B5"}
@@ -16,6 +19,9 @@
"split": {
"soft_serial_pin": "D2"
},
+ "ws2812": {
+ "pin": "D3"
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
diff --git a/keyboards/helix/rev3_5rows/rev3_5rows.c b/keyboards/helix/rev3_5rows/rev3_5rows.c
index 704f915510..28fa314a7b 100644
--- a/keyboards/helix/rev3_5rows/rev3_5rows.c
+++ b/keyboards/helix/rev3_5rows/rev3_5rows.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "helix.h"
+#include "rev3_5rows.h"
bool is_mac_mode(void) {
return keymap_config.swap_lalt_lgui == false;
diff --git a/keyboards/helix/rev3_5rows/rules.mk b/keyboards/helix/rev3_5rows/rules.mk
index f29deaf586..23b73845f0 100644
--- a/keyboards/helix/rev3_5rows/rules.mk
+++ b/keyboards/helix/rev3_5rows/rules.mk
@@ -2,7 +2,6 @@ EXTRAKEY_ENABLE = yes # Audio control and System control
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
SPLIT_KEYBOARD = yes
RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
OLED_ENABLE = yes
OLED_DRIVER = SSD1306
ENCODER_ENABLE = yes
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 18:05:06 +0000