From ae9f5eaf4cfbd93cdc647fd6423c5a3076540d58 Mon Sep 17 00:00:00 2001 From: wangfq Date: Mon, 17 Aug 2026 17:19:40 +0800 Subject: [PATCH] =?UTF-8?q?chore(vd960DBN):=20=E5=9B=BA=E4=BB=B6=E7=89=88?= =?UTF-8?q?=E6=9C=AC=201.02.01=20(=E4=B8=89=E6=AE=B5=E5=BC=8F)=20+=20cmcng?= =?UTF-8?q?.h=20=E6=B3=A8=E9=87=8A=E4=BF=AE=E5=A4=8D=20(2026-08-17)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 用户更新: - FIRMWARE_VER "1.02.01" (MAIN=1 SUB=2, 新增 FIRMWARE_VER_SUBSUB=1) - 注释修复: GBK 乱码注释恢复中文 (文件 GBK→UTF-8 编码转换, 中文注释正常) - 注意: BLE 上报仍为 MAIN/SUB 两字节 (1.02), SUBSUB 仅字符串上报使用 --- .../APP/include/cmcng.h | 49 +++++++++---------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/vd960DBN/BLE/OnlyUpdateApp_Peripheral/APP/include/cmcng.h b/vd960DBN/BLE/OnlyUpdateApp_Peripheral/APP/include/cmcng.h index d7224c8..8996ee1 100644 --- a/vd960DBN/BLE/OnlyUpdateApp_Peripheral/APP/include/cmcng.h +++ b/vd960DBN/BLE/OnlyUpdateApp_Peripheral/APP/include/cmcng.h @@ -11,12 +11,11 @@ #include #define PRODUCT_MODEL "DLD960GA" -/* 2026-08-17: 1.0 -> 1.1: stack-overflow fix (freq reset) + RAM slimming + UART2 RX DMA. - NOTE: string must match MAIN/SUB digits (was inconsistent: "1.0" vs MAIN=1 SUB=1) */ -#define FIRMWARE_VER "1.1" +#define FIRMWARE_VER "1.02.01" #define HARDWARE_VER "1.0" #define FIRMWARE_VER_MAIN 1 -#define FIRMWARE_VER_SUB 1 +#define FIRMWARE_VER_SUB 2 +#define FIRMWARE_VER_SUBSUB 1 #define HARDWARE_VER_MAIN 1 #define HARDWARE_VER_SUB 1 @@ -26,32 +25,32 @@ #define MAX_UART_TXRX_LEN 32 #define MAX_TOUCHUAN_DISABLE_TIME 15 -#define BT_DISABLE_IDLE_TIMEOUT 0 //10 // гʱ رʱ䣬Ĭ10 min +#define BT_DISABLE_IDLE_TIMEOUT 0 //10 // 蓝牙空闲超时 关闭时间，默认10 min typedef enum { - DDType_DNT900 = 1, //1 ???????? DNT900 - DDType_WireDUS, //2???????????? DG + DDType_DNT900 = 1, //1 区位有线 DNT900 + DDType_WireDUS, //2超声波车位有线 DG DDType_4G_1, - DDType_WireDus_Wb, //4 ???????????? ??? - DDType_LoraAreaMain, //5 Lora ?????? - DDType_LoraAreaSub, //6 Lora ??????? - DDType_LoraLotMain, //7 Lora ?????? - DDType_LoraLotSub, //8 Lora ??????? - DDType_LoraBroadcast, //9 Lora ???????? - DDType_LoraRelay, //10 Lora ?????? ???? DLR101 - DDType_Relay, //11 ?????????? ???RS485-2 ??? - DDType_4G_IOT, //12 4G ????????????????MQTT - DDType_Wire_Collect_IOT, //13 ??????????????????????MQTT - DDType_Wire_Display_IOT, //14 ?????????????????MQTT - DDType_Radar_Lot, //15 ??????? - + DDType_WireDus_Wb, //4 超声波车位有线 万泊 + DDType_LoraAreaMain, //5 Lora 区位主机 + DDType_LoraAreaSub, //6 Lora 区位从机 + DDType_LoraLotMain, //7 Lora 车位主机 + DDType_LoraLotSub, //8 Lora 车位从机 + DDType_LoraBroadcast, //9 Lora 广播模式 + DDType_LoraRelay, //10 Lora 中继， 使用 DLR101 + DDType_Relay, //11 中继模式， 通过RS485-2 收发 + DDType_4G_IOT, //12 4G 上报传感数据，使用MQTT + DDType_Wire_Collect_IOT, //13 有线，上报传感数据，使用MQTT + DDType_Wire_Display_IOT, //14 有线显示发布，使用MQTT + DDType_Radar_Lot, //15 雷达车位 + DDType_DLD950 = 20, //DLD950 DDType_DBN101 = 21, DDType_DNT910 = 22, //DNT910,DNT920 DDType_DNT920 = 23, - DDType_DLD950V4 = 24, + DDType_DLD950V4 = 24, // DLD960 }DG_Device_Type; typedef enum @@ -69,12 +68,12 @@ typedef struct _SUB_CODE_ENABLE_ uint8_t net_enable; uint8_t iot_enable; uint8_t custom_enable; - uint8_t loop_enable; // ??????? + uint8_t loop_enable; // 流量计数 uint8_t dgdus_enable; uint8_t wbdus_enable; uint8_t radar_enable; - uint8_t laser_enable; // lora?????????? - uint8_t lora_enable; // Lora ???? + uint8_t laser_enable; // lora激光雷达车位 + uint8_t lora_enable; // Lora 车位 //uint8_t input_enable; } Sub_Code_Enable; @@ -98,7 +97,7 @@ extern Pkg_Uart g_pkg_uart_2; typedef struct _DBN_BLE_STATE_ { uint8_t flag; // if need to report - uint8_t enable; // Ƿʹ + uint8_t enable; // 使能 uint8_t send_flag; uint8_t obj_amount; uint8_t cmd;