diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-03-03 07:54:11 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-03 07:54:11 +1100 |
| commit | d950b97115269a4e7e149bf1eb9b4c6ead13cf7b (patch) | |
| tree | 3acf12f792c383a7af87db82cc130b29a604402e /quantum | |
| parent | cde2859a6591b1274da20978bd158f20229faa88 (diff) | |
| download | qmk_firmware-d950b97115269a4e7e149bf1eb9b4c6ead13cf7b.tar.gz qmk_firmware-d950b97115269a4e7e149bf1eb9b4c6ead13cf7b.zip | |
Format code according to conventions (#12088)
Co-authored-by: QMK Bot <hello@qmk.fm>
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/rgb_matrix.c | 7 | ||||
| -rw-r--r-- | quantum/rgb_matrix_types.h | 8 | ||||
| -rw-r--r-- | quantum/split_common/transport.c | 18 |
3 files changed, 16 insertions, 17 deletions
diff --git a/quantum/rgb_matrix.c b/quantum/rgb_matrix.c index 69d4c0209..8aae48603 100644 --- a/quantum/rgb_matrix.c +++ b/quantum/rgb_matrix.c | |||
| @@ -158,7 +158,7 @@ void eeconfig_update_rgb_matrix_default(void) { | |||
| 158 | rgb_matrix_config.mode = RGB_MATRIX_STARTUP_MODE; | 158 | rgb_matrix_config.mode = RGB_MATRIX_STARTUP_MODE; |
| 159 | rgb_matrix_config.hsv = (HSV){RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL}; | 159 | rgb_matrix_config.hsv = (HSV){RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL}; |
| 160 | rgb_matrix_config.speed = RGB_MATRIX_STARTUP_SPD; | 160 | rgb_matrix_config.speed = RGB_MATRIX_STARTUP_SPD; |
| 161 | rgb_matrix_config.flags = LED_FLAG_ALL; | 161 | rgb_matrix_config.flags = LED_FLAG_ALL; |
| 162 | eeconfig_update_rgb_matrix(); | 162 | eeconfig_update_rgb_matrix(); |
| 163 | } | 163 | } |
| 164 | 164 | ||
| @@ -193,13 +193,12 @@ void rgb_matrix_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) { | |||
| 193 | rgb_matrix_driver.set_color(index - k_rgb_matrix_split[0], red, green, blue); | 193 | rgb_matrix_driver.set_color(index - k_rgb_matrix_split[0], red, green, blue); |
| 194 | else if (is_keyboard_left() && index < k_rgb_matrix_split[0]) | 194 | else if (is_keyboard_left() && index < k_rgb_matrix_split[0]) |
| 195 | #endif | 195 | #endif |
| 196 | rgb_matrix_driver.set_color(index, red, green, blue); | 196 | rgb_matrix_driver.set_color(index, red, green, blue); |
| 197 | } | 197 | } |
| 198 | 198 | ||
| 199 | void rgb_matrix_set_color_all(uint8_t red, uint8_t green, uint8_t blue) { | 199 | void rgb_matrix_set_color_all(uint8_t red, uint8_t green, uint8_t blue) { |
| 200 | #if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT) | 200 | #if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT) |
| 201 | for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) | 201 | for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) rgb_matrix_set_color(i, red, green, blue); |
| 202 | rgb_matrix_set_color(i, red, green, blue); | ||
| 203 | #else | 202 | #else |
| 204 | rgb_matrix_driver.set_color_all(red, green, blue); | 203 | rgb_matrix_driver.set_color_all(red, green, blue); |
| 205 | #endif | 204 | #endif |
diff --git a/quantum/rgb_matrix_types.h b/quantum/rgb_matrix_types.h index 8cd5b17a7..1a37922af 100644 --- a/quantum/rgb_matrix_types.h +++ b/quantum/rgb_matrix_types.h | |||
| @@ -85,10 +85,10 @@ typedef struct PACKED { | |||
| 85 | typedef union { | 85 | typedef union { |
| 86 | uint32_t raw; | 86 | uint32_t raw; |
| 87 | struct PACKED { | 87 | struct PACKED { |
| 88 | uint8_t enable : 2; | 88 | uint8_t enable : 2; |
| 89 | uint8_t mode : 6; | 89 | uint8_t mode : 6; |
| 90 | HSV hsv; | 90 | HSV hsv; |
| 91 | uint8_t speed; // EECONFIG needs to be increased to support this | 91 | uint8_t speed; // EECONFIG needs to be increased to support this |
| 92 | led_flags_t flags; | 92 | led_flags_t flags; |
| 93 | }; | 93 | }; |
| 94 | } rgb_config_t; | 94 | } rgb_config_t; |
diff --git a/quantum/split_common/transport.c b/quantum/split_common/transport.c index daa60bb73..27a1c0d3a 100644 --- a/quantum/split_common/transport.c +++ b/quantum/split_common/transport.c | |||
| @@ -203,8 +203,8 @@ void transport_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) | |||
| 203 | # endif | 203 | # endif |
| 204 | 204 | ||
| 205 | # if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT) | 205 | # if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT) |
| 206 | memcpy((void*)i2c_buffer->rgb_matrix, (void *)rgb_matrix_config, sizeof(i2c_buffer->rgb_matrix)); | 206 | memcpy((void *)i2c_buffer->rgb_matrix, (void *)rgb_matrix_config, sizeof(i2c_buffer->rgb_matrix)); |
| 207 | memcpy((void*)i2c_buffer->rgb_suspend_state, (void *)g_suspend_state, sizeof(i2c_buffer->rgb_suspend_state)); | 207 | memcpy((void *)i2c_buffer->rgb_suspend_state, (void *)g_suspend_state, sizeof(i2c_buffer->rgb_suspend_state)); |
| 208 | # endif | 208 | # endif |
| 209 | } | 209 | } |
| 210 | 210 | ||
| @@ -357,24 +357,24 @@ bool transport_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) | |||
| 357 | 357 | ||
| 358 | # ifdef WPM_ENABLE | 358 | # ifdef WPM_ENABLE |
| 359 | // Write wpm to slave | 359 | // Write wpm to slave |
| 360 | serial_m2s_buffer.current_wpm = get_current_wpm(); | 360 | serial_m2s_buffer.current_wpm = get_current_wpm(); |
| 361 | # endif | 361 | # endif |
| 362 | 362 | ||
| 363 | # ifdef SPLIT_MODS_ENABLE | 363 | # ifdef SPLIT_MODS_ENABLE |
| 364 | serial_m2s_buffer.real_mods = get_mods(); | 364 | serial_m2s_buffer.real_mods = get_mods(); |
| 365 | serial_m2s_buffer.weak_mods = get_weak_mods(); | 365 | serial_m2s_buffer.weak_mods = get_weak_mods(); |
| 366 | # ifndef NO_ACTION_ONESHOT | 366 | # ifndef NO_ACTION_ONESHOT |
| 367 | serial_m2s_buffer.oneshot_mods = get_oneshot_mods(); | 367 | serial_m2s_buffer.oneshot_mods = get_oneshot_mods(); |
| 368 | # endif | 368 | # endif |
| 369 | # endif | 369 | # endif |
| 370 | 370 | ||
| 371 | # if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT) | 371 | # if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT) |
| 372 | serial_m2s_buffer.rgb_matrix = rgb_matrix_config; | 372 | serial_m2s_buffer.rgb_matrix = rgb_matrix_config; |
| 373 | serial_m2s_buffer.rgb_suspend_state = g_suspend_state; | 373 | serial_m2s_buffer.rgb_suspend_state = g_suspend_state; |
| 374 | # endif | 374 | # endif |
| 375 | 375 | ||
| 376 | # ifndef DISABLE_SYNC_TIMER | 376 | # ifndef DISABLE_SYNC_TIMER |
| 377 | serial_m2s_buffer.sync_timer = sync_timer_read32() + SYNC_TIMER_OFFSET; | 377 | serial_m2s_buffer.sync_timer = sync_timer_read32() + SYNC_TIMER_OFFSET; |
| 378 | # endif | 378 | # endif |
| 379 | return true; | 379 | return true; |
| 380 | } | 380 | } |
| @@ -414,7 +414,7 @@ void transport_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) | |||
| 414 | 414 | ||
| 415 | # if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT) | 415 | # if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT) |
| 416 | rgb_matrix_config = serial_m2s_buffer.rgb_matrix; | 416 | rgb_matrix_config = serial_m2s_buffer.rgb_matrix; |
| 417 | g_suspend_state = serial_m2s_buffer.rgb_suspend_state; | 417 | g_suspend_state = serial_m2s_buffer.rgb_suspend_state; |
| 418 | # endif | 418 | # endif |
| 419 | } | 419 | } |
| 420 | 420 | ||
