From bb19c0059e29a91236951bbd1ada0047ced8fa4a Mon Sep 17 00:00:00 2001 From: zhaohe Date: Thu, 17 Jul 2025 14:53:30 +0800 Subject: [PATCH] =?UTF-8?q?v3.3.1=20|=20=E4=BF=AE=E5=A4=8D=E6=81=A2?= =?UTF-8?q?=E5=A4=8D=E5=87=BA=E5=8E=82=E8=AE=BE=E7=BD=AE=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=20=E6=8E=89=E7=94=B5=E4=B8=A2=E5=A4=B1=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appsrc/appbase/utils/h2o2_computer/zh2o2_computer.c | 9 ++++++++- appsrc/appconfig/basic/zappversion.hpp | 2 +- appsrc/service/app_core.cpp | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/appsrc/appbase/utils/h2o2_computer/zh2o2_computer.c b/appsrc/appbase/utils/h2o2_computer/zh2o2_computer.c index c267dab..da7cada 100644 --- a/appsrc/appbase/utils/h2o2_computer/zh2o2_computer.c +++ b/appsrc/appbase/utils/h2o2_computer/zh2o2_computer.c @@ -199,9 +199,16 @@ int zh2o2_computer_self_test() { printf("T AirPressure RH H2O2(ppm) RS\n"); for (size_t i = 0; i < 500; i += 1) { float rs = zh2o2_compute_rs(i, zh2o2_t2k(temperatureC), rh, AirPressure); - printf("%d %d %d %d %d\n", (int) temperatureC, (int)AirPressure, (int)rh, (int) i, (int)rs); + printf("%d %d %d %d %d\n", (int)temperatureC, (int)AirPressure, (int)rh, (int)i, (int)rs); } printf("Test passed\n"); + // ppm temp rs 大气压 + printf("result:%f\n", zh2o2_compute_rs(100, zh2o2_t2k(25), 50, 101325)); + printf("result:%f\n", zh2o2_compute_rs(200, zh2o2_t2k(30), 50, 101325)); + printf("result:%f\n", zh2o2_compute_rs(500, zh2o2_t2k(30), 60, 101325)); + + ; + return 0; } \ No newline at end of file diff --git a/appsrc/appconfig/basic/zappversion.hpp b/appsrc/appconfig/basic/zappversion.hpp index 9f529f8..58eb4da 100644 --- a/appsrc/appconfig/basic/zappversion.hpp +++ b/appsrc/appconfig/basic/zappversion.hpp @@ -1,3 +1,3 @@ #pragma once -#define VERSION "3.3.0" +#define VERSION "3.3.1" #define PROJECT_NAME "TRANSMIT_DM" \ No newline at end of file diff --git a/appsrc/service/app_core.cpp b/appsrc/service/app_core.cpp index eeec0ef..0ef3081 100644 --- a/appsrc/service/app_core.cpp +++ b/appsrc/service/app_core.cpp @@ -65,6 +65,7 @@ void AppCore::initialize() { logger->warn("factory_reset_flag exists, will reset database and disinfectant logs"); system("rm -rf db"); system("rm -rf disinfection_logs"); + system("rm -rf factory_reset_flag"); } // 设备扩展设置数据库