Service: log EC firmware version if Debug logs are enabled

EC registers for firmware version and date are currently hard-coded. This will be revised in a future commit.
Sparronator9999 · Feb 4, 2025 · 3ccf718 · 3ccf718
1 parent 88426dd
commit 3ccf718
Show file tree

Hide file tree

Showing 11 changed files with 90 additions and 17 deletions.
diff --git a/YAMDCC.Common/YAMDCC.Common.csproj b/YAMDCC.Common/YAMDCC.Common.csproj
@@ -12,8 +12,8 @@
         <RuntimeIdentifiers>win7-x64;win7-x86;win-x64;win-x86</RuntimeIdentifiers>
         <TargetFramework>net48</TargetFramework>
         <Title>YAMDCC common code library</Title>
-        <VersionPrefix>1.0.0</VersionPrefix>
-        <VersionSuffix>release</VersionSuffix>
+        <VersionPrefix>1.0.1</VersionPrefix>
+        <VersionSuffix>dev</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">
         <DebugType>none</DebugType>

diff --git a/YAMDCC.Config/YAMDCC.Config.csproj b/YAMDCC.Config/YAMDCC.Config.csproj
@@ -12,8 +12,8 @@
         <RuntimeIdentifiers>win7-x64;win7-x86;win-x64;win-x86</RuntimeIdentifiers>
         <TargetFramework>net48</TargetFramework>
         <Title>YAMDCC config library</Title>
-        <VersionPrefix>1.0.0</VersionPrefix>
-        <VersionSuffix>release</VersionSuffix>
+        <VersionPrefix>1.0.1</VersionPrefix>
+        <VersionSuffix>dev</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">
         <DebugType>none</DebugType>

diff --git a/YAMDCC.ConfigEditor/MainForm.cs b/YAMDCC.ConfigEditor/MainForm.cs
@@ -20,7 +20,6 @@
 using System.Diagnostics;
 using System.Drawing;
 using System.IO;
-using System.Text;
 using System.Windows.Forms;
 using YAMDCC.Common;
 using YAMDCC.Common.Dialogs;

diff --git a/YAMDCC.ConfigEditor/YAMDCC.ConfigEditor.csproj b/YAMDCC.ConfigEditor/YAMDCC.ConfigEditor.csproj
@@ -20,8 +20,8 @@
         <TargetFramework>net48</TargetFramework>
         <Title>YAMDCC config editor</Title>
         <UseWindowsForms>true</UseWindowsForms>
-        <VersionPrefix>1.0.0</VersionPrefix>
-        <VersionSuffix>release</VersionSuffix>
+        <VersionPrefix>1.0.1</VersionPrefix>
+        <VersionSuffix>dev</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">
         <DebugType>none</DebugType>

diff --git a/YAMDCC.ECAccess/EC.cs b/YAMDCC.ECAccess/EC.cs
@@ -18,6 +18,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
+using System.Text;
 using System.Threading;
 
 namespace YAMDCC.ECAccess;
@@ -141,6 +142,65 @@ public void UnloadDriver()
         }
     }
 
