From 521359bb161aff9284e650cdf3559a04eba34187 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Tue, 26 Dec 2023 21:24:05 +0800
Subject: [PATCH] V1.3

---
 README.md                                | 2 ++
 src/configs/gconfig.hpp                  | 1 -
 src/service/disinfection_ctl_service.cpp | 3 +--
 src/version.hpp                          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 83822b1..39c5409 100644
--- a/README.md
+++ b/README.md
@@ -22,4 +22,6 @@ V1.1
     1. 添加消毒结果打印
 V1.2
     1. 修改桶液体计算公式
+V1.3
+    1. 修改预热时间从数据库取数值
 ```
\ No newline at end of file
diff --git a/src/configs/gconfig.hpp b/src/configs/gconfig.hpp
index beda902..0a771bd 100644
--- a/src/configs/gconfig.hpp
+++ b/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(  //
diff --git a/src/service/disinfection_ctl_service.cpp b/src/service/disinfection_ctl_service.cpp
index 0a6744f..1d8d2cf 100644
--- a/src/service/disinfection_ctl_service.cpp
+++ b/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;
diff --git a/src/version.hpp b/src/version.hpp
index ad8ec44..915ecf7 100644
--- a/src/version.hpp
+++ b/src/version.hpp
@@ -1,2 +1,2 @@
 #pragma once
-#define VERSION "1.2"
\ No newline at end of file
+#define VERSION "1.3"
\ No newline at end of file