From 827ad7e08e4661998c5da2764ed840e92717f0ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Fri, 29 Sep 2017 00:50:56 +0200 Subject: [PATCH] Rename BridgeCounter to I2cSchedulerCounter and move it to the top of masterCallback. --- right/src/slave_scheduler.c | 5 ++--- right/src/slave_scheduler.h | 2 +- right/src/usb_protocol_handler.c | 8 ++++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/right/src/slave_scheduler.c b/right/src/slave_scheduler.c index 1eb47ed..f1af173 100644 --- a/right/src/slave_scheduler.c +++ b/right/src/slave_scheduler.c @@ -9,7 +9,7 @@ uint8_t previousSlaveId; uint8_t currentSlaveId; -uint32_t BridgeCounter; +uint32_t I2cSchedulerCounter; uhk_slave_t Slaves[] = { { .init = UhkModuleSlaveDriver_Init, .update = UhkModuleSlaveDriver_Update, .perDriverId = UhkModuleDriverId_LeftKeyboardHalf }, @@ -22,10 +22,9 @@ uhk_slave_t Slaves[] = { static void masterCallback(I2C_Type *base, i2c_master_handle_t *handle, status_t previousStatus, void *userData) { bool isTransferScheduled = false; + I2cSchedulerCounter++; do { - BridgeCounter++; - uhk_slave_t *previousSlave = Slaves + previousSlaveId; uhk_slave_t *currentSlave = Slaves + currentSlaveId; diff --git a/right/src/slave_scheduler.h b/right/src/slave_scheduler.h index ff25a16..71e6c0c 100644 --- a/right/src/slave_scheduler.h +++ b/right/src/slave_scheduler.h @@ -37,7 +37,7 @@ // Variables: extern uhk_slave_t Slaves[]; - extern uint32_t BridgeCounter; + extern uint32_t I2cSchedulerCounter; // Functions: diff --git a/right/src/usb_protocol_handler.c b/right/src/usb_protocol_handler.c index 5382cd1..1a664c3 100644 --- a/right/src/usb_protocol_handler.c +++ b/right/src/usb_protocol_handler.c @@ -206,10 +206,10 @@ void getDebugInfo(void) GenericHidOutBuffer[3] = I2C_Watchdog >> 16; GenericHidOutBuffer[4] = I2C_Watchdog >> 24; - GenericHidOutBuffer[5] = BridgeCounter >> 0; - GenericHidOutBuffer[6] = BridgeCounter >> 8; - GenericHidOutBuffer[7] = BridgeCounter >> 16; - GenericHidOutBuffer[8] = BridgeCounter >> 24; + GenericHidOutBuffer[5] = I2cSchedulerCounter >> 0; + GenericHidOutBuffer[6] = I2cSchedulerCounter >> 8; + GenericHidOutBuffer[7] = I2cSchedulerCounter >> 16; + GenericHidOutBuffer[8] = I2cSchedulerCounter >> 24; GenericHidOutBuffer[9] = I2cWatchdog_OuterCounter >> 0; GenericHidOutBuffer[10] = I2cWatchdog_OuterCounter >> 8;