Browse Source

update

master
zhaohe 1 year ago
parent
commit
ee1f8ffe47
  1. 8
      api/cmds/device_state_cmd_impl.cpp
  2. 1
      api/cmds/device_state_cmd_impl.hpp
  3. 63
      api/cmds/disinfection_cmd_impl.cpp
  4. 13
      api/cmds/disinfection_cmd_impl.hpp

8
api/cmds/device_state_cmd_impl.cpp

@ -32,8 +32,6 @@ json DeviceStateCmdImpl::createSensorDataJson() {
#else
#endif
report["h2o2_1"] = m_deviceIoControlService->H2O2Sensor_readH2O2PPM(0);
report["temp_1"] = m_deviceIoControlService->H2O2Sensor_readTemperature(0);
report["humid_1"] = m_deviceIoControlService->H2O2Sensor_readHumid(0);
@ -115,6 +113,12 @@ void DeviceStateCmdImpl::getState(json& cmd, json& receipt) {
receipt["disinfectionConfig"]["continued_humi"] = m_disinfectionCtrlService->m_context.continued_humi;
return;
}
void DeviceStateCmdImpl::DeviceState__getDBDBExtChannelCtrlComponentState(json& cmd, json& receipt) {
receipt["ack"]["online"] = m_deviceIoControlService->DBDB__extValBoardIsOnline();
return;
}
void DeviceStateCmdImpl::initialize() {
GET_TO_SERVICE(m_msgProcesser);
GET_TO_SERVICE(m_zconfig);

1
api/cmds/device_state_cmd_impl.hpp

@ -34,6 +34,7 @@ class DeviceStateCmdImpl : public enable_shared_from_this<DeviceStateCmdImpl> {
private:
void getState(json& cmd, json& receipt);
void DeviceState__getDBDBExtChannelCtrlComponentState(json& cmd, json& receipt);
private:
json createSensorDataJson();

63
api/cmds/disinfection_cmd_impl.cpp

@ -123,6 +123,69 @@ void DisinfectionCmdImpl::getDisinfectionConfig(json& cmd, json& receipt) {
return;
}
// {
// "command" : "setDehumidifyAfterDisinfectionEnable",
// "messageId" : "call-2",
// "params" : {"enable":true}
// }
bool DehumidifyBeforeDisinfectionEnable;
bool DehumidifyAfterDisinfectionEnable;
bool DegradeAfterDisinfectionEnable;
int32_t DehumidifyBeforeDisinfectionThreshold;
int32_t DehumidifyAfterDisinfectionThreshold;
void DisinfectionCmdImpl::setDehumidifyBeforeDisinfectionEnable(json& cmd, json& receipt) {
bool enable = cmd["enable"];
logger->info("setDehumidifyBeforeDisinfectionEnable {}", enable);
DehumidifyBeforeDisinfectionEnable = enable;
return;
}
void DisinfectionCmdImpl::setDehumidifyAfterDisinfectionEnable(json& cmd, json& receipt) {
bool enable = cmd["enable"];
logger->info("setDehumidifyAfterDisinfectionEnable {}", enable);
DehumidifyAfterDisinfectionEnable = enable;
return;
}
void DisinfectionCmdImpl::setDegradeAfterDisinfectionEnable(json& cmd, json& receipt) {
bool enable = cmd["enable"];
logger->info("setDegradeAfterDisinfectionEnable {}", enable);
DegradeAfterDisinfectionEnable = enable;
return;
}
void DisinfectionCmdImpl::setDehumidifyBeforeDisinfectionThreshold(json& cmd, json& receipt) {
int32_t value = jsonGet<int>(cmd["value"]);
logger->info("setDehumidifyBeforeDisinfectionThreshold {}", value);
DehumidifyBeforeDisinfectionThreshold = value;
return;
}
void DisinfectionCmdImpl::setDehumidifyAfterDisinfectionThreshold(json& cmd, json& receipt) {
int32_t value = jsonGet<int>(cmd["value"]);
logger->info("setDehumidifyAfterDisinfectionThreshold {}", value);
DehumidifyAfterDisinfectionThreshold = value;
return;
}
void DisinfectionCmdImpl::getDehumidifyBeforeDisinfectionEnable(json& cmd, json& receipt) {
receipt["ack"]["enable"] = DehumidifyBeforeDisinfectionEnable;
return;
}
void DisinfectionCmdImpl::getDehumidifyAfterDisinfectionEnable(json& cmd, json& receipt) {
receipt["ack"]["enable"] = DehumidifyAfterDisinfectionEnable;
return;
}
void DisinfectionCmdImpl::getDegradeAfterDisinfectionEnable(json& cmd, json& receipt) {
receipt["ack"]["enable"] = DegradeAfterDisinfectionEnable;
return;
}
void DisinfectionCmdImpl::getDehumidifyBeforeDisinfectionThreshold(json& cmd, json& receipt) {
receipt["ack"]["value"] = DehumidifyBeforeDisinfectionThreshold;
return;
}
void DisinfectionCmdImpl::getDehumidifyAfterDisinfectionThreshold(json& cmd, json& receipt) {
receipt["ack"]["value"] = DehumidifyAfterDisinfectionThreshold;
return;
}
void DisinfectionCmdImpl::initialize() {
GET_TO_SERVICE(m_msgProcesser);
GET_TO_SERVICE(m_zconfig);

13
api/cmds/disinfection_cmd_impl.hpp

@ -42,6 +42,19 @@ class DisinfectionCmdImpl : public enable_shared_from_this<DisinfectionCmdImpl>
void startDraining(json& cmd, json& receipt);
void stopDraining(json& cmd, json& receipt);
#endif
void setDehumidifyBeforeDisinfectionEnable(json& cmd, json& receipt);
void setDehumidifyAfterDisinfectionEnable(json& cmd, json& receipt);
void setDegradeAfterDisinfectionEnable(json& cmd, json& receipt);
void setDehumidifyBeforeDisinfectionThreshold(json& cmd, json& receipt);
void setDehumidifyAfterDisinfectionThreshold(json& cmd, json& receipt);
void getDehumidifyBeforeDisinfectionEnable(json& cmd, json& receipt);
void getDehumidifyAfterDisinfectionEnable(json& cmd, json& receipt);
void getDegradeAfterDisinfectionEnable(json& cmd, json& receipt);
void getDehumidifyBeforeDisinfectionThreshold(json& cmd, json& receipt);
void getDehumidifyAfterDisinfectionThreshold(json& cmd, json& receipt);
void startFormula(json& cmd, json& receipt);
};

Loading…
Cancel
Save