V1.3

README.md

@@ -22,4 +22,6 @@ V1.1
     1. 添加消毒结果打印
 V1.2
     1. 修改桶液体计算公式
+V1.3
+    1. 修改预热时间从数据库取数值
 ```

src/configs/gconfig.hpp

@@ -20,7 +20,6 @@
       marco(int32_t /* */, iflytopSubDeviceCanBitrate, 500000) /*子设备Can设备波特率*/ \
       marco(string /*  */, pipettingRobotCanIFName, "can1")    /*移液臂Can设备名称*/    \
       marco(int32_t /* */, pipettingRobotCanBitrate, 500000)   /*移液臂Can设备波特率*/ \
-      marco(int32_t /* */, preHeatLastTimeS, 60)               /*预热时间*/                \
       marco(int32_t /* */, disinfectantBucketCapacity_g, 2300) /*消毒桶容积*/
 
 configTemplateDEFILE_CONFIG_SERVICE2(  //

src/service/disinfection_ctl_service.cpp

@@ -171,8 +171,7 @@ void DisinfectionCtrlService::initContext(DisinfectionContext& context,
                                           float                continued_humi         //
 ) {
   context.m_disinfectionID = createDisinfectionID();
-  // context.pre_heat_time_s              = m_dbService->getSettingVal("pre_heat_time_s");
-  context.pre_heat_time_s              = GET_SERVICE(GConfig)->get_preHeatLastTimeS();
+  context.pre_heat_time_s              = m_dbService->getSettingVal("pre_heat_time_s");
   context.stoped_gs                    = stoped_gs;
   context.continued_gs                 = continued_gs;
   context.stoped_satur                 = stoped_satur;

src/version.hpp

@@ -1,2 +1,2 @@
 #pragma once
-#define VERSION "1.2"
+#define VERSION "1.3"