Browse Source

update

storage-in-realtime
zhaohe 12 months ago
parent
commit
a19cfc497e
  1. 6
      appsrc/service/app/add_liquid_service.cpp
  2. 4
      appsrc/service/app/drain_liquid_service.cpp

6
appsrc/service/app/add_liquid_service.cpp

@ -62,7 +62,7 @@ void AddLiquidService::addLiquidWork(int stopatg) {
*/ */
m_workstate = kemptyLineLiquid; m_workstate = kemptyLineLiquid;
logger->info("start drain the liquid from the line"); logger->info("start drain the liquid from the line");
m_dcs->SprayPump_startInRPM(-PORT.emptyPipeSprayPumpRPM);
m_dcs->SprayPump_startInRPM(-PORT.emptyPipeSprayPumpRPM);
thisThread.sleepForMs(1000); thisThread.sleepForMs(1000);
m_dcs->AddLiquidPump_run(-23); // @TODO:提取常数到系统配置中 m_dcs->AddLiquidPump_run(-23); // @TODO:提取常数到系统配置中
#define EMTPTY_LINE_WHEN_ADDING_DISINFECTANT_TIMES 1000 #define EMTPTY_LINE_WHEN_ADDING_DISINFECTANT_TIMES 1000
@ -78,6 +78,10 @@ void AddLiquidService::addLiquidWork(int stopatg) {
*/ */
logger->info("empty line liquid done"); logger->info("empty line liquid done");
m_workstate = kidle; m_workstate = kidle;
if (!thisThread.getExitFlag()) {
GET_SERVICE(IflytopFrontEndService)->sendPrompt("加液完成");
}
} }
void AddLiquidService::stop() { void AddLiquidService::stop() {

4
appsrc/service/app/drain_liquid_service.cpp

@ -81,8 +81,8 @@ void DrainLiquidService::workThread() {
m_dcs->AddLiquidPump_stop(); m_dcs->AddLiquidPump_stop();
m_dcs->SprayPump_stop(); m_dcs->SprayPump_stop();
if(!thisThread.getExitFlag()){
// m_dcs->WarningLight_setState();
if (!thisThread.getExitFlag()) {
GET_SERVICE(IflytopFrontEndService)->sendPrompt("排液完成");
} }
m_workstate = kidle; m_workstate = kidle;
} }
Loading…
Cancel
Save