From d9ffdb6bb34d2c5bbbcff6dee939eda9ee355509 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= <laci@monda.hu>
Date: Fri, 17 Mar 2017 01:46:06 +0100
Subject: [PATCH] Replace i2cAddress with moduleId in bridge_slave_t.

---
 right/src/bridge_protocol_scheduler.c | 8 ++++----
 right/src/bridge_protocol_scheduler.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/right/src/bridge_protocol_scheduler.c b/right/src/bridge_protocol_scheduler.c
index 4b0830e..f234616 100644
--- a/right/src/bridge_protocol_scheduler.c
+++ b/right/src/bridge_protocol_scheduler.c
@@ -10,8 +10,8 @@ uint8_t ledsBuffer[BUFFER_SIZE] = {FRAME_REGISTER_PWM_FIRST};
 uint8_t currentBridgeSlaveId = 0;
 
 bridge_slave_t bridgeSlaves[] = {
-        { .i2cAddress = I2C_ADDRESS_LEFT_KEYBOARD_HALF, .type = BridgeSlaveType_UhkModule },
-        { .i2cAddress = I2C_ADDRESS_LED_DRIVER_LEFT,    .type = BridgeSlaveType_LedDriver },
+    { .moduleId = 0, .type = BridgeSlaveType_UhkModule },
+    { .moduleId = 0, .type = BridgeSlaveType_LedDriver },
 };
 
 bool BridgeSlaveLedDriverHandler(uint8_t ledDriverId) {
@@ -30,9 +30,9 @@ static void bridgeProtocolCallback(I2C_Type *base, i2c_master_handle_t *handle,
     SetLeds(0xff);
 
     if (bridgeSlave->type == BridgeSlaveType_UhkModule) {
-        BridgeSlaveUhkModuleHandler(0);
+        BridgeSlaveUhkModuleHandler(bridgeSlave->moduleId);
     } else if (bridgeSlave->type == BridgeSlaveType_LedDriver) {
-        BridgeSlaveLedDriverHandler(0);
+        BridgeSlaveLedDriverHandler(bridgeSlave->moduleId);
     }
 
     if (++currentBridgeSlaveId >= (sizeof(bridgeSlaves) / sizeof(bridge_slave_t))) {
diff --git a/right/src/bridge_protocol_scheduler.h b/right/src/bridge_protocol_scheduler.h
index 0c5a54e..a986c00 100644
--- a/right/src/bridge_protocol_scheduler.h
+++ b/right/src/bridge_protocol_scheduler.h
@@ -14,7 +14,7 @@
     } bridge_slave_type_t;
 
     typedef struct {
-        uint8_t i2cAddress;
+        uint8_t moduleId;  // This is a unique, per-module ID.
         bridge_slave_type_t type;
         bool isConnected;
     } bridge_slave_t;