Skip to content

Commit

Permalink
Replace Console.WriteLine calls with Resolver.Log
Browse files Browse the repository at this point in the history
  • Loading branch information
adrianstevens committed Oct 24, 2023
1 parent 35f1ec2 commit da027e4
Show file tree
Hide file tree
Showing 67 changed files with 211 additions and 188 deletions.
4 changes: 2 additions & 2 deletions Source/3-AxisDigitalAccelerometer16g/Driver/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ ThreeAxisDigitalAccelerometer16g sensor;

public override Task Initialize()
{
Console.WriteLine("Initializing");
Resolver.Log.Info("Initializing");

sensor = new ThreeAxisDigitalAccelerometer16g(Device.CreateI2cBus());
sensor.SetPowerState(false, false, true, false, ThreeAxisDigitalAccelerometer16g.Frequencies.TwoHz);

sensor.Updated += (sender, result) =>
{
Console.WriteLine($"Accel: [X:{result.New.X.MetersPerSecondSquared:N2}," +
Resolver.Log.Info($"Accel: [X:{result.New.X.MetersPerSecondSquared:N2}," +
$"Y:{result.New.Y.MetersPerSecondSquared:N2}," +
$"Z:{result.New.Z.MetersPerSecondSquared:N2} (m/s^2)]");
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ public class MeadowApp : App<F7FeatherV2>

public override Task Initialize()
{
Console.WriteLine("Initializing");
Resolver.Log.Info("Initializing");

sensor = new ThreeAxisDigitalAccelerometer16g(Device.CreateI2cBus());
sensor.SetPowerState(false, false, true, false, ThreeAxisDigitalAccelerometer16g.Frequencies.TwoHz);

sensor.Updated += (sender, result) =>
{
Console.WriteLine($"Accel: [X:{result.New.X.MetersPerSecondSquared:N2}," +
Resolver.Log.Info($"Accel: [X:{result.New.X.MetersPerSecondSquared:N2}," +
$"Y:{result.New.Y.MetersPerSecondSquared:N2}," +
$"Z:{result.New.Z.MetersPerSecondSquared:N2} (m/s^2)]");
};
Expand Down
6 changes: 3 additions & 3 deletions Source/3-AxisDigitalAccelerometer1_5g/Driver/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ ThreeAxisDigitalAccelerometer1_5g sensor;

public override Task Initialize()
{
Console.WriteLine("Initializing");
Resolver.Log.Info("Initializing");

// create the sensor driver
sensor = new ThreeAxisDigitalAccelerometer1_5g(Device.CreateI2cBus());

// classical .NET events can also be used:
sensor.Updated += (sender, result) => {
Console.WriteLine($"Accel: [X:{result.New.X.MetersPerSecondSquared:N2}," +
Resolver.Log.Info($"Accel: [X:{result.New.X.MetersPerSecondSquared:N2}," +
$"Y:{result.New.Y.MetersPerSecondSquared:N2}," +
$"Z:{result.New.Z.MetersPerSecondSquared:N2} (m/s^2)]" +
$" Direction: {sensor.Direction}" +
Expand All @@ -33,7 +33,7 @@ public override Task Initialize()

// Example that uses an IObersvable subscription to only be notified when the filter is satisfied
var consumer = ThreeAxisDigitalAccelerometer1_5g.CreateObserver(
handler: result => Console.WriteLine($"Observer: [x] changed by threshold; new [x]: X:{result.New.X:N2}, old: X:{result.Old?.X:N2}"),
handler: result => Resolver.Log.Info($"Observer: [x] changed by threshold; new [x]: X:{result.New.X:N2}, old: X:{result.Old?.X:N2}"),
// only notify if there's a greater than 0.5G change in the Z direction
filter: result => {
if (result.Old is { } old)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ public class MeadowApp : App<F7FeatherV2>

public override Task Initialize()
{
Console.WriteLine("Initializing");
Resolver.Log.Info("Initializing");

// create the sensor driver
sensor = new ThreeAxisDigitalAccelerometer1_5g(Device.CreateI2cBus());

// classical .NET events can also be used:
sensor.Updated += (sender, result) =>
{
Console.WriteLine($"Accel: [X:{result.New.X.MetersPerSecondSquared:N2}," +
Resolver.Log.Info($"Accel: [X:{result.New.X.MetersPerSecondSquared:N2}," +
$"Y:{result.New.Y.MetersPerSecondSquared:N2}," +
$"Z:{result.New.Z.MetersPerSecondSquared:N2} (m/s^2)]" +
$" Direction: {sensor.Direction}" +
Expand All @@ -34,7 +34,7 @@ public override Task Initialize()

// Example that uses an IObersvable subscription to only be notified when the filter is satisfied
var consumer = ThreeAxisDigitalAccelerometer1_5g.CreateObserver(
handler: result => Console.WriteLine($"Observer: [x] changed by threshold; new [x]: X:{result.New.X:N2}, old: X:{result.Old?.X:N2}"),
handler: result => Resolver.Log.Info($"Observer: [x] changed by threshold; new [x]: X:{result.New.X:N2}, old: X:{result.Old?.X:N2}"),
// only notify if there's a greater than 0.5G change in the Z direction
filter: result =>
{
Expand Down
8 changes: 4 additions & 4 deletions Source/3-AxisDigitalCompass/Driver/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,22 @@ ThreeAxisDigitalCompass sensor;

public override Task Initialize()
{
Console.WriteLine("Initializing ...");
Resolver.Log.Info("Initializing ...");

sensor = new ThreeAxisDigitalCompass(Device.CreateI2cBus());

sensor.Updated += (sender, result) => {
Console.WriteLine($"Direction: [X:{result.New.X:N2}," +
Resolver.Log.Info($"Direction: [X:{result.New.X:N2}," +
$"Y:{result.New.Y:N2}," +
$"Z:{result.New.Z:N2}]");

Console.WriteLine($"Heading: [{Hmc5883.DirectionToHeading(result.New).DecimalDegrees:N2}] degrees");
Resolver.Log.Info($"Heading: [{Hmc5883.DirectionToHeading(result.New).DecimalDegrees:N2}] degrees");
};

var consumer = Hmc5883.CreateObserver(
handler: result =>
{
Console.WriteLine($"Observer: [x] changed by threshold; " +
Resolver.Log.Info($"Observer: [x] changed by threshold; " +
$"new [x]: X:{Hmc5883.DirectionToHeading(result.New):N2}, " +
$"old: X:{((result.Old != null) ? Hmc5883.DirectionToHeading(result.Old.Value) : "n/a"):N2} degrees");
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@ public class MeadowApp : App<F7FeatherV2>

public override Task Initialize()
{
Console.WriteLine("Initializing ...");
Resolver.Log.Info("Initializing ...");

sensor = new ThreeAxisDigitalCompass(Device.CreateI2cBus());

sensor.Updated += (sender, result) =>
{
Console.WriteLine($"Direction: [X:{result.New.X:N2}," +
Resolver.Log.Info($"Direction: [X:{result.New.X:N2}," +
$"Y:{result.New.Y:N2}," +
$"Z:{result.New.Z:N2}]");
Console.WriteLine($"Heading: [{Hmc5883.DirectionToHeading(result.New).DecimalDegrees:N2}] degrees");
Resolver.Log.Info($"Heading: [{Hmc5883.DirectionToHeading(result.New).DecimalDegrees:N2}] degrees");
};

var consumer = Hmc5883.CreateObserver(
handler: result =>
{
Console.WriteLine($"Observer: [x] changed by threshold; " +
Resolver.Log.Info($"Observer: [x] changed by threshold; " +
$"new [x]: X:{Hmc5883.DirectionToHeading(result.New):N2}, " +
$"old: X:{((result.Old != null) ? Hmc5883.DirectionToHeading(result.Old.Value) : "n/a"):N2} degrees");
},
Expand Down
2 changes: 1 addition & 1 deletion Source/4-DigitDisplay/Driver/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ FourDigitDisplay display;

public override Task Initialize()
{
Console.WriteLine("Initializing ...");
Resolver.Log.Info("Initializing ...");

display = new FourDigitDisplay(
device: Device,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class MeadowApp : App<F7FeatherV2>

public override Task Initialize()
{
Console.WriteLine("Initializing ...");
Resolver.Log.Info("Initializing ...");

display = new FourDigitDisplay(
device: Device,
Expand Down
6 changes: 3 additions & 3 deletions Source/Button/Driver/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ Button button;

public override Task Initialize()
{
Console.WriteLine("Initialize...");
Resolver.Log.Info("Initialize...");

button = new Button(Device.Pins.D13)
{
LongClickedThreshold = TimeSpan.FromMilliseconds(1500)
};

button.Clicked += (s, e) => Console.WriteLine("Grove Button clicked");
button.Clicked += (s, e) => Resolver.Log.Info("Grove Button clicked");

button.LongClicked += (s, e) => Console.WriteLine("Grove Button long clicked");
button.LongClicked += (s, e) => Resolver.Log.Info("Grove Button long clicked");

return Task.CompletedTask;
}
Expand Down
6 changes: 3 additions & 3 deletions Source/Button/Sample/Button_Sample/MeadowApp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ public class MeadowApp : App<F7FeatherV2>

public override Task Initialize()
{
Console.WriteLine("Initialize...");
Resolver.Log.Info("Initialize...");

button = new Button(Device.Pins.D13)
{
LongClickedThreshold = TimeSpan.FromMilliseconds(1500)
};

button.Clicked += (s, e) => Console.WriteLine("Grove Button clicked");
button.Clicked += (s, e) => Resolver.Log.Info("Grove Button clicked");

button.LongClicked += (s, e) => Console.WriteLine("Grove Button long clicked");
button.LongClicked += (s, e) => Resolver.Log.Info("Grove Button long clicked");

return Task.CompletedTask;
}
Expand Down
4 changes: 2 additions & 2 deletions Source/Buzzer/Driver/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Buzzer buzzer;

public override Task Initialize()
{
Console.WriteLine("Initialize...");
Resolver.Log.Info("Initialize...");

buzzer = new Buzzer(Device.Pins.D13);

Expand All @@ -28,7 +28,7 @@ public override async Task Run()
{
for (int i = 0; i < 5; i++)
{
Console.WriteLine("Playing A major triad starting at A4");
Resolver.Log.Info("Playing A major triad starting at A4");
await buzzer.PlayTone(new Frequency(440, Frequency.UnitType.Hertz), TimeSpan.FromMilliseconds(500)); //A
await buzzer.PlayTone(new Frequency(554.37f, Frequency.UnitType.Hertz), TimeSpan.FromMilliseconds(500)); //C#
await buzzer.PlayTone(new Frequency(659.25f, Frequency.UnitType.Hertz), TimeSpan.FromMilliseconds(500)); //E
Expand Down
4 changes: 2 additions & 2 deletions Source/Buzzer/Sample/Buzzer_Sample/MeadowApp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class MeadowApp : App<F7FeatherV2>

public override Task Initialize()
{
Console.WriteLine("Initialize...");
Resolver.Log.Info("Initialize...");

buzzer = new Buzzer(Device.Pins.D13);

Expand All @@ -27,7 +27,7 @@ public override async Task Run()
{
for (int i = 0; i < 5; i++)
{
Console.WriteLine("Playing A major triad starting at A4");
Resolver.Log.Info("Playing A major triad starting at A4");
await buzzer.PlayTone(new Frequency(440, Frequency.UnitType.Hertz), TimeSpan.FromMilliseconds(500)); //A
await buzzer.PlayTone(new Frequency(554.37f, Frequency.UnitType.Hertz), TimeSpan.FromMilliseconds(500)); //C#
await buzzer.PlayTone(new Frequency(659.25f, Frequency.UnitType.Hertz), TimeSpan.FromMilliseconds(500)); //E
Expand Down
4 changes: 2 additions & 2 deletions Source/FlameSensor/Driver/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ FlameSensor flameSensor;

public override Task Initialize()
{
Console.WriteLine("Initialize...");
Resolver.Log.Info("Initialize...");

flameSensor = new FlameSensor(Device.Pins.D13);

flameSensor.FlameDetected += (s, e) =>
{
Console.WriteLine($"fire detected: {e}");
Resolver.Log.Info($"fire detected: {e}");
};

return Task.CompletedTask;
Expand Down
4 changes: 2 additions & 2 deletions Source/FlameSensor/Sample/FlameSensor_Sample/MeadowApp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ public class MeadowApp : App<F7FeatherV2>

public override Task Initialize()
{
Console.WriteLine("Initialize...");
Resolver.Log.Info("Initialize...");

flameSensor = new FlameSensor(Device.Pins.D13);

flameSensor.FlameDetected += (s, e) =>
{
Console.WriteLine($"fire detected: {e}");
Resolver.Log.Info($"fire detected: {e}");
};

return Task.CompletedTask;
Expand Down
23 changes: 23 additions & 0 deletions Source/Grove.sln
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.Units", "..\..\Meado
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.Core", "..\..\Meadow.Core\source\Meadow.Core\Meadow.Core.csproj", "{A2183707-FC58-4A4F-A3A6-DC7CE41D7DA0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "4-ChannelSpdtRelay", "4-ChannelSpdtRelay", "{CFEB0449-4B3E-41C2-83A9-99D0FA5C22EC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sample", "Sample", "{F2452A20-B901-499C-9B30-65BE39FCCF10}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "4-ChannelSpdtRelay", "4-ChannelSpdtRelay\Driver\4-ChannelSpdtRelay.csproj", "{BBBD136F-8AB1-475A-B5DC-3CDB3D7C0402}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "4-ChannelSpdtRelay_Sample", "4-ChannelSpdtRelay\Sample\4-ChannelSpdtRelay_Sample\4-ChannelSpdtRelay_Sample.csproj", "{3D954EBE-50AB-439C-90FE-3FEC0A5D6039}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -803,6 +811,18 @@ Global
{A2183707-FC58-4A4F-A3A6-DC7CE41D7DA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A2183707-FC58-4A4F-A3A6-DC7CE41D7DA0}.Release|Any CPU.Build.0 = Release|Any CPU
{A2183707-FC58-4A4F-A3A6-DC7CE41D7DA0}.Release|Any CPU.Deploy.0 = Release|Any CPU
{BBBD136F-8AB1-475A-B5DC-3CDB3D7C0402}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BBBD136F-8AB1-475A-B5DC-3CDB3D7C0402}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BBBD136F-8AB1-475A-B5DC-3CDB3D7C0402}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{BBBD136F-8AB1-475A-B5DC-3CDB3D7C0402}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BBBD136F-8AB1-475A-B5DC-3CDB3D7C0402}.Release|Any CPU.Build.0 = Release|Any CPU
{BBBD136F-8AB1-475A-B5DC-3CDB3D7C0402}.Release|Any CPU.Deploy.0 = Release|Any CPU
{3D954EBE-50AB-439C-90FE-3FEC0A5D6039}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3D954EBE-50AB-439C-90FE-3FEC0A5D6039}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3D954EBE-50AB-439C-90FE-3FEC0A5D6039}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{3D954EBE-50AB-439C-90FE-3FEC0A5D6039}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3D954EBE-50AB-439C-90FE-3FEC0A5D6039}.Release|Any CPU.Build.0 = Release|Any CPU
{3D954EBE-50AB-439C-90FE-3FEC0A5D6039}.Release|Any CPU.Deploy.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -924,6 +944,9 @@ Global
{F74E46CD-7928-4885-8012-20FF086CC641} = {669A65E7-D76B-48E4-98AE-DE7D33662054}
{FDFD3020-E06B-4B0C-BEAF-37806311A0DE} = {669A65E7-D76B-48E4-98AE-DE7D33662054}
{A2183707-FC58-4A4F-A3A6-DC7CE41D7DA0} = {669A65E7-D76B-48E4-98AE-DE7D33662054}
{F2452A20-B901-499C-9B30-65BE39FCCF10} = {CFEB0449-4B3E-41C2-83A9-99D0FA5C22EC}
{BBBD136F-8AB1-475A-B5DC-3CDB3D7C0402} = {CFEB0449-4B3E-41C2-83A9-99D0FA5C22EC}
{3D954EBE-50AB-439C-90FE-3FEC0A5D6039} = {F2452A20-B901-499C-9B30-65BE39FCCF10}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {803C75D4-CF94-4881-BC4C-7CBE9D272949}
Expand Down
2 changes: 1 addition & 1 deletion Source/LCD/Driver/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ LCD display;

public override Task Initialize()
{
Console.WriteLine("Initialize...");
Resolver.Log.Info("Initialize...");

display = new LCD(Device.CreateI2cBus());

Expand Down
2 changes: 1 addition & 1 deletion Source/LCD/Samples/LCD_Sample/MeadowApp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class MeadowApp : App<F7FeatherV2>

public override Task Initialize()
{
Console.WriteLine("Initialize...");
Resolver.Log.Info("Initialize...");

display = new LCD(Device.CreateI2cBus());

Expand Down
6 changes: 3 additions & 3 deletions Source/LEDButton/Driver/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@ LEDButton ledButton;

public override Task Initialize()
{
Console.WriteLine("Initialize...");
Resolver.Log.Info("Initialize...");

ledButton = new LEDButton(buttonPin: Device.Pins.D12, ledPin: Device.Pins.D13);

ledButton.LongClickedThreshold = TimeSpan.FromMilliseconds(1500);

ledButton.Clicked += (s, e) =>
{
Console.WriteLine("Grove Button clicked");
Resolver.Log.Info("Grove Button clicked");
ledButton.IsLedOn = !ledButton.IsLedOn;
};

ledButton.LongClicked += (s, e) =>
{
Console.WriteLine("Grove Button long clicked");
Resolver.Log.Info("Grove Button long clicked");
};

return Task.CompletedTask;
Expand Down
6 changes: 3 additions & 3 deletions Source/LEDButton/Sample/LEDButton_Sample/MeadowApp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@ public class MeadowApp : App<F7FeatherV2>

public override Task Initialize()
{
Console.WriteLine("Initialize...");
Resolver.Log.Info("Initialize...");

ledButton = new LEDButton(buttonPin: Device.Pins.D12, ledPin: Device.Pins.D13);

ledButton.LongClickedThreshold = TimeSpan.FromMilliseconds(1500);

ledButton.Clicked += (s, e) =>
{
Console.WriteLine("Grove Button clicked");
Resolver.Log.Info("Grove Button clicked");
ledButton.IsLedOn = !ledButton.IsLedOn;
};

ledButton.LongClicked += (s, e) =>
{
Console.WriteLine("Grove Button long clicked");
Resolver.Log.Info("Grove Button long clicked");
};

return Task.CompletedTask;
Expand Down
2 changes: 1 addition & 1 deletion Source/LEDSocket/Driver/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ LEDSocket led;

public override Task Initialize()
{
Console.WriteLine("Initialize...");
Resolver.Log.Info("Initialize...");

led = new LEDSocket(Device.Pins.D13);

Expand Down
2 changes: 1 addition & 1 deletion Source/LEDSocket/Sample/LEDSocket_Sample/MeadowApp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class MeadowApp : App<F7FeatherV2>

public override Task Initialize()
{
Console.WriteLine("Initialize...");
Resolver.Log.Info("Initialize...");

led = new LEDSocket(Device.Pins.D13);

Expand Down
Loading

0 comments on commit da027e4

Please sign in to comment.