Skip to content
This repository has been archived by the owner on Mar 12, 2024. It is now read-only.

Commit

Permalink
Merge pull request #98 from WildernessLabs/develop
Browse files Browse the repository at this point in the history
Update to 1.9.0
  • Loading branch information
jorgedevs committed Feb 27, 2024
2 parents b0fdbbe + 6bfaa57 commit 78bc5eb
Show file tree
Hide file tree
Showing 20 changed files with 511 additions and 48 deletions.
109 changes: 88 additions & 21 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
##
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore

# User-specific files
*.rsuser
*.suo
*.user
*.userosscache
Expand All @@ -12,17 +13,24 @@
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

# Mono auto generated files
mono_crash.*

# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
[Ww][Ii][Nn]32/
[Aa][Rr][Mm]/
[Aa][Rr][Mm]64/
bld/
[Bb]in/
[Oo]bj/
[Ll]og/
[Ll]ogs/

# Visual Studio 2015/2017 cache/options directory
.vs/
Expand All @@ -36,9 +44,10 @@ Generated\ Files/
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

# NUNIT
# NUnit
*.VisualState.xml
TestResult.xml
nunit-*.xml

# Build Results of an ATL Project
[Dd]ebugPS/
Expand All @@ -52,15 +61,17 @@ BenchmarkDotNet.Artifacts/
project.lock.json
project.fragment.lock.json
artifacts/
**/Properties/launchSettings.json

# ASP.NET Scaffolding
ScaffoldingReadMe.txt

# StyleCop
StyleCopReport.xml

# Files built by Visual Studio
*_i.c
*_p.c
*_i.h
*_h.h
*.ilk
*.meta
*.obj
Expand All @@ -77,7 +88,9 @@ StyleCopReport.xml
*.tlh
*.tmp
*.tmp_proj
*_wpftmp.csproj
*.log
*.tlog
*.vspscc
*.vssscc
.builds
Expand Down Expand Up @@ -119,9 +132,6 @@ _ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user

# JustCode is a .NET coding add-in
.JustCode

# TeamCity is a build add-in
_TeamCity*

Expand All @@ -132,6 +142,11 @@ _TeamCity*
.axoCover/*
!.axoCover/settings.json

# Coverlet is a free, cross platform Code Coverage Tool
coverage*.json
coverage*.xml
coverage*.info

# Visual Studio code coverage results
*.coverage
*.coveragexml
Expand Down Expand Up @@ -179,6 +194,8 @@ PublishScripts/

# NuGet Packages
*.nupkg
# NuGet Symbol Packages
*.snupkg
# The packages folder can be ignored because of Package Restore
**/[Pp]ackages/*
# except build/, which is used as an MSBuild target.
Expand All @@ -203,12 +220,14 @@ BundleArtifacts/
Package.StoreAssociation.xml
_pkginfo.txt
*.appx
*.appxbundle
*.appxupload

# Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache
# but keep track of directories ending in .cache
!*.[Cc]ache/
!?*.[Cc]ache/

# Others
ClientBin/
Expand All @@ -221,7 +240,7 @@ ClientBin/
*.publishsettings
orleans.codegen.cs

# Including strong name files can present a security risk
# Including strong name files can present a security risk
# (https://github.com/github/gitignore/pull/2483#issue-259490424)
#*.snk

Expand Down Expand Up @@ -252,6 +271,9 @@ ServiceFabricBackup/
*.bim.layout
*.bim_*.settings
*.rptproj.rsuser
*- [Bb]ackup.rdl
*- [Bb]ackup ([0-9]).rdl
*- [Bb]ackup ([0-9][0-9]).rdl

# Microsoft Fakes
FakesAssemblies/
Expand All @@ -272,6 +294,17 @@ node_modules/
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
*.vbw

# Visual Studio 6 auto-generated project file (contains which files were open etc.)
*.vbp

# Visual Studio 6 workspace and project file (working project files containing files to include in project)
*.dsw
*.dsp

# Visual Studio 6 technical files
*.ncb
*.aps

# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
Expand All @@ -287,12 +320,8 @@ paket-files/
# FAKE - F# Make
.fake/

# JetBrains Rider
.idea/
*.sln.iml

# CodeRush
.cr/
# CodeRush personal settings
.cr/personal

# Python Tools for Visual Studio (PTVS)
__pycache__/
Expand All @@ -317,7 +346,7 @@ __pycache__/
# OpenCover UI analysis results
OpenCover/

# Azure Stream Analytics local run output
# Azure Stream Analytics local run output
ASALocalRun/

# MSBuild Binary and Structured Log
Expand All @@ -326,15 +355,53 @@ ASALocalRun/
# NVidia Nsight GPU debugger configuration file
*.nvuser

# MFractors (Xamarin productivity tool) working folder
# MFractors (Xamarin productivity tool) working folder
.mfractor/

# macOS Garbage
**/*.DS_Store
**/.DS_Store
# Local History for Visual Studio
.localhistory/

# Visual Studio History (VSHistory) files
.vshistory/

# BeatPulse healthcheck temp database
healthchecksdb

# Backup folder for Package Reference Convert tool in Visual Studio 2017
MigrationBackup/

# Ionide (cross platform F# VS Code tools) working folder
.ionide/

# Fody - auto-generated XML schema
FodyWeavers.xsd

# VS Code files for those working on multiple tools
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
*.code-workspace

# Local History for Visual Studio Code
.history/

# Windows Installer files from build outputs
*.cab
*.msi
*.msix
*.msm
*.msp

# JetBrains Rider
**/.idea/
*.sln.iml

# Secrets
**/Secrets.cs

# MAC Bullshit
# MacOS Stuff
.DS_Store
*.DS_Store
**/.DS_Store
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Meadow;
using Meadow.Foundation.Graphics;
using Meadow.Logging;
using Meadow.Peripherals.Displays;

namespace MeadowApp
{
Expand All @@ -10,7 +11,7 @@ public abstract class DisplayBase
private RotationType _rotation;

protected Logger Logger { get; private set; }
protected abstract IGraphicsDisplay Display { get; }
protected abstract IPixelDisplay Display { get; }

public DisplayBase(Logger logger, RotationType rotation = RotationType.Default)

Check warning on line 16 in Source/Board_Specific_Samples/CoreComputeBreakout/DisplayBase.cs

View workflow job for this annotation

GitHub Actions / build

Non-nullable field '_canvas' must contain a non-null value when exiting constructor. Consider declaring the field as nullable.
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Meadow.Foundation.Displays;
using Meadow.Foundation.Graphics;
using Meadow.Hardware;
using Meadow.Logging;
using Meadow.Peripherals.Displays;

namespace MeadowApp
{
Expand All @@ -16,6 +16,6 @@ public I2CDisplay(II2cBus bus, Logger logger)
_display = new Ssd1306(bus, displayType: Ssd130xBase.DisplayType.OLED128x64);
}

protected override IGraphicsDisplay Display => _display;
protected override IPixelDisplay Display => _display;
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
using Meadow.Devices;
using Meadow.Foundation.Displays;
using Meadow.Foundation.Graphics;
using Meadow.Foundation.Displays;
using Meadow.Hardware;
using Meadow.Logging;
using Meadow.Peripherals.Displays;

namespace MeadowApp
{
Expand All @@ -22,6 +21,6 @@ public SPIDisplay(ISpiBus bus, IPin chipSelect, IPin dc, IPin reset, Logger logg
_display = new St7789(bus, _chipSelect, _dc, _reset, 240, 240);
}

protected override IGraphicsDisplay Display => _display;
protected override IPixelDisplay Display => _display;
}
}
2 changes: 1 addition & 1 deletion Source/Cellular/Cell_Basics/MeadowApp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ async void CellAdapter_NetworkConnected(INetworkAdapter networkAdapter, NetworkC
}
}

void CellAdapter_NetworkDisconnected(INetworkAdapter networkAdapter)
void CellAdapter_NetworkDisconnected(INetworkAdapter sender, NetworkDisconnectionEventArgs args)
{
Console.WriteLine("Cell network disconnected!");
}
Expand Down
5 changes: 3 additions & 2 deletions Source/IO/DigitalInterruptPort_Basics/MeadowApp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,16 @@ public override Task Initialize()
var observer = IDigitalInterruptPort.CreateObserver(
handler: result =>
{
Resolver.Log.Info($"Observer filter satisfied, time: {result.New.Time.ToShortTimeString()}");
Resolver.Log.Info($"Observer filter satisfied, time: {result.New.Time}");
},
// Optional filter paramter, showing a 1 second filter, i.e., only notify
// if the new event is > 1 second from last time it was notified.
filter: result =>
{
if (result.Old is { } old)
{ // C# 8 null pattern matching for not null
return (result.New.Time - old.Time) > TimeSpan.FromSeconds(1);
//return (result.New.Time - old.Time) > TimeSpan.FromSeconds(1);
return (result.New.Time - old.Time) > TimeSpan.FromSeconds(1).TotalSeconds;
}
else return false;
}
Expand Down
2 changes: 1 addition & 1 deletion Source/IO/WakeOnInterrupt/MeadowApp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public override Task Initialize()
Resolver.Log.Info("Sleeping...");
};

Device.PlatformOS.AfterWake += () =>
Device.PlatformOS.AfterWake += (e, o) =>
{
Thread.Sleep(1000);
_red.State = false;
Expand Down
Loading

0 comments on commit 78bc5eb

Please sign in to comment.