Merge pull request #19 from WildernessLabs/bugfix

Bugfix
WildernessLabs · Nov 19, 2024 · 76e7345 · 76e7345
2 parents a0bff0e + 8d8cb30
commit 76e7345
Show file tree

Hide file tree

Showing 7 changed files with 238 additions and 169 deletions.
diff --git a/Source/Devices/MBM55R4 Data Sheet.pdf b/Source/Devices/MBM55R4 Data Sheet.pdf
diff --git a/Source/Driver/MBusSerialServer.cs b/Source/Driver/MBusSerialServer.cs
@@ -1,6 +1,5 @@
 using Meadow.Hardware;
 using System;
-using System.Diagnostics;
 using System.IO;
 using System.Threading;
 
@@ -112,7 +111,7 @@ public byte[] WriteTelegram(ITelegram frame)
             Port.ReadTimeout = TimeSpan.FromSeconds(1);
         }
 
-        Debug.WriteLine($"TX-Buffer:\r\n{BitConverter.ToString(frameData)}");
+        Resolver.Log.Debug($"TX-Buffer:\r\n{BitConverter.ToString(frameData)}");
         Port.Write(frameData);
 
         // wait for ack
@@ -123,7 +122,7 @@ public byte[] WriteTelegram(ITelegram frame)
 
             var read = Port.Read(_rxBuffer, 0, _rxBuffer.Length);
 
-            Debug.WriteLine($"Read: {read}");
+            Resolver.Log.Debug($"Read: {read}");
 
             if (read == 0)
             {
@@ -139,7 +138,7 @@ public byte[] WriteTelegram(ITelegram frame)
 
             var data = new byte[read];
             Array.Copy(_rxBuffer, data, read);
-            Debug.WriteLine($"RX-Buffer:\r\n{BitConverter.ToString(data)}");
+            Resolver.Log.Debug($"RX-Buffer:\r\n{BitConverter.ToString(data)}");
             return data;
 
         }

diff --git a/Source/Driver/Meadow.MBus.csproj b/Source/Driver/Meadow.MBus.csproj
@@ -25,7 +25,7 @@
   <ItemGroup>
     <None Include=".\Readme.md" Pack="true" PackagePath="" />
     <None Include="..\icon.png" Link="icon.png" Pack="true" PackagePath="" />
-    <ProjectReference Include="..\..\..\Meadow.Core\source\Meadow.Core\Meadow.Core.csproj" />
+    <PackageReference Include="Meadow" Version="1.12.8" />
   </ItemGroup>
 
 </Project>
diff --git a/Source/MBus.sln b/Source/MBus.sln
diff --git a/Source/Samples/MBus_Desktop_Sample/MBus_Desktop_Sample.csproj b/Source/Samples/MBus_Desktop_Sample/MBus_Desktop_Sample.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Meadow.Core\source\implementations\windows\Meadow.Windows\Meadow.Windows.csproj" />
+    <PackageReference Include="Meadow.Windows" Version="1.12.8" />
     <ProjectReference Include="..\..\Devices\SchneiderElectric\IEM3135\Driver\IEM3135.csproj" />
     <ProjectReference Include="..\..\Driver\Meadow.MBus.csproj" />
   </ItemGroup>

diff --git a/Source/Samples/MBus_Feather_Sample/MBus_Feather_Sample.csproj b/Source/Samples/MBus_Feather_Sample/MBus_Feather_Sample.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Meadow.Sdk/1.1.0">
+  <PropertyGroup>
+    <RepositoryUrl>https://github.com/WildernessLabs/Meadow.Foundation</RepositoryUrl>
+    <Company>Wilderness Labs, Inc</Company>
+    <Authors>Wilderness Labs, Inc</Authors>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <OutputType>Library</OutputType>
+    <AssemblyName>App</AssemblyName>
+      <LangVersion>10</LangVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Meadow.Core\source\implementations\f7\Meadow.F7\Meadow.F7.csproj" />
+    <ProjectReference Include="..\..\Devices\RelayMBus\PadPulsM2\Driver\PadPulsM2.csproj" />
+    <ProjectReference Include="..\..\Driver\Meadow.MBus.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/Source/Samples/MBus_Feather_Sample/MeadowApp.cs b/Source/Samples/MBus_Feather_Sample/MeadowApp.cs
@@ -0,0 +1,53 @@
+using Meadow.Devices;
+using Meadow.Foundation.MBus.RelayMBus;
+using Meadow.Hardware;
+using System.Threading.Tasks;
+
+namespace Meadow.Foundation.MBus.MBus_Feather_Sample;
+
+
+public class MBM55R : MBusSerialServer
+{
+    public MBM55R(ISerialPort port)
+        : base(port)
+    {
+        port.BaudRate = 9600;
+        port.Parity = Parity.Even;
+        port.Open();
+    }
+}
+
+public class MeadowApp : App<F7FeatherV2>
+{
+    //<!=SNIP=>
+    private PadPulsM2 pulseCounter;
+
+    public override Task Initialize()
+    {
+        Resolver.Log.Info("Initialize...");
+
+        var port = Device.PlatformOS.GetSerialPortName("com1").CreateSerialPort(9600, parity: Parity.Even);
+
+        var mbm = new MBM55R(port);
+        pulseCounter = new PadPulsM2(mbm);
+        pulseCounter.StartMonitoring();
+
+        Resolver.Log.Info($"Counter ports: {pulseCounter.Ports[0].ID}  {pulseCounter.Ports[1].ID}");
+
+        return base.Initialize();
+    }
+
+    public override async Task Run()
+    {
+        Resolver.Log.Info("Run");
+
+        while (true)
+        {
+            Resolver.Log.Info($"now: {pulseCounter.Ports[0].CurrentDateTime}");
+            await Task.Delay(2000);
+        }
+
+    }
+
+    //<!=SNOP=>
+}