From d866b9a43f06d624027b4a61992c92fe3b4d484d Mon Sep 17 00:00:00 2001 From: zhaohe Date: Wed, 22 May 2024 18:15:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=87=E6=B0=A7=E5=8C=96?= =?UTF-8?q?=E6=B0=A2=E6=B5=93=E5=BA=A6=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .settings/language.settings.xml | 4 ++-- usrc/base/hardware.cpp | 24 +++++++++++++----------- usrc/project_configs.h | 2 +- zsdk | 2 +- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index 7845a34..a979a7e 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/usrc/base/hardware.cpp b/usrc/base/hardware.cpp index 4985f54..ed34551 100644 --- a/usrc/base/hardware.cpp +++ b/usrc/base/hardware.cpp @@ -65,7 +65,7 @@ void Hardware::init() { ZASSERT(huart2.Init.BaudRate == 19200); ZASSERT(huart2.Init.StopBits == UART_STOPBITS_2); m_H2o2Sensor_ModbusBlockHost.initialize(&huart2); - m_H2o2Sensor_H2O2Adc.initialize(&hadc1, ADC_CHANNEL_10); // + m_H2o2Sensor_H2O2Adc.initialize("h2o2adc", &hadc1, ADC_CHANNEL_10); // m_H2o2Sensor_HMP110.init(&m_H2o2Sensor_ModbusBlockHost); if (m_H2o2Sensor_HMP110.ping(1)) { @@ -163,8 +163,9 @@ int32_t Hardware::h2o2_sensor_data(report_h2o2_data_t* readdata) { // float mv = adcv / 4095.0 * 3.3 * 1000; // float ma = mv / 150.0; // float ppm = (ma - 4) / (20 - 4) * 2000; - int32_t h2o2ma = (h2o2adcVal / 4095.0 * 3.3 * 1000) / 150.0; + double h2o2ma = (h2o2adcVal / 4095.0 * 3.3 * 1000) / 150.0; int32_t h2o2ppm = (h2o2ma - 4) * 1.0 / (20 - 4) * 2000; + if (h2o2ppm < 0) h2o2ppm = 0; readdata->sensor_error = ecode != 0; readdata->h2o2 = h2o2ppm; @@ -172,15 +173,16 @@ int32_t Hardware::h2o2_sensor_data(report_h2o2_data_t* readdata) { readdata->temp = sensordata.temp; readdata->saturation = 0; - ZLOGI(TAG, "ecode: %d ppm:%d, rh:%d, temp:%d, df_ptemp:%d, ah:%d, mr:%d, wbt:%d, eh:%d", // - ecode, // - h2o2ppm, // - sensordata.rh, // - sensordata.temp, // - sensordata.df_ptemp, // - sensordata.ah, // - sensordata.mr, // - sensordata.wet_bulb_temp, // + ZLOGI(TAG, "ecode: %d ppm:%d %.2f(ma), rh:%d, temp:%d, df_ptemp:%d, ah:%d, mr:%d, wbt:%d, eh:%d", // + ecode, // + h2o2ppm, // + h2o2ma, // + sensordata.rh, // + sensordata.temp, // + sensordata.df_ptemp, // + sensordata.ah, // + sensordata.mr, // + sensordata.wet_bulb_temp, // sensordata.enthalpy); return 0; diff --git a/usrc/project_configs.h b/usrc/project_configs.h index 1f27745..cfc4b73 100644 --- a/usrc/project_configs.h +++ b/usrc/project_configs.h @@ -17,7 +17,7 @@ * @brief 基础配置 * */ -#define SOFTWARE_VERSION 1 // 软件版本 +#define SOFTWARE_VERSION 2 // 软件版本 #define HARDWARE_VERSION 1 // 硬件版本 #define PROJECT "h2o2_ext_sensor_pv1" // 工程名称 #define SN_HEADER "SN" // SN号前缀 diff --git a/zsdk b/zsdk index 2d0aea4..897203c 160000 --- a/zsdk +++ b/zsdk @@ -1 +1 @@ -Subproject commit 2d0aea4bda82668626ba11d42658eb2f36f48119 +Subproject commit 897203c3911a41d84f49f420d1d647ca3a04c2e5