Browse Source

fix 名称调整

jiangjy 2 weeks ago
parent
commit
e808eb0257

+ 1 - 1
Furnace/FurnaceRT/Config/IO/ELK/_ioDefinePM.xml

@@ -1261,7 +1261,7 @@
 		<DO_ITEM Index="2784" Name="DO_FIMS1N2PurgeValveOpen" BufferOffset="2784" Addr="D1174.0" Description="AV63 opne(FIMS1 N2 Purge Valve)(D1174.0)" />
 		<DO_ITEM Index="2785" Name="DO_FIMS1N2PurgeValveClose" BufferOffset="2785" Addr="D1174.1" Description="AV63 close(FIMS1 N2 Purge Valve)(D1174.1)" />
 		<DO_ITEM Index="2786" Name="DO_FIMS2N2PurgeValveOpen" BufferOffset="2786" Addr="D1174.2" Description="AV64 opne(FIMS2 N2 Purge Valve)(D1174.2)" />
-		<DO_ITEM Index="2787" Name="DO_FIMS2N2PurgeValveClose" BufferOffset="2787" Addr="D1174.3" Description="AV65 close(FIMS2 N2 Purge Valve)(D1174.3)" />
+		<DO_ITEM Index="2787" Name="DO_FIMS2N2PurgeValveClose" BufferOffset="2787" Addr="D1174.3" Description="AV64 close(FIMS2 N2 Purge Valve)(D1174.3)" />
 		<DO_ITEM Index="2912" Name="DO_FIMS1VaccumValveOpen" BufferOffset="2912" Addr="D1182.0" Description="FIMS1 AV217-A (vacuum pumping)(D1182.0)" />
 		<DO_ITEM Index="2913" Name="DO_FIMS1VaccumValveClose" BufferOffset="2913" Addr="D1182.1" Description="FIMS1 AV217-B (Breaking the vacuum)(D1182.1)" />
 		<DO_ITEM Index="2914" Name="DO_FIMS2VaccumValveOpen" BufferOffset="2914" Addr="D1182.2" Description="AV218 open(FIMS2 vaccum valve)(D1182.2)" />

+ 5 - 4
Furnace/FurnaceRT/Devices/IoFFU.cs

@@ -292,7 +292,7 @@ namespace FurnaceRT.Devices
             //DATA.Subscribe($"{Module}.{Name}.MaxSpeed", () => MaxSpeed);
             //DATA.Subscribe($"{Module}.{Name}.IsReset", () => IsReset);
             //DATA.Subscribe($"{Module}.{Name}.ErrorTimer", () => ErrorTimer);
-    
+
             //DATA.Subscribe($"{Module}.{Name}.Voltage", () => Voltage);
             //DATA.Subscribe($"{Module}.{Name}.Current", () => Current);
             OP.Subscribe($"{Module}.{Name}.SetCurrectSpeed", (string cmd, object[] param) =>
@@ -312,9 +312,10 @@ namespace FurnaceRT.Devices
         {
 
             if (_scSetSpeed != null && _aoSetSpeed != null)
-                _aoSetSpeed.FloatValue = (float)_scSetSpeed.DoubleValue;
-
-
+            {
+                var scValue = _scSetSpeed.Value == null ? 0f : float.Parse(_scSetSpeed.Value.ToString());
+                SetSpeedMethods(scValue);
+            }
         }
         public bool SetCurrectSpeed(object[] param)
         {

+ 1 - 1
Furnace/FurnaceSimulator/Config/ELK/_ioDefinePM.xml

@@ -1261,7 +1261,7 @@
 		<DO_ITEM Index="2784" Name="DO_FIMS1N2PurgeValveOpen" BufferOffset="2784" Addr="D1174.0" Description="AV63 opne(FIMS1 N2 Purge Valve)(D1174.0)" />
 		<DO_ITEM Index="2785" Name="DO_FIMS1N2PurgeValveClose" BufferOffset="2785" Addr="D1174.1" Description="AV63 close(FIMS1 N2 Purge Valve)(D1174.1)" />
 		<DO_ITEM Index="2786" Name="DO_FIMS2N2PurgeValveOpen" BufferOffset="2786" Addr="D1174.2" Description="AV64 opne(FIMS2 N2 Purge Valve)(D1174.2)" />
-		<DO_ITEM Index="2787" Name="DO_FIMS2N2PurgeValveClose" BufferOffset="2787" Addr="D1174.3" Description="AV65 close(FIMS2 N2 Purge Valve)(D1174.3)" />
+		<DO_ITEM Index="2787" Name="DO_FIMS2N2PurgeValveClose" BufferOffset="2787" Addr="D1174.3" Description="AV64 close(FIMS2 N2 Purge Valve)(D1174.3)" />
 		<DO_ITEM Index="2912" Name="DO_FIMS1VaccumValveOpen" BufferOffset="2912" Addr="D1182.0" Description="FIMS1 AV217-A (vacuum pumping)(D1182.0)" />
 		<DO_ITEM Index="2913" Name="DO_FIMS1VaccumValveClose" BufferOffset="2913" Addr="D1182.1" Description="FIMS1 AV217-B (Breaking the vacuum)(D1182.1)" />
 		<DO_ITEM Index="2914" Name="DO_FIMS2VaccumValveOpen" BufferOffset="2914" Addr="D1182.2" Description="AV218 open(FIMS2 vaccum valve)(D1182.2)" />

+ 1 - 1
Furnace/FurnaceSimulator/Config/_ioDefinePM.xml

@@ -1261,7 +1261,7 @@
 		<DO_ITEM Index="2784" Name="DO_FIMS1N2PurgeValveOpen" BufferOffset="2784" Addr="D1174.0" Description="AV63 opne(FIMS1 N2 Purge Valve)(D1174.0)" />
 		<DO_ITEM Index="2785" Name="DO_FIMS1N2PurgeValveClose" BufferOffset="2785" Addr="D1174.1" Description="AV63 close(FIMS1 N2 Purge Valve)(D1174.1)" />
 		<DO_ITEM Index="2786" Name="DO_FIMS2N2PurgeValveOpen" BufferOffset="2786" Addr="D1174.2" Description="AV64 opne(FIMS2 N2 Purge Valve)(D1174.2)" />
-		<DO_ITEM Index="2787" Name="DO_FIMS2N2PurgeValveClose" BufferOffset="2787" Addr="D1174.3" Description="AV65 close(FIMS2 N2 Purge Valve)(D1174.3)" />
+		<DO_ITEM Index="2787" Name="DO_FIMS2N2PurgeValveClose" BufferOffset="2787" Addr="D1174.3" Description="AV64 close(FIMS2 N2 Purge Valve)(D1174.3)" />
 		<DO_ITEM Index="2912" Name="DO_FIMS1VaccumValveOpen" BufferOffset="2912" Addr="D1182.0" Description="FIMS1 AV217-A (vacuum pumping)(D1182.0)" />
 		<DO_ITEM Index="2913" Name="DO_FIMS1VaccumValveClose" BufferOffset="2913" Addr="D1182.1" Description="FIMS1 AV217-B (Breaking the vacuum)(D1182.1)" />
 		<DO_ITEM Index="2914" Name="DO_FIMS2VaccumValveOpen" BufferOffset="2914" Addr="D1182.2" Description="AV218 open(FIMS2 vaccum valve)(D1182.2)" />