Merge pull request #377 from WildernessLabs/feature/serial-wombat

Feature/serial wombat
WildernessLabs · Jul 21, 2022 · a414ed2 · a414ed2
2 parents 4611a80 + 918c2d3
commit a414ed2
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 67 deletions.
diff --git a/...ation.Peripherals/ICs.IOExpanders.SerialWombat/Driver/ICs.IOExpanders.SerialWombat.csproj b/...ation.Peripherals/ICs.IOExpanders.SerialWombat/Driver/ICs.IOExpanders.SerialWombat.csproj
@@ -26,5 +26,6 @@
     <ProjectReference Include="..\..\..\..\..\Meadow.Units\Source\Meadow.Units\Meadow.Units.csproj" />
     <ProjectReference Include="..\..\..\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
     <ProjectReference Include="..\..\Sensors.Distance.Hcsr04\Driver\Sensors.Distance.Hcsr04.csproj" />
+    <ProjectReference Include="..\..\Servos.ServoCore\Driver\Servos.ServoCore.csproj" />
   </ItemGroup>
 </Project>
diff --git a/...adow.Foundation.Peripherals/ICs.IOExpanders.SerialWombat/Driver/SerialWombatBase.Servo.cs b/...adow.Foundation.Peripherals/ICs.IOExpanders.SerialWombat/Driver/SerialWombatBase.Servo.cs
@@ -0,0 +1,27 @@
+using Meadow.Foundation.Servos;
+using Meadow.Hardware;
+using System;
+
+namespace Meadow.Foundation.ICs.IOExpanders
+{
+    public abstract partial class SerialWombatBase
+    {
+        public class Servo : IServo
+        {
+            public ServoConfig Config => throw new NotImplementedException();
+
+            public Servo(IPin pin)
+            {
+                throw new NotImplementedException();
+            }
+
+            /*
+            byte[] tx = { 200, _pin, (byte)SerialWombatPinModes.PIN_MODE_SERVO, _pin, (byte)(_position & 0xFF), (byte)((_position >> 8) & 0xFF), _reverse ? (byte)1 : (byte)0, 0x55 };
+			byte[] rx;
+			_sw.sendPacket(tx, out rx);
+			byte[] tx2 = { 201, _pin, (byte)SerialWombatPinModes.PIN_MODE_SERVO, (byte)(_min & 0xFF), (byte)((_min >> 8) & 0xFF), (byte)((_max - _min) & 0xFF), (byte)(((_max - _min) >> 8) & 0xFF), 0x55 };
+			_sw.sendPacket(tx2, out rx);
+            */
+        }
+    }
+}
diff --git a/Source/Meadow.Foundation.Peripherals/ICs.IOExpanders.SerialWombat/Driver/SerialWombatBase.cs b/Source/Meadow.Foundation.Peripherals/ICs.IOExpanders.SerialWombat/Driver/SerialWombatBase.cs
@@ -1,4 +1,5 @@
-using Meadow.Hardware;
+using Meadow.Foundation.Servos;
+using Meadow.Hardware;
 using Meadow.Logging;
 using Meadow.Peripherals.Sensors;
 using Meadow.Units;
@@ -367,5 +368,10 @@ public IRangeFinder CreateDistanceSensor(IPin trigger, IPin echo, TimeSpan readP
         {
             return new Hcsr04(this, trigger, echo, readPeriod);
         }
+
+        public IServo CreateServo(IPin pin)
+        {
+            return new Servo(pin);
+        }
     }
 }
diff --git a/....Foundation.Peripherals/ICs.IOExpanders.SerialWombat/Samples/Sw18AB_ADC_Sample/Program.cs b/....Foundation.Peripherals/ICs.IOExpanders.SerialWombat/Samples/Sw18AB_ADC_Sample/Program.cs
diff --git a/...ripherals/ICs.IOExpanders.SerialWombat/Samples/Sw18AB_ADC_Sample/Sw18AB_ADC_Sample.csproj b/...ripherals/ICs.IOExpanders.SerialWombat/Samples/Sw18AB_ADC_Sample/Sw18AB_ADC_Sample.csproj
@@ -5,7 +5,7 @@
     <Authors>Wilderness Labs, Inc</Authors>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <OutputType>Exe</OutputType>
+    <OutputType>Library</OutputType>
     <AssemblyName>App</AssemblyName>
   </PropertyGroup>
   <ItemGroup>

diff --git a/...dation.Peripherals/ICs.IOExpanders.SerialWombat/Samples/Sw18AB_Discrete_Sample/Program.cs b/...dation.Peripherals/ICs.IOExpanders.SerialWombat/Samples/Sw18AB_Discrete_Sample/Program.cs
diff --git a/...ICs.IOExpanders.SerialWombat/Samples/Sw18AB_Discrete_Sample/Sw18AB_Discrete_Sample.csproj b/...ICs.IOExpanders.SerialWombat/Samples/Sw18AB_Discrete_Sample/Sw18AB_Discrete_Sample.csproj
@@ -1,11 +1,11 @@
-<Project Sdk="Meadow.Sdk/1.1.0">
+<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>Exe</OutputType>
+    <OutputType>Library</OutputType>
     <AssemblyName>App</AssemblyName>
   </PropertyGroup>
   <ItemGroup>

diff --git a/....Foundation.Peripherals/ICs.IOExpanders.SerialWombat/Samples/Sw18AB_PWM_Sample/Program.cs b/....Foundation.Peripherals/ICs.IOExpanders.SerialWombat/Samples/Sw18AB_PWM_Sample/Program.cs
diff --git a/...ripherals/ICs.IOExpanders.SerialWombat/Samples/Sw18AB_PWM_Sample/Sw18AB_PWM_Sample.csproj b/...ripherals/ICs.IOExpanders.SerialWombat/Samples/Sw18AB_PWM_Sample/Sw18AB_PWM_Sample.csproj
@@ -5,7 +5,7 @@
     <Authors>Wilderness Labs, Inc</Authors>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <OutputType>Exe</OutputType>
+    <OutputType>Library</OutputType>
     <AssemblyName>App</AssemblyName>
   </PropertyGroup>
   <ItemGroup>

diff --git a/...tion.Peripherals/ICs.IOExpanders.SerialWombat/Samples/Sw18AB_Ultrasonic_Sample/Program.cs b/...tion.Peripherals/ICs.IOExpanders.SerialWombat/Samples/Sw18AB_Ultrasonic_Sample/Program.cs
diff --git a/...IOExpanders.SerialWombat/Samples/Sw18AB_Ultrasonic_Sample/Sw18AB_Ultrasonic_Sample.csproj b/...IOExpanders.SerialWombat/Samples/Sw18AB_Ultrasonic_Sample/Sw18AB_Ultrasonic_Sample.csproj
@@ -5,7 +5,7 @@
     <Authors>Wilderness Labs, Inc</Authors>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <OutputType>Exe</OutputType>
+    <OutputType>Library</OutputType>
     <AssemblyName>App</AssemblyName>
   </PropertyGroup>
   <ItemGroup>

diff --git a/...eripherals/ICs.IOExpanders.SerialWombat/Samples/Sw18AB_Ultrasonic_Sample/appsettings.yaml b/...eripherals/ICs.IOExpanders.SerialWombat/Samples/Sw18AB_Ultrasonic_Sample/appsettings.yaml
@@ -1,5 +1,5 @@
 Logging:
   LogLevel:
-    Default: "Debug"
+    Default: "Trace"
 Telemetry:
   RosBridge: "192.168.1.70:9090"