diff --git a/README.md b/README.md index e9a2d95..12df707 100644 --- a/README.md +++ b/README.md @@ -13,4 +13,9 @@ # 编译PC版本的代码 ./buildpc.sh +``` + +``` +VERSION 1.0.1 + 1. 修复nlog 打印时,使用{:.f}导致的异常错误 ``` \ No newline at end of file diff --git a/appsrc/appsetting/project_port/basic/project_constant.hpp b/appsrc/appsetting/project_port/basic/project_constant.hpp index d15ecfb..964d55d 100644 --- a/appsrc/appsetting/project_port/basic/project_constant.hpp +++ b/appsrc/appsetting/project_port/basic/project_constant.hpp @@ -1,5 +1,5 @@ #pragma once -#define VERSION "1.0.0" +#define VERSION "1.0.1" #define PROJECT_NAME "TRANSMIT_DM" #define PROJECT_LARGE_SPACE_DM "LargeSpaceDM" diff --git a/appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.cpp b/appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.cpp index e8ca5f2..ddc47f2 100644 --- a/appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.cpp +++ b/appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.cpp @@ -17,7 +17,7 @@ string DisinfectionCtrlService::getSetting(SettingId sid) { // 2. 从 系统配置 中进行查找 // m_realtimeCfg.find if (sid == SettingId::loglevel) { - return fmt::format("{:.2f}", m_tlog); + return fmt::format("{}", m_tlog); } auto value = m_realtimeCfg.find(sid); if (value != m_realtimeCfg.end()) { @@ -455,10 +455,9 @@ void DisinfectionCtrlService::processStatePreheat(DisinfectionEvent* event) { tryLogState(true); // dics->Blower_ctrl(90); - // usleep(1000 * 1000); + // usleep(1000 * 1000) dics->Heater_ctrl(100); s_remaintime = getSettingAsInt(SettingId::pre_heat_time_s); - } else if (event->event == kevent_exit_state) { // dics->Blower_ctrl(0); // usleep(1000 * 1000); diff --git a/appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.hpp b/appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.hpp index a3eadef..01a8261 100644 --- a/appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.hpp +++ b/appsrc/service/app/disinfection_ctrl/disinfection_ctrl_service.hpp @@ -37,7 +37,7 @@ class DisinfectionCtrlService : public enable_shared_from_this m_realtimeCfg; diff --git a/appsrc/service/app/disinfection_ctrl/disinfection_state_machine.cpp b/appsrc/service/app/disinfection_ctrl/disinfection_state_machine.cpp index 860800c..fc878c4 100644 --- a/appsrc/service/app/disinfection_ctrl/disinfection_state_machine.cpp +++ b/appsrc/service/app/disinfection_ctrl/disinfection_state_machine.cpp @@ -73,7 +73,7 @@ void DisinfectionStateMachine::process() { callStateProcesser(m_state, &exit_event); m_state = event->changeState.to; m_enter_state_tp = zsystem_clock().now(); - logger->info("PROCESS EVEN: {:10}:{}", string(m_state), disinfection_event_to_string(exit_event.event)); + logger->info("PROCESS EVEN: {:10}:{}", string(m_state), disinfection_event_to_string(enter_event.event)); callStateProcesser(m_state, &enter_event); } else {