Skip to content

Commit 9e34470

Browse files
committed
firmware/qmk: sync
1 parent fd1e8c1 commit 9e34470

File tree

12 files changed

+546
-543
lines changed

12 files changed

+546
-543
lines changed

firmware/qmk/keyboards/rgoulter/minif4_36/config.h

+15-15
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,30 @@
66
// RGB Matrix
77
#ifdef RGB_MATRIX_ENABLE
88

9-
#ifdef SPLIT_KEYBOARD
9+
# ifdef SPLIT_KEYBOARD
1010
// 18 + 4 on each side
11-
#define DRIVER_LED_TOTAL 44
12-
#define RGB_MATRIX_LED_COUNT 44
13-
#define RGB_MATRIX_SPLIT { 22,22 }
14-
#else
15-
#define DRIVER_LED_TOTAL 22
16-
#define RGB_MATRIX_LED_COUNT 22
17-
#endif
11+
# define DRIVER_LED_TOTAL 44
12+
# define RGB_MATRIX_LED_COUNT 44
13+
# define RGB_MATRIX_SPLIT \
14+
{ 22, 22 }
15+
# else
16+
# define DRIVER_LED_TOTAL 22
17+
# define RGB_MATRIX_LED_COUNT 22
18+
# endif
1819

19-
#define RGB_MATRIX_KEYPRESSES
20+
# define RGB_MATRIX_KEYPRESSES
2021

2122
#endif
2223

2324
// OLED
2425
#ifdef OLED_ENABLE
2526
/* B8, B9 instead of B6, B7 */
26-
#define I2C1_SCL_PIN B8
27-
#define I2C1_SDA_PIN B9
27+
# define I2C1_SCL_PIN B8
28+
# define I2C1_SDA_PIN B9
2829
#endif
2930

30-
3131
#ifdef SPLIT_KEYBOARD
32-
#ifdef HAPTIC_ENABLE
33-
#define SPLIT_HAPTIC_ENABLE
34-
#endif
32+
# ifdef HAPTIC_ENABLE
33+
# define SPLIT_HAPTIC_ENABLE
34+
# endif
3535
#endif

firmware/qmk/keyboards/rgoulter/minif4_36/halconf.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
#pragma once
55

66
#ifdef OLED_ENABLE
7-
#define HAL_USE_I2C TRUE
7+
# define HAL_USE_I2C TRUE
88
#endif
99

1010
#ifdef RGB_MATRIX_ENABLE
11-
#define HAL_USE_PWM TRUE
11+
# define HAL_USE_PWM TRUE
1212
#endif
1313

1414
#ifdef SPLIT_KEYBOARD
15-
#define PAL_USE_CALLBACKS TRUE
16-
#define PAL_USE_WAIT TRUE
15+
# define PAL_USE_CALLBACKS TRUE
16+
# define PAL_USE_WAIT TRUE
1717
#endif
1818

1919
#include_next <halconf.h>

firmware/qmk/keyboards/rgoulter/minif4_36/minif4_36.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "minif4_36.h"
55

66
#ifdef SPLIT_KEYBOARD
7-
#include "split_util.h"
7+
# include "split_util.h"
88
#endif
99

1010
void board_init(void) {

firmware/qmk/keyboards/rgoulter/minif4_36/minif4_36.h

-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@
44
#pragma once
55

66
#include "quantum.h"
7-

firmware/qmk/keyboards/rgoulter/x_2/config.h

+12-12
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@
55

66
// RGB Lighting
77
#ifdef RGBLIGHT_ENABLE
8-
#define DRIVER_LED_TOTAL 4
9-
#define RGBLED_NUM 4
10-
#define RGBLIGHT_LIMIT_VAL 80
11-
#define RGBLIGHT_DEFAULT_VAL 30
12-
#define RGBLIGHT_VAL_STEP 8
8+
# define DRIVER_LED_TOTAL 4
9+
# define RGBLED_NUM 4
10+
# define RGBLIGHT_LIMIT_VAL 80
11+
# define RGBLIGHT_DEFAULT_VAL 30
12+
# define RGBLIGHT_VAL_STEP 8
1313
#endif
1414

1515
#ifdef RGB_MATRIX_ENABLE
16-
#define DRIVER_LED_TOTAL 70
17-
#define RGBLED_NUM 70
18-
#define RGB_MATRIX_LED_COUNT 70
19-
#define RGB_MATRIX_KEYPRESSES
16+
# define DRIVER_LED_TOTAL 70
17+
# define RGBLED_NUM 70
18+
# define RGB_MATRIX_LED_COUNT 70
19+
# define RGB_MATRIX_KEYPRESSES
2020
#endif
2121

2222
#ifdef RGB_MATRIX_ENABLE
23-
#ifdef RGBLIGHT_ENABLE
24-
#error "rgblight and rgb_matrix both enabled"
25-
#endif
23+
# ifdef RGBLIGHT_ENABLE
24+
# error "rgblight and rgb_matrix both enabled"
25+
# endif
2626
#endif

firmware/qmk/keyboards/rgoulter/x_2/halconf.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
#pragma once
55

66
#ifdef RGBLIGHT_ENABLE
7-
#define HAL_USE_PWM TRUE
7+
# define HAL_USE_PWM TRUE
88
#endif
99

1010
#ifdef RGB_MATRIX_ENABLE
11-
#define HAL_USE_PWM TRUE
11+
# define HAL_USE_PWM TRUE
1212
#endif
1313

1414
#include_next <halconf.h>

0 commit comments

Comments
 (0)