From cf25e15b92d5e41835d4c474e8f7fda09b5ff938 Mon Sep 17 00:00:00 2001 From: Derek Goslin Date: Mon, 23 Oct 2023 13:15:45 +0100 Subject: [PATCH 1/3] Fixed type name typo --- MCP2221IOConsole/Commands/Flash/BaseWriteGpSetingsCommand.cs | 4 ++-- MCP2221IOConsole/Commands/Flash/WriteGp0SettingsCommand.cs | 2 +- MCP2221IOConsole/Commands/Flash/WriteGp1SettingsCommand.cs | 2 +- MCP2221IOConsole/Commands/Flash/WriteGp2SettingsCommand.cs | 2 +- MCP2221IOConsole/Commands/Flash/WriteGp3SettingsCommand.cs | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MCP2221IOConsole/Commands/Flash/BaseWriteGpSetingsCommand.cs b/MCP2221IOConsole/Commands/Flash/BaseWriteGpSetingsCommand.cs index c2f27e6..cce607a 100644 --- a/MCP2221IOConsole/Commands/Flash/BaseWriteGpSetingsCommand.cs +++ b/MCP2221IOConsole/Commands/Flash/BaseWriteGpSetingsCommand.cs @@ -29,9 +29,9 @@ namespace MCP2221IOConsole.Commands.Flash { - internal abstract class BaseWriteGpSetingsCommand : BaseCommand + internal abstract class BaseWriteGpSettingsCommand : BaseCommand { - protected BaseWriteGpSetingsCommand(IServiceProvider serviceProvider) : base(serviceProvider) + protected BaseWriteGpSettingsCommand(IServiceProvider serviceProvider) : base(serviceProvider) { } diff --git a/MCP2221IOConsole/Commands/Flash/WriteGp0SettingsCommand.cs b/MCP2221IOConsole/Commands/Flash/WriteGp0SettingsCommand.cs index 2dd22b9..a606795 100644 --- a/MCP2221IOConsole/Commands/Flash/WriteGp0SettingsCommand.cs +++ b/MCP2221IOConsole/Commands/Flash/WriteGp0SettingsCommand.cs @@ -29,7 +29,7 @@ namespace MCP2221IOConsole.Commands.Flash { [Command(Description = "Write GP0 power up settings")] - internal class WriteGp0SettingsCommand : BaseWriteGpSetingsCommand + internal class WriteGp0SettingsCommand : BaseWriteGpSettingsCommand { public WriteGp0SettingsCommand(IServiceProvider serviceProvider) : base(serviceProvider) { diff --git a/MCP2221IOConsole/Commands/Flash/WriteGp1SettingsCommand.cs b/MCP2221IOConsole/Commands/Flash/WriteGp1SettingsCommand.cs index 2d199fc..d4b0893 100644 --- a/MCP2221IOConsole/Commands/Flash/WriteGp1SettingsCommand.cs +++ b/MCP2221IOConsole/Commands/Flash/WriteGp1SettingsCommand.cs @@ -29,7 +29,7 @@ namespace MCP2221IOConsole.Commands.Flash { [Command(Description = "Write GP1 power up settings")] - internal class WriteGp1SettingsCommand : BaseWriteGpSetingsCommand + internal class WriteGp1SettingsCommand : BaseWriteGpSettingsCommand { public WriteGp1SettingsCommand(IServiceProvider serviceProvider) : base(serviceProvider) { diff --git a/MCP2221IOConsole/Commands/Flash/WriteGp2SettingsCommand.cs b/MCP2221IOConsole/Commands/Flash/WriteGp2SettingsCommand.cs index 3886ebd..e7e75c5 100644 --- a/MCP2221IOConsole/Commands/Flash/WriteGp2SettingsCommand.cs +++ b/MCP2221IOConsole/Commands/Flash/WriteGp2SettingsCommand.cs @@ -29,7 +29,7 @@ namespace MCP2221IOConsole.Commands.Flash { [Command(Description = "Write GP2 power up settings")] - internal class WriteGp2SettingsCommand : BaseWriteGpSetingsCommand + internal class WriteGp2SettingsCommand : BaseWriteGpSettingsCommand { public WriteGp2SettingsCommand(IServiceProvider serviceProvider) : base(serviceProvider) { diff --git a/MCP2221IOConsole/Commands/Flash/WriteGp3SettingsCommand.cs b/MCP2221IOConsole/Commands/Flash/WriteGp3SettingsCommand.cs index 1a38d1c..cb36015 100644 --- a/MCP2221IOConsole/Commands/Flash/WriteGp3SettingsCommand.cs +++ b/MCP2221IOConsole/Commands/Flash/WriteGp3SettingsCommand.cs @@ -6,7 +6,7 @@ namespace MCP2221IOConsole.Commands.Flash { [Command(Description = "Write GP3 power up settings")] - internal class WriteGp3SettingsCommand : BaseWriteGpSetingsCommand + internal class WriteGp3SettingsCommand : BaseWriteGpSettingsCommand { public WriteGp3SettingsCommand(IServiceProvider serviceProvider) : base(serviceProvider) { From 8909f1f82d7900ba106ba6ab762d5e4e0854edd0 Mon Sep 17 00:00:00 2001 From: Derek Goslin Date: Wed, 6 Mar 2024 17:49:25 +0000 Subject: [PATCH 2/3] Fix request message command Updated .net framework --- .../MCP2221IO.UnitTests.csproj | 44 +++++------ MCP2221IO/Device.cs | 4 +- MCP2221IO/MCP2221IO.csproj | 40 +++++----- MCP2221IOConsole/MCP2221IOConsole.csproj | 78 ++++++++++--------- PModAqs/PModAqs.csproj | 55 ++++++------- 5 files changed, 114 insertions(+), 107 deletions(-) diff --git a/MCP2221IO.UnitTests/MCP2221IO.UnitTests.csproj b/MCP2221IO.UnitTests/MCP2221IO.UnitTests.csproj index f5741cc..65ee0da 100644 --- a/MCP2221IO.UnitTests/MCP2221IO.UnitTests.csproj +++ b/MCP2221IO.UnitTests/MCP2221IO.UnitTests.csproj @@ -1,28 +1,28 @@ - - netcoreapp3.1 + + net7.0 + enable + false + - false - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - + + + diff --git a/MCP2221IO/Device.cs b/MCP2221IO/Device.cs index 8fcd4f1..3630a3d 100644 --- a/MCP2221IO/Device.cs +++ b/MCP2221IO/Device.cs @@ -594,7 +594,7 @@ private IList SmBusReadCommand(I2cAddress address, byte command, ushort le { List writeData = new List() { command }; - I2cWriteData(CommandCodes.WriteI2cData, address, writeData); + I2cWriteData(CommandCodes.WriteI2cDataNoStop, address, writeData); var result = I2cReadData(CommandCodes.ReadI2cDataRepeatedStart, address, length); @@ -621,7 +621,7 @@ private void SmBusWriteCommand(I2cAddress address, byte command, bool pec, param writeData.Add(Crc8.ComputeChecksum(writeData)); } - I2cWriteData(CommandCodes.WriteI2cDataNoStop, address, writeData); + I2cWriteData(CommandCodes.WriteI2cData, address, writeData); }); } diff --git a/MCP2221IO/MCP2221IO.csproj b/MCP2221IO/MCP2221IO.csproj index 79feeef..67d8c24 100644 --- a/MCP2221IO/MCP2221IO.csproj +++ b/MCP2221IO/MCP2221IO.csproj @@ -1,24 +1,26 @@ - - netstandard2.1 - 1.0.5 - 1.0.0 Initial Version - Derek Goslin - Derek Goslin - Copyright © Derek Goslin 2022 - MIT - https://github.com/DerekGn/MCP2221IO - https://github.com/DerekGn/MCP2221IO - A .Net Core library for interacting with an MCP2221 HID Usb device. + + net7.0 + enable + 2.0.0 + + 1.0.0 Initial Version + 2.0.0 Upgraded to .net 7 + + Derek Goslin + Derek Goslin + Copyright © Derek Goslin 2022 + MIT + https://github.com/DerekGn/MCP2221IO + https://github.com/DerekGn/MCP2221IO + A .Net Core library for interacting with an MCP2221 HID Usb device. Supports all function of the MCP2221 device. + -Supports all function of the MCP2221 device. - - - - - - - + + + + + diff --git a/MCP2221IOConsole/MCP2221IOConsole.csproj b/MCP2221IOConsole/MCP2221IOConsole.csproj index 75205a7..fced3a7 100644 --- a/MCP2221IOConsole/MCP2221IOConsole.csproj +++ b/MCP2221IOConsole/MCP2221IOConsole.csproj @@ -1,44 +1,48 @@  - - Exe - netcoreapp3.1 - MCP2221IOConsole - MCP2221IO.Console - Derek Goslin - MCP2221IO.Console - A .Net Core console application for interacting with a connected MCP2221 HID device - MIT - https://github.com/DerekGn/MCP2221IO - https://github.com/DerekGn/MCP2221IO - 1.0.0 Initial Version - 1.0.5 - + + Exe + net7.0 + enable + MCP2221IOConsole + MCP2221IO.Console + Derek Goslin + MCP2221IO.Console + A .Net Core console application for interacting with a connected MCP2221 HID device + MIT + https://github.com/DerekGn/MCP2221IO + https://github.com/DerekGn/MCP2221IO + + 1.0.0 Initial Version + 2.0.0 Upgraded to .net 7 + + 2.0.0 + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + + - - - Always - - + + + Always + + diff --git a/PModAqs/PModAqs.csproj b/PModAqs/PModAqs.csproj index f53ba06..7c71e0e 100644 --- a/PModAqs/PModAqs.csproj +++ b/PModAqs/PModAqs.csproj @@ -1,34 +1,35 @@  - - Exe - netcoreapp3.1 - + + Exe + net7.0 + enable + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + + - - - Always - - + + + Always + + From a475f120efe3edf2503e488ab1acf098e7950dba Mon Sep 17 00:00:00 2001 From: Derek Goslin Date: Wed, 6 Mar 2024 17:57:12 +0000 Subject: [PATCH 3/3] Updated package referenec versions --- .../MCP2221IO.UnitTests.csproj | 12 ++++----- MCP2221IO/MCP2221IO.csproj | 4 +-- MCP2221IOConsole/MCP2221IOConsole.csproj | 24 ++++++++--------- PModAqs/PModAqs.csproj | 26 +++++++++---------- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/MCP2221IO.UnitTests/MCP2221IO.UnitTests.csproj b/MCP2221IO.UnitTests/MCP2221IO.UnitTests.csproj index 65ee0da..844a2c8 100644 --- a/MCP2221IO.UnitTests/MCP2221IO.UnitTests.csproj +++ b/MCP2221IO.UnitTests/MCP2221IO.UnitTests.csproj @@ -7,15 +7,15 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/MCP2221IO/MCP2221IO.csproj b/MCP2221IO/MCP2221IO.csproj index 67d8c24..b85bdf0 100644 --- a/MCP2221IO/MCP2221IO.csproj +++ b/MCP2221IO/MCP2221IO.csproj @@ -19,8 +19,8 @@ - - + + diff --git a/MCP2221IOConsole/MCP2221IOConsole.csproj b/MCP2221IOConsole/MCP2221IOConsole.csproj index fced3a7..43aee1b 100644 --- a/MCP2221IOConsole/MCP2221IOConsole.csproj +++ b/MCP2221IOConsole/MCP2221IOConsole.csproj @@ -21,18 +21,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/PModAqs/PModAqs.csproj b/PModAqs/PModAqs.csproj index 7c71e0e..a1dab90 100644 --- a/PModAqs/PModAqs.csproj +++ b/PModAqs/PModAqs.csproj @@ -7,19 +7,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + +