V204|

1. 添加新设备DT600B的支持
      2. 重构风机和空压机控制相关代码
      3. 支持风机状态和空压机状态读取协议支持

README.md

@@ -41,6 +41,11 @@
     V203
       1. 修改协议 kfn_disinfectant_bucket_level_sensor_read_level 名称和定义
       2. 修复部分BUG
+
+    V204
+      1. 添加新设备DT600B的支持
+      2. 重构风机和空压机控制相关代码
+      3. 支持风机状态和空压机状态读取协议支持
 ```
 
 ```c

app_protocols/transmit_disfection_protocol

@@ -1 +1 @@
-Subproject commit d1e20693ae72b61d3fcda318e698a9da25d263c4
+Subproject commit e63817fe9b7106a6da61e0f586fbdd4a305c907c

app_protocols/zscanprotocol

@@ -1 +1 @@
-Subproject commit 81529a15c57000f73cc5bd4b7276f567099b9988
+Subproject commit 75bfc77f79ad77e305a68bda7f8a0fcd90e29969

stm32components

@@ -1 +1 @@
-Subproject commit 2d392a81f356b3987da8eb7883dd002585c446b2
+Subproject commit 56543e221208090c57ba8448b751c454a83d4c86

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; }

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) {

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;  // 返回空压机状态
   }
 }
 

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,7 +245,7 @@ void BlowerCtrlService::readState(int16_t* state, int32_t* maxnum) {
       break;
     case kMiniPwmBlower:
       state[0] = m_powerVal;
-      state[1] = miniPwmBlower.blowerFbCnt;
+      memcpy(&state[1], &miniPwmBlower.blowerFbCnt, 2);
       *maxnum = 2;  //
       break;
     default:

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) {

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;

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                            // 调试串口

usrc/version.hpp

@@ -0,0 +1,3 @@
+#pragma once
+#define SOFTWARE_VERSION                   204                               // 软件版本
+#define HARDWARE_VERSION                   1                                 // 硬件版本