Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Add pointer(?) to disable_JTAG to prevent compiler errors (#4310)

Browse source
This commit is contained in:
Drashna Jaelre 2018-10-31 15:14:59 -07:00 committed by MechMerlin
parent bd6d6d93f2
commit f63c0b7844
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
quantum/split_common/split_util.c
View file

@ -92,13 +92,14 @@ void split_keyboard_setup(void) {
sei(); sei();
} }
void disable_JTAG(void);
void keyboard_slave_loop(void) { void keyboard_slave_loop(void) {
// Disable JTAG since we skip calling keyboard_init() on the slave side // Disable JTAG since we skip calling keyboard_init() on the slave side
// Future fix will possible call keyboard_init() on the slave to remove this need // Future fix will possible call keyboard_init() on the slave to remove this need
disable_JTAG(); disable_JTAG();
matrix_init(); matrix_init();
//Init RGB //Init RGB
#ifdef RGBLIGHT_ENABLE #ifdef RGBLIGHT_ENABLE
rgblight_init(); rgblight_init();
@ -107,7 +108,7 @@ void keyboard_slave_loop(void) {
while (1) { while (1) {
// Matrix Slave Scan // Matrix Slave Scan
matrix_slave_scan(); matrix_slave_scan();
// Read Backlight Info // Read Backlight Info
#ifdef BACKLIGHT_ENABLE #ifdef BACKLIGHT_ENABLE
#ifdef USE_I2C #ifdef USE_I2C
@ -126,14 +127,14 @@ void keyboard_slave_loop(void) {
// Disable interupts (RGB data is big) // Disable interupts (RGB data is big)
cli(); cli();
// Create new DWORD for RGB data // Create new DWORD for RGB data
uint32_t dword; uint32_t dword;
// Fill the new DWORD with the data that was sent over // Fill the new DWORD with the data that was sent over
uint8_t *dword_dat = (uint8_t *)(&dword); uint8_t *dword_dat = (uint8_t *)(&dword);
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
dword_dat[i] = i2c_slave_buffer[I2C_RGB_START+i]; dword_dat[i] = i2c_slave_buffer[I2C_RGB_START+i];
} }
// Update the RGB now with the new data and set RGB_DIRTY to false // Update the RGB now with the new data and set RGB_DIRTY to false
rgblight_update_dword(dword); rgblight_update_dword(dword);
RGB_DIRTY = false; RGB_DIRTY = false;