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

Replace i2cAddress with moduleId in bridge_slave_t.

Browse Source
This commit is contained in:
László Monda
2017-03-17 01:46:06 +01:00
parent 02fe3b818f
commit d9ffdb6bb3
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
right/src/bridge_protocol_scheduler.c
View File

@@ -10,8 +10,8 @@ uint8_t ledsBuffer[BUFFER_SIZE] = {FRAME_REGISTER_PWM_FIRST};
uint8_t currentBridgeSlaveId = 0; uint8_t currentBridgeSlaveId = 0;
bridge_slave_t bridgeSlaves[] = { bridge_slave_t bridgeSlaves[] = {
{ .i2cAddress = I2C_ADDRESS_LEFT_KEYBOARD_HALF, .type = BridgeSlaveType_UhkModule }, { .moduleId = 0, .type = BridgeSlaveType_UhkModule },
{ .i2cAddress = I2C_ADDRESS_LED_DRIVER_LEFT, .type = BridgeSlaveType_LedDriver }, { .moduleId = 0, .type = BridgeSlaveType_LedDriver },
}; };
bool BridgeSlaveLedDriverHandler(uint8_t ledDriverId) { bool BridgeSlaveLedDriverHandler(uint8_t ledDriverId) {
@@ -30,9 +30,9 @@ static void bridgeProtocolCallback(I2C_Type *base, i2c_master_handle_t *handle,
SetLeds(0xff); SetLeds(0xff);
if (bridgeSlave->type == BridgeSlaveType_UhkModule) { if (bridgeSlave->type == BridgeSlaveType_UhkModule) {
BridgeSlaveUhkModuleHandler(0); BridgeSlaveUhkModuleHandler(bridgeSlave->moduleId);
} else if (bridgeSlave->type == BridgeSlaveType_LedDriver) { } else if (bridgeSlave->type == BridgeSlaveType_LedDriver) {
BridgeSlaveLedDriverHandler(0); BridgeSlaveLedDriverHandler(bridgeSlave->moduleId);
} }
if (++currentBridgeSlaveId >= (sizeof(bridgeSlaves) / sizeof(bridge_slave_t))) { if (++currentBridgeSlaveId >= (sizeof(bridgeSlaves) / sizeof(bridge_slave_t))) {

2
right/src/bridge_protocol_scheduler.h
View File

@@ -14,7 +14,7 @@
} bridge_slave_type_t; } bridge_slave_type_t;
typedef struct { typedef struct {
uint8_t i2cAddress; uint8_t moduleId; // This is a unique, per-module ID.
bridge_slave_type_t type; bridge_slave_type_t type;
bool isConnected; bool isConnected;
} bridge_slave_t; } bridge_slave_t;