implement changes

qmk · Dec 2, 2024 · 697da9d · 697da9d
1 parent 3a3105b
commit 697da9d
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 26 deletions.
diff --git a/keyboards/splitkb/halcyon/kyria/rev4/config.h b/keyboards/splitkb/halcyon/kyria/rev4/config.h
@@ -22,15 +22,11 @@
 // GPIO2 = GP26
 // CS = GP13
 
-#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
-#endif
+#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
@@ -3,9 +3,12 @@
 
 #pragma once
 
-#if HAL_USE_SPI == TRUE
-#    define SPI_USE_WAIT TRUE
-#    define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-#endif
+//// VIK
+
+#define HAL_USE_I2C TRUE
+
+#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 ([email protected])
 // 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) {