firmware/qmk: sync

rgoulter · Jun 13, 2024 · 9e34470 · 9e34470
1 parent fd1e8c1
commit 9e34470
Show file tree

Hide file tree

Showing 12 changed files with 546 additions and 543 deletions.
diff --git a/firmware/qmk/keyboards/rgoulter/minif4_36/config.h b/firmware/qmk/keyboards/rgoulter/minif4_36/config.h
@@ -6,30 +6,30 @@
 // RGB Matrix
 #ifdef RGB_MATRIX_ENABLE
 
-#ifdef SPLIT_KEYBOARD
+#    ifdef SPLIT_KEYBOARD
 // 18 + 4 on each side
-#define DRIVER_LED_TOTAL 44
-#define RGB_MATRIX_LED_COUNT 44
-#define RGB_MATRIX_SPLIT { 22,22 }
-#else
-#define DRIVER_LED_TOTAL 22
-#define RGB_MATRIX_LED_COUNT 22
-#endif
+#        define DRIVER_LED_TOTAL 44
+#        define RGB_MATRIX_LED_COUNT 44
+#        define RGB_MATRIX_SPLIT \
+            { 22, 22 }
+#    else
+#        define DRIVER_LED_TOTAL 22
+#        define RGB_MATRIX_LED_COUNT 22
+#    endif
 
-#define RGB_MATRIX_KEYPRESSES
+#    define RGB_MATRIX_KEYPRESSES
 
 #endif
 
 // OLED
 #ifdef OLED_ENABLE
 /* B8, B9 instead of B6, B7 */
-#define I2C1_SCL_PIN B8
-#define I2C1_SDA_PIN B9
+#    define I2C1_SCL_PIN B8
+#    define I2C1_SDA_PIN B9
 #endif
 
-
 #ifdef SPLIT_KEYBOARD
-#ifdef HAPTIC_ENABLE
-#define SPLIT_HAPTIC_ENABLE
-#endif
+#    ifdef HAPTIC_ENABLE
+#        define SPLIT_HAPTIC_ENABLE
+#    endif
 #endif
diff --git a/firmware/qmk/keyboards/rgoulter/minif4_36/halconf.h b/firmware/qmk/keyboards/rgoulter/minif4_36/halconf.h
@@ -4,16 +4,16 @@
 #pragma once
 
 #ifdef OLED_ENABLE
-#define HAL_USE_I2C TRUE
+#    define HAL_USE_I2C TRUE
 #endif
 
 #ifdef RGB_MATRIX_ENABLE
-#define HAL_USE_PWM TRUE
+#    define HAL_USE_PWM TRUE
 #endif
 
 #ifdef SPLIT_KEYBOARD
-#define PAL_USE_CALLBACKS TRUE
-#define PAL_USE_WAIT TRUE
+#    define PAL_USE_CALLBACKS TRUE
+#    define PAL_USE_WAIT TRUE
 #endif
 
 #include_next <halconf.h>
diff --git a/firmware/qmk/keyboards/rgoulter/minif4_36/minif4_36.c b/firmware/qmk/keyboards/rgoulter/minif4_36/minif4_36.c
@@ -4,7 +4,7 @@
 #include "minif4_36.h"
 
 #ifdef SPLIT_KEYBOARD
-#include "split_util.h"
+#    include "split_util.h"
 #endif
 
 void board_init(void) {

diff --git a/firmware/qmk/keyboards/rgoulter/minif4_36/minif4_36.h b/firmware/qmk/keyboards/rgoulter/minif4_36/minif4_36.h
@@ -4,4 +4,3 @@
 #pragma once
 
 #include "quantum.h"
-
diff --git a/firmware/qmk/keyboards/rgoulter/x_2/config.h b/firmware/qmk/keyboards/rgoulter/x_2/config.h
@@ -5,22 +5,22 @@
 
 // RGB Lighting
 #ifdef RGBLIGHT_ENABLE
-#define DRIVER_LED_TOTAL 4
-#define RGBLED_NUM 4
-#define RGBLIGHT_LIMIT_VAL 80
-#define RGBLIGHT_DEFAULT_VAL 30
-#define RGBLIGHT_VAL_STEP 8
+#    define DRIVER_LED_TOTAL 4
+#    define RGBLED_NUM 4
+#    define RGBLIGHT_LIMIT_VAL 80
+#    define RGBLIGHT_DEFAULT_VAL 30
+#    define RGBLIGHT_VAL_STEP 8
 #endif
 
 #ifdef RGB_MATRIX_ENABLE
-#define DRIVER_LED_TOTAL 70
-#define RGBLED_NUM 70
-#define RGB_MATRIX_LED_COUNT 70
-#define RGB_MATRIX_KEYPRESSES
+#    define DRIVER_LED_TOTAL 70
+#    define RGBLED_NUM 70
+#    define RGB_MATRIX_LED_COUNT 70
+#    define RGB_MATRIX_KEYPRESSES
 #endif
 
 #ifdef RGB_MATRIX_ENABLE
-#ifdef RGBLIGHT_ENABLE
-#error "rgblight and rgb_matrix both enabled"
-#endif
+#    ifdef RGBLIGHT_ENABLE
+#        error "rgblight and rgb_matrix both enabled"
+#    endif
 #endif
diff --git a/firmware/qmk/keyboards/rgoulter/x_2/halconf.h b/firmware/qmk/keyboards/rgoulter/x_2/halconf.h
@@ -4,11 +4,11 @@
 #pragma once
 
 #ifdef RGBLIGHT_ENABLE
-#define HAL_USE_PWM TRUE
+#    define HAL_USE_PWM TRUE
 #endif
 
 #ifdef RGB_MATRIX_ENABLE
-#define HAL_USE_PWM TRUE
+#    define HAL_USE_PWM TRUE
 #endif
 
 #include_next <halconf.h>