diff --git a/right/src/slave_scheduler.c b/right/src/slave_scheduler.c index 94d0cab..9298c9c 100644 --- a/right/src/slave_scheduler.c +++ b/right/src/slave_scheduler.c @@ -16,9 +16,9 @@ slave_driver_initializer_t slaveDriverInitializers[] = { }; uhk_slave_t slaves[] = { - { .slaveHandler = UhkModuleSlaveDriver_Update, .moduleId = 0 }, - { .slaveHandler = LedSlaveDriver_Update, .moduleId = 0 }, - { .slaveHandler = LedSlaveDriver_Update, .moduleId = 1 }, + { .updater = UhkModuleSlaveDriver_Update, .moduleId = 0 }, + { .updater = LedSlaveDriver_Update, .moduleId = 0 }, + { .updater = LedSlaveDriver_Update, .moduleId = 1 }, }; static void bridgeProtocolCallback(I2C_Type *base, i2c_master_handle_t *handle, status_t status, void *userData) @@ -28,7 +28,7 @@ static void bridgeProtocolCallback(I2C_Type *base, i2c_master_handle_t *handle, } uhk_slave_t *bridgeSlave = slaves + currentBridgeSlaveId; - bridgeSlave->slaveHandler(bridgeSlave->moduleId); + bridgeSlave->updater(bridgeSlave->moduleId); currentBridgeSlaveId++; if (currentBridgeSlaveId >= (sizeof(slaves) / sizeof(uhk_slave_t))) { @@ -49,5 +49,5 @@ void InitSlaveScheduler() I2C_MasterTransferCreateHandle(I2C_MAIN_BUS_BASEADDR, &I2cMasterHandle, bridgeProtocolCallback, NULL); // Kickstart the scheduler by triggering the first callback. - slaves[0].slaveHandler(slaves[0].moduleId); + slaves[0].updater(slaves[0].moduleId); } diff --git a/right/src/slave_scheduler.h b/right/src/slave_scheduler.h index 8ad30c7..9a87d7d 100644 --- a/right/src/slave_scheduler.h +++ b/right/src/slave_scheduler.h @@ -13,12 +13,12 @@ UhkSlaveType_Touchpad } uhk_slave_type_t; - typedef void (slave_handler_t)(uint8_t); + typedef void (slave_updater_t)(uint8_t); typedef void (*slave_driver_initializer_t)(); typedef struct { uint8_t moduleId; // This is a unique, per-module ID. - slave_handler_t *slaveHandler; + slave_updater_t *updater; bool isConnected; } uhk_slave_t;