General cleanup

WildernessLabs · Jun 28, 2024 · b9ad9e2 · b9ad9e2
1 parent 969a23c
commit b9ad9e2
Show file tree

Hide file tree

Showing 19 changed files with 111 additions and 196 deletions.
diff --git a/Source/Clima_Demo/MeadowApp.cs b/Source/Clima_Demo/MeadowApp.cs
@@ -8,19 +8,17 @@ namespace Clima_Demo;
 
 public class ClimaApp : ClimaAppBase
 {
-    private MainController mainController;
-
-    public ClimaApp()
-    {
-        mainController = new MainController();
-    }
+    private MainController? mainController;
 
     public override Task Initialize()
     {
-        Resolver.Log.Trace($"!! Initializing");
+        Resolver.Log.Info($"Initialize...");
+
+        mainController = new MainController();
 
         var reliabilityService = Resolver.Services.Get<IReliabilityService>();
-        reliabilityService!.MeadowSystemError += OnMeadowSystemError;
+        reliabilityService!.MeadowSystemError += OnMeadowSystemError;
+
         if (reliabilityService.LastBootWasFromCrash)
         {
             mainController.LogAppStartupAfterCrash(reliabilityService.GetCrashData());
@@ -57,12 +55,14 @@ private void OnMeadowSystemError(MeadowSystemErrorInfo error, bool recommendRese
 
     private void OnMeadowSystemError(object sender, MeadowSystemErrorInfo e)
     {
-        Resolver.Log.Error($"App has detected a system error: {e.Message}");
+        Resolver.Log.Error($"App has detected a system error: {e.Message}");
+
         if (e is Esp32SystemErrorInfo esp)
         {
             Resolver.Log.Error($"ESP function: {esp.Function}");
             Resolver.Log.Error($"ESP status code: {esp.StatusCode}");
-        }
+        }
+
         if (e.Exception != null)
         {
             Resolver.Log.Error($"Exception: {e.Exception.Message}");
@@ -76,74 +76,4 @@ private void OnMeadowSystemError(object sender, MeadowSystemErrorInfo e)
             }
         }
     }
-}
-
-//public class MeadowApp : App<F7CoreComputeV2>
-//{
-//    private MainController mainController;
-
-//    public MeadowApp()
-//    {
-//        mainController = new MainController();
-//    }
-
-//    public override Task Initialize()
-//    {
-//        var reliabilityService = Resolver.Services.Get<IReliabilityService>();
-//        reliabilityService!.MeadowSystemError += OnMeadowSystemError;
-//        if (reliabilityService.LastBootWasFromCrash)
-//        {
-//            mainController.LogAppStartupAfterCrash(reliabilityService.GetCrashData());
-//            reliabilityService.ClearCrashData();
-//        }
-
-//        var wifi = Device.NetworkAdapters.Primary<IWiFiNetworkAdapter>();
-//        mainController.Initialize(new Clima().Create() as IClimaHardware, wifi);
-
-//        return Task.CompletedTask;
-//    }
-
-//    private void OnMeadowSystemError(MeadowSystemErrorInfo error, bool recommendReset, out bool forceReset)
-//    {
-//        if (error is Esp32SystemErrorInfo espError)
-//        {
-//            Resolver.Log.Warn($"The ESP32 has had an error ({espError.StatusCode}).");
-//        }
-//        else
-//        {
-//            Resolver.Log.Info($"We've had a system error: {error}");
-//        }
-
-//        if (recommendReset)
-//        {
-//            Resolver.Log.Warn($"Meadow is recommending a device reset");
-//        }
-
-//        forceReset = recommendReset;
-
-//        // override the reset recommendation
-//        //forceReset = false;
-//    }
-
-//    private void OnMeadowSystemError(object sender, MeadowSystemErrorInfo e)
-//    {
-//        Resolver.Log.Error($"App has detected a system error: {e.Message}");
-//        if (e is Esp32SystemErrorInfo esp)
-//        {
-//            Resolver.Log.Error($"ESP function: {esp.Function}");
-//            Resolver.Log.Error($"ESP status code: {esp.StatusCode}");
-//        }
-//        if (e.Exception != null)
-//        {
-//            Resolver.Log.Error($"Exception: {e.Exception.Message}");
-//            Resolver.Log.Error($"ErrorNumber: {e.ErrorNumber}");
-//            Resolver.Log.Error($"HResult: {e.Exception.HResult}");
-
-//            if (e.Exception.InnerException != null)
-//            {
-//                Resolver.Log.Error($"InnerException: {e.Exception.InnerException.Message}");
-//                Resolver.Log.Error($"HResult: {e.Exception.InnerException.HResult}");
-//            }
-//        }
-//    }
-//}
+}
diff --git a/Source/Meadow.Clima.sln b/Source/Meadow.Clima.sln
@@ -34,20 +34,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sensors.Weather.WindVane",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Clima_Demo", "Clima_Demo\Clima_Demo.csproj", "{E914AFEB-4392-443C-A45B-67B71DD81171}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Displays.TftSpi", "..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\Displays.TftSpi\Driver\Displays.TftSpi.csproj", "{ADF5E9DD-85CA-4C28-8E44-EE8819F322D1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Displays.TextDisplayMenu", "..\..\Meadow.Foundation\Source\Meadow.Foundation.Libraries_and_Frameworks\Displays.TextDisplayMenu\Driver\Displays.TextDisplayMenu.csproj", "{2300B0AB-E8B2-4897-B532-5148636483A0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web.Maple.Server", "..\..\Maple\Source\Web.Maple.Server\Web.Maple.Server.csproj", "{009F059F-0677-487C-9C9B-9396AF54D67C}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.Units", "..\..\Meadow.Units\Source\Meadow.Units\Meadow.Units.csproj", "{CAC3B6F1-6337-493A-9D90-9FB8BAE28417}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.Modbus", "..\..\Meadow.Modbus\src\Meadow.Modbus\Meadow.Modbus.csproj", "{85DC9E85-3472-418A-8065-5EF99323E6FE}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet", "..\..\MQTTnet\Source\MQTTnet\MQTTnet.csproj", "{F6EB1347-3926-4308-BE20-70AC53BEBF1D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Graphics.MicroGraphics", "..\..\Meadow.Foundation\Source\Meadow.Foundation.Libraries_and_Frameworks\Graphics.MicroGraphics\Driver\Graphics.MicroGraphics.csproj", "{6604B4E1-D993-48E5-A3D0-6A5A180EFB76}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serialization.MicroJson", "..\..\Meadow.Foundation\Source\Meadow.Foundation.Libraries_and_Frameworks\Serialization.MicroJson\Driver\Serialization.MicroJson.csproj", "{6300EAB4-806F-4C18-8FE0-57C45A2C0C58}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sensors.Light.Veml7700", "..\..\Meadow.Foundation\Source\Meadow.Foundation.Peripherals\Sensors.Light.Veml7700\Driver\Sensors.Light.Veml7700.csproj", "{C5925D96-F9F4-4F42-AC8D-97E464252A4D}"
@@ -326,60 +318,6 @@ Global
 		{E914AFEB-4392-443C-A45B-67B71DD81171}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{E914AFEB-4392-443C-A45B-67B71DD81171}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{E914AFEB-4392-443C-A45B-67B71DD81171}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{ADF5E9DD-85CA-4C28-8E44-EE8819F322D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ADF5E9DD-85CA-4C28-8E44-EE8819F322D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ADF5E9DD-85CA-4C28-8E44-EE8819F322D1}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{ADF5E9DD-85CA-4C28-8E44-EE8819F322D1}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{ADF5E9DD-85CA-4C28-8E44-EE8819F322D1}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{ADF5E9DD-85CA-4C28-8E44-EE8819F322D1}.Debug|iPhone.Deploy.0 = Debug|Any CPU
