Skip to content

Commit

Permalink
Merge pull request #1046 from WildernessLabs/v1.12.8
Browse files Browse the repository at this point in the history
Release 1.12.8
  • Loading branch information
adrianstevens authored Jan 7, 2025
2 parents 5e4db38 + 6659af1 commit dd5592d
Show file tree
Hide file tree
Showing 556 changed files with 5,081 additions and 2,499 deletions.
1 change: 1 addition & 0 deletions .github/workflows/develop-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Develop Build
on:
workflow_dispatch:
pull_request:
branches: [ develop ]
push:
branches: [ develop ]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.12.0" />
<PackageReference Include="Meadow.Foundation" Version="1.12.0" />
<PackageReference Include="Meadow.F7" Version="1.12.8" />
<PackageReference Include="Meadow.Foundation" Version="1.12.8" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.12.0" />
<PackageReference Include="Meadow.Foundation" Version="1.12.0" />
<PackageReference Include="Meadow.F7" Version="1.12.8" />
<PackageReference Include="Meadow.Foundation" Version="1.12.8" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.12.0" />
<PackageReference Include="Meadow.Foundation" Version="1.12.0" />
<PackageReference Include="Meadow.F7" Version="1.12.8" />
<PackageReference Include="Meadow.Foundation" Version="1.12.8" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.12.0" />
<PackageReference Include="Meadow.Foundation" Version="1.12.0" />
<PackageReference Include="Meadow.F7" Version="1.12.8" />
<PackageReference Include="Meadow.Foundation" Version="1.12.8" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.12.0" />
<PackageReference Include="Meadow.Foundation" Version="1.12.0" />
<PackageReference Include="Meadow.F7" Version="1.12.8" />
<PackageReference Include="Meadow.Foundation" Version="1.12.8" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.12.0" />
<PackageReference Include="Meadow.Foundation" Version="1.12.0" />
<PackageReference Include="Meadow.F7" Version="1.12.8" />
<PackageReference Include="Meadow.Foundation" Version="1.12.8" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.12.0" />
<PackageReference Include="Meadow.Foundation" Version="1.12.0" />
<PackageReference Include="Meadow.F7" Version="1.12.8" />
<PackageReference Include="Meadow.Foundation" Version="1.12.8" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.12.0" />
<PackageReference Include="Meadow.Foundation" Version="1.12.0" />
<PackageReference Include="Meadow.F7" Version="1.12.8" />
<PackageReference Include="Meadow.Foundation" Version="1.12.8" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.12.0" />
<PackageReference Include="Meadow.Foundation" Version="1.12.0" />
<PackageReference Include="Meadow.F7" Version="1.12.8" />
<PackageReference Include="Meadow.Foundation" Version="1.12.8" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.12.0" />
<PackageReference Include="Meadow.Foundation" Version="1.12.0" />
<PackageReference Include="Meadow.F7" Version="1.12.8" />
<PackageReference Include="Meadow.Foundation" Version="1.12.8" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<LangVersion>10</LangVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.12.0" />
<PackageReference Include="Meadow.Foundation" Version="1.12.0" />
<PackageReference Include="Meadow.F7" Version="1.12.8" />
<PackageReference Include="Meadow.Foundation" Version="1.12.8" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.12.0" />
<PackageReference Include="Meadow.Foundation" Version="1.12.0" />
<PackageReference Include="Meadow.F7" Version="1.12.8" />
<PackageReference Include="Meadow.Foundation" Version="1.12.8" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.12.0" />
<PackageReference Include="Meadow.Foundation" Version="1.12.0" />
<PackageReference Include="Meadow.F7" Version="1.12.8" />
<PackageReference Include="Meadow.Foundation" Version="1.12.8" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.12.0" />
<PackageReference Include="Meadow.Foundation" Version="1.12.0" />
<PackageReference Include="Meadow.F7" Version="1.12.8" />
<PackageReference Include="Meadow.Foundation" Version="1.12.8" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.12.0" />
<PackageReference Include="Meadow.Foundation" Version="1.12.0" />
<PackageReference Include="Meadow.F7" Version="1.12.8" />
<PackageReference Include="Meadow.Foundation" Version="1.12.8" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.12.0" />
<PackageReference Include="Meadow.Foundation" Version="1.12.0" />
<PackageReference Include="Meadow.F7" Version="1.12.8" />
<PackageReference Include="Meadow.Foundation" Version="1.12.8" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<LangVersion>8.0</LangVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.Foundation" Version="1.12.0" />
<PackageReference Include="Meadow.F7" Version="1.12.0" />
<PackageReference Include="Meadow.Foundation" Version="1.12.8" />
<PackageReference Include="Meadow.F7" Version="1.12.8" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.12.0" />
<PackageReference Include="Meadow.Foundation" Version="1.12.0" />
<PackageReference Include="Meadow.F7" Version="1.12.8" />
<PackageReference Include="Meadow.Foundation" Version="1.12.8" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<ItemGroup>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.12.0" />
<PackageReference Include="Meadow.Foundation" Version="1.12.0" />
<PackageReference Include="Meadow.F7" Version="1.12.8" />
<PackageReference Include="Meadow.Foundation" Version="1.12.8" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<ItemGroup>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.12.0" />
<PackageReference Include="Meadow.Foundation" Version="1.12.0" />
<PackageReference Include="Meadow.F7" Version="1.12.8" />
<PackageReference Include="Meadow.Foundation" Version="1.12.8" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<ItemGroup>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.12.0" />
<PackageReference Include="Meadow.Foundation" Version="1.12.0" />
<PackageReference Include="Meadow.F7" Version="1.12.8" />
<PackageReference Include="Meadow.Foundation" Version="1.12.8" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.12.0" />
<PackageReference Include="Meadow.Foundation" Version="1.12.0" />
<PackageReference Include="Meadow.F7" Version="1.12.8" />
<PackageReference Include="Meadow.Foundation" Version="1.12.8" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.12.0" />
<PackageReference Include="Meadow.Foundation" Version="1.12.0" />
<PackageReference Include="Meadow.F7" Version="1.12.8" />
<PackageReference Include="Meadow.Foundation" Version="1.12.8" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.12.0" />
<PackageReference Include="Meadow.Foundation" Version="1.12.0" />
<PackageReference Include="Meadow.F7" Version="1.12.8" />
<PackageReference Include="Meadow.Foundation" Version="1.12.8" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<ItemGroup>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.12.0" />
<PackageReference Include="Meadow.Foundation" Version="1.12.0" />
<PackageReference Include="Meadow.F7" Version="1.12.8" />
<PackageReference Include="Meadow.Foundation" Version="1.12.8" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public virtual void ReadRegister(byte address, Span<byte> readBuffer)
}

/// <summary>
/// Reads a single byte from the specified address of the peripheral
/// Does a half-duplex read of a single byte from the specified address of the peripheral
/// </summary>
/// <param name="address">Address to read</param>
/// <returns>The byte read</returns>
Expand All @@ -116,8 +116,8 @@ public virtual byte ReadRegister(byte address)
AutoSetBusSpeedAndMode();

WriteBuffer.Span[0] = address;
Bus.Exchange(ChipSelect, WriteBuffer.Span[0..1], ReadBuffer.Span[0..1], chipSelectMode);
return ReadBuffer.Span[0];
Bus.Exchange(ChipSelect, WriteBuffer.Span[..2], ReadBuffer.Span[..2], chipSelectMode);
return ReadBuffer.Span[1];
}

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@
<None Include="..\..\Source\icon.png" Pack="true" PackagePath="" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Meadow.Contracts" Version="1.12.0" />
<PackageReference Include="Meadow.Contracts" Version="1.12.8" />
</ItemGroup>
</Project>
9 changes: 5 additions & 4 deletions Source/Meadow.Foundation.Core/ObservableBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,10 @@ public Unsubscriber(List<IObserver<IChangeResult<UNIT>>> observers, IObserver<IC

public void Dispose()
{
if (!(observer == null)) { observers.Remove(observer); }
if (observer != null)
{
observers.Remove(observer);
}
}
}

Expand All @@ -75,9 +78,7 @@ public static FilterableChangeObserver<UNIT> CreateObserver(
Action<IChangeResult<UNIT>> handler,
Predicate<IChangeResult<UNIT>>? filter = null)
{
return new FilterableChangeObserver<UNIT>(
handler, filter);
return new FilterableChangeObserver<UNIT>(handler, filter);
}

}
}
31 changes: 22 additions & 9 deletions Source/Meadow.Foundation.Core/PollingSensorBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ public abstract class PollingSensorBase<UNIT>
: SamplingSensorBase<UNIT>
where UNIT : struct
{
/// <summary>
/// Event raised when a bus communication error occurs
/// </summary>
public event EventHandler<Exception>? CommunicationError;

/// <summary>
/// Starts updating the sensor on the updateInterval frequency specified.
///
Expand Down Expand Up @@ -44,19 +49,27 @@ public override void StartUpdating(TimeSpan? updateInterval = null)
{
while (true)
{
if (ct.IsCancellationRequested)
try
{
observers.ForEach(x => x.OnCompleted());
IsSampling = false;
break;
}
oldConditions = Conditions;
if (ct.IsCancellationRequested)
{
observers.ForEach(x => x.OnCompleted());
IsSampling = false;
break;
}
oldConditions = Conditions;

Conditions = await Read();
Conditions = await Read();

result = new ChangeResult<UNIT>(Conditions, oldConditions);
result = new ChangeResult<UNIT>(Conditions, oldConditions);

RaiseEventsAndNotify(result);
RaiseEventsAndNotify(result);
}
catch (Exception ex)
{
Resolver.Log.Warn($"{this.GetType().Name} threw {ex.Message}");
CommunicationError?.Invoke(this, ex);
}

await Task.Delay(UpdateInterval);
}
Expand Down
2 changes: 1 addition & 1 deletion Source/Meadow.Foundation.Core/SamplingSensorBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ protected void RaiseUpdated(UNIT newValue)
/// </summary>
public UNIT Conditions
{
get => IsSampling ? _conditions : ReadSensor().Result;
get => IsSampling ? _conditions : Read().Result;
protected set => _conditions = value;
}

Expand Down
Loading

0 comments on commit dd5592d

Please sign in to comment.