feat: BLE 新增 RS485 地址/波特率读写 + 空闲关蓝牙超时 + 功能码细分

- 新增 CMD_DBN_RW_UART_BAUD (0x31): 读写 RS485 波特率、485 地址、空闲关蓝牙超时
- storage.h: 新增 flash 地址 ADDR_BT_Close_TIMEOUT_Offset(0x10)、Addr_RS485_Baud_Offset(0x11,3B)、Addr_RS485_ID_Offset(0x14)
- 功能码细分: g_function_mode bit0→fm_700bs_disable(0=700BS/1=Modbus), bit1→fm_radar_input_disable(0=光耦/1=复位)
- factory_dev 出厂默认: RS485 ID=1, 波特率=9600, 蓝牙超时=0
- para_store_init 上电从 flash 恢复所有新增配置
This commit is contained in:
wangfq
2026-07-22 14:25:32 +08:00
parent e581479071
commit 441a3e61cb
5 changed files with 78 additions and 0 deletions
@@ -41,11 +41,19 @@ extern uint32_t g_loop_cut_amount;
extern uint8_t g_loop_power_up_state;
extern uint8_t g_function_mode;
extern uint8_t g_fm_700bs_disable ; //0: 700bs protocol; 1 Modbus protocol
extern uint8_t g_fm_radar_input_disable; //0: radar input enable; 1 reset
/* 新算法状? (DLD154V4B 移植) */
extern uint8_t g_loop_stable; // 稳定期结束标? (0=收敛?, 1=稳定)
extern uint8_t g_env_activity; // 环境活跃? (BLE condition 字段来源)
extern uint8_t g_storage_uart_num;
extern uint32_t g_storage_uart_baud;
extern uint8_t g_max_counter_bt_min;
extern uint32_t g_max_counter_bt_timeout;
extern uint8_t g_rs485_id;
uint32_t mstick(void);
#endif /* INCLUDE_CMCNG_H_ */
@@ -52,6 +52,8 @@
// #define CMD_SET_RELAY 0xC4
#define CMD_SENS_ACS_ENABLE 0xC5 // 设备主动上报 使能
#define CMD_DBN_RW_UART_BAUD 0x31
@@ -26,12 +26,20 @@
// #define Addr_Release_Rate_Weight 0x1E
// #define Addr_Release_Rate_Mode 0x1F
#define ADDR_BT_Close_TIMEOUT_Offset 0x10
#define Addr_RS485_Baud_Offset 0x11 // 3 byte
#define Addr_RS485_ID_Offset 0x14 // 1 byte
#define Addr_Loop_Sens_List_Offset 0x20
#define Addr_Sens_Array_In 0x20
#define Addr_Sens_Array_Out 0x30
#define RS_BAUD_DEFAULT 9600
#define MAX_LOOP_SENS_AMOUNT 3 // 4 // 5
#pragma pack(1)