-		{ADF5E9DD-85CA-4C28-8E44-EE8819F322D1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{ADF5E9DD-85CA-4C28-8E44-EE8819F322D1}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{ADF5E9DD-85CA-4C28-8E44-EE8819F322D1}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
-		{ADF5E9DD-85CA-4C28-8E44-EE8819F322D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ADF5E9DD-85CA-4C28-8E44-EE8819F322D1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ADF5E9DD-85CA-4C28-8E44-EE8819F322D1}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{ADF5E9DD-85CA-4C28-8E44-EE8819F322D1}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{ADF5E9DD-85CA-4C28-8E44-EE8819F322D1}.Release|iPhone.Build.0 = Release|Any CPU
-		{ADF5E9DD-85CA-4C28-8E44-EE8819F322D1}.Release|iPhone.Deploy.0 = Release|Any CPU
-		{ADF5E9DD-85CA-4C28-8E44-EE8819F322D1}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{ADF5E9DD-85CA-4C28-8E44-EE8819F322D1}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{ADF5E9DD-85CA-4C28-8E44-EE8819F322D1}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{2300B0AB-E8B2-4897-B532-5148636483A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2300B0AB-E8B2-4897-B532-5148636483A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2300B0AB-E8B2-4897-B532-5148636483A0}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{2300B0AB-E8B2-4897-B532-5148636483A0}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{2300B0AB-E8B2-4897-B532-5148636483A0}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{2300B0AB-E8B2-4897-B532-5148636483A0}.Debug|iPhone.Deploy.0 = Debug|Any CPU
-		{2300B0AB-E8B2-4897-B532-5148636483A0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{2300B0AB-E8B2-4897-B532-5148636483A0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{2300B0AB-E8B2-4897-B532-5148636483A0}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
-		{2300B0AB-E8B2-4897-B532-5148636483A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2300B0AB-E8B2-4897-B532-5148636483A0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2300B0AB-E8B2-4897-B532-5148636483A0}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{2300B0AB-E8B2-4897-B532-5148636483A0}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{2300B0AB-E8B2-4897-B532-5148636483A0}.Release|iPhone.Build.0 = Release|Any CPU
-		{2300B0AB-E8B2-4897-B532-5148636483A0}.Release|iPhone.Deploy.0 = Release|Any CPU
-		{2300B0AB-E8B2-4897-B532-5148636483A0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{2300B0AB-E8B2-4897-B532-5148636483A0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{2300B0AB-E8B2-4897-B532-5148636483A0}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{009F059F-0677-487C-9C9B-9396AF54D67C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{009F059F-0677-487C-9C9B-9396AF54D67C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{009F059F-0677-487C-9C9B-9396AF54D67C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{009F059F-0677-487C-9C9B-9396AF54D67C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{009F059F-0677-487C-9C9B-9396AF54D67C}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{009F059F-0677-487C-9C9B-9396AF54D67C}.Debug|iPhone.Deploy.0 = Debug|Any CPU
-		{009F059F-0677-487C-9C9B-9396AF54D67C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{009F059F-0677-487C-9C9B-9396AF54D67C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{009F059F-0677-487C-9C9B-9396AF54D67C}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
-		{009F059F-0677-487C-9C9B-9396AF54D67C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{009F059F-0677-487C-9C9B-9396AF54D67C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{009F059F-0677-487C-9C9B-9396AF54D67C}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{009F059F-0677-487C-9C9B-9396AF54D67C}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{009F059F-0677-487C-9C9B-9396AF54D67C}.Release|iPhone.Build.0 = Release|Any CPU
-		{009F059F-0677-487C-9C9B-9396AF54D67C}.Release|iPhone.Deploy.0 = Release|Any CPU
-		{009F059F-0677-487C-9C9B-9396AF54D67C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{009F059F-0677-487C-9C9B-9396AF54D67C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{009F059F-0677-487C-9C9B-9396AF54D67C}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
 		{CAC3B6F1-6337-493A-9D90-9FB8BAE28417}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CAC3B6F1-6337-493A-9D90-9FB8BAE28417}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CAC3B6F1-6337-493A-9D90-9FB8BAE28417}.Debug|iPhone.ActiveCfg = Debug|Any CPU
@@ -416,18 +354,6 @@ Global
 		{F6EB1347-3926-4308-BE20-70AC53BEBF1D}.Release|iPhone.Build.0 = Release|Any CPU
 		{F6EB1347-3926-4308-BE20-70AC53BEBF1D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{F6EB1347-3926-4308-BE20-70AC53BEBF1D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{6604B4E1-D993-48E5-A3D0-6A5A180EFB76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6604B4E1-D993-48E5-A3D0-6A5A180EFB76}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6604B4E1-D993-48E5-A3D0-6A5A180EFB76}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{6604B4E1-D993-48E5-A3D0-6A5A180EFB76}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{6604B4E1-D993-48E5-A3D0-6A5A180EFB76}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{6604B4E1-D993-48E5-A3D0-6A5A180EFB76}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{6604B4E1-D993-48E5-A3D0-6A5A180EFB76}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6604B4E1-D993-48E5-A3D0-6A5A180EFB76}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6604B4E1-D993-48E5-A3D0-6A5A180EFB76}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{6604B4E1-D993-48E5-A3D0-6A5A180EFB76}.Release|iPhone.Build.0 = Release|Any CPU
-		{6604B4E1-D993-48E5-A3D0-6A5A180EFB76}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{6604B4E1-D993-48E5-A3D0-6A5A180EFB76}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{6300EAB4-806F-4C18-8FE0-57C45A2C0C58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6300EAB4-806F-4C18-8FE0-57C45A2C0C58}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6300EAB4-806F-4C18-8FE0-57C45A2C0C58}.Debug|iPhone.ActiveCfg = Debug|Any CPU
@@ -470,13 +396,9 @@ Global
 		{C753A7DA-C51E-4154-8DA5-270DD988EF16} = {2889A476-F914-49E8-9F97-4CC6CA34A901}
 		{EF62412C-FE4E-4B04-8C90-20615AACD1F2} = {2889A476-F914-49E8-9F97-4CC6CA34A901}
 		{BF400519-2445-4D03-AFEF-112A0E2B6CA2} = {2889A476-F914-49E8-9F97-4CC6CA34A901}
-		{ADF5E9DD-85CA-4C28-8E44-EE8819F322D1} = {2889A476-F914-49E8-9F97-4CC6CA34A901}
-		{2300B0AB-E8B2-4897-B532-5148636483A0} = {2889A476-F914-49E8-9F97-4CC6CA34A901}
-		{009F059F-0677-487C-9C9B-9396AF54D67C} = {2889A476-F914-49E8-9F97-4CC6CA34A901}
 		{CAC3B6F1-6337-493A-9D90-9FB8BAE28417} = {2889A476-F914-49E8-9F97-4CC6CA34A901}
 		{85DC9E85-3472-418A-8065-5EF99323E6FE} = {2889A476-F914-49E8-9F97-4CC6CA34A901}
 		{F6EB1347-3926-4308-BE20-70AC53BEBF1D} = {2889A476-F914-49E8-9F97-4CC6CA34A901}
-		{6604B4E1-D993-48E5-A3D0-6A5A180EFB76} = {2889A476-F914-49E8-9F97-4CC6CA34A901}
 		{6300EAB4-806F-4C18-8FE0-57C45A2C0C58} = {2889A476-F914-49E8-9F97-4CC6CA34A901}
 		{C5925D96-F9F4-4F42-AC8D-97E464252A4D} = {2889A476-F914-49E8-9F97-4CC6CA34A901}
 	EndGlobalSection

diff --git a/Source/Meadow.Clima/ClimaAppBase.cs b/Source/Meadow.Clima/ClimaAppBase.cs
@@ -1,4 +1,6 @@
-namespace Meadow.Devices;
+using Meadow.Devices.Clima.Hardware;
+
+namespace Meadow.Devices;
 
 public abstract class ClimaAppBase : App<F7CoreComputeV2, ClimaHardwareProvider, IClimaHardware>
 {

diff --git a/Source/Meadow.Clima/ClimaHardwareProvider.cs b/Source/Meadow.Clima/ClimaHardwareProvider.cs
@@ -1,4 +1,5 @@
-using Meadow.Foundation.ICs.IOExpanders;
+using Meadow.Devices.Clima.Hardware;
+using Meadow.Foundation.ICs.IOExpanders;
 using Meadow.Hardware;
 using Meadow.Logging;
 using System;

diff --git a/Source/Meadow.Clima/Constants/CloudEventIds.cs b/Source/Meadow.Clima/Constants/CloudEventIds.cs
@@ -1,8 +1,8 @@
-namespace Clima_Demo;
+namespace Meadow.Devices.Clima.Constants;
 
 public enum CloudEventIds
 {
     DeviceStarted = 100,
     Telemetry = 110,
     BootFromCrash = 200
-}
+}
diff --git a/Source/Meadow.Clima/Controllers/CloudController.cs b/Source/Meadow.Clima/Controllers/CloudController.cs
@@ -1,10 +1,11 @@
-using Meadow;
-using Meadow.Cloud;
+using Meadow.Cloud;
+using Meadow.Devices.Clima.Constants;
+using Meadow.Devices.Clima.Models;
 using System;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Clima_Demo;
+namespace Meadow.Devices.Clima.Controllers;
 
 public class CloudController
 {
@@ -139,4 +140,4 @@ private void SendEvent(CloudEvent cloudEvent)
             Resolver.Log.Warn($"Failed to send cloud event: {ex.Message}");
         }
     }
-}
+}
diff --git a/Source/Meadow.Clima/Controllers/LocationController.cs b/Source/Meadow.Clima/Controllers/LocationController.cs
@@ -1,9 +1,8 @@
-using Meadow;
-using Meadow.Devices;
+using Meadow.Devices.Clima.Hardware;
 using Meadow.Peripherals.Sensors.Location.Gnss;
 using System;
 
-namespace Clima_Demo;
+namespace Meadow.Devices.Clima.Controllers;
 
 public class LocationController
 {
@@ -36,4 +35,4 @@ private void OnGnssDataReceived(object sender, IGnssResult e)
             }
         }
     }
-}
+}
diff --git a/Source/Meadow.Clima/Controllers/NetworkController.cs b/Source/Meadow.Clima/Controllers/NetworkController.cs
@@ -3,7 +3,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Meadow.Devices;
+namespace Meadow.Devices.Clima.Controllers;
 
 public class NetworkController
 {
@@ -125,4 +125,4 @@ private void OnNetworkConnected(INetworkAdapter sender, NetworkConnectionEventAr
         lastDown = null;
         ConnectionStateChanged?.Invoke(this, true);
     }
-}
+}
diff --git a/Source/Meadow.Clima/Controllers/NotificationController.cs b/Source/Meadow.Clima/Controllers/NotificationController.cs
@@ -1,7 +1,7 @@
 using Meadow.Peripherals.Leds;
 using System;
 
-namespace Clima_Demo;
+namespace Meadow.Devices.Clima.Controllers;
 
 public class NotificationController
 {
@@ -88,4 +88,4 @@ private void ReportWarnings()
             rgbLed?.SetColor(RgbLedColors.Green);
         }
     }
-}
+}
diff --git a/Source/Meadow.Clima/Controllers/PowerController.cs b/Source/Meadow.Clima/Controllers/PowerController.cs
@@ -1,10 +1,10 @@
-using Meadow;
-using Meadow.Devices;
+using Meadow.Devices.Clima.Hardware;
+using Meadow.Devices.Clima.Models;
 using Meadow.Units;
 using System;
 using System.Threading.Tasks;
 
