summaryrefslogtreecommitdiffstats
path: root/quantum
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2018-10-31 23:14:59 +0100
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>2018-10-31 23:14:59 +0100
commitf63c0b784490a04069b59f1b77355d5982f55ceb (patch)
tree31570c4ad73a9f0914af873006e0edeb16ec6dfd /quantum
parentbd6d6d93f26578baf7ef1d05d51963d8c38ee7c9 (diff)
downloadqmk_firmware-f63c0b784490a04069b59f1b77355d5982f55ceb.tar.gz
qmk_firmware-f63c0b784490a04069b59f1b77355d5982f55ceb.tar.xz
Add pointer(?) to disable_JTAG to prevent compiler errors (#4310)
Diffstat (limited to 'quantum')
-rw-r--r--quantum/split_common/split_util.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c
index 7ca68c56c..8d39329d4 100644
--- a/quantum/split_common/split_util.c
+++ b/quantum/split_common/split_util.c
@@ -92,13 +92,14 @@ void split_keyboard_setup(void) {
sei();
}
+void disable_JTAG(void);
void keyboard_slave_loop(void) {
// 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
disable_JTAG();
-
+
matrix_init();
-
+
//Init RGB
#ifdef RGBLIGHT_ENABLE
rgblight_init();
@@ -107,7 +108,7 @@ void keyboard_slave_loop(void) {
while (1) {
// Matrix Slave Scan
matrix_slave_scan();
-
+
// Read Backlight Info
#ifdef BACKLIGHT_ENABLE
#ifdef USE_I2C
@@ -126,14 +127,14 @@ void keyboard_slave_loop(void) {
// Disable interupts (RGB data is big)
cli();
// Create new DWORD for RGB data
- uint32_t dword;
-
+ uint32_t dword;
+
// Fill the new DWORD with the data that was sent over
uint8_t *dword_dat = (uint8_t *)(&dword);
for (int i = 0; i < 4; 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
rgblight_update_dword(dword);
RGB_DIRTY = false;