浏览代码

Fix file missing issue

Zixuan 1 月之前
父节点
当前提交
fc28427cb5
共有 3 个文件被更改,包括 16 次插入13 次删除
  1. 7 7
      Configs/ConfigFile/Hardwares/HTR1 - U2.xml
  2. 5 5
      MinicsConsole/HostLifetime.cs
  3. 4 1
      Tools/ToMcFile/Program.cs

+ 7 - 7
Configs/ConfigFile/Hardwares/HTR1 - U2.xml

@@ -51,38 +51,38 @@
 		<ChannelData>
 			<Mini8Index>1</Mini8Index>
 			<ChannelIndex>8</ChannelIndex>
-			<Name>REC-3</Name>
+			<Name>AV125&amp;124</Name>
 			<ChannelMode>Control</ChannelMode>
 		</ChannelData>
 		<ChannelData>
 			<Mini8Index>1</Mini8Index>
 			<ChannelIndex>9</ChannelIndex>
-			<Name>AV125&amp;124</Name>
+			<Name>AV126</Name>
 			<ChannelMode>Control</ChannelMode>
 		</ChannelData>
 		<ChannelData>
 			<Mini8Index>1</Mini8Index>
 			<ChannelIndex>10</ChannelIndex>
-			<Name>AV126</Name>
+			<Name>AV131&amp;132</Name>
 			<ChannelMode>Control</ChannelMode>
 		</ChannelData>
 		<ChannelData>
 			<Mini8Index>1</Mini8Index>
 			<ChannelIndex>11</ChannelIndex>
-			<Name>AV131&amp;132</Name>
+			<Name>AV127&amp;128</Name>
 			<ChannelMode>Control</ChannelMode>
 		</ChannelData>
 		<ChannelData>
 			<Mini8Index>1</Mini8Index>
 			<ChannelIndex>12</ChannelIndex>
-			<Name>AV127&amp;128</Name>
+			<Name>AV130&amp;129</Name>
 			<ChannelMode>Control</ChannelMode>
 		</ChannelData>
 		<ChannelData>
 			<Mini8Index>1</Mini8Index>
 			<ChannelIndex>13</ChannelIndex>
-			<Name>AV130&amp;129</Name>
-			<ChannelMode>Control</ChannelMode>
+			<Name>Spare</Name>
+			<ChannelMode>UnUsed</ChannelMode>
 		</ChannelData>
 		<ChannelData>
 			<Mini8Index>1</Mini8Index>

+ 5 - 5
MinicsConsole/HostLifetime.cs

@@ -85,11 +85,11 @@ class HostLifetime(
             await Task.CompletedTask;
 
         log.Info("Minics Console has been shutted down by UI request");
-        log.Info("Saving setting files..");
-        hardwareFileLoader.Save();
-        configFileLoader.Save();
-        addressFileLoader.Save();
-        BaseConfigFileLoader.Save(basicInfo);
+        //log.Info("Saving setting files..");
+        //hardwareFileLoader.Save();
+        //configFileLoader.Save();
+        //addressFileLoader.Save();
+        //BaseConfigFileLoader.Save(basicInfo);
         log.Info("Closing all mini8 connections..");
         hardWareMonitor.CloseConnections();
         log.Info("Closing RT server connections..");

+ 4 - 1
Tools/ToMcFile/Program.cs

@@ -53,7 +53,10 @@ internal class Program
             Dictionary<byte, Mini8ConfigXML> mini8Configs = [];
             foreach (var colum in row_colum.Value)
             {
-                if (!byte.TryParse(colum.Value[0], out byte mini8Index))
+
+                if (!colum.Value.TryGetValue(0, out string? key) || string.IsNullOrEmpty(key))
+                    continue;
+                if (!byte.TryParse(key, out byte mini8Index))
                     continue;
 
                 if (!mini8Configs.TryGetValue(mini8Index, out Mini8ConfigXML? mini8Config))