Skip to content

Commit da2e9be

Browse files
authored
Merging 1.5.1 changes into main (#151)
* #140 show crank position and speed on Crank tab * #141 version number updates to 1.5.1 * #142 renamed update-versions.cmd * #142 converted to powershell * #141 updated version numbers to 1.5.1 * #142 updated to use Powershell's XML capability instead of regex * #141 update version numbers to 1.5.1 using latest version of update-versions,.ps1 * #143 added "Signed Release" build config and script for signing * #144 update wixproj SDK to match nupkgs * #147 renamed solution file * #147 updated content of solution file to XML solution format * #143 remove pause when when sign tool is not found to avoid blocking automated process * #147 updated actions workflow for new solution file extension * #147 updated to centralised package management * #149 added an auto update check feature * #150 udated some test packages
1 parent 5e15b40 commit da2e9be

32 files changed

Lines changed: 616 additions & 101 deletions

Directory.Packages.props

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<Project>
2+
<!-- Central package versions for the solution. This enables NuGet Central Package Management (CPM).
3+
Requires NuGet/dotnet SDK that supports Directory.Packages.props (NuGet 6+/VS2022+).
4+
-->
5+
<PropertyGroup>
6+
<ManagePackageVersionsCentrally>True</ManagePackageVersionsCentrally>
7+
<CentralPackageVersionsFileImported>True</CentralPackageVersionsFileImported>
8+
</PropertyGroup>
9+
<ItemGroup>
10+
<PackageVersion Include="WixToolset.UI.wixext" Version="6.0.2" />
11+
<PackageVersion Include="WixToolset.NetFx.wixext" Version="6.0.2" />
12+
<PackageVersion Include="System.IO.Ports" Version="6.0.0" />
13+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
14+
<PackageVersion Include="Com0Com.CSharp" Version="1.0.5" />
15+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
16+
<PackageVersion Include="NUnit" Version="4.5.1" />
17+
<PackageVersion Include="NUnit.Analyzers" Version="4.12.0" />
18+
<PackageVersion Include="NUnit3TestAdapter" Version="6.2.0" />
19+
<PackageVersion Include="coverlet.collector" Version="8.0.1" />
20+
</ItemGroup>
21+
</Project>

ImageSource/update-available.pdn

4.83 KB
Binary file not shown.

ImageSource/update-available.png

880 Bytes
Loading

ImageSource/update-check-due.pdn

4.31 KB
Binary file not shown.

ImageSource/update-check-due.png

721 Bytes
Loading

Trixter.XDream.API.Testing/Trixter.XDream.API.Testing.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Com0Com.CSharp" Version="1.0.5" />
22-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
23-
<PackageReference Include="NUnit" Version="4.4.0" />
24-
<PackageReference Include="NUnit.Analyzers" Version="4.11.2">
21+
<PackageReference Include="Com0Com.CSharp" />
22+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
23+
<PackageReference Include="NUnit" />
24+
<PackageReference Include="NUnit.Analyzers">
2525
<PrivateAssets>all</PrivateAssets>
2626
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2727
</PackageReference>
28-
<PackageReference Include="NUnit3TestAdapter" Version="6.1.0" />
29-
<PackageReference Include="coverlet.collector" Version="6.0.4">
28+
<PackageReference Include="NUnit3TestAdapter" />
29+
<PackageReference Include="coverlet.collector">
3030
<PrivateAssets>all</PrivateAssets>
3131
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3232
</PackageReference>

Trixter.XDream.API/Communication/XDreamMessage.cs

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
namespace Trixter.XDream.API.Communications
77
{
88
[DebuggerDisplay("{DebuggerDisplay}")]
9-
public class XDreamMessage : XDreamState
9+
public class XDreamMessage : XDreamState
1010
{
1111
/* Packet content
1212
* 6A 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
@@ -28,7 +28,7 @@ public class XDreamMessage : XDreamState
2828
* (0F) XOR of 00..0E------------------------------------------------------+
2929
*/
3030
internal const int MessageSize = 32;
31-
31+
3232
public const int Error = -1;
3333

3434
private const int packetLength = 16;
@@ -122,7 +122,7 @@ internal static byte[] GetDataPacket(XDreamState state)
122122
result[0x06] = 255;
123123
result[0x07] = 255;
124124

125-
int notButtons = ~(int)state.Buttons;
125+
int notButtons = ~(int)state.Buttons;
126126

127127
result[0x08] = (byte)(notButtons >> 8);
128128
result[0x09] = (byte)(notButtons & 0xFF);
@@ -142,12 +142,17 @@ internal static string GetDataPacketText(XDreamState state)
142142
return null;
143143

144144
byte[] packetBytes = GetDataPacket(state);
145-
return string.Join(string.Empty, packetBytes.Select(b=>b.ToString("x2")));
145+
return string.Join(string.Empty, packetBytes.Select(b => b.ToString("x2")));
146+
}
147+
148+
internal static byte[] GetDataPacketTextBytes(XDreamState state)
149+
{
150+
if (state == null)
151+
throw new ArgumentNullException(nameof(state));
152+
return Encoding.ASCII.GetBytes(GetDataPacketText(state));
146153
}
147154

148-
internal static byte [] GetDataPacketTextBytes(XDreamState state) => Encoding.ASCII.GetBytes(GetDataPacketText(state));
149-
150155
}
151156

152-
157+
153158
}

Trixter.XDream.API/Communication/XDreamSerialPortBase.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,16 @@ public abstract class XDreamSerialPortBase : IDisposable
1313

1414
public bool IsDisposed { get; private set; } = false;
1515

16-
protected bool MessageTimerEnabled { get => this.messageTimer.Enabled; set => this.messageTimer.Enabled=value; }
16+
protected bool MessageTimerEnabled
17+
{
18+
get => this.messageTimer != null ? this.messageTimer.Enabled : false;
19+
set {
20+
if (this.messageTimer == null)
21+
throw new InvalidOperationException();
22+
23+
this.messageTimer.Enabled = value;
24+
}
25+
}
1726

1827
/// <summary>
1928
/// Override to do something with an incoming packet.

Trixter.XDream.API/Communication/XDreamSerialPortServer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ private void ResistanceTimer_Elapsed(object sender, System.Timers.ElapsedEventAr
125125

126126
if (this.resistanceExpires == DateTimeOffset.MaxValue)
127127
return;
128-
double t = (this.resistanceExpires - DateTime.UtcNow).TotalMilliseconds;
128+
double t = (this.resistanceExpires - DateTimeOffset.UtcNow).TotalMilliseconds;
129129
if (t<=0)
130130
{
131131
this.Resistance = 0;

Trixter.XDream.API/Trixter.XDream.API.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<Configurations>Debug;Release;Signed Release</Configurations>
1616
</PropertyGroup>
1717
<ItemGroup>
18-
<PackageReference Include="System.IO.Ports" Version="6.0.0" />
18+
<PackageReference Include="System.IO.Ports" />
1919
</ItemGroup>
2020

2121

0 commit comments

Comments
 (0)