Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
d1bd5a0100
3 changed files with 9 additions and 2 deletions
|
@ -297,6 +297,9 @@ uint8_t I2C3733_Init_Drivers(void) {
|
||||||
if (gcr_actual > LED_GCR_MAX) gcr_actual = LED_GCR_MAX;
|
if (gcr_actual > LED_GCR_MAX) gcr_actual = LED_GCR_MAX;
|
||||||
gcr_desired = gcr_actual;
|
gcr_desired = gcr_actual;
|
||||||
|
|
||||||
|
void issi3733_prepare_arrays(void);
|
||||||
|
issi3733_prepare_arrays();
|
||||||
|
|
||||||
// Set up master device
|
// Set up master device
|
||||||
i2c_led_send_CRWL(0);
|
i2c_led_send_CRWL(0);
|
||||||
i2c_led_select_page(0, 3);
|
i2c_led_select_page(0, 3);
|
||||||
|
|
|
@ -300,8 +300,6 @@ int main(void) {
|
||||||
i2c1_init();
|
i2c1_init();
|
||||||
#endif // RGB_MATRIX_ENABLE
|
#endif // RGB_MATRIX_ENABLE
|
||||||
|
|
||||||
matrix_init();
|
|
||||||
|
|
||||||
USB_Hub_init();
|
USB_Hub_init();
|
||||||
|
|
||||||
DBGC(DC_MAIN_UDC_START_BEGIN);
|
DBGC(DC_MAIN_UDC_START_BEGIN);
|
||||||
|
|
|
@ -206,6 +206,12 @@ void gcr_compute(void) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void issi3733_prepare_arrays(void) {
|
void issi3733_prepare_arrays(void) {
|
||||||
|
static bool s_init = false;
|
||||||
|
if (s_init) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
s_init = true;
|
||||||
|
|
||||||
memset(issidrv, 0, sizeof(issi3733_driver_t) * ISSI3733_DRIVER_COUNT);
|
memset(issidrv, 0, sizeof(issi3733_driver_t) * ISSI3733_DRIVER_COUNT);
|
||||||
|
|
||||||
int i;
|
int i;
|
||||||
|
|
Loading…
Reference in a new issue