revised menu organization

reduced size of files in the data directory added hwinfo support
mhwlng · Dec 24, 2020 · 1e5b19e · 1e5b19e
1 parent 713fa11
commit 1e5b19e
Show file tree

Hide file tree

Showing 17 changed files with 955 additions and 231 deletions.
diff --git a/Elite/App.xaml.cs b/Elite/App.xaml.cs
@@ -33,6 +33,9 @@ public partial class App : Application
         public static readonly object RefreshJsonLock = new object();
         public static readonly object RefreshSystemLock = new object();
 
+        public static Task HWInfoTask;
+        private static CancellationTokenSource _hwInfoTokenSource = new CancellationTokenSource();
+
         public static Task JsonTask;
         private static CancellationTokenSource _jsonTokenSource = new CancellationTokenSource();
 
@@ -317,6 +320,7 @@ protected override void OnStartup(StartupEventArgs evtArgs)
                 Engine.Razor.Compile("target.cshtml", null);
                 Engine.Razor.Compile("galnet.cshtml", null);
                 Engine.Razor.Compile("poi.cshtml", null);
+                Engine.Razor.Compile("hwinfo.cshtml", null);
 
                 Engine.Razor.Compile("galaxy.cshtml", null);
                 Engine.Razor.Compile("engineers.cshtml", null);
@@ -356,6 +360,15 @@ protected override void OnStartup(StartupEventArgs evtArgs)
                 Engineer.GetShoppingList();
                 Engineer.GetBestSystems();
 
+                splashScreen.Dispatcher.Invoke(() => splashScreen.ProgressText.Text = "Getting sensor data from HWInfo...");
+
+                HWInfo.ReadMem("HWINFO.INC");
+                
+                if (HWInfo.SensorData.Any())
+                {
+                    HWInfo.SaveDataToFile(@"Data\hwinfo.json");
+                }
+
                 if (File.Exists(Path.Combine(ExePath, "joystickSettings.config")) && ConfigurationManager.GetSection("joystickSettings") is NameValueCollection joystickSection)
                 {
                     _pid = joystickSection["PID"];
@@ -610,6 +623,28 @@ protected override void OnStartup(StartupEventArgs evtArgs)
 
                 }, jsonToken);
 
+                var hwInfoToken = _hwInfoTokenSource.Token;
+
+                HWInfoTask = Task.Run(async () =>
+                {
+                    Log.Info("HWInfo task started");
+
+                    while (true)
+                    {
+                        if (hwInfoToken.IsCancellationRequested)
+                        {
+                            hwInfoToken.ThrowIfCancellationRequested();
+                        }
+
+                        HWInfo.ReadMem("HWINFO.INC");
+
+                        FipHandler.RefreshHWInfoPages();
+
+                        await Task.Delay(5 * 1000, _hwInfoTokenSource.Token); // repeat every 5 seconds
+                    }
+
+                }, hwInfoToken);
+
             });
 
         }
@@ -639,6 +674,23 @@ protected override void OnExit(ExitEventArgs e)
 
             _notifyIcon.Dispose(); //the icon would clean up automatically, but this is cleaner
 
+            _hwInfoTokenSource.Cancel();
+
+            var hwInfoToken = _hwInfoTokenSource.Token;
+
+            try
+            {
+                HWInfoTask?.Wait(hwInfoToken);
+            }
+            catch (OperationCanceledException)
+            {
+                Log.Info("HWInfo background task ended");
+            }
+            finally
+            {
+                _hwInfoTokenSource.Dispose();
+            }
+
             _jsonTokenSource.Cancel();
 
             var jsonToken = _jsonTokenSource.Token;

diff --git a/Elite/Elite.csproj b/Elite/Elite.csproj
@@ -137,6 +137,7 @@
     <Compile Include="Audio\CachedSoundSampleProvider.cs" />
     <Compile Include="CommunityGoals.cs" />
     <Compile Include="Galnet.cs" />
+    <Compile Include="HWInfo.cs" />
     <Compile Include="SystemInfo.cs" />
     <Compile Include="Route.cs" />
     <Compile Include="Cargo.cs" />
@@ -213,6 +214,9 @@
     <None Include="Templates\cargo.cshtml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="Templates\hwinfo.cshtml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Templates\galnet.cshtml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -271,6 +275,9 @@
   <ItemGroup>
     <Content Include="FodyWeavers.xml" />
     <Resource Include="Hourglass.ico" />
+    <None Include="HWINFO.inc">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <Content Include="Sounds\257357__brnck__button-click.wav">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

diff --git a/Elite/FipHandler.cs b/Elite/FipHandler.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
 using Microsoft.Win32;
 
 namespace Elite
@@ -115,6 +116,22 @@ public void RefreshSystemDevicePages()
             }
         }
 
+        public void RefreshHWInfoPages()
+        {
+            if (HWInfo.SensorData.Any())
+            {
+                for (var index = 0; index < _fipPanels.Count; index++)
+                {
+                    var fipPanel = _fipPanels[index];
+
+                    if (fipPanel.CurrentTab == LcdTab.HWInfo)
+                    {
+                        fipPanel.RefreshDevicePage();
+                    }
+                }
+            }
+        }
+
         private bool IsFipDevice(IntPtr device)
         {
             var mGuid = Guid.Empty;