Browse Source

revise reservoir pump bug

chenzk 6 days ago
parent
commit
7d2a38becb

+ 2 - 2
CyberX8_MainPages/ViewModels/MetalSHHomePageViewModel.cs

@@ -440,7 +440,7 @@ namespace CyberX8_MainPages.ViewModels
             _rtDataKeys.Add($"{Module}.TotalTime");
             _rtDataKeys.Add($"{Module}.TimeRemain");
             _rtDataKeys.Add($"{Module}.IsSingalPump");
-            _rtDataKeys.Add($"{Module}.subordinateReservoirPump");
+            _rtDataKeys.Add($"{Module}.SubordinateReservoirPump");
             if (_timer == null)
             {
                 _timer = new DispatcherTimer();
@@ -461,7 +461,7 @@ namespace CyberX8_MainPages.ViewModels
                 _rtDataValueDic = QueryDataClient.Instance.Service.PollData(_rtDataKeys);
                 if (_rtDataValueDic != null)
                 {
-                    _subordinateReservoirPumpOn = CommonFunction.GetValue<bool>(_rtDataValueDic, $"{Module}.subordinateReservoirPump");
+                    _subordinateReservoirPumpOn = CommonFunction.GetValue<bool>(_rtDataValueDic, $"{Module}.SubordinateReservoirPump");
                     IsSingalPump = CommonFunction.GetValue<bool>(_rtDataValueDic, $"{Module}.IsSingalPump");
                     MetalData = CommonFunction.GetValue<StandardHotMetalDeviceData>(_rtDataValueDic, $"{Module}.{METALDATA}");
                     MetalData.CellPump ^= _subordinateReservoirPumpOn;

+ 1 - 0
CyberX8_RT/Devices/Reservoir/StandardHotReservoirDevice.cs

@@ -701,6 +701,7 @@ namespace CyberX8_RT.Devices.Reservoir
             DATA.Subscribe($"{Module}.IsRegulatePump", () => _isRegulatePump, SubscriptionAttribute.FLAG.IgnoreSaveDB);
             DATA.Subscribe($"{Module}.PumpSpeed", () => _regulatePumpSpeed, SubscriptionAttribute.FLAG.IgnoreSaveDB);
             DATA.Subscribe($"{Module}.IsCMMConfig", () => _isCMMConfig, SubscriptionAttribute.FLAG.IgnoreSaveDB);
+            DATA.Subscribe($"{Module}.SubordinateReservoirPump", () => _reservoirData.RegulatePumpSignalIn, SubscriptionAttribute.FLAG.IgnoreSaveDB);
         }
         /// <summary>
         /// 初始化操作

+ 0 - 1
CyberX8_RT/Modules/Metal/MetalEntity.cs

@@ -350,7 +350,6 @@ namespace CyberX8_RT.Modules.Metal
             DATA.Subscribe($"{Module}.IsDisable", () => IsDisable, SubscriptionAttribute.FLAG.IgnoreSaveDB);
             DATA.Subscribe($"{Module}.CurrentRecipe", () => _currentRecipe != null ? _currentRecipe.Ppid : "", SubscriptionAttribute.FLAG.IgnoreSaveDB);
             DATA.Subscribe($"{Module}.MetalUsage", () => MetalUsage, SubscriptionAttribute.FLAG.IgnoreSaveDB);
-            DATA.Subscribe($"{Module}.subordinateReservoirPump", () => _reservoirDevice.ReservoirData.RegulatePumpSignalIn, SubscriptionAttribute.FLAG.IgnoreSaveDB);
         }
         /// <summary>
         /// 初始化SVID