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瓒呭0娉㈣溅浣嶆湁绾 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 瓒呭0娉㈣溅浣嶆湁绾 涓囨硦 + 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 涓婃姤浼犳劅鏁版嵁锛屼娇鐢∕QTT + DDType_Wire_Collect_IOT, //13 鏈夌嚎锛屼笂鎶ヤ紶鎰熸暟鎹紝浣跨敤MQTT + DDType_Wire_Display_IOT, //14 鏈夌嚎鏄剧ず鍙戝竷锛屼娇鐢∕QTT + 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;