From 7a6faeddf389136bbf4efdcd0b27d5ffdcd0e4f0 Mon Sep 17 00:00:00 2001
From: Adam Honse <calcprogrammer1@gmail.com>
Date: Sun, 27 Nov 2022 03:26:01 -0600
Subject: [PATCH] Append i2c address to port name

---
 .../LEDStripController/LEDStripController.cpp | 26 ++++++++++++++-----
 .../LEDStripController/LEDStripController.h   |  1 +
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/Controllers/LEDStripController/LEDStripController.cpp b/Controllers/LEDStripController/LEDStripController.cpp
index ffbbeb590..7db01a01d 100644
--- a/Controllers/LEDStripController/LEDStripController.cpp
+++ b/Controllers/LEDStripController/LEDStripController.cpp
@@ -6,6 +6,7 @@
 
 #include "LEDStripController.h"
 #include "ResourceManager.h"
+#include "LogManager.h"
 
 #include <fstream>
 #include <iostream>
@@ -34,6 +35,9 @@ void LEDStripController::Initialize(char* ledstring, led_protocol proto)
     //Assume serial device unless a different protocol is specified
     bool    serial = TRUE;
 
+    //Default i2c address out of range
+    i2c_addr = 255;
+
     source = strtok_s(ledstring, ",", &next);
 
     //Check if we are setting up a Keyboard Visualizer UDP protocol device
@@ -43,6 +47,13 @@ void LEDStripController::Initialize(char* ledstring, led_protocol proto)
         serial = FALSE;
     }
 
+    //I2C includes extra entry - I2C device address
+    if (protocol == LED_PROTOCOL_BASIC_I2C)
+    {
+        udpport_baud = strtok_s(next, ",", &next);
+        i2c_addr = atoi(udpport_baud);
+    }
+
     //Check for either the UDP port or the serial baud rate
     if (strlen(next))
     {
@@ -97,8 +108,11 @@ void LEDStripController::InitializeI2C(char* i2cname)
     {
         if(ResourceManager::get()->GetI2CBusses()[i2c_idx]->device_name == std::string(i2cname))
         {
-            i2cport = ResourceManager::get()->GetI2CBusses()[i2c_idx];
-            break;
+            if(i2c_addr < 128)
+            {
+                i2cport = ResourceManager::get()->GetI2CBusses()[i2c_idx];
+                break;
+            }
         }
     }
 
@@ -138,7 +152,7 @@ std::string LEDStripController::GetLocation()
     }
     else if(i2cport != NULL)
     {
-        return("I2C: " + std::string(i2cport->device_name));
+        return("I2C: " + std::string(i2cport->device_name) + ", Address " + std::to_string(i2c_addr));
     }
     else
     {
@@ -376,7 +390,7 @@ void LEDStripController::SetLEDsBasicI2C(std::vector<RGBColor> colors)
         {
             if(i2cport != NULL)
             {
-                i2cport->i2c_smbus_write_i2c_block_data(0x08, offset, 30, serial_buf);
+                i2cport->i2c_smbus_write_i2c_block_data(i2c_addr, offset, 30, serial_buf);
                 offset += 30;
                 index = 0;
             }
@@ -387,12 +401,12 @@ void LEDStripController::SetLEDsBasicI2C(std::vector<RGBColor> colors)
     {
         if(i2cport != NULL)
         {
-            i2cport->i2c_smbus_write_i2c_block_data(0x08, offset, index, serial_buf);
+            i2cport->i2c_smbus_write_i2c_block_data(i2c_addr, offset, index, serial_buf);
         }
     }
 
     if(i2cport != NULL)
     {
-        i2cport->i2c_smbus_write_byte(0x08, 0xFF);
+        i2cport->i2c_smbus_write_byte(i2c_addr, 0xFF);
     }
 }
diff --git a/Controllers/LEDStripController/LEDStripController.h b/Controllers/LEDStripController/LEDStripController.h
index b787db621..aae68e0ef 100644
--- a/Controllers/LEDStripController/LEDStripController.h
+++ b/Controllers/LEDStripController/LEDStripController.h
@@ -76,6 +76,7 @@ private:
     serial_port *serialport;
     net_port *udpport;
     i2c_smbus_interface *i2cport;
+    unsigned char i2c_addr;
     led_protocol protocol;
 };