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

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

Browse Source 
- 新增 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
Download Patch File Download Diff File Expand all files Collapse all files
BLE/DLD154Pro_Peripheral_28K/APP/dbn_ble_srv.c
+38
View File
@@ -429,6 +429,8 @@ static void unpack_pkg_set_cjq_param(uint8_t *pkg, uint8_t len)
g_loop_cng_unit.direction_mode = pkg[i++];
g_function_mode = (g_loop_cng_unit.direction_mode >> 4) & 0x0F;
g_fm_700bs_disable = g_function_mode & 0x01;
g_fm_radar_input_disable = (g_function_mode >> 1) & 0x01;
g_hold_time = g_loop_cng_unit.exist_mode * 20 * 5;
g_freq_sens = (g_loop_cng_unit.sensitvity > 0) ? (g_loop_cng_unit.sensitvity - 1) : 0;
@@ -637,6 +639,42 @@ void manage_dbn_ble_default(uint8_t *pkg, uint8_t len)
set_response_buf(&g_buf_ble_response, MAGIC_BYTE_DBN_DEFAULT, _cmd, tmp_ble_buf, i);
// PRINT("\nGet_Cjq_param\n");
} break;
case CMD_DBN_RW_UART_BAUD:{ // 读写波特率
uint8_t _rw = pkg[4];
uint32_t _baud = 0;
i = 0;
tmp_ble_buf[i++] = _rw;
tmp_ble_buf[i++] = 0x0; //status
if(_rw == 0){// read baud
tmp_ble_buf[i++] = g_max_counter_bt_min; // 表示空闲蓝牙超时关闭时间
tmp_ble_buf[i++] = (uint8_t)g_storage_uart_baud; //1 为485串口，g_storage_uart_baud；2 为TTL串口g_storage_uart_baud_2
tmp_ble_buf[i++] = (uint8_t)(g_storage_uart_baud >> 8);
tmp_ble_buf[i++] = (uint8_t)(g_storage_uart_baud >> 16);
tmp_ble_buf[i++] = g_rs485_id;
tmp_ble_buf[i++] = 0;
tmp_ble_buf[i++] = 0;
tmp_ble_buf[i++] = 0;
// 4BYte Reserved
}
else { // write baud
g_max_counter_bt_min = pkg[5];
g_storage_uart_baud = pkg[6];
g_storage_uart_baud |= (uint16_t)(pkg[7] << 8) & 0xFF00;
g_storage_uart_baud |= (uint32_t)(pkg[8] << 16) & 0xFF0000;
g_rs485_id = pkg[9];
tmp_ble_buf[i++] = g_max_counter_bt_min;
tmp_ble_buf[i++] = (uint8_t)g_storage_uart_baud;
tmp_ble_buf[i++] = (uint8_t)(g_storage_uart_baud >> 8);
tmp_ble_buf[i++] = (uint8_t)(g_storage_uart_baud >> 16);
tmp_ble_buf[i++] = g_rs485_id; tmp_ble_buf[i++] = 0x00; tmp_ble_buf[i++] = 0x00; tmp_ble_buf[i++] = 0x00; // 3BYte Reserved
write_cfg_to_store(ADDR_BT_Close_TIMEOUT_Offset, &tmp_ble_buf[2], 5);
}
set_response_buf(&g_buf_ble_response, MAGIC_BYTE_DBN_DEFAULT, _cmd, tmp_ble_buf, i);
} break;
// case CMD_DBN_LOOP_SAMPLE_PARAM:{
// // 获取/设置 地感采样参数
//// PRINT("SAMPLE_CNG: %02X\n", pkg[4]);
BLE/DLD154Pro_Peripheral_28K/APP/include/cmcng.h
+8
View File
@@ -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_ */
BLE/DLD154Pro_Peripheral_28K/APP/include/dbn_ble_srv.h
+2
View File
@@ -52,6 +52,8 @@
// #define CMD_SET_RELAY 0xC4
#define CMD_SENS_ACS_ENABLE 0xC5 // 设备主动上报 使能
#define CMD_DBN_RW_UART_BAUD 0x31
BLE/DLD154Pro_Peripheral_28K/APP/include/storage.h
+8
View File
@@ -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)
BLE/DLD154Pro_Peripheral_28K/APP/peripheral_main.c
+22
View File
@@ -33,7 +33,16 @@
uint8_t g_flag_bt_state = 0; // 0 蓝牙没有连接，1 有蓝牙连接
uint8_t g_function_mode = 0;
uint8_t g_fm_700bs_disable = 0; //0: 700bs protocol; 1 Modbus protocol
uint8_t g_fm_radar_input_disable = 0; //0: radar input enable; 1 reset
uint32_t g_sys_freq = 0;
uint8_t g_storage_uart_num = 0;
uint32_t g_storage_uart_baud = 19200;//9600;
uint8_t g_max_counter_bt_min = 0;
uint32_t g_max_counter_bt_timeout = 0; //BT_DISABLE_IDLE_TIMEOUT * 60 * 1000; // ms unit
uint8_t g_rs485_id = 0;
/*===========================================================================
* IO 宏定义 -- DLD154Pro 硬件资源
@@ -277,6 +286,11 @@ void factory_dev(void){
i = 4;
memcpy(&rBuf[i], &g_loop_cng_unit.sensitvity, 7);
i += 7;
rBuf[Addr_RS485_ID_Offset] = 1;
rBuf[Addr_RS485_Baud_Offset] = RS_BAUD_DEFAULT & 0xFF;
rBuf[Addr_RS485_Baud_Offset + 1] = (RS_BAUD_DEFAULT >> 8) & 0xFF;
rBuf[Addr_RS485_Baud_Offset + 2] = (RS_BAUD_DEFAULT >> 16) & 0xFF;
rBuf[ADDR_BT_Close_TIMEOUT_Offset] = 0;
i = Addr_Loop_Sens_List_Offset;
if(g_loop_sens_list.total > MAX_LOOP_SENS_AMOUNT)
@@ -313,11 +327,19 @@ void para_store_init(void)
memcpy(&g_loop_cng_unit, &rBuf[4], sizeof(g_loop_cng_unit));
memcpy(&g_loop_sens_list, &rBuf[Addr_Loop_Sens_List_Offset], sizeof(g_loop_sens_list));
g_rs485_id = rBuf[Addr_RS485_ID_Offset];
g_storage_uart_baud = rBuf[Addr_RS485_Baud_Offset] | (rBuf[Addr_RS485_Baud_Offset + 1] << 8) | (rBuf[Addr_RS485_Baud_Offset + 2] << 16);
g_max_counter_bt_min = rBuf[ADDR_BT_Close_TIMEOUT_Offset]; // unit: minute
g_max_counter_bt_timeout = g_max_counter_bt_min * 60 * 1000; // unit: ms
g_loop_out_delay = g_loop_cng_unit.delay_time * 2; // 定时器以 50ms 为单位, 延时以100ms为单位
g_hold_time = g_loop_cng_unit.exist_mode * 20 * 5; //50ms/per, period: 5s
g_safe_max_cnt = g_loop_cng_unit.loopSafe_Timeout * 10 * (1000 / 50);
g_freq_level = g_loop_cng_unit.loopFreq_Level - 1;
g_function_mode = g_loop_cng_unit.direction_mode >> 4;
g_fm_700bs_disable = g_function_mode & 0x01;
g_fm_radar_input_disable = (g_function_mode >> 1) & 0x01;
g_freq_sens = (g_loop_cng_unit.sensitvity > 0) ? (g_loop_cng_unit.sensitvity - 1) : 0;
#ifdef DEBUG