Browse Source

重命名device_io_ctrl_service 名称

storage-in-realtime
zhaohe 12 months ago
parent
commit
9fb8b37f89
  1. 11
      README.md
  2. 2
      appsrc/service/app/add_liquid_service.hpp
  3. 2
      appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.cpp
  4. 2
      appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.hpp
  5. 2
      appsrc/service/app/disinfection_ctrl_service_ext.hpp
  6. 2
      appsrc/service/app/drain_liquid_service.hpp
  7. 2
      appsrc/service/hardware/device_io_ctrl_service.cpp
  8. 0
      appsrc/service/hardware/device_io_ctrl_service.hpp
  9. 2
      appsrc/service/hardware/disinfectant_weight_update_service.hpp
  10. 2
      appsrc/service/hardware/warning_light_controler.hpp
  11. 2
      appsrc/service/main_control_service.cpp
  12. 2
      appsrc/service/test_page_mgr_service.hpp

11
README.md

@ -66,15 +66,20 @@ TODO:
3. 填充硬件测试页面。OK
4. 指令重发代码功能。OK
5. 硬件测试 OK
6. 所有后台程序添加异常检查,当异常发生过,则设置全局标志位(硬件异常)。此时后台程序相应的线程将不再继续工作。(直到设备重启) OK
6. 所有后台程序添加异常检查,当异常发生过,则设置全局标志位(硬件异常)。此时后台程序相应的线程将不再继续工作。(直到设备重启)
7. 所有后台程序(有前端启动的),则是检查全局标志位,如果触发错误,则报错。
---------------------------------------------------------------------
10.添加异常上报前端程序,添加异常状态读取程序
9. 对接消毒服务
11.针对关键接口添加异常标志位检测程序。(消毒,加液,排液体,气密性测试)
8. 添加消毒日志打印程序
8. 消毒测试
9. 添加气密封性测试逻辑代码。
9. 处理硬件异常上报
8. 添加一个程序根据全局异常标志位,对设备进行相应的检查,如果检查通过则清空标志位。同时如果发生异常,则发送板子复位指令,对板子进行复位。
...
5. 单片机支持自动过滤掉重发的指令。

2
appsrc/service/app/add_liquid_service.hpp

@ -12,7 +12,7 @@
//
#include "baseservice/baseservice.hpp"
#include "service/hardware/device_ctrl_service.hpp"
#include "service/hardware/device_io_ctrl_service.hpp"
#include "service/hardware/disinfectant_weight_update_service.hpp"
//
namespace iflytop {

2
appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.cpp

@ -180,7 +180,7 @@ void DisinfectionCtrlService::traceState() {
* StateMachine *
*******************************************************************************/
void DisinfectionCtrlService::exceptionProcesser(const appexception& e) {
logger->error("exceptionProcesser:{}", e);
logger->error("exceptionProcesser:{}", e.what());
sm.changeState(DisinfectionState::appexception);
DS->setAppExceptionFlag(e);
}

2
appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.hpp

@ -13,7 +13,7 @@
#include "baseservice/baseservice.hpp"
#include "disinfection_state_machine.hpp"
#include "service/hardware/base/h2o2_sensor_data_mgr.hpp"
#include "service/hardware/device_ctrl_service.hpp"
#include "service/hardware/device_io_ctrl_service.hpp"
#include "service/hardware/disinfectant_weight_update_service.hpp"
//
namespace iflytop {

2
appsrc/service/app/disinfection_ctrl_service_ext.hpp

@ -14,7 +14,7 @@
#include "baseservice/baseservice.hpp"
#include "disinfection_ctrl/disinfection_state_machine.hpp"
#include "service/hardware/base/h2o2_sensor_data_mgr.hpp"
#include "service/hardware/device_ctrl_service.hpp"
#include "service/hardware/device_io_ctrl_service.hpp"
#include "service/hardware/disinfectant_weight_update_service.hpp"
//
namespace iflytop {

2
appsrc/service/app/drain_liquid_service.hpp

@ -10,7 +10,7 @@
#include <vector>
//
#include "baseservice/baseservice.hpp"
#include "service/hardware/device_ctrl_service.hpp"
#include "service/hardware/device_io_ctrl_service.hpp"
#include "service/hardware/disinfectant_weight_update_service.hpp"
//
namespace iflytop {

2
appsrc/service/hardware/device_ctrl_service.cpp → appsrc/service/hardware/device_io_ctrl_service.cpp

@ -1,4 +1,4 @@
#include "device_ctrl_service.hpp"
#include "device_io_ctrl_service.hpp"
using namespace iflytop;
using namespace std;
using namespace core;

0
appsrc/service/hardware/device_ctrl_service.hpp → appsrc/service/hardware/device_io_ctrl_service.hpp

2
appsrc/service/hardware/disinfectant_weight_update_service.hpp

@ -10,7 +10,7 @@
#include <vector>
//
#include "baseservice/baseservice.hpp"
#include "device_ctrl_service.hpp"
#include "device_io_ctrl_service.hpp"
//
#include "base/can_packet_dumper.hpp"
#include "base/h2o2_sensor_data_mgr.hpp"

2
appsrc/service/hardware/warning_light_controler.hpp

@ -10,7 +10,7 @@
#include <vector>
//
#include "baseservice/baseservice.hpp"
#include "device_ctrl_service.hpp"
#include "device_io_ctrl_service.hpp"
//
#include "base/can_packet_dumper.hpp"
#include "base/h2o2_sensor_data_mgr.hpp"

2
appsrc/service/main_control_service.cpp

@ -16,7 +16,7 @@
#include "service/app/drain_liquid_service.hpp"
#include "service/app/pipeline_pressure_control.hpp"
//
#include "hardware/device_ctrl_service.hpp"
#include "hardware/device_io_ctrl_service.hpp"
#include "hardware/disinfectant_weight_update_service.hpp"
#include "hardware/warning_light_controler.hpp"

2
appsrc/service/test_page_mgr_service.hpp

@ -12,7 +12,7 @@
#include "appbase/appbean/test_page_iterm.hpp"
#include "baseservice/baseservice.hpp"
#include "testpage/test_page_processer.hpp"
#include "service/hardware/device_ctrl_service.hpp"
#include "service/hardware/device_io_ctrl_service.hpp"
namespace iflytop {
using namespace testpage;

Loading…
Cancel
Save