From 866acfc842dfb7599b46d72b84db6c6231132b1a Mon Sep 17 00:00:00 2001 From: zhaohe Date: Fri, 11 Jul 2025 21:54:02 +0800 Subject: [PATCH] =?UTF-8?q?V204|=20=20=20=20=20=20=201.=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=96=B0=E8=AE=BE=E5=A4=87DT600B=E7=9A=84=E6=94=AF?= =?UTF-8?q?=E6=8C=81=20=20=20=20=20=20=202.=20=E9=87=8D=E6=9E=84=E9=A3=8E?= =?UTF-8?q?=E6=9C=BA=E5=92=8C=E7=A9=BA=E5=8E=8B=E6=9C=BA=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81=20=20=20=20=20=20=203.=20?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=A3=8E=E6=9C=BA=E7=8A=B6=E6=80=81=E5=92=8C?= =?UTF-8?q?=E7=A9=BA=E5=8E=8B=E6=9C=BA=E7=8A=B6=E6=80=81=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 5 +++++ app_protocols/transmit_disfection_protocol | 2 +- app_protocols/zscanprotocol | 2 +- stm32components | 2 +- usrc/base/device_info.cpp | 1 + usrc/dmapp_controler/blower_controller.cpp | 3 ++- usrc/dmapp_service/air_compressor_ctrl_service.cpp | 3 ++- usrc/dmapp_service/blower_ctrl_service.cpp | 8 ++++---- usrc/irq/hal_irq_processer.cpp | 4 ++-- usrc/irq/hal_irq_processer.hpp | 4 ++-- usrc/project_configs.h | 2 -- usrc/version.hpp | 3 +++ 12 files changed, 24 insertions(+), 15 deletions(-) create mode 100644 usrc/version.hpp diff --git a/README.md b/README.md index 6b7df6d..56290ba 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,11 @@ V203 1. 修改协议 kfn_disinfectant_bucket_level_sensor_read_level 名称和定义 2. 修复部分BUG + + V204 + 1. 添加新设备DT600B的支持 + 2. 重构风机和空压机控制相关代码 + 3. 支持风机状态和空压机状态读取协议支持 ``` ```c diff --git a/app_protocols/transmit_disfection_protocol b/app_protocols/transmit_disfection_protocol index d1e2069..e63817f 160000 --- a/app_protocols/transmit_disfection_protocol +++ b/app_protocols/transmit_disfection_protocol @@ -1 +1 @@ -Subproject commit d1e20693ae72b61d3fcda318e698a9da25d263c4 +Subproject commit e63817fe9b7106a6da61e0f586fbdd4a305c907c diff --git a/app_protocols/zscanprotocol b/app_protocols/zscanprotocol index 81529a1..75bfc77 160000 --- a/app_protocols/zscanprotocol +++ b/app_protocols/zscanprotocol @@ -1 +1 @@ -Subproject commit 81529a15c57000f73cc5bd4b7276f567099b9988 +Subproject commit 75bfc77f79ad77e305a68bda7f8a0fcd90e29969 diff --git a/stm32components b/stm32components index 2d392a8..56543e2 160000 --- a/stm32components +++ b/stm32components @@ -1 +1 @@ -Subproject commit 2d392a81f356b3987da8eb7883dd002585c446b2 +Subproject commit 56543e221208090c57ba8448b751c454a83d4c86 diff --git a/usrc/base/device_info.cpp b/usrc/base/device_info.cpp index d2e8ca7..a4c4b2f 100644 --- a/usrc/base/device_info.cpp +++ b/usrc/base/device_info.cpp @@ -1,6 +1,7 @@ #include "device_info.hpp" #include "transmit_disfection_protocol/transmit_disfection_protocol.hpp" +#include "version.hpp" uint16_t deviceInfo_init() { return 0; } uint16_t deviceInfo_getProtocolVersion() { return PROTOCOL_VERSION; } diff --git a/usrc/dmapp_controler/blower_controller.cpp b/usrc/dmapp_controler/blower_controller.cpp index 787ac6a..4fe6154 100644 --- a/usrc/dmapp_controler/blower_controller.cpp +++ b/usrc/dmapp_controler/blower_controller.cpp @@ -12,7 +12,8 @@ void BlowerController::initialize() { REG_LAMADA_FN(kfn_blower_ctrl_safe_valve, [](ProcessContext* cxt) { fn_blower_ctrl_safe_valve(cxt); }); REG_LAMADA_FN(kfn_blower_read_ei, [](ProcessContext* cxt) { fn_blower_read_ei(cxt); }); REG_LAMADA_FN(kfn_blower_is_open, [](ProcessContext* cxt) { fn_blower_is_open(cxt); }); - REG_LAMADA_FN(kfn_blower_read_state, [](ProcessContext* cxt) { fn_blower_is_open(cxt); }); + REG_LAMADA_FN(kfn_blower_read_type, [](ProcessContext* cxt) { fn_blower_read_type(cxt); }); + REG_LAMADA_FN(kfn_blower_read_state, [](ProcessContext* cxt) { fn_blower_read_state(cxt); }); } void BlowerController::fn_blower_ctrl(ProcessContext* cxt) { diff --git a/usrc/dmapp_service/air_compressor_ctrl_service.cpp b/usrc/dmapp_service/air_compressor_ctrl_service.cpp index a9d7faf..22f9b17 100644 --- a/usrc/dmapp_service/air_compressor_ctrl_service.cpp +++ b/usrc/dmapp_service/air_compressor_ctrl_service.cpp @@ -77,7 +77,8 @@ void AirCompressorCtrlService::readState(int16_t* state, int32_t* maxnum) { *maxnum = 2; // 返回空压机状态 } else { state[0] = m_power_level; - *maxnum = 1; // 返回空压机状态 + state[1] = 0; // fbcnt + *maxnum = 2; // 返回空压机状态 } } diff --git a/usrc/dmapp_service/blower_ctrl_service.cpp b/usrc/dmapp_service/blower_ctrl_service.cpp index 54bc851..5fed440 100644 --- a/usrc/dmapp_service/blower_ctrl_service.cpp +++ b/usrc/dmapp_service/blower_ctrl_service.cpp @@ -33,7 +33,7 @@ typedef struct { uint32_t channle; ZGPIO enGpio; ZGPIO fbGpio; - int32_t blowerFbCnt; + uint16_t blowerFbCnt; } PwmBlower; static IOBlower ioblower; @@ -245,12 +245,12 @@ void BlowerCtrlService::readState(int16_t* state, int32_t* maxnum) { break; case kMiniPwmBlower: state[0] = m_powerVal; - state[1] = miniPwmBlower.blowerFbCnt; - *maxnum = 2; // + memcpy(&state[1], &miniPwmBlower.blowerFbCnt, 2); + *maxnum = 2; // break; default: state[0] = m_powerVal; - *maxnum = 1; + *maxnum = 1; break; } diff --git a/usrc/irq/hal_irq_processer.cpp b/usrc/irq/hal_irq_processer.cpp index 48694a5..8b4f1e8 100644 --- a/usrc/irq/hal_irq_processer.cpp +++ b/usrc/irq/hal_irq_processer.cpp @@ -4,8 +4,8 @@ using namespace iflytop; -uint32_t PC9_IRQ_CNT; -uint32_t PC4_IRQ_CNT; +uint16_t PC9_IRQ_CNT; +uint16_t PC4_IRQ_CNT; extern "C" { void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) { diff --git a/usrc/irq/hal_irq_processer.hpp b/usrc/irq/hal_irq_processer.hpp index 34adb68..46a0740 100644 --- a/usrc/irq/hal_irq_processer.hpp +++ b/usrc/irq/hal_irq_processer.hpp @@ -2,5 +2,5 @@ #include "base/appdep.hpp" -extern uint32_t PC9_IRQ_CNT; -extern uint32_t PC4_IRQ_CNT; +extern uint16_t PC9_IRQ_CNT; +extern uint16_t PC4_IRQ_CNT; diff --git a/usrc/project_configs.h b/usrc/project_configs.h index da17095..637480d 100644 --- a/usrc/project_configs.h +++ b/usrc/project_configs.h @@ -15,8 +15,6 @@ * @brief 基础配置 * */ -#define SOFTWARE_VERSION 203 // 软件版本 -#define HARDWARE_VERSION 1 // 硬件版本 #define PROJECT "transmit_disinfection_micro_re" // 工程名称 #define SN_HEADER "SN" // SN号前缀 #define DEBUG_UART huart1 // 调试串口 diff --git a/usrc/version.hpp b/usrc/version.hpp new file mode 100644 index 0000000..3e2f8d1 --- /dev/null +++ b/usrc/version.hpp @@ -0,0 +1,3 @@ +#pragma once +#define SOFTWARE_VERSION 204 // 软件版本 +#define HARDWARE_VERSION 1 // 硬件版本