-namespace Clima_Demo;
+namespace Meadow.Devices.Clima.Controllers;
 
 public class PowerController
 {
@@ -120,4 +120,4 @@ private void BatteryVoltageUpdated(object sender, IChangeResult<Voltage> e)
             }
         }
     }
-}
+}
diff --git a/Source/Meadow.Clima/Controllers/SensorController.cs b/Source/Meadow.Clima/Controllers/SensorController.cs
@@ -1,10 +1,10 @@
-using Meadow;
-using Meadow.Devices;
+using Meadow.Devices.Clima.Hardware;
+using Meadow.Devices.Clima.Models;
 using Meadow.Units;
 using System;
 using System.Threading.Tasks;
 
-namespace Clima_Demo;
+namespace Meadow.Devices.Clima.Controllers;
 
 public class SensorController
 {
@@ -173,4 +173,4 @@ private void WindvaneUpdated(object sender, IChangeResult<Azimuth> e)
 
         Resolver.Log.InfoIf(LogSensorData, $"Wind Vane:       {e.New.DecimalDegrees} (mean: {windVaneBuffer.Mean().DecimalDegrees})");
     }
-}
+}
diff --git a/Source/Meadow.Clima/Hardware/ClimaHardwareBase.cs b/Source/Meadow.Clima/Hardware/ClimaHardwareBase.cs
@@ -10,7 +10,7 @@
 using Meadow.Peripherals.Sensors.Weather;
 using System;
 
-namespace Meadow.Devices;
+namespace Meadow.Devices.Clima.Hardware;
 
 /// <summary>
 /// Contains common elements of Clima hardware

diff --git a/Source/Meadow.Clima/Hardware/ClimaHardwareV2.cs b/Source/Meadow.Clima/Hardware/ClimaHardwareV2.cs
@@ -6,7 +6,7 @@
 using Meadow.Peripherals.Sensors.Weather;
 using System;
 
-namespace Meadow.Devices;
+namespace Meadow.Devices.Clima.Hardware;
 
 /// <summary>
 /// Represents the Clima v2.x hardware