From 612bf24b1598972a5df4dc23a5a4e8cab9cbbf2b Mon Sep 17 00:00:00 2001 From: xin Date: Thu, 13 Nov 2025 14:45:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/Constant_Temperature_Config.json | 6 +++--- .../src/Temperature/TemperatureRegulator.cpp | 2 ++ othersoft/TemperatureControler/src/json/logout.cpp | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/othersoft/TemperatureControler/project/Constant_Temperature_Config.json b/othersoft/TemperatureControler/project/Constant_Temperature_Config.json index 3be86a6..a568bd3 100644 --- a/othersoft/TemperatureControler/project/Constant_Temperature_Config.json +++ b/othersoft/TemperatureControler/project/Constant_Temperature_Config.json @@ -19,9 +19,9 @@ "Pin": 19 }, "WINDOWS": { - "Pin_H": 7, - "Pin_L": 10, - "WaitTime": 40 + "Pin_H": 10, + "Pin_L": 7, + "WaitTime": 80 } }, "Constant_Temperature": { diff --git a/othersoft/TemperatureControler/src/Temperature/TemperatureRegulator.cpp b/othersoft/TemperatureControler/src/Temperature/TemperatureRegulator.cpp index 9aa9642..bce9c28 100644 --- a/othersoft/TemperatureControler/src/Temperature/TemperatureRegulator.cpp +++ b/othersoft/TemperatureControler/src/Temperature/TemperatureRegulator.cpp @@ -138,6 +138,8 @@ void TemperatureRegulator::setconfig(json jconfig) { m_TG_Manager=new TG_Manager(); m_TG_Manager->SetPin_V2(Windows_Pin_H,Windows_Pin_L,Cooler_Pin_EN,Hot_Pin_EN,Fan_Pin_H,Fan_Pin_L); + m_TG_Manager->Set_Waite_time_for_Windows(Windows_WaitTime); + // m_TG_Manager->SetPin(pin1_H,pin1_L,pin2_H,pin2_L); if (jconfig.contains("Constant_Temperature")) { if (jconfig["Constant_Temperature"].contains("CoolBegin_Temp_Insight")) { diff --git a/othersoft/TemperatureControler/src/json/logout.cpp b/othersoft/TemperatureControler/src/json/logout.cpp index bdd6fa3..e349722 100644 --- a/othersoft/TemperatureControler/src/json/logout.cpp +++ b/othersoft/TemperatureControler/src/json/logout.cpp @@ -135,7 +135,7 @@ void saveData(QString sender,QString qstr) QString path="/home/data/TempData/"+currentTime.toString("yyyy_MM_dd_hh_mm_ss")+".csv"; system("mkdir -p /home/data/TempData"); datafile=fopen(path.toStdString().c_str(),"a+"); - fprintf(datafile,QString::fromLocal8Bit("日期, 数据类型, 日期~n").toStdString().c_str()); + fprintf(datafile,QString::fromLocal8Bit("日期, 数据类型, 日期\n").toStdString().c_str()); }