+    /// <summary>
+    /// Reads a series of bytes from the EC as a text string.
+    /// </summary>
+    /// <param name="reg">
+    /// The EC register to start reading the string from.
+    /// </param>
+    /// <param name="len">
+    /// The maximum length of the string to read.
+    /// </param>
+    /// <param name="value">
+    /// If successful, contains the string value read
+    /// from the EC, otherwise <see langword="null"/>.
+    /// </param>
+    /// <returns>
+    /// <see langword="true"/> if the operation was
+    /// successful, otherwise <see langword="false"/>.
+    /// </returns>
+    /// <exception cref="ArgumentException"/>
+    public bool ReadString(byte reg, byte len, out string value)
+    {
+        if (len <= 0)
+        {
+            throw new ArgumentException("`len` must not be zero or negative.");
+        }
+        if (reg + len > 0xFF)
+        {
+            throw new ArgumentException("`reg` + `len` must not be over 0xFF (255).");
+        }
+
+        value = null;
+
+        if (_Driver.IsOpen)
+        {
+            byte[] buffer = new byte[len];
+            for (int i = 0; i < len; i++)
+            {
+                if (ReadByte((byte)(reg + i), out buffer[i]))
+                {
+                    if (buffer[i] == 0) // null byte
+                    {
+                        value = Encoding.UTF8.GetString(buffer, 0, i);
+                        return true;
+                    }
+                    if (buffer[i] is < 32 or > 126)
+                    {
+                        return false;
+                    }
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            value = Encoding.UTF8.GetString(buffer);
+            return true;
+        }
+        return false;
+    }
+
     /// <summary>
     /// Reads a byte from the EC at the specified register.
     /// </summary>

diff --git a/YAMDCC.ECAccess/YAMDCC.ECAccess.csproj b/YAMDCC.ECAccess/YAMDCC.ECAccess.csproj
@@ -13,8 +13,8 @@
         <RuntimeIdentifiers>win7-x64;win7-x86;win-x64;win-x86</RuntimeIdentifiers>
         <TargetFramework>net48</TargetFramework>
         <Title>YAMDCC EC library</Title>
-        <VersionPrefix>1.0.0</VersionPrefix>
-        <VersionSuffix>release</VersionSuffix>
+        <VersionPrefix>1.0.1</VersionPrefix>
+        <VersionSuffix>dev</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">
         <DebugType>none</DebugType>

diff --git a/YAMDCC.ECInspector/YAMDCC.ECInspector.csproj b/YAMDCC.ECInspector/YAMDCC.ECInspector.csproj
@@ -18,8 +18,8 @@
         <TargetFramework>net48</TargetFramework>
         <Title>YAMDCC EC inspector</Title>
         <UseWindowsForms>true</UseWindowsForms>
-        <VersionPrefix>1.0.0</VersionPrefix>
-        <VersionSuffix>release</VersionSuffix>
+        <VersionPrefix>1.0.1</VersionPrefix>
+        <VersionSuffix>dev</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">
         <DebugType>none</DebugType>

diff --git a/YAMDCC.Logs/YAMDCC.Logs.csproj b/YAMDCC.Logs/YAMDCC.Logs.csproj
@@ -12,8 +12,8 @@
         <RuntimeIdentifiers>win7-x64;win7-x86;win-x64;win-x86</RuntimeIdentifiers>
         <TargetFramework>net48</TargetFramework>
         <Title>YAMDCC logging library</Title>
-        <VersionPrefix>1.0.0</VersionPrefix>
-        <VersionSuffix>release</VersionSuffix>
+        <VersionPrefix>1.0.1</VersionPrefix>
+        <VersionSuffix>dev</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">
         <DebugType>none</DebugType>

diff --git a/YAMDCC.Service/FanControlService.cs b/YAMDCC.Service/FanControlService.cs
@@ -106,6 +106,20 @@ protected override void OnStart(string[] args)
         }
         Log.Info(Strings.GetString("drvLoadSuccess"));
 
+        if (Log.FileLevel == LogLevel.Debug)
+        {
+            if (_EC.ReadString(0xA0, 0xC, out string ecVer) && ecVer.Length == 0xC)
+            {
+                Log.Debug($"EC firmware version: {ecVer}");
+            }
+            if (_EC.ReadString(0xAC, 0x10, out string ecDate) && ecDate.Length == 0x10)
+            {
+                Log.Debug("EC firmware date: " +
+                    $"{ecDate.Substring(2, 2)}/{ecDate.Substring(0, 2)}/{ecDate.Substring(4, 4)} " +
+                    $"{ecDate.Substring(8, 2)}:{ecDate.Substring(11, 2)}:{ecDate.Substring(14, 2)}");
+            }
+        }
+
         // Set up IPC server
         Log.Info("Starting IPC server...");
         IPCServer.Start();

diff --git a/YAMDCC.Service/YAMDCC.Service.csproj b/YAMDCC.Service/YAMDCC.Service.csproj
@@ -15,8 +15,8 @@
         <RuntimeIdentifiers>win7-x64;win7-x86;win-x64;win-x86</RuntimeIdentifiers>
         <TargetFramework>net48</TargetFramework>
         <Title>YAMDCC service</Title>
-        <VersionPrefix>1.0.0</VersionPrefix>
-        <VersionSuffix>release</VersionSuffix>
+        <VersionPrefix>1.0.1</VersionPrefix>
+        <VersionSuffix>dev</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">
         <DebugType>none</DebugType>

diff --git a/YAMDCC.Updater/YAMDCC.Updater.csproj b/YAMDCC.Updater/YAMDCC.Updater.csproj
@@ -17,8 +17,8 @@
         <TargetFramework>net48</TargetFramework>
         <Title>YAMDCC updater</Title>
         <UseWindowsForms>true</UseWindowsForms>
-        <VersionPrefix>1.0.0</VersionPrefix>
-        <VersionSuffix>release</VersionSuffix>
+        <VersionPrefix>1.0.1</VersionPrefix>
+        <VersionSuffix>dev</VersionSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)'=='Release'">
         <DebugType>none</DebugType>