Merge pull request #65 from WildernessLabs/v4

Check version mcp to switch between v3 and v4 hardware
WildernessLabs · Feb 4, 2024 · d2ce559 · d2ce559
2 parents 1cf91c7 + ff95953
commit d2ce559
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 24 deletions.
diff --git a/Source/Meadow.Clima/Clima.cs b/Source/Meadow.Clima/Clima.cs
@@ -1,4 +1,5 @@
-using Meadow.Hardware;
+using Meadow.Foundation.ICs.IOExpanders;
+using Meadow.Hardware;
 using Meadow.Logging;
 using System;
 
@@ -44,8 +45,34 @@ public static IClimaHardware Create()
             }
             else if (device is IF7CoreComputeMeadowDevice { } ccm)
             {
-                logger?.Info("Instantiating Clima v3 specific hardware");
-                hardware = new ClimaHardwareV3(ccm, i2cBus);
+                Mcp23008? mcpVersion = null;
+                byte version = 0;
+
+                try
+                {
+                    logger?.Info("Instantiating version MCP23008");
+
+                    var resetPort = ccm.Pins.D02.CreateDigitalOutputPort();
+
+                    mcpVersion = new Mcp23008(i2cBus, address: 0x27, resetPort: resetPort);
+
+                    version = mcpVersion.ReadFromPorts();
+                }
+                catch
+                {
+                    logger?.Info("Failed to instantiate version MCP23008");
+                }
+
+                if (version > 4)
+                {
+                    logger?.Info("Instantiating Clima v4 specific hardware");
+                    hardware = new ClimaHardwareV4(ccm, i2cBus, mcpVersion!);
+                }
+                else
+                {
+                    logger?.Info("Instantiating Clima v3 specific hardware");
+                    hardware = new ClimaHardwareV3(ccm, i2cBus, mcpVersion!);
+                }
             }
             else
             {

diff --git a/Source/Meadow.Clima/ClimaHardwareV3.cs b/Source/Meadow.Clima/ClimaHardwareV3.cs
@@ -16,7 +16,10 @@ namespace Meadow.Devices
     /// </summary>
     public class ClimaHardwareV3 : ClimaHardwareBase
     {
-        private readonly IF7CoreComputeMeadowDevice _device;
+        /// <summary>
+        /// The Meadow CCM device
+        /// </summary>
+        protected readonly IF7CoreComputeMeadowDevice _device;
 
         private Scd40? _environmentalSensor;
         private ICO2ConcentrationSensor? _co2ConcentrationSensor;
@@ -35,7 +38,7 @@ public class ClimaHardwareV3 : ClimaHardwareBase
         /// <summary>
         /// The MCP23008 IO expander that contains the Clima hardware version 
         /// </summary>
-        Mcp23008? McpVersion { get; set; }
+        public Mcp23008 McpVersion { get; protected set; }
 
         /// <inheritdoc/>
         public override string RevisionString => "v3.x";
@@ -59,8 +62,11 @@ public class ClimaHardwareV3 : ClimaHardwareBase
         /// </summary>
         /// <param name="device">The meadow device</param>
         /// <param name="i2cBus">The I2C bus</param>
-        public ClimaHardwareV3(IF7CoreComputeMeadowDevice device, II2cBus i2cBus)
+        /// <param name="mcpVersion">The Mcp23008 used to read version information</param>
+        public ClimaHardwareV3(IF7CoreComputeMeadowDevice device, II2cBus i2cBus, Mcp23008 mcpVersion)
         {
+            McpVersion = mcpVersion;
+
             _device = device;
 
             I2cBus = i2cBus;
@@ -69,18 +75,6 @@ public ClimaHardwareV3(IF7CoreComputeMeadowDevice device, II2cBus i2cBus)
             // Must initialise any PWM based I/O first
             GetRgbPwmLed();
 
-            try
-            {
-                Logger?.Trace("Instantiating Mcp Version");
-                McpVersion = new Mcp23008(I2cBus, address: 0x27, resetPort: device.Pins.D02.CreateDigitalOutputPort());
-                Logger?.Info("Mcp Version up");
-            }
-            catch (Exception e)
-            {
-                Logger?.Trace($"ERR creating the MCP that has version information: {e.Message}");
-            }
-
-
             try
             {
                 Logger?.Trace("Instantiating Solar Voltage Input");

diff --git a/Source/Meadow.Clima/ClimaHardwareV4.cs b/Source/Meadow.Clima/ClimaHardwareV4.cs
@@ -1,4 +1,5 @@
-using Meadow.Hardware;
+using Meadow.Foundation.ICs.IOExpanders;
+using Meadow.Hardware;
 
 namespace Meadow.Devices
 {
@@ -7,8 +8,6 @@ namespace Meadow.Devices
     /// </summary>
     public class ClimaHardwareV4 : ClimaHardwareV3
     {
-        private readonly IF7CoreComputeMeadowDevice _device;
-
         /// <inheritdoc/>
         public override string RevisionString => "v4.x";
 
@@ -17,10 +16,10 @@ public class ClimaHardwareV4 : ClimaHardwareV3
         /// </summary>
         /// <param name="device">The meadow device</param>
         /// <param name="i2cBus">The I2C bus</param>
-        public ClimaHardwareV4(IF7CoreComputeMeadowDevice device, II2cBus i2cBus)
-        : base(device, i2cBus)
+        /// <param name="mcpVersion">The Mcp23008 used to read version information</param>
+        public ClimaHardwareV4(IF7CoreComputeMeadowDevice device, II2cBus i2cBus, Mcp23008 mcpVersion)
+        : base(device, i2cBus, mcpVersion)
         {
-            _device = device;
         }
 
         internal override I2cConnector? CreateQwiicConnector()