Merge pull request #571 from WildernessLabs/develop

Merge to main for RC2-2
WildernessLabs · Mar 5, 2023 · 4c501f1 · 4c501f1
2 parents 8b30bc6 + 4ede1a7
commit 4c501f1
Show file tree

Hide file tree

Showing 556 changed files with 5,052 additions and 2,101 deletions.
diff --git a/...Meadow.Foundation.Core.Samples/Audio.PiezoSpeaker_Sample/Audio.PiezoSpeaker_Sample.csproj b/...Meadow.Foundation.Core.Samples/Audio.PiezoSpeaker_Sample/Audio.PiezoSpeaker_Sample.csproj
@@ -9,8 +9,8 @@
     <AssemblyName>App</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Meadow.F7" Version="0.*" />
-    <PackageReference Include="Meadow.Foundation" Version="0.*" />
+    <ProjectReference Include="..\..\..\..\Meadow.Core\Source\implementations\f7\Meadow.F7\Meadow.F7.csproj" />
+    <ProjectReference Include="..\..\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
   </ItemGroup>
   <ItemGroup>
     <None Update="meadow.config.yaml">

diff --git a/...oundation.Core.Samples/Generators.SoftPwmPort_Sample/Generators.SoftPwmPort_Sample.csproj b/...oundation.Core.Samples/Generators.SoftPwmPort_Sample/Generators.SoftPwmPort_Sample.csproj
@@ -9,8 +9,8 @@
     <AssemblyName>App</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Meadow.F7" Version="0.*" />
-    <PackageReference Include="Meadow.Foundation" Version="0.*" />
+    <ProjectReference Include="..\..\..\..\Meadow.Core\Source\implementations\f7\Meadow.F7\Meadow.F7.csproj" />
+    <ProjectReference Include="..\..\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
   </ItemGroup>
   <ItemGroup>
     <None Update="meadow.config.yaml">

diff --git a/Source/Meadow.Foundation.Core.Samples/Generators.SoftPwmPort_Sample/MeadowApp.cs b/Source/Meadow.Foundation.Core.Samples/Generators.SoftPwmPort_Sample/MeadowApp.cs
@@ -16,7 +16,7 @@ public override Task Initialize()
         {
             Resolver.Log.Info("Initializing...");
 
-            IDigitalOutputPort digiOut = Device.CreateDigitalOutputPort(Device.Pins.D00);
+            IDigitalOutputPort digiOut = Device.Pins.D00.CreateDigitalOutputPort();
             softPwmPort = new SoftPwmPort(digiOut);
 
             return Task.CompletedTask;

diff --git a/Source/Meadow.Foundation.Core.Samples/Leds.LedBarGraph_Sample/Leds.LedBarGraph_Sample.csproj b/Source/Meadow.Foundation.Core.Samples/Leds.LedBarGraph_Sample/Leds.LedBarGraph_Sample.csproj
@@ -9,8 +9,8 @@
     <AssemblyName>App</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Meadow.F7" Version="0.*" />
-    <PackageReference Include="Meadow.Foundation" Version="0.*" />
+    <ProjectReference Include="..\..\..\..\Meadow.Core\Source\implementations\f7\Meadow.F7\Meadow.F7.csproj" />
+    <ProjectReference Include="..\..\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
   </ItemGroup>
   <ItemGroup>
     <None Update="meadow.config.yaml">

diff --git a/Source/Meadow.Foundation.Core.Samples/Leds.LedBarGraph_Sample/MeadowApp.cs b/Source/Meadow.Foundation.Core.Samples/Leds.LedBarGraph_Sample/MeadowApp.cs
@@ -32,7 +32,7 @@ public override Task Initialize()
                  Device.Pins.D02
             };
 
-            ledBarGraph = new LedBarGraph(Device, pins);
+            ledBarGraph = new LedBarGraph(pins);
 
             return Task.CompletedTask;
         }

diff --git a/Source/Meadow.Foundation.Core.Samples/Leds.Led_Sample/Leds.Led_Sample.csproj b/Source/Meadow.Foundation.Core.Samples/Leds.Led_Sample/Leds.Led_Sample.csproj
@@ -9,8 +9,8 @@
     <AssemblyName>App</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Meadow.F7" Version="0.*" />
