darkkirb/qmk_firmware
1
0
Fork 0
forked from mirrors/qmk_firmware
Code Issues Pull requests Projects Releases Packages Wiki Activity

Format code according to conventions (#12088)

Browse source 
Co-authored-by: QMK Bot <hello@qmk.fm>
This commit is contained in:
github-actions[bot] 2021-03-03 07:54:11 +11:00 committed by GitHub
parent cde2859a65
commit d950b97115
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
quantum/rgb_matrix.c
View file

@ -158,7 +158,7 @@ void eeconfig_update_rgb_matrix_default(void) {
rgb_matrix_config.mode = RGB_MATRIX_STARTUP_MODE; rgb_matrix_config.mode = RGB_MATRIX_STARTUP_MODE;
rgb_matrix_config.hsv = (HSV){RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL}; rgb_matrix_config.hsv = (HSV){RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL};
rgb_matrix_config.speed = RGB_MATRIX_STARTUP_SPD; rgb_matrix_config.speed = RGB_MATRIX_STARTUP_SPD;
rgb_matrix_config.flags = LED_FLAG_ALL; rgb_matrix_config.flags = LED_FLAG_ALL;
eeconfig_update_rgb_matrix(); eeconfig_update_rgb_matrix();
} }
@ -193,13 +193,12 @@ void rgb_matrix_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
rgb_matrix_driver.set_color(index - k_rgb_matrix_split[0], red, green, blue); rgb_matrix_driver.set_color(index - k_rgb_matrix_split[0], red, green, blue);
else if (is_keyboard_left() && index < k_rgb_matrix_split[0]) else if (is_keyboard_left() && index < k_rgb_matrix_split[0])
#endif #endif
rgb_matrix_driver.set_color(index, red, green, blue); rgb_matrix_driver.set_color(index, red, green, blue);
} }
void rgb_matrix_set_color_all(uint8_t red, uint8_t green, uint8_t blue) { void rgb_matrix_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
#if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT) #if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) rgb_matrix_set_color(i, red, green, blue);
rgb_matrix_set_color(i, red, green, blue);
#else #else
rgb_matrix_driver.set_color_all(red, green, blue); rgb_matrix_driver.set_color_all(red, green, blue);
#endif #endif

8
quantum/rgb_matrix_types.h
View file

@ -85,10 +85,10 @@ typedef struct PACKED {
typedef union { typedef union {
uint32_t raw; uint32_t raw;
struct PACKED { struct PACKED {
uint8_t enable : 2; uint8_t enable : 2;
uint8_t mode : 6; uint8_t mode : 6;
HSV hsv; HSV hsv;
uint8_t speed; // EECONFIG needs to be increased to support this uint8_t speed; // EECONFIG needs to be increased to support this
led_flags_t flags; led_flags_t flags;
}; };
} rgb_config_t; } rgb_config_t;

18
quantum/split_common/transport.c
View file

@ -203,8 +203,8 @@ void transport_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[])
# endif # endif
# if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT) # if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
memcpy((void*)i2c_buffer->rgb_matrix, (void *)rgb_matrix_config, sizeof(i2c_buffer->rgb_matrix)); memcpy((void *)i2c_buffer->rgb_matrix, (void *)rgb_matrix_config, sizeof(i2c_buffer->rgb_matrix));
memcpy((void*)i2c_buffer->rgb_suspend_state, (void *)g_suspend_state, sizeof(i2c_buffer->rgb_suspend_state)); memcpy((void *)i2c_buffer->rgb_suspend_state, (void *)g_suspend_state, sizeof(i2c_buffer->rgb_suspend_state));
# endif # endif
} }
@ -357,24 +357,24 @@ bool transport_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix[])
# ifdef WPM_ENABLE # ifdef WPM_ENABLE
// Write wpm to slave // Write wpm to slave
serial_m2s_buffer.current_wpm = get_current_wpm(); serial_m2s_buffer.current_wpm = get_current_wpm();
# endif # endif
# ifdef SPLIT_MODS_ENABLE # ifdef SPLIT_MODS_ENABLE
serial_m2s_buffer.real_mods = get_mods(); serial_m2s_buffer.real_mods = get_mods();
serial_m2s_buffer.weak_mods = get_weak_mods(); serial_m2s_buffer.weak_mods = get_weak_mods();
# ifndef NO_ACTION_ONESHOT # ifndef NO_ACTION_ONESHOT
serial_m2s_buffer.oneshot_mods = get_oneshot_mods(); serial_m2s_buffer.oneshot_mods = get_oneshot_mods();
# endif # endif
# endif # endif
# if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT) # if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
serial_m2s_buffer.rgb_matrix = rgb_matrix_config; serial_m2s_buffer.rgb_matrix = rgb_matrix_config;
serial_m2s_buffer.rgb_suspend_state = g_suspend_state; serial_m2s_buffer.rgb_suspend_state = g_suspend_state;
# endif # endif
# ifndef DISABLE_SYNC_TIMER # ifndef DISABLE_SYNC_TIMER
serial_m2s_buffer.sync_timer = sync_timer_read32() + SYNC_TIMER_OFFSET; serial_m2s_buffer.sync_timer = sync_timer_read32() + SYNC_TIMER_OFFSET;
# endif # endif
return true; return true;
} }
@ -414,7 +414,7 @@ void transport_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[])
# if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT) # if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
rgb_matrix_config = serial_m2s_buffer.rgb_matrix; rgb_matrix_config = serial_m2s_buffer.rgb_matrix;
g_suspend_state = serial_m2s_buffer.rgb_suspend_state; g_suspend_state = serial_m2s_buffer.rgb_suspend_state;
# endif # endif
} }