From f216cf89e8c8e91b220a9c26cf3650061534777b Mon Sep 17 00:00:00 2001 From: zhaohe Date: Thu, 16 May 2024 16:36:24 +0800 Subject: [PATCH] update --- .vscode/settings.json | 3 ++- src/main_control_service.cpp | 4 ++++ src/service/device_io_control_service_test.cpp | 8 +++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 9a2eed7..92de242 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -65,6 +65,7 @@ "typeinfo": "cpp", "valarray": "cpp", "variant": "cpp", - "codecvt": "cpp" + "codecvt": "cpp", + "bak": "c" } } \ No newline at end of file diff --git a/src/main_control_service.cpp b/src/main_control_service.cpp index 96ae84c..dcc5f54 100644 --- a/src/main_control_service.cpp +++ b/src/main_control_service.cpp @@ -5,6 +5,7 @@ #include "iflytop/core/components/stringutils.hpp" #include "iflytop/core/core.hpp" #include "service/device_io_control_service_test.hpp" +#include "service/disinfection_printer_service.hpp" #include "version.hpp" using namespace iflytop; using namespace core; @@ -62,6 +63,9 @@ void MainControlService::initialize() { }); GET_SERVICE(IflytopFrontEndService)->startListen(); + BUILD_AND_REG_SERRVICE(DisinfectionPrinterService); + GET_SERVICE(DisinfectionPrinterService)->initialize(); + BUILD_AND_REG_SERRVICE(DisinfectionCtrlService); GET_SERVICE(DisinfectionCtrlService)->initialize(); diff --git a/src/service/device_io_control_service_test.cpp b/src/service/device_io_control_service_test.cpp index da3ec5c..49716f9 100644 --- a/src/service/device_io_control_service_test.cpp +++ b/src/service/device_io_control_service_test.cpp @@ -1,11 +1,17 @@ #include "device_io_control_service_test.hpp" +#include "iflytop/components/uart_printer/uart_printer.hpp" +#include "iflytoplinuxsdk/src/iflytop/components/ziconv.hpp" + using namespace iflytop; using namespace std; #define IN_TEST 1 -void DeviceIoControlServiceTest::printerPrintf(string str) {} +void DeviceIoControlServiceTest::printerPrintf(string str) { // + logger->info("PP:{}", str); + GET_SERVICE(UartPrinter)->print(ZIconv::utf8_to_gb2312(str)); +} int32_t DeviceIoControlServiceTest::H2O2Sensor_readH2O2PPM(int32_t sensorid) { return 300 + rand() % 1000; } int32_t DeviceIoControlServiceTest::H2O2Sensor_readHumid(int32_t sensorid) { return 20 + rand() % 30; }