-    <PackageReference Include="Meadow.Foundation" Version="0.*" />
+    <ProjectReference Include="..\..\..\..\Meadow.Core\Source\implementations\f7\Meadow.F7\Meadow.F7.csproj" />
+    <ProjectReference Include="..\..\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
   </ItemGroup>
   <ItemGroup>
     <None Update="meadow.config.yaml">

diff --git a/Source/Meadow.Foundation.Core.Samples/Leds.Led_Sample/MeadowApp.cs b/Source/Meadow.Foundation.Core.Samples/Leds.Led_Sample/MeadowApp.cs
@@ -17,30 +17,29 @@ public class MeadowApp : App<F7FeatherV2>
         public override Task Initialize()
         {
             var onRgbLed = new RgbLed(
-                device: Device,
                 redPin: Device.Pins.OnboardLedRed,
                 greenPin: Device.Pins.OnboardLedGreen,
                 bluePin: Device.Pins.OnboardLedBlue);
             onRgbLed.SetColor(RgbLedColors.Red);
 
             leds = new List<Led>
             {
-                new Led(Device.CreateDigitalOutputPort(Device.Pins.D00, false)),
-                new Led(Device.CreateDigitalOutputPort(Device.Pins.D01, false)),
-                new Led(Device.CreateDigitalOutputPort(Device.Pins.D02, false)),
-                new Led(Device.CreateDigitalOutputPort(Device.Pins.D03, false)),
-                new Led(Device.CreateDigitalOutputPort(Device.Pins.D04, false)),
-                new Led(Device.CreateDigitalOutputPort(Device.Pins.D05, false)),
-                new Led(Device.CreateDigitalOutputPort(Device.Pins.D06, false)),
-                new Led(Device.CreateDigitalOutputPort(Device.Pins.D07, false)),
-                new Led(Device.CreateDigitalOutputPort(Device.Pins.D08, false)),
-                new Led(Device.CreateDigitalOutputPort(Device.Pins.D09, false)),
-                new Led(Device.CreateDigitalOutputPort(Device.Pins.D10, false)),
-                new Led(Device.CreateDigitalOutputPort(Device.Pins.D11, false)),
-                new Led(Device.CreateDigitalOutputPort(Device.Pins.D12, false)),
-                new Led(Device.CreateDigitalOutputPort(Device.Pins.D13, false)),
-                new Led(Device.CreateDigitalOutputPort(Device.Pins.D14, false)),
-                new Led(Device.CreateDigitalOutputPort(Device.Pins.D15, false))
+                new Led(Device.Pins.D00),
+                new Led(Device.Pins.D01),
+                new Led(Device.Pins.D02),
+                new Led(Device.Pins.D03),
+                new Led(Device.Pins.D04),
+                new Led(Device.Pins.D05),
+                new Led(Device.Pins.D06),
+                new Led(Device.Pins.D07),
+                new Led(Device.Pins.D08),
+                new Led(Device.Pins.D09),
+                new Led(Device.Pins.D10),
+                new Led(Device.Pins.D11),
+                new Led(Device.Pins.D12),
+                new Led(Device.Pins.D13),
+                new Led(Device.Pins.D14),
+                new Led(Device.Pins.D15)
             };
 
             onRgbLed.SetColor(RgbLedColors.Green);

diff --git a/...adow.Foundation.Core.Samples/Leds.PwmLedBarGraph_Sample/Leds.PwmLedBarGraph_Sample.csproj b/...adow.Foundation.Core.Samples/Leds.PwmLedBarGraph_Sample/Leds.PwmLedBarGraph_Sample.csproj
@@ -9,8 +9,8 @@
     <AssemblyName>App</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Meadow.F7" Version="0.*" />
-    <PackageReference Include="Meadow.Foundation" Version="0.*" />
+    <ProjectReference Include="..\..\..\..\Meadow.Core\Source\implementations\f7\Meadow.F7\Meadow.F7.csproj" />
+    <ProjectReference Include="..\..\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
   </ItemGroup>
   <ItemGroup>
     <None Update="meadow.config.yaml">

diff --git a/Source/Meadow.Foundation.Core.Samples/Leds.PwmLedBarGraph_Sample/MeadowApp.cs b/Source/Meadow.Foundation.Core.Samples/Leds.PwmLedBarGraph_Sample/MeadowApp.cs
@@ -34,7 +34,7 @@ public override Task Initialize()
                  Device.Pins.D02
             };
 
-            pwmLedBarGraph = new PwmLedBarGraph(Device, pins, new Voltage(2.2));
+            pwmLedBarGraph = new PwmLedBarGraph(pins, new Voltage(2.2));
 
             return Task.CompletedTask;
         }

diff --git a/...adow.Foundation.Core.Samples/Leds.PwmLed_Onboard_Sample/Leds.PwmLed_Onboard_Sample.csproj b/...adow.Foundation.Core.Samples/Leds.PwmLed_Onboard_Sample/Leds.PwmLed_Onboard_Sample.csproj
@@ -9,8 +9,8 @@
     <AssemblyName>App</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Meadow.F7" Version="0.*" />
-    <PackageReference Include="Meadow.Foundation" Version="0.*" />
+    <ProjectReference Include="..\..\..\..\Meadow.Core\Source\implementations\f7\Meadow.F7\Meadow.F7.csproj" />
+    <ProjectReference Include="..\..\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
   </ItemGroup>
   <ItemGroup>
     <None Update="meadow.config.yaml">

diff --git a/Source/Meadow.Foundation.Core.Samples/Leds.PwmLed_Onboard_Sample/MeadowApp.cs b/Source/Meadow.Foundation.Core.Samples/Leds.PwmLed_Onboard_Sample/MeadowApp.cs
@@ -18,9 +18,9 @@ public class MeadowApp : App<F7FeatherV2>
         public override Task Initialize()
         {
             Resolver.Log.Info("Initializing...");
-            redPwmLed = new PwmLed(Device, Device.Pins.OnboardLedRed, TypicalForwardVoltage.ResistorLimited, CircuitTerminationType.High);
-            greenPwmLed = new PwmLed(Device, Device.Pins.OnboardLedGreen, TypicalForwardVoltage.ResistorLimited, CircuitTerminationType.High);
-            bluePwmLed = new PwmLed(Device, Device.Pins.OnboardLedBlue, TypicalForwardVoltage.ResistorLimited, CircuitTerminationType.High);
+            redPwmLed = new PwmLed(Device.Pins.OnboardLedRed, TypicalForwardVoltage.ResistorLimited, CircuitTerminationType.High);
+            greenPwmLed = new PwmLed(Device.Pins.OnboardLedGreen, TypicalForwardVoltage.ResistorLimited, CircuitTerminationType.High);
+            bluePwmLed = new PwmLed(Device.Pins.OnboardLedBlue, TypicalForwardVoltage.ResistorLimited, CircuitTerminationType.High);
 
             return Task.CompletedTask;
         }

diff --git a/Source/Meadow.Foundation.Core.Samples/Leds.PwmLed_Sample/Leds.PwmLed_Sample.csproj b/Source/Meadow.Foundation.Core.Samples/Leds.PwmLed_Sample/Leds.PwmLed_Sample.csproj
@@ -9,8 +9,8 @@
     <AssemblyName>App</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Meadow.F7" Version="0.*" />
-    <PackageReference Include="Meadow.Foundation" Version="0.*" />
+    <ProjectReference Include="..\..\..\..\Meadow.Core\Source\implementations\f7\Meadow.F7\Meadow.F7.csproj" />
+    <ProjectReference Include="..\..\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
   </ItemGroup>
   <ItemGroup>
     <None Update="meadow.config.yaml">

diff --git a/Source/Meadow.Foundation.Core.Samples/Leds.PwmLed_Sample/MeadowApp.cs b/Source/Meadow.Foundation.Core.Samples/Leds.PwmLed_Sample/MeadowApp.cs
@@ -20,7 +20,6 @@ public override Task Initialize()
             Resolver.Log.Info("Initializing...");
 
             var onRgbLed = new RgbLed(
-                device: Device,
                 redPin: Device.Pins.OnboardLedRed,
                 greenPin: Device.Pins.OnboardLedGreen,
                 bluePin: Device.Pins.OnboardLedBlue);

diff --git a/Source/Meadow.Foundation.Core.Samples/Leds.RgbLed_Sample/Leds.RgbLed_Sample.csproj b/Source/Meadow.Foundation.Core.Samples/Leds.RgbLed_Sample/Leds.RgbLed_Sample.csproj
@@ -9,8 +9,8 @@
     <AssemblyName>App</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Meadow.F7" Version="0.*" />
-    <PackageReference Include="Meadow.Foundation" Version="0.*" />
+    <ProjectReference Include="..\..\..\..\Meadow.Core\Source\implementations\f7\Meadow.F7\Meadow.F7.csproj" />
+    <ProjectReference Include="..\..\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
   </ItemGroup>
   <ItemGroup>
     <None Update="meadow.config.yaml">

diff --git a/Source/Meadow.Foundation.Core.Samples/Leds.RgbLed_Sample/MeadowApp.cs b/Source/Meadow.Foundation.Core.Samples/Leds.RgbLed_Sample/MeadowApp.cs
@@ -19,7 +19,6 @@ public override Task Initialize()
             Resolver.Log.Info("Initializing...");
 
             var onRgbLed = new RgbLed(
-                device: Device,
                 redPin: Device.Pins.OnboardLedRed,
                 greenPin: Device.Pins.OnboardLedGreen,
                 bluePin: Device.Pins.OnboardLedBlue);

diff --git a/...oundation.Core.Samples/Leds.RgbPwmLed_Onboard_Sample/Leds.RgbPwmLed_Onboard_Sample.csproj b/...oundation.Core.Samples/Leds.RgbPwmLed_Onboard_Sample/Leds.RgbPwmLed_Onboard_Sample.csproj
@@ -9,8 +9,8 @@
     <AssemblyName>App</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Meadow.F7" Version="0.*" />
-    <PackageReference Include="Meadow.Foundation" Version="0.*" />
+    <ProjectReference Include="..\..\..\..\Meadow.Core\Source\implementations\f7\Meadow.F7\Meadow.F7.csproj" />
+    <ProjectReference Include="..\..\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
   </ItemGroup>
   <ItemGroup>
     <None Update="meadow.config.yaml">

diff --git a/Source/Meadow.Foundation.Core.Samples/Leds.RgbPwmLed_Onboard_Sample/MeadowApp.cs b/Source/Meadow.Foundation.Core.Samples/Leds.RgbPwmLed_Onboard_Sample/MeadowApp.cs
@@ -20,7 +20,6 @@ public override Task Initialize()
             Resolver.Log.Info("Creating peripherals...");
 
             onboardLed = new RgbPwmLed(
-                Device,
                 Device.Pins.OnboardLedRed,
                 Device.Pins.OnboardLedGreen,
                 Device.Pins.OnboardLedBlue,

diff --git a/Source/Meadow.Foundation.Core.Samples/Leds.RgbPwmLed_Sample/Leds.RgbPwmLed_Sample.csproj b/Source/Meadow.Foundation.Core.Samples/Leds.RgbPwmLed_Sample/Leds.RgbPwmLed_Sample.csproj
@@ -9,8 +9,8 @@
     <AssemblyName>App</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Meadow.F7" Version="0.*" />
-    <PackageReference Include="Meadow.Foundation" Version="0.*" />
+    <ProjectReference Include="..\..\..\..\Meadow.Core\Source\implementations\f7\Meadow.F7\Meadow.F7.csproj" />
+    <ProjectReference Include="..\..\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
   </ItemGroup>
   <ItemGroup>
     <None Update="meadow.config.yaml">

diff --git a/Source/Meadow.Foundation.Core.Samples/Leds.RgbPwmLed_Sample/MeadowApp.cs b/Source/Meadow.Foundation.Core.Samples/Leds.RgbPwmLed_Sample/MeadowApp.cs
@@ -21,7 +21,6 @@ public override Task Initialize()
             Resolver.Log.Info("Initializing...");
 
             var onRgbLed = new RgbLed(
-                device: Device,
                 redPin: Device.Pins.OnboardLedRed,
                 greenPin: Device.Pins.OnboardLedGreen,
                 bluePin: Device.Pins.OnboardLedBlue);
@@ -30,22 +29,18 @@ public override Task Initialize()
             rgbPwmLeds = new List<RgbPwmLed>()
             {
                 new RgbPwmLed(
-                    Device,
                     Device.Pins.D02,
                     Device.Pins.D03,
                     Device.Pins.D04),
                 new RgbPwmLed(
-                    Device,
                     Device.Pins.D05,
                     Device.Pins.D06,
                     Device.Pins.D07),
                 new RgbPwmLed(
-                    Device,
                     Device.Pins.D08,
                     Device.Pins.D09,
                     Device.Pins.D10),
                 new RgbPwmLed(
-                    Device,
                     Device.Pins.D11,
                     Device.Pins.D12,
                     Device.Pins.D13)

diff --git a/...Meadow.Foundation.Core.Samples/Motor.HBridgeMotor_Sample/Motor.HBridgeMotor_Sample.csproj b/...Meadow.Foundation.Core.Samples/Motor.HBridgeMotor_Sample/Motor.HBridgeMotor_Sample.csproj
@@ -9,8 +9,8 @@
     <AssemblyName>App</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Meadow.F7" Version="0.*" />
-    <PackageReference Include="Meadow.Foundation" Version="0.*" />
+    <ProjectReference Include="..\..\..\..\Meadow.Core\Source\implementations\f7\Meadow.F7\Meadow.F7.csproj" />
+    <ProjectReference Include="..\..\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
   </ItemGroup>
   <ItemGroup>
     <None Update="meadow.config.yaml">

diff --git a/Source/Meadow.Foundation.Core.Samples/Relays.Relay_Sample/Relays.Relay_Sample.csproj b/Source/Meadow.Foundation.Core.Samples/Relays.Relay_Sample/Relays.Relay_Sample.csproj
@@ -9,8 +9,8 @@
     <AssemblyName>App</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Meadow.F7" Version="0.*" />
-    <PackageReference Include="Meadow.Foundation" Version="0.*" />
+    <ProjectReference Include="..\..\..\..\Meadow.Core\Source\implementations\f7\Meadow.F7\Meadow.F7.csproj" />
+    <ProjectReference Include="..\..\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
   </ItemGroup>
   <ItemGroup>
     <None Update="meadow.config.yaml">

diff --git a/Source/Meadow.Foundation.Core.Samples/Sensors.Buttons.PushButton_BasicSample/MeadowApp.cs b/Source/Meadow.Foundation.Core.Samples/Sensors.Buttons.PushButton_BasicSample/MeadowApp.cs
@@ -24,15 +24,14 @@ public override Task Initialize()
         {
             Resolver.Log.Info("Initialize...");
 
-            onboardLed = new RgbPwmLed(device: Device,
+            onboardLed = new RgbPwmLed(
                 redPwmPin: Device.Pins.OnboardLedRed,
                 greenPwmPin: Device.Pins.OnboardLedGreen,
                 bluePwmPin: Device.Pins.OnboardLedBlue,
                 CommonType.CommonAnode);
 
             // intialize the push button
             pushButton = new PushButton(
-                Device,
                 Device.Pins.D02,
                 Meadow.Hardware.ResistorMode.InternalPullDown);
 

diff --git a/...ples/Sensors.Buttons.PushButton_BasicSample/Sensors.Buttons.PushButton_BasicSample.csproj b/...ples/Sensors.Buttons.PushButton_BasicSample/Sensors.Buttons.PushButton_BasicSample.csproj
@@ -9,8 +9,8 @@
     <AssemblyName>App</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Meadow.F7" Version="0.*" />
-    <PackageReference Include="Meadow.Foundation" Version="0.*" />
+    <ProjectReference Include="..\..\..\..\Meadow.Core\Source\implementations\f7\Meadow.F7\Meadow.F7.csproj" />
+    <ProjectReference Include="..\..\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
   </ItemGroup>
   <ItemGroup>
     <None Update="meadow.config.yaml">

diff --git a/Source/Meadow.Foundation.Core.Samples/Sensors.Buttons.PushButton_Sample/MeadowApp.cs b/Source/Meadow.Foundation.Core.Samples/Sensors.Buttons.PushButton_Sample/MeadowApp.cs
@@ -23,7 +23,6 @@ public override Task Initialize()
             Resolver.Log.Info("Initializing...");
 
             led = new RgbPwmLed(
-                Device,
                 Device.Pins.OnboardLedRed,
                 Device.Pins.OnboardLedGreen,
                 Device.Pins.OnboardLedBlue);
@@ -93,38 +92,38 @@ void TestMultiplePorts()
             // Important note: You can only use on Push Button per Group Set (GSXX)
             pushButtons = new List<PushButton>
             {
-                new PushButton(Device, Device.Pins.A03),         // <- GS00
-                //new PushButton(Device, Device.Pins.A05),         // <- GS00
+                new PushButton(Device.Pins.A03),         // <- GS00
+                //new PushButton(Device.Pins.A05),         // <- GS00
 
-                new PushButton(Device, Device.Pins.A04),         // <- GS01
+                new PushButton(Device.Pins.A04),         // <- GS01
 
-                new PushButton(Device, Device.Pins.A02),         // <- GS03
+                new PushButton(Device.Pins.A02),         // <- GS03
 
-                //new PushButton(Device, Device.Pins.A00),         // <- GS04
-                new PushButton(Device, Device.Pins.D05),         // <- GS04
+                //new PushButton(Device.Pins.A00),         // <- GS04
+                new PushButton(Device.Pins.D05),         // <- GS04
 
-                new PushButton(Device, Device.Pins.A01),         // <- GS05
-                //new PushButton(Device, Device.Pins.COPI),        // <- GS05
+                new PushButton(Device.Pins.A01),         // <- GS05
+                //new PushButton(Device.Pins.COPI),        // <- GS05
 
-                new PushButton(Device, Device.Pins.D08),         // <- GS06
-                //new PushButton(Device, Device.Pins.D09),         // <- GS06
+                new PushButton(Device.Pins.D08),         // <- GS06
+                //new PushButton(Device.Pins.D09),         // <- GS06
 
-                new PushButton(Device, Device.Pins.D07),         // <- GS07
-                //new PushButton(Device, Device.Pins.D10),         // <- GS07
+                new PushButton(Device.Pins.D07),         // <- GS07
+                //new PushButton(Device.Pins.D10),         // <- GS07
 
-                new PushButton(Device, Device.Pins.D03),         // <- GS08
+                new PushButton(Device.Pins.D03),         // <- GS08
 
-                new PushButton(Device, Device.Pins.D00),         // <- GS09
-                //new PushButton(Device, Device.Pins.D04),         // <- GS09
+                new PushButton(Device.Pins.D00),         // <- GS09
+                //new PushButton(Device.Pins.D04),         // <- GS09
 
-                new PushButton(Device, Device.Pins.CIPO),         // <- GS11
+                new PushButton(Device.Pins.CIPO),         // <- GS11
 
-                new PushButton(Device, Device.Pins.D01),         // <- GS13
-                //new PushButton(Device, Device.Pins.D06),         // <- GS13
+                new PushButton(Device.Pins.D01),         // <- GS13
+                //new PushButton(Device.Pins.D06),         // <- GS13
 
-                new PushButton(Device, Device.Pins.D12),         // <- GS14
+                new PushButton(Device.Pins.D12),         // <- GS14
 
-                new PushButton(Device, Device.Pins.D13),         // <- GS15
+                new PushButton(Device.Pins.D13),         // <- GS15
             };
 
             foreach (var pushButton in pushButtons)

diff --git a/...n.Core.Samples/Sensors.Buttons.PushButton_Sample/Sensors.Buttons.PushButton_Sample.csproj b/...n.Core.Samples/Sensors.Buttons.PushButton_Sample/Sensors.Buttons.PushButton_Sample.csproj
@@ -9,8 +9,8 @@
     <AssemblyName>App</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Meadow.F7" Version="0.*" />
-    <PackageReference Include="Meadow.Foundation" Version="0.*" />
+    <ProjectReference Include="..\..\..\..\Meadow.Core\Source\implementations\f7\Meadow.F7\Meadow.F7.csproj" />
+    <ProjectReference Include="..\..\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
   </ItemGroup>
   <ItemGroup>
     <None Update="meadow.config.yaml">

diff --git a/...Meadow.Foundation.Core.Samples/Sensors.Environmental.AnalogWaterLevel_Sample/MeadowApp.cs b/...Meadow.Foundation.Core.Samples/Sensors.Environmental.AnalogWaterLevel_Sample/MeadowApp.cs
@@ -18,7 +18,6 @@ public override Task Initialize()
 
             // configure our AnalogWaterLevel sensor
             analogWaterLevel = new AnalogWaterLevel(
-                device: Device,
                 analogPin: Device.Pins.A00
             );
 

diff --git a/...nvironmental.AnalogWaterLevel_Sample/Sensors.Environmental.AnalogWaterLevel_Sample.csproj b/...nvironmental.AnalogWaterLevel_Sample/Sensors.Environmental.AnalogWaterLevel_Sample.csproj
@@ -9,8 +9,8 @@
     <AssemblyName>App</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Meadow.F7" Version="0.*" />
-    <PackageReference Include="Meadow.Foundation" Version="0.*" />
+    <ProjectReference Include="..\..\..\..\Meadow.Core\Source\implementations\f7\Meadow.F7\Meadow.F7.csproj" />
+    <ProjectReference Include="..\..\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
   </ItemGroup>
   <ItemGroup>
     <None Update="meadow.config.yaml">