wangfq/vd_960
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

chore(vd960DBN): 固件版本 1.02.01 (三段式) + cmcng.h 注释修复 (2026-08-17)

Browse Source 
用户更新:
- FIRMWARE_VER "1.02.01" (MAIN=1 SUB=2, 新增 FIRMWARE_VER_SUBSUB=1)
- 注释修复: GBK 乱码注释恢复中文 (文件 GBK→UTF-8 编码转换, 中文注释正常)
- 注意: BLE 上报仍为 MAIN/SUB 两字节 (1.02), SUBSUB 仅字符串上报使用
This commit is contained in:
wangfq
2026-08-17 17:19:40 +08:00
parent 263dc4e05d
commit ae9f5eaf4c
1 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vd960DBN/BLE/OnlyUpdateApp_Peripheral/APP/include/cmcng.h
+23 -24
View File
@@ -11,12 +11,11 @@
#include <stdint.h> #include <stdint.h>
#define PRODUCT_MODEL "DLD960GA" #define PRODUCT_MODEL "DLD960GA"
/* 2026-08-17: 1.0 -> 1.1: stack-overflow fix (freq reset) + RAM slimming + UART2 RX DMA. #define FIRMWARE_VER "1.02.01"
NOTE: string must match MAIN/SUB digits (was inconsistent: "1.0" vs MAIN=1 SUB=1) */
#define FIRMWARE_VER "1.1"
#define HARDWARE_VER "1.0" #define HARDWARE_VER "1.0"
#define FIRMWARE_VER_MAIN 1 #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_MAIN 1
#define HARDWARE_VER_SUB 1 #define HARDWARE_VER_SUB 1
@@ -26,32 +25,32 @@
#define MAX_UART_TXRX_LEN 32 #define MAX_UART_TXRX_LEN 32
#define MAX_TOUCHUAN_DISABLE_TIME 15 #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 typedef enum
{ {
DDType_DNT900 = 1, //1 ???????? DNT900 DDType_DNT900 = 1, //1 区位有线 DNT900
DDType_WireDUS, //2???ù?¨???????? DG DDType_WireDUS, //2超声波车位有线 DG
DDType_4G_1, DDType_4G_1,
DDType_WireDus_Wb, //4 ???ù?¨???????? ?ò?? DDType_WireDus_Wb, //4 超声波车位有线 万泊
DDType_LoraAreaMain, //5 Lora ?????÷?ú DDType_LoraAreaMain, //5 Lora 区位主机
DDType_LoraAreaSub, //6 Lora ???????ú DDType_LoraAreaSub, //6 Lora 区位从机
DDType_LoraLotMain, //7 Lora ?????÷?ú DDType_LoraLotMain, //7 Lora 车位主机
DDType_LoraLotSub, //8 Lora ???????ú DDType_LoraLotSub, //8 Lora 车位从机
DDType_LoraBroadcast, //9 Lora ???????? DDType_LoraBroadcast, //9 Lora 广播模式
DDType_LoraRelay, //10 Lora ?????? ???? DLR101 DDType_LoraRelay, //10 Lora 中继， 使用 DLR101
DDType_Relay, //11 ?????????? ?¨??RS485-2 ??·? DDType_Relay, //11 中继模式， 通过RS485-2 收发
DDType_4G_IOT, //12 4G ??±¨??????????????MQTT DDType_4G_IOT, //12 4G 上报传感数据，使用MQTT
DDType_Wire_Collect_IOT, //13 ????????±¨??????????????MQTT DDType_Wire_Collect_IOT, //13 有线，上报传感数据，使用MQTT
DDType_Wire_Display_IOT, //14 ????????·?????????MQTT DDType_Wire_Display_IOT, //14 有线显示发布，使用MQTT
DDType_Radar_Lot, //15 ?×?????? DDType_Radar_Lot, //15 雷达车位
DDType_DLD950 = 20, //DLD950 DDType_DLD950 = 20, //DLD950
DDType_DBN101 = 21, DDType_DBN101 = 21,
DDType_DNT910 = 22, //DNT910,DNT920 DDType_DNT910 = 22, //DNT910,DNT920
DDType_DNT920 = 23, DDType_DNT920 = 23,
DDType_DLD950V4 = 24, DDType_DLD950V4 = 24, // DLD960
}DG_Device_Type; }DG_Device_Type;
typedef enum typedef enum
@@ -69,12 +68,12 @@ typedef struct _SUB_CODE_ENABLE_
uint8_t net_enable; uint8_t net_enable;
uint8_t iot_enable; uint8_t iot_enable;
uint8_t custom_enable; uint8_t custom_enable;
uint8_t loop_enable; // ?÷?????? uint8_t loop_enable; // 流量计数
uint8_t dgdus_enable; uint8_t dgdus_enable;
uint8_t wbdus_enable; uint8_t wbdus_enable;
uint8_t radar_enable; uint8_t radar_enable;
uint8_t laser_enable; // lora?¤???×?????? uint8_t laser_enable; // lora激光雷达车位
uint8_t lora_enable; // Lora ???? uint8_t lora_enable; // Lora 车位
//uint8_t input_enable; //uint8_t input_enable;
} Sub_Code_Enable; } Sub_Code_Enable;
@@ -98,7 +97,7 @@ extern Pkg_Uart g_pkg_uart_2;
typedef struct _DBN_BLE_STATE_ typedef struct _DBN_BLE_STATE_
{ {
uint8_t flag; // if need to report uint8_t flag; // if need to report
uint8_t enable; // 是否使能 uint8_t enable; // 使能
uint8_t send_flag; uint8_t send_flag;
uint8_t obj_amount; uint8_t obj_amount;
uint8_t cmd; uint8_t cmd;