uhk/firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename bridge_slave_t to uhk_slave_t and bridge_slave_type_t to uhk_slave_type_t

Browse Source
This commit is contained in:
László Monda
2017-05-05 00:10:42 +02:00
parent c291107312
commit c8abc2ec8e
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
right/src/bridge_protocol_scheduler.c
View File

@@ -10,7 +10,7 @@
uint8_t currentBridgeSlaveId = 0; uint8_t currentBridgeSlaveId = 0;
bridge_slave_t bridgeSlaves[] = { uhk_slave_t bridgeSlaves[] = {
{ .slaveHandler = BridgeSlaveUhkModuleHandler, .moduleId = 0 }, { .slaveHandler = BridgeSlaveUhkModuleHandler, .moduleId = 0 },
{ .slaveHandler = BridgeSlaveLedDriverHandler, .moduleId = 0 }, { .slaveHandler = BridgeSlaveLedDriverHandler, .moduleId = 0 },
{ .slaveHandler = BridgeSlaveLedDriverHandler, .moduleId = 1 }, { .slaveHandler = BridgeSlaveLedDriverHandler, .moduleId = 1 },
@@ -21,13 +21,13 @@ static void bridgeProtocolCallback(I2C_Type *base, i2c_master_handle_t *handle,
if (TestStates.disableI2c) { if (TestStates.disableI2c) {
return; return;
} }
bridge_slave_t *bridgeSlave = bridgeSlaves + currentBridgeSlaveId; uhk_slave_t *bridgeSlave = bridgeSlaves + currentBridgeSlaveId;
bool isFinished = bridgeSlave->slaveHandler(bridgeSlave->moduleId); bool isFinished = bridgeSlave->slaveHandler(bridgeSlave->moduleId);
if (isFinished) { if (isFinished) {
currentBridgeSlaveId++; currentBridgeSlaveId++;
if (currentBridgeSlaveId >= (sizeof(bridgeSlaves) / sizeof(bridge_slave_t))) { if (currentBridgeSlaveId >= (sizeof(bridgeSlaves) / sizeof(uhk_slave_t))) {
currentBridgeSlaveId = 0; currentBridgeSlaveId = 0;
} }
} }

4
right/src/bridge_protocol_scheduler.h
View File

@@ -11,7 +11,7 @@
BridgeSlaveType_LedDriver, BridgeSlaveType_LedDriver,
BridgeSlaveType_UhkModule, BridgeSlaveType_UhkModule,
BridgeSlaveType_Touchpad BridgeSlaveType_Touchpad
} bridge_slave_type_t; } uhk_slave_type_t;
typedef bool (slave_handler_t)(uint8_t); typedef bool (slave_handler_t)(uint8_t);
@@ -19,7 +19,7 @@
uint8_t moduleId; // This is a unique, per-module ID. uint8_t moduleId; // This is a unique, per-module ID.
slave_handler_t *slaveHandler; slave_handler_t *slaveHandler;
bool isConnected; bool isConnected;
} bridge_slave_t; } uhk_slave_t;
// Functions: // Functions: