Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

B6.5 updates - WIP - samples need lifecycle updates #359

Merged
merged 16 commits into from
Jul 8, 2022
Merged

B6.5 updates - WIP - samples need lifecycle updates #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
88cd818
B6.5 updates - samples don't work
adrianstevens Jul 4, 2022
f4a67ca
Update samples to new lifecycle pattern
adrianstevens Jul 4, 2022
87a6964
Switch Output type of samples to Library
adrianstevens Jul 5, 2022
173c0b4
Remove program.cs from samples
adrianstevens Jul 5, 2022
88930e1
Update Meadow.Foundation.Core samples with app life cycle changes
jorgedevs Jul 6, 2022
5bb4913
Update Audio.* and Displays.ePaper samples
jorgedevs Jul 6, 2022
31648a6
Update Displays.* samples
jorgedevs Jul 6, 2022
b2c1354
Update all ICs.* sample projects
jorgedevs Jul 6, 2022
530ebe6
Update Leds.*, Motors.* and RTCs.* sample projects
jorgedevs Jul 7, 2022
b20c978
M.F. sample lifecycle updates
adrianstevens Jul 8, 2022
88b21e0
Update System.Text.Encodings.Web in MapleServer sample
adrianstevens Jul 8, 2022
64565e7
Update Sensors.Atmospheric.*, Sensors.Camera.* and Sensors.Distance.*
jorgedevs Jul 8, 2022
1dcbe88
More sample lifecycle updates
adrianstevens Jul 8, 2022
ff9c6c3
More sample updates
jorgedevs Jul 8, 2022
f8fd4b8
More sample lifecycle updates + cleanup
adrianstevens Jul 8, 2022
8338f19
Update sample init console message
adrianstevens Jul 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion ...Meadow.Foundation.Core.Samples/Audio.PiezoSpeaker_Sample/Audio.PiezoSpeaker_Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
23 changes: 12 additions & 11 deletions Source/Meadow.Foundation.Core.Samples/Audio.PiezoSpeaker_Sample/MeadowApp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,35 @@
using System;
using System.Threading.Tasks;
using Meadow;
using Meadow;
using Meadow.Devices;
using Meadow.Foundation.Audio;
using Meadow.Units;
using System;
using System.Threading.Tasks;

namespace Audio.PiezoSpeaker_Sample
{
public class MeadowApp : App<F7FeatherV2, MeadowApp>
public class MeadowApp : App<F7FeatherV2>
{
//<!=SNIP=>

protected PiezoSpeaker piezoSpeaker;

public MeadowApp()
public override Task Initialize()
{
Console.WriteLine("Initializing...");

piezoSpeaker = new PiezoSpeaker(Device.CreatePwmPort(Device.Pins.D05));
piezoSpeaker = new PiezoSpeaker(Device.CreatePwmPort(Device.Pins.D05, new Frequency(100, Frequency.UnitType.Hertz)));

_ = PlayTriad();
return Task.CompletedTask;
}

async Task PlayTriad()
public override async Task Run()
{
for (int i = 0; i < 5; i++)
{
Console.WriteLine("Playing A major triad starting at A4");
await piezoSpeaker.PlayTone(440, 500); //A
await piezoSpeaker.PlayTone(554.37f, 500); //C#
await piezoSpeaker.PlayTone(659.25f, 500); //E
await piezoSpeaker.PlayTone(new Frequency(440, Frequency.UnitType.Hertz), 500); //A
await piezoSpeaker.PlayTone(new Frequency(554.37f, Frequency.UnitType.Hertz), 500); //C#
await piezoSpeaker.PlayTone(new Frequency(659.25f, Frequency.UnitType.Hertz), 500); //E

await Task.Delay(2500);
}
Expand Down
17 changes: 0 additions & 17 deletions Source/Meadow.Foundation.Core.Samples/Audio.PiezoSpeaker_Sample/Program.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...oundation.Core.Samples/Generators.SoftPwmPort_Sample/Generators.SoftPwmPort_Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
21 changes: 14 additions & 7 deletions Source/Meadow.Foundation.Core.Samples/Generators.SoftPwmPort_Sample/MeadowApp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,33 @@
using System;
using System.Threading;
using Meadow;
using Meadow;
using Meadow.Devices;
using Meadow.Foundation.Generators;
using Meadow.Hardware;
using System;
using System.Threading;
using System.Threading.Tasks;

namespace Generators.SoftPwmPort_Sample
{
public class MeadowApp : App<F7FeatherV2, MeadowApp>
public class MeadowApp : App<F7FeatherV2>
{
//<!=SNIP=>

protected SoftPwmPort softPwmPort;

public MeadowApp()
public override Task Initialize()
{
Console.WriteLine("Initializing...");

IDigitalOutputPort digiOut = Device.CreateDigitalOutputPort(Device.Pins.D00);
softPwmPort = new SoftPwmPort(digiOut);

softPwmPort = new SoftPwmPort(digiOut);

return Task.CompletedTask;
}

public override Task Run()
{
TestSoftPwmPort();
return Task.CompletedTask;
}

protected void TestSoftPwmPort()
Expand Down
17 changes: 0 additions & 17 deletions Source/Meadow.Foundation.Core.Samples/Generators.SoftPwmPort_Sample/Program.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Source/Meadow.Foundation.Core.Samples/Leds.LedBarGraph_Sample/Leds.LedBarGraph_Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
30 changes: 15 additions & 15 deletions Source/Meadow.Foundation.Core.Samples/Leds.LedBarGraph_Sample/MeadowApp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
using Meadow.Foundation.Leds;
using Meadow.Hardware;
using System;
using System.Threading;
using System.Threading.Tasks;

namespace Leds.LedBarGraph_Sample
{
public class MeadowApp : App<F7FeatherV2, MeadowApp>
public class MeadowApp : App<F7FeatherV2>
{
//<!=SNIP=>

LedBarGraph ledBarGraph;

public MeadowApp()
public override Task Initialize()
{
Console.WriteLine("Initializing...");

Expand All @@ -34,10 +34,10 @@ public MeadowApp()

ledBarGraph = new LedBarGraph(Device, pins);

TestLedBarGraph();
return Task.CompletedTask;
}

protected void TestLedBarGraph()
public override async Task Run()
{
Console.WriteLine("TestLedBarGraph...");

Expand All @@ -49,47 +49,47 @@ protected void TestLedBarGraph()
for (int i = 0; i < ledBarGraph.Count; i++)
{
ledBarGraph.SetLed(i, true);
Thread.Sleep(1000);
await Task.Delay(1000);
ledBarGraph.SetLed(i, false);
}

Thread.Sleep(1000);
await Task.Delay(1000);

Console.WriteLine("Turning them on using Percentage...");
while (percentage < 1)
{
percentage += 0.10m;
Console.WriteLine($"{percentage}");
ledBarGraph.Percentage = (float) Math.Min(1.0m, percentage);
Thread.Sleep(500);
await Task.Delay(1000);
}

Thread.Sleep(1000);
await Task.Delay(1000);

Console.WriteLine("Turning them off using Percentage...");
while (percentage > 0)
{
percentage -= 0.10m;
Console.WriteLine($"{percentage}");
ledBarGraph.Percentage = (float) Math.Max(0.0m, percentage);
Thread.Sleep(500);
await Task.Delay(1000);
}

Thread.Sleep(1000);
await Task.Delay(1000);

Console.WriteLine("Blinking for 3 seconds...");
ledBarGraph.StartBlink();
Thread.Sleep(3000);
await Task.Delay(3000);
ledBarGraph.Stop();

Thread.Sleep(1000);
await Task.Delay(1000);

Console.WriteLine("Blinking for 3 seconds...");
ledBarGraph.StartBlink(TimeSpan.FromSeconds(1), TimeSpan.FromSeconds(1));
Thread.Sleep(3000);
await Task.Delay(3000);
ledBarGraph.Stop();

Thread.Sleep(1000);
await Task.Delay(1000);
}
}

Expand Down
17 changes: 0 additions & 17 deletions Source/Meadow.Foundation.Core.Samples/Leds.LedBarGraph_Sample/Program.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Source/Meadow.Foundation.Core.Samples/Leds.Led_Sample/Leds.Led_Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
26 changes: 13 additions & 13 deletions Source/Meadow.Foundation.Core.Samples/Leds.Led_Sample/MeadowApp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
using Meadow.Foundation.Leds;
using System;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;

namespace Leds.Led_Sample
{
public class MeadowApp : App<F7FeatherV2, MeadowApp>
public class MeadowApp : App<F7FeatherV2>
{
//<!=SNIP=>

readonly List<Led> leds;
List<Led> leds;

public MeadowApp()
public override Task Initialize()
{
var onRgbLed = new RgbLed(
device: Device,
Expand Down Expand Up @@ -44,10 +44,10 @@ public MeadowApp()

onRgbLed.SetColor(RgbLed.Colors.Green);

TestLeds();
return Task.CompletedTask;
}

protected void TestLeds()
public override async Task Run()
{
Console.WriteLine("TestLeds...");

Expand All @@ -57,37 +57,37 @@ protected void TestLeds()
foreach (var led in leds)
{
led.IsOn = true;
Thread.Sleep(100);
await Task.Delay(100);
}

Thread.Sleep(1000);
await Task.Delay(1000);

Console.WriteLine("Turning off each led every 100ms");
foreach (var led in leds)
{
led.IsOn = false;
Thread.Sleep(100);
await Task.Delay(100);
}

Thread.Sleep(1000);
await Task.Delay(1000);

Console.WriteLine("Blinking the LEDs for a second each");
foreach (var led in leds)
{
led.StartBlink();
Thread.Sleep(3000);
await Task.Delay(3000);
led.Stop();
}

Console.WriteLine("Blinking the LEDs for a second each with on (1s) and off (1s)");
foreach (var led in leds)
{
led.StartBlink(TimeSpan.FromSeconds(1), TimeSpan.FromSeconds(1));
Thread.Sleep(3000);
await Task.Delay(3000);
led.Stop();
}

Thread.Sleep(3000);
await Task.Delay(3000);
}
}

Expand Down
17 changes: 0 additions & 17 deletions Source/Meadow.Foundation.Core.Samples/Leds.Led_Sample/Program.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...adow.Foundation.Core.Samples/Leds.PwmLedBarGraph_Sample/Leds.PwmLedBarGraph_Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading