update to merged changes

splitkb · Dec 3, 2024 · e27c341 · e27c341
1 parent 3ec4399
commit e27c341
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 61 deletions.
diff --git a/keyboards/splitkb/halcyon/elora/keymaps/default/keymap.c b/keyboards/splitkb/halcyon/elora/keymaps/default/keymap.c
@@ -197,8 +197,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_ADJUST] = LAYOUT(
       _______, _______, _______, _______, _______, _______,                                    _______, _______, _______, _______,  _______, _______,
       _______, _______, _______, QWERTY , _______, _______,                                    _______, _______, _______, _______,  _______, _______,
-      _______, _______, _______, DVORAK , _______, _______,                                    RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI,  RGB_MOD, _______,
-      _______, _______, _______, COLEMAK, _______, _______,_______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_VAD, RGB_RMOD, _______,
+      _______, _______, _______, DVORAK , _______, _______,                                    RM_TOGG, RM_SATU, RM_HUEU, RM_VALU, RM_NEXT, _______,
+      _______, _______, _______, COLEMAK, _______, _______,_______, _______, _______, _______, _______, RM_SATD, RM_HUED, RM_VALD, RM_PREV, _______,
                                  _______, _______, _______,_______, _______, _______, _______, _______, _______, _______
     ),
 

diff --git a/keyboards/splitkb/halcyon/elora/rev2/config.h b/keyboards/splitkb/halcyon/elora/rev2/config.h
@@ -14,4 +14,19 @@
 #define SERIAL_PIO_USE_PIO1        // Use PIO1 as PIO0 is used for WS2812 driver
 
 // VBUS detection
-#define USB_VBUS_PIN GP1
+#define USB_VBUS_PIN GP1
+
+//// VIK
+
+// GPIO1 = GP27
+// GPIO2 = GP26
+// CS = GP13
+
+#define I2C_DRIVER I2C0
+#define I2C1_SDA_PIN GP16
+#define I2C1_SCL_PIN GP17
+
+#define SPI_DRIVER SPID1
+#define SPI_SCK_PIN GP14
+#define SPI_MOSI_PIN GP15
+#define SPI_MISO_PIN GP12
diff --git a/keyboards/splitkb/halcyon/elora/rev2/halconf.h b/keyboards/splitkb/halcyon/elora/rev2/halconf.h
@@ -5,23 +5,10 @@
 
 //// VIK
 
-// GPIO1 = GP27
-// GPIO2 = GP26
-// CS = GP13
+#define HAL_USE_I2C TRUE
 
-#if HAL_USE_I2C == TRUE
-#   define I2C_DRIVER I2C0
-#   define I2C1_SDA_PIN GP16
-#   define I2C1_SCL_PIN GP17
-#endif
-
-#if HAL_USE_SPI == TRUE
-#   define SPI_DRIVER SPID1
-#   define SPI_SCK_PIN GP14
-#   define SPI_MOSI_PIN GP15
-#   define SPI_MISO_PIN GP12
-#   define SPI_USE_WAIT TRUE
-#   define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-#endif
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/splitkb/halcyon/elora/rev2/keyboard.json b/keyboards/splitkb/halcyon/elora/rev2/keyboard.json
@@ -3,12 +3,12 @@
     "bootloader": "rp2040",
     "diode_direction": "COL2ROW",
     "encoder": {
-        "enabled": true,
         "rotary": [
             {"pin_a": "GP22", "pin_b": "GP18", "resolution": 2}
         ]
     },
     "features": {
+        "encoder": true,
         "extrakey": true,
         "mousekey": true,
         "nkro": true,

diff --git a/keyboards/splitkb/halcyon/elora/rev2/mcuconf.h b/keyboards/splitkb/halcyon/elora/rev2/mcuconf.h
@@ -7,12 +7,8 @@
 
 //// VIK
 
-#if HAL_USE_I2C == TRUE
-#   undef RP_I2C_USE_I2C0
-#   define RP_I2C_USE_I2C0 TRUE
-#endif
+#undef RP_I2C_USE_I2C0
+#define RP_I2C_USE_I2C0 TRUE
 
-#if HAL_USE_SPI == TRUE
-#   undef RP_SPI_USE_SPI1
-#   define RP_SPI_USE_SPI1 TRUE
-#endif
+#undef RP_SPI_USE_SPI1
+#define RP_SPI_USE_SPI1 TRUE
diff --git a/keyboards/splitkb/halcyon/elora/rev2/rev2.c b/keyboards/splitkb/halcyon/elora/rev2/rev2.c
@@ -1,7 +1,7 @@
 // Copyright 2024 splitkb.com (support@splitkb.com)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {

diff --git a/keyboards/splitkb/halcyon/kyria/keymaps/default/keymap.c b/keyboards/splitkb/halcyon/kyria/keymaps/default/keymap.c
@@ -176,9 +176,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                        `----------------------------------'  `----------------------------------'
  */
     [_ADJUST] = LAYOUT(
-      _______, _______, _______, QWERTY , _______, _______,                                    _______, _______, _______, _______,  _______, _______,
-      _______, _______, _______, DVORAK , _______, _______,                                    RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI,  RGB_MOD, _______,
-      _______, _______, _______, COLEMAK, _______, _______,_______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_VAD, RGB_RMOD, _______,
+      _______, _______, _______, QWERTY , _______, _______,                                    _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, DVORAK , _______, _______,                                    RM_TOGG, RM_SATU, RM_HUEU, RM_VALU, RM_NEXT, _______,
+      _______, _______, _______, COLEMAK, _______, _______,_______, _______, _______, _______, _______, RM_SATD, RM_HUED, RM_VALD, RM_PREV, _______,
                                  _______, _______, _______,_______, _______, _______, _______, _______, _______, _______
     ),
 

diff --git a/keyboards/splitkb/halcyon/kyria/rev4/config.h b/keyboards/splitkb/halcyon/kyria/rev4/config.h
@@ -14,4 +14,19 @@
 #define SERIAL_PIO_USE_PIO1        // Use PIO1 as PIO0 is used for WS2812 driver
 
 // VBUS detection
-#define USB_VBUS_PIN GP1
+#define USB_VBUS_PIN GP1
+
+//// VIK
+
+// GPIO1 = GP27
+// GPIO2 = GP26
+// CS = GP13
+
+#define I2C_DRIVER I2C0
+#define I2C1_SDA_PIN GP16
+#define I2C1_SCL_PIN GP17
+
+#define SPI_DRIVER SPID1
+#define SPI_SCK_PIN GP14
+#define SPI_MOSI_PIN GP15
+#define SPI_MISO_PIN GP12
diff --git a/keyboards/splitkb/halcyon/kyria/rev4/halconf.h b/keyboards/splitkb/halcyon/kyria/rev4/halconf.h
@@ -5,23 +5,10 @@
 
 //// VIK
 
-// GPIO1 = GP27
-// GPIO2 = GP26
-// CS = GP13
+#define HAL_USE_I2C TRUE
 
-#if HAL_USE_I2C == TRUE
-#   define I2C_DRIVER I2C0
-#   define I2C1_SDA_PIN GP16
-#   define I2C1_SCL_PIN GP17
-#endif
-
-#if HAL_USE_SPI == TRUE
-#   define SPI_DRIVER SPID1
-#   define SPI_SCK_PIN GP14
-#   define SPI_MOSI_PIN GP15
-#   define SPI_MISO_PIN GP12
-#   define SPI_USE_WAIT TRUE
-#   define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-#endif
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
 #include_next <halconf.h>
diff --git a/keyboards/splitkb/halcyon/kyria/rev4/keyboard.json b/keyboards/splitkb/halcyon/kyria/rev4/keyboard.json
@@ -3,12 +3,12 @@
     "bootloader": "rp2040",
     "diode_direction": "COL2ROW",
     "encoder": {
-        "enabled": true,
         "rotary": [
             {"pin_a": "GP23", "pin_b": "GP22", "resolution": 2}
         ]
     },
     "features": {
+        "encoder": true,
         "extrakey": true,
         "mousekey": true,
         "nkro": true,

diff --git a/keyboards/splitkb/halcyon/kyria/rev4/mcuconf.h b/keyboards/splitkb/halcyon/kyria/rev4/mcuconf.h
@@ -7,12 +7,8 @@
 
 //// VIK
 
-#if HAL_USE_I2C == TRUE
-#   undef RP_I2C_USE_I2C0
-#   define RP_I2C_USE_I2C0 TRUE
-#endif
+#undef RP_I2C_USE_I2C0
+#define RP_I2C_USE_I2C0 TRUE
 
-#if HAL_USE_SPI == TRUE
-#   undef RP_SPI_USE_SPI1
-#   define RP_SPI_USE_SPI1 TRUE
-#endif
+#undef RP_SPI_USE_SPI1
+#define RP_SPI_USE_SPI1 TRUE
diff --git a/keyboards/splitkb/halcyon/kyria/rev4/rev4.c b/keyboards/splitkb/halcyon/kyria/rev4/rev4.c
@@ -1,7 +1,7 @@
 // Copyright 2024 splitkb.com (support@splitkb.com)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include QMK_KEYBOARD_H
+#include "quantum.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {