Merge pull request #172 from K-Society/develop

Develop
K-Society · Dec 20, 2024 · 071e96d · 071e96d
2 parents c5ad1a8 + 594eb4b
commit 071e96d
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 106 deletions.
diff --git a/src/01/KSociety.SharpCubeProgrammer/CubeProgrammerApi.cs b/src/01/KSociety.SharpCubeProgrammer/CubeProgrammerApi.cs
@@ -31,6 +31,8 @@ public class CubeProgrammerApi : ICubeProgrammerApi
         private const int DisposedFlag = 1;
         private int _isDisposed;
 
+        private static DisplayCallBacks DisplayCallBacks = new DisplayCallBacks();
+
         #region [Constructor]
 
         public CubeProgrammerApi(ILogger<CubeProgrammerApi> logger = default)
@@ -418,22 +420,21 @@ public CubeProgrammerError ConnectI2CBootloader(I2CConnectParameters i2CParamete
         /// <inheritdoc />
         public DisplayCallBacks SetDisplayCallbacks(InitProgressBar initProgressBar, LogMessageReceived messageReceived, ProgressBarUpdateReceived progressBarUpdate)
         {
-            var callbacksHandle = new DisplayCallBacks
-            {
-                InitProgressBar = initProgressBar,
-                LogMessage = messageReceived,
-                LoadBar = progressBarUpdate
-            };
+            DisplayCallBacks.InitProgressBar = initProgressBar;
+            DisplayCallBacks.LogMessage = messageReceived;
+            DisplayCallBacks.LoadBar = progressBarUpdate;
+            Native.ProgrammerApi.SetDisplayCallbacks(DisplayCallBacks);
 
-            Native.ProgrammerApi.SetDisplayCallbacks(callbacksHandle);
-
-            return callbacksHandle;
+            return DisplayCallBacks;
         }
 
         /// <inheritdoc />
-        public void SetDisplayCallbacks(DisplayCallBacks callbacksHandle)
+        public DisplayCallBacks SetDisplayCallbacks(DisplayCallBacks callbacksHandle)
         {
-            Native.ProgrammerApi.SetDisplayCallbacks(callbacksHandle);
+            DisplayCallBacks = callbacksHandle;
+            Native.ProgrammerApi.SetDisplayCallbacks(DisplayCallBacks);
+
+            return DisplayCallBacks;
         }
 
         /// <inheritdoc />
@@ -548,33 +549,6 @@ public CubeProgrammerError WriteMemoryAutoFill(string address, byte[] data)
             return result;
         }
 
-        /// <inheritdoc />
-        //public CubeProgrammerError WriteMemoryBySector(string address, byte[] data)
-        //{
-        //    var result = CubeProgrammerError.CubeprogrammerErrorOther;
-
-        //    if (!String.IsNullOrEmpty(address) && data.Length > 0)
-        //    {
-        //        var uintAddress = this.HexConverterToUint(address);
-
-        //        try
-        //        {
-        //            var gch = GCHandle.Alloc(data, GCHandleType.Pinned);
-        //            var writeMemoryResult = Native.ProgrammerApi.WriteMemoryBySector(uintAddress, gch.AddrOfPinnedObject(), (uint)data.Length);
-        //            gch.Free();
-        //            result = this.CheckResult(writeMemoryResult);
-
-        //            return result;
-        //        }
-        //        catch (Exception ex)
-        //        {
-        //            this._logger?.LogError(ex, "WriteMemoryBySector: ");
-        //        }
-        //    }
-
-        //    return result;
-        //}
-
         /// <inheritdoc />
         public CubeProgrammerError WriteMemoryAndVerify(string address, byte[] data)
         {
@@ -602,33 +576,6 @@ public CubeProgrammerError WriteMemoryAndVerify(string address, byte[] data)
             return result;
         }
 
-        /// <inheritdoc />
-        //public CubeProgrammerError WriteMemoryBySectorAndVerify(string address, byte[] data)
-        //{
-        //    var result = CubeProgrammerError.CubeprogrammerErrorOther;
-
-        //    if (!String.IsNullOrEmpty(address) && data.Length > 0)
-        //    {
-        //        var uintAddress = this.HexConverterToUint(address);
-
-        //        try
-        //        {
-        //            var gch = GCHandle.Alloc(data, GCHandleType.Pinned);
-        //            var writeMemoryResult = Native.ProgrammerApi.WriteMemoryBySectorAndVerify(uintAddress, gch.AddrOfPinnedObject(), (uint)data.Length);
-        //            gch.Free();
-        //            result = this.CheckResult(writeMemoryResult);
-
-        //            return result;
-        //        }
-        //        catch (Exception ex)
-        //        {
-        //            this._logger?.LogError(ex, "WriteMemoryBySectorAndVerify: ");
-        //        }
-        //    }
-
-        //    return result;
-        //}
-
         /// <inheritdoc />
         public CubeProgrammerError EditSector(string address, byte[] data)
         {

diff --git a/src/01/KSociety.SharpCubeProgrammer/Interface/ICubeProgrammerApi.cs b/src/01/KSociety.SharpCubeProgrammer/Interface/ICubeProgrammerApi.cs
@@ -112,7 +112,7 @@ public interface ICubeProgrammerApi : IDisposable, IAsyncDisposable
         /// This routine allows to choose your custom display.
         /// </summary>
         /// <param name="callbacksHandle">Fill the struct to customize the display tool.</param>
-        void SetDisplayCallbacks(DisplayCallBacks callbacksHandle);
+        DisplayCallBacks SetDisplayCallbacks(DisplayCallBacks callbacksHandle);
 
         /// <summary>
         /// This routine allows to choose the verbosity level for display.
@@ -151,11 +151,6 @@ public interface ICubeProgrammerApi : IDisposable, IAsyncDisposable
         /// <param name="data">Data buffer.</param>
         CubeProgrammerError WriteMemoryAutoFill(string address, byte[] data);
 
-        /// <summary>
-        /// This routine allows to write memory data on the user interface with the configuration already initialized.
-        /// </summary>
-        //CubeProgrammerError WriteMemoryBySector(string address, byte[] data);
-
         /// <summary>
         /// This routine allows to write memory data and verify on the user interface with the configuration already initialized.
         /// Inside it uses the WriteMemoryAutoFill function.
@@ -164,11 +159,6 @@ public interface ICubeProgrammerApi : IDisposable, IAsyncDisposable
         /// <param name="data">Data buffer.</param>
         CubeProgrammerError WriteMemoryAndVerify(string address, byte[] data);
 
-        /// <summary>
-        /// This routine allows to write memory data and verify on the user interface with the configuration already initialized.
-        /// </summary>
-        //CubeProgrammerError WriteMemoryBySectorAndVerify(string address, byte[] data);
-
         /// <summary>
         /// This routine allows to write sector data on the user interface with the configuration already initialized.
         /// </summary>

diff --git a/src/01/KSociety.SharpCubeProgrammer/KSociety.SharpCubeProgrammer.csproj b/src/01/KSociety.SharpCubeProgrammer/KSociety.SharpCubeProgrammer.csproj
@@ -67,7 +67,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.146" />
+    <PackageReference Update="Nerdbank.GitVersioning" Version="3.7.112" />
   </ItemGroup>
 
 </Project>
diff --git a/src/01/KSociety.SharpCubeProgrammer/Struct/DisplayCallBacks.cs b/src/01/KSociety.SharpCubeProgrammer/Struct/DisplayCallBacks.cs
@@ -2,12 +2,13 @@
 
 namespace SharpCubeProgrammer.Struct
 {
+    using System;
     using System.Runtime.InteropServices;
 
     [UnmanagedFunctionPointer(CallingConvention.Cdecl, SetLastError = true)]
     public delegate void InitProgressBar();
 
-    [UnmanagedFunctionPointer(CallingConvention.Cdecl, SetLastError = true)]
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Ansi, SetLastError = true)]
     public delegate void LogMessageReceived(int messageType, [MarshalAs(UnmanagedType.LPWStr)] string message);
 
     [UnmanagedFunctionPointer(CallingConvention.Cdecl, SetLastError = true)]

diff --git a/src/01/KSociety.Test/KSociety.Test.csproj b/src/01/KSociety.Test/KSociety.Test.csproj
@@ -9,12 +9,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="KSociety.Log.Serilog.Sinks.XUnit" Version="1.4.12" />
+    <PackageReference Include="KSociety.Log.Serilog.Sinks.XUnit" Version="1.4.15" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="9.0.0" />
     <PackageReference Include="xunit" Version="2.9.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/01/Programmer/Programmer.vcxproj b/src/01/Programmer/Programmer.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\packages\Nerdbank.GitVersioning.3.6.143\build\Nerdbank.GitVersioning.props" Condition="Exists('..\..\..\packages\Nerdbank.GitVersioning.3.6.143\build\Nerdbank.GitVersioning.props')" />
+  <Import Project="..\..\..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.props" Condition="Exists('..\..\..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -216,14 +216,14 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.targets')" />
+    <Import Project="..\..\..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.props'))" />
-    <Error Condition="!Exists('..\..\..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.targets'))" />
     <Error Condition="!Exists('..\..\..\packages\Microsoft.Build.Tasks.Git.8.0.0\build\Microsoft.Build.Tasks.Git.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.Build.Tasks.Git.8.0.0\build\Microsoft.Build.Tasks.Git.props'))" />
   </Target>
 </Project>
diff --git a/src/01/Programmer/packages.config b/src/01/Programmer/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Nerdbank.GitVersioning" version="3.6.146" targetFramework="native" developmentDependency="true" />
+  <package id="Nerdbank.GitVersioning" version="3.7.112" targetFramework="native" developmentDependency="true" />
   <package id="Microsoft.Build.Tasks.Git" version="8.0.0" targetFramework="native" developmentDependency="true" />
   <package id="Microsoft.SourceLink.Common" version="8.0.0" targetFramework="native" developmentDependency="true" />
   <package id="Microsoft.SourceLink.GitHub" version="8.0.0" targetFramework="native" developmentDependency="true" />

diff --git a/src/01/Samples/Programming/Program.cs b/src/01/Samples/Programming/Program.cs
@@ -83,21 +83,21 @@ private static void Main(string[] args)
                 //var bu = CubeProgrammerApi.InitOptionBytesInterface();
                 #region [File Open Testing]
 
-                //var file = System.IO.File.ReadAllBytes(@"..\..\..\..\..\Test\BIN_32001505_CEU_02000005.bin");
+                var file = System.IO.File.ReadAllBytes(@"..\..\..\..\..\Test\BIN_32001506_REU_04800004.bin");
                 //var filePointer = CubeProgrammerApi.FileOpen(@"..\..\..\..\..\Test\BIN_32001505_CEU_02000005.bin");
                 //var buffer = new byte[65537];
-                var buffer = new byte[88996];//2048
+                //var buffer = new byte[88996];//2048
                 //var buffer = new byte[89000];//2048
 
-                for (int i = 0; i < 88064; i++)
-                {
-                    buffer[i] = 0xDD;
-                }
+                //for (int i = 0; i < 88064; i++)
+                //{
+                //    buffer[i] = 0xDD;
+                //}
 
-                for (int i = 88064; i < 88996; i++)
-                {
-                    buffer[i] = 0x05;
-                }
+                //for (int i = 88064; i < 88996; i++)
+                //{
+                //    buffer[i] = 0x05;
+                //}
 
                 //var buffer = new byte[932];
                 //for (int i = 0; i < 932; i++)
@@ -108,7 +108,8 @@ private static void Main(string[] args)
                 //if (filePointer != IntPtr.Zero)
                 //{
                 //CubeProgrammerApi.MassErase();
-                var verify = CubeProgrammerApi.WriteMemoryAndVerify("0x08000400", buffer);
+                //var verify = CubeProgrammerApi.WriteMemoryAndVerify("0x08000400", buffer);
+                var verify = CubeProgrammerApi.WriteMemoryAndVerify("0x08036000", file);
                 //var verify = CubeProgrammerApi.WriteMemoryAndVerify("0x08015800", buffer);
 
                 if (verify.Equals(CubeProgrammerError.CubeprogrammerNoError))

diff --git a/src/01/Samples/Programming/Programming.csproj b/src/01/Samples/Programming/Programming.csproj
@@ -8,10 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="8.1.1" />
+    <PackageReference Include="Autofac" Version="8.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
-    <PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.4" />
+    <PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="9.0.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
   </ItemGroup>
 
@@ -26,7 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.146" />
+    <PackageReference Update="Nerdbank.GitVersioning" Version="3.7.112" />
   </ItemGroup>
 
 </Project>
diff --git a/src/01/Samples/ProgrammingLegacy/ProgrammingLegacy.csproj b/src/01/Samples/ProgrammingLegacy/ProgrammingLegacy.csproj
@@ -76,16 +76,16 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Autofac">
-      <Version>8.1.1</Version>
+      <Version>8.2.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Configuration.Json">
       <Version>9.0.0</Version>
     </PackageReference>
     <PackageReference Include="Serilog.Extensions.Hosting">
-      <Version>8.0.0</Version>
+      <Version>9.0.0</Version>
     </PackageReference>
     <PackageReference Include="Serilog.Settings.Configuration">
-      <Version>8.0.4</Version>
+      <Version>9.0.0</Version>
     </PackageReference>
     <PackageReference Include="Serilog.Sinks.Console">
       <Version>6.0.0</Version>

diff --git a/src/01/Samples/QuickStart/QuickStart.csproj b/src/01/Samples/QuickStart/QuickStart.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="Nerdbank.GitVersioning" Version="3.6.146" />
+    <PackageReference Update="Nerdbank.GitVersioning" Version="3.7.112" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Directory.csproj.props b/src/Directory.csproj.props
@@ -16,7 +16,7 @@
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">
       <PrivateAssets>all</PrivateAssets>
-      <Version>3.6.146</Version>
+      <Version>3.7.112</Version>
     </PackageReference>
   </ItemGroup>