Better EC firmware version support

- Add firmware version/date to YAMDCC config (backwards-compatible change)

- Only get EC firmware version/date if supported according to current config

- Display EC firmware version that was used during EC-to-config or when "Get computer model..." button was pressed

YAMDCC.Config/YAMDCC_Config.cs

@@ -66,6 +66,29 @@ public sealed class YAMDCC_Config
     [XmlElement]
     public string Author { get; set; }
 
+    /// <summary>
+    /// Set to <see langword="true"/> if the EC supports reading
+    /// firmware version from registers <c>0xA0</c>-<c>0xBB</c>.
+    /// </summary>
+    /// <remarks>
+    /// If <see langword="false"/>, the <see cref="FirmVer"/>
+    /// and <see cref="FirmDate"/> properties are ignored.
+    /// </remarks>
+    [XmlElement]
+    public bool FirmVerSupported { get; set; }
+
+    /// <summary>
+    /// The EC firmware version of the laptop this config was made for.
+    /// </summary>
+    [XmlElement]
+    public string FirmVer { get; set; }
+
+    /// <summary>
+    /// The EC firmware date of the laptop this config was made for.
+    /// </summary>
+    [XmlElement]
+    public DateTime? FirmDate { get; set; }
+
     /// <summary>
     /// The list of <see cref="FanConf"/>s associated with the laptop.
     /// </summary>

YAMDCC.ConfigEditor/MainForm.cs

@@ -309,6 +309,20 @@ private void IPCMessage(object sender, PipeMessageEventArgs<ServiceResponse, Ser
                     }
                     break;
                 }
+                case Response.FirmVer:
+                {
+                    // no idea how the EcVer struct became a nested
+                    // object array, but this works so keeping it
+                    if (args[0] is object[] obj && obj.Length == 2 &&
+                        obj[0] is string ver && obj[1] is DateTime date)
+                    {
+                        Config.FirmVer = ver;
+                        Config.FirmDate = date;
+                        txtFirmVer.Text = Config.FirmVer;
+                        txtFirmDate.Text = $"{Config.FirmDate:G}";
+                    }
+                    break;
+                }
             }
         });
     }
@@ -1004,6 +1018,11 @@ private void btnGetModel_Click(object sender, EventArgs e)
             txtModel.Text = pcModel;
             Config.Model = pcModel;
         }
+
+        if (Config.FirmVerSupported)
+        {
+            SendSvcMessage(new ServiceCommand(Command.GetFirmVer));
+        }
     }
 
     private void FullBlastToggle(object sender, EventArgs e)
@@ -1106,9 +1125,17 @@ private void LoadConf(YAMDCC_Config cfg)
         txtAuthor.Text = cfg.Author;
         txtManufacturer.Text = cfg.Manufacturer;
         txtModel.Text = cfg.Model;
+        if (cfg.FirmVerSupported)
+        {
+            txtFirmVer.Text = cfg.FirmVer;
+            txtFirmDate.Text = $"{cfg.FirmDate:G}";
+        }
+        else
+        {
+            txtFirmVer.Text = "(unknown)";
+            txtFirmDate.Text = "(unknown)";
+        }
         txtAuthor.Enabled = true;
-        txtManufacturer.Enabled = true;
-        txtModel.Enabled = true;
         btnGetModel.Enabled = true;
 
         if (cfg.FullBlastConf is null)
@@ -1276,8 +1303,6 @@ private void DisableAll()
         tbKeyLight.Enabled = false;
 
         txtAuthor.Enabled = false;
-        txtManufacturer.Enabled = false;
-        txtModel.Enabled = false;
         btnGetModel.Enabled = false;
     }
 

YAMDCC.ConfigEditor/MainForm.resx

@@ -192,6 +192,12 @@
   <metadata name="lblAuthor.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
+  <metadata name="lblFirmVer.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="lblFirmDate.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
   <metadata name="tblApply.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>

YAMDCC.IPC/EcInfo.cs

@@ -0,0 +1,14 @@
+using MessagePack;
+using System;
+
+namespace YAMDCC.IPC;
+
+[MessagePackObject]
+public class EcInfo
+{
+    [Key(0)]
+    public string Version { get; set; }
+
+    [Key(1)]
+    public DateTime Date { get; set; }
+}

YAMDCC.IPC/ServiceCommand.cs

@@ -128,6 +128,17 @@ public enum Command
     /// maximum brightness value (minus offset).
     /// </remarks>
     SetKeyLightBright,
