|
@@ -230,7 +230,7 @@ namespace Venus_RT.Devices
|
|
|
if (!_serial.Open())
|
|
|
{
|
|
|
StatusDry = EdwardsPumpState.Disconnected;
|
|
|
- EV.PostAlarmLog(Module, "Edwards Pump串口无法打开");
|
|
|
+ LOG.Write(eEvent.ERR_DRY_PUMP, Module, "Edwards Pump串口无法打开");
|
|
|
return false;
|
|
|
}
|
|
|
|
|
@@ -255,13 +255,14 @@ namespace Venus_RT.Devices
|
|
|
private void OnErrorOccurred(string obj)
|
|
|
{
|
|
|
StatusDry = EdwardsPumpState.ERROR;
|
|
|
-
|
|
|
+ LOG.Write(eEvent.WARN_DEVICE_INFO, Module, $"[{Module}] edwards pump error: [{obj}]");
|
|
|
}
|
|
|
|
|
|
private void OnPortDataChanged(string obj)
|
|
|
{
|
|
|
if (string.IsNullOrEmpty(obj))
|
|
|
-
|
|
|
+ LOG.Write(eEvent.WARN_DEVICE_INFO, Module, "edwards pump message IsNullOrEmpty");
|
|
|
+
|
|
|
try
|
|
|
{
|
|
|
_timerReceiveStatus.Stop();
|
|
@@ -290,7 +291,7 @@ namespace Venus_RT.Devices
|
|
|
if (_trigPumpOn.Q && _timerPumpOn.IsTimeout())
|
|
|
{
|
|
|
_trigPumpOn.RST = true;
|
|
|
- EV.PostMessage(Module, EventEnum.DefaultWarning, "Edwards Pump 无法打开");
|
|
|
+ LOG.Write(eEvent.WARN_DEVICE_INFO, Module, "Edwards Pump 无法打开");
|
|
|
}
|
|
|
if (_trigPumpOff.Q)
|
|
|
{
|
|
@@ -304,7 +305,7 @@ namespace Venus_RT.Devices
|
|
|
if (_trigPumpOff.Q && _timerPumpOff.IsTimeout())
|
|
|
{
|
|
|
_trigPumpOff.RST = true;
|
|
|
- EV.PostMessage(Module, EventEnum.DefaultWarning, "Edwards Pump 无法关闭");
|
|
|
+ LOG.Write(eEvent.WARN_DEVICE_INFO, Module, "Edwards Pump 无法关闭");
|
|
|
}
|
|
|
if (_trigPumpOn.Q)
|
|
|
{
|
|
@@ -316,7 +317,7 @@ namespace Venus_RT.Devices
|
|
|
|
|
|
break;
|
|
|
default:
|
|
|
-
|
|
|
+ LOG.Write(eEvent.EV_DEVICE_INFO, Module, $"Edwards Pump {SendData} {QueryCmdReply(cmd)}");
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
@@ -431,13 +432,13 @@ namespace Venus_RT.Devices
|
|
|
{
|
|
|
_trigPumpOn.CLK = true;
|
|
|
_timerPumpOn.Start(CHK_PUMP_REC_INTERVAL);
|
|
|
-
|
|
|
+ LOG.Write(eEvent.EV_DEVICE_INFO, Module, $"[{Module}] Switch on Edwards Pump");
|
|
|
}
|
|
|
else if (SendData == "!P2")
|
|
|
{
|
|
|
_trigPumpOff.CLK = true;
|
|
|
_timerPumpOff.Start(CHK_PUMP_REC_INTERVAL);
|
|
|
-
|
|
|
+ LOG.Write(eEvent.EV_DEVICE_INFO, Module, $"[{Module}] Switch off Edwards Pump");
|
|
|
}
|
|
|
return _serial.Write(str + "\r");
|
|
|
}
|