+    /// <summary>
+    /// Gets the EC firmware version and date for the current laptop.
+    /// </summary>
+    /// <remarks>
+    /// <para>This command does not take any data.</para>
+    /// <para>
+    /// The result is sent to the caller as a
+    /// <see cref="Response.FirmVer"/> message.
+    /// </para>
+    /// </remarks>
+    GetFirmVer,
 }
 
 /// <summary>

YAMDCC.IPC/ServiceResponse.cs

@@ -103,6 +103,15 @@ public enum Response
     /// </para>
     /// </remarks>
     KeyLightBright,
+    /// <summary>
+    /// The result of a <see cref="Command.GetFirmVer"/> command.
+    /// </summary>
+    /// <remarks>
+    /// This response's <see cref="ServiceResponse.Value"/> field
+    /// includes an <see cref="EcInfo"/> instance containing the
+    /// firmware version and date.
+    /// </remarks>
+    FirmVer,
 }
 
 /// <summary>

YAMDCC.Service/FanControlService.cs

@@ -17,6 +17,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Globalization;
 using System.IO;
 using System.IO.Pipes;
 using System.ServiceProcess;
@@ -48,6 +49,8 @@ internal sealed class FanControlService : ServiceBase
     private readonly EC _EC;
 
     private readonly Timer CooldownTimer = new(1000);
+
+    private EcInfo EcInfo;
     #endregion
 
     /// <summary>
@@ -106,17 +109,21 @@ protected override void OnStart(string[] args)
         }
         Log.Info(Strings.GetString("drvLoadSuccess"));
 
-        if (Log.FileLevel == LogLevel.Debug)
+
+        if (confLoaded && Config.FirmVerSupported)
         {
+            EcInfo = new();
             if (_EC.ReadString(0xA0, 0xC, out string ecVer) && ecVer.Length == 0xC)
             {
+                EcInfo.Version = ecVer;
                 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)}");
+                string temp = $"{ecDate.Substring(4, 4)}-{ecDate.Substring(0, 2)}-{ecDate.Substring(2, 2)}" +
+                    $"T{ecDate.Substring(8, 2)}:{ecDate.Substring(11, 2)}:{ecDate.Substring(14, 2)}";
+                EcInfo.Date = DateTime.ParseExact(temp, "s", CultureInfo.InvariantCulture);
+                Log.Debug($"EC firmware date: {EcInfo.Date:G}");
             }
         }
 
@@ -309,6 +316,13 @@ private void IPCClientMessage(object sender, PipeMessageEventArgs<ServiceCommand
                 }
                 break;
             }
+            case Command.GetFirmVer:
+            {
+                parseSuccess = true;
+                sendSuccessMsg = false;
+                cmdSuccess = GetFirmVer(id);
+                break;
+            }
             default:    // Unknown command
                 Log.Error(Strings.GetString("errBadCmd", cmd));
                 break;
@@ -650,6 +664,18 @@ private bool SetKeyLight(byte brightness)
         return LogECWriteByte(klCfg.Reg, (byte)(brightness + klCfg.MinVal));
     }
 
+    private bool GetFirmVer(int clientId)
+    {
+        if (Config is null || !Config.FirmVerSupported)
+        {
+            return false;
+        }
+
+        Log.Debug(Strings.GetString("svcGerFirmVer", clientId));
+        IPCServer.PushMessage(new ServiceResponse(Response.FirmVer, EcInfo), clientId);
+        return true;
+    }
+
     private bool ECtoConf()
     {
         if (Config is null)
@@ -682,6 +708,17 @@ private bool ECtoConf()
                 Config.Model = pcModel;
             }
 
+            if (Config.FirmVerSupported)
+            {
+                Config.FirmVer = EcInfo.Version;
+                Config.FirmDate = EcInfo.Date;
+            }
+            else
+            {
+                Config.FirmVer = null;
+                Config.FirmDate = null;
+            }
+
             for (int i = 0; i < Config.FanConfs.Count; i++)
             {
                 Log.Info(Strings.GetString("svcReadProfs", i + 1, Config.FanConfs.Count));

YAMDCC.Service/Strings.resx

@@ -243,4 +243,7 @@ Please run 'YAMDCC.exe' instead.</value>
   <data name="svcWriteFanMode" xml:space="preserve">
     <value>Writing fan mode setting...</value>
   </data>
+  <data name="svcGetFirmVer" xml:space="preserve">
+    <value>Sending firmware version to client {0}...</value>
+  </data>
 </root>