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

fix(vd960DBN): 消灭 data_json[1024] 中间缓冲, 防 BSS 重叠致 MQTT 上报 _raw 异常

Browse Source 
- root cause: data_json[1024] + payload[1400] BSS 合计 2424B,
  叠加 iot_mqtt_srv.c 其他缓冲 (~9KB total), 在 48KB RAM 上
  与 mqttBuf[1024] 重叠, event_report 的 MQTT 二进制
  泄漏到 loop_data payload

- fix: 直接在 payload 构建完整 JSON, 省 1024B BSS
- defense: coil_count > 4 硬限, 防 0xC0 坏帧溢出
- JSON 输出格式不变

- also: set_response_tran_to_notify 加返回值
- also: uart_srv BLE 通知逻辑重构
This commit is contained in:
wangfq
2026-07-23 09:26:18 +08:00
parent 95a1d2b5d2
commit e11a80c859
4 changed files with 58 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vd960DBN/BLE/OnlyUpdateApp_Peripheral/APP/dbn_ble_srv.c
+1
View File
@@ -308,6 +308,7 @@ uint8_t set_response_tran_to_notify(uint8_t *dat_ori, uint8_t dat_len, BLE_Notif
}
notify_dst->len = dat_len;
notify_dst->flag = 1;
return notify_dst->flag;
}
vd960DBN/BLE/OnlyUpdateApp_Peripheral/APP/iot_mqtt_srv.c
+15 -12
View File
@@ -685,20 +685,28 @@ void iot_mqtt_publish_sensor(void) {
}
}
/*--- Step 4: 构建 JSON → 发布 (字段与 V1.02 协议一致) ---*/
static char data_json[1024];
/*--- Step 4: 构建 JSON → 发布 (字段与 V1.02 协议一致) ---
直接构建到 payload, 省掉 data_json[1024] 中间缓冲:
- 消除 BSS 压力 (省 1024B), 降低与 mqttBuf 重叠风险
- 消除 %s 拷贝尾部二进制残留的路径 (2026-07-23 _raw 事故)
- coil_count 边界硬限, 防 0xC0 坏帧致溢出 */
static char payload[1400];
char *p = data_json;
int remaining = sizeof(data_json);
char *p = payload;
int remaining = sizeof(payload);
int written;
const char *freq_level_names[] = {"high", "mid_high", "mid_low", "low"};
uint8_t i;
uint8_t coil_n = _cached_sr.coil_count;
if (coil_n > 4) coil_n = 4; /* 硬限: 防坏帧致 snprintf 循环溢出 */
written = snprintf(p, remaining, "{\"channels\":[");
/* 先写外层包装头 (msg_id/cmd/ts/data) */
written = snprintf(p, remaining,
"{\"msg_id\":%d,\"cmd\":\"loop_data\",\"ts\":%lu,\"data\":{\"channels\":[",
++g_iot_msg_id, dev_time_now());
if (written < 0 || written >= remaining) return;
p += written; remaining -= written;
for (i = 0; i < _cached_sr.coil_count; i++) {
for (i = 0; i < coil_n; i++) {
const LUP_CoilSensor *cs = &_cached_sr.coils[i];
const char *misc_type_str = "time";
uint32_t misc_val = 0;
@@ -725,12 +733,7 @@ void iot_mqtt_publish_sensor(void) {
p += written; remaining -= written;
}
snprintf(p, remaining, "]}");
/* Wrap and publish — V1.01 双主题模型: dld960/{sn}/dev */
snprintf(payload, sizeof(payload),
"{\"msg_id\":%d,\"cmd\":\"loop_data\",\"ts\":%lu,\"data\":%s}",
++g_iot_msg_id, dev_time_now(), data_json);
snprintf(p, remaining, "]}}");
{
char topic[IOT_MQTT_TOPIC_MAX_LEN];
vd960DBN/BLE/OnlyUpdateApp_Peripheral/APP/usart_biz.c
+8 -11
View File
@@ -172,10 +172,16 @@ void uart_srv(void)
if(g_dbn_ble_state_acs_enable.flag != 0){
// BLE ACS 已连接 → 改 Magic 为 0x8F 发给 BLE
g_pkg_uart_2.pkg[0] = 0x8F;
_report_flag = 1; // 保留给 BLE
g_flag_notify_temp = set_response_tran_to_notify(g_pkg_uart_2.pkg, g_pkg_uart_2.offset, &g_notify_buftemp); // 保留给 BLE
}
// else: 回调已推送 TCP，直接清理
}
else {
if(g_flag_bt_state){
g_flag_notify_temp = set_response_tran_to_notify(g_pkg_uart_2.pkg, g_pkg_uart_2.offset, &g_notify_buftemp);
InitPkgUart(&g_pkg_uart_2);
}
}
// 调试打印
for(i = 0; i < g_pkg_uart_2.offset; i++){
@@ -183,10 +189,6 @@ void uart_srv(void)
}
PRINT("\n");
if(_report_flag){
// 传感器帧保留在 pkg 中供上层 (tcp_json_srv) 处理
// 不 InitPkgUart — 由 tcp_json_push_sensor 消费后清理
}
}
else {
// 非 0x7F 魔法字节
@@ -199,16 +201,11 @@ void uart_srv(void)
if(g_flag_bt_state){
g_flag_notify_temp = set_response_tran_to_notify(g_pkg_uart_2.pkg, g_pkg_uart_2.offset, &g_notify_buftemp);
}
else{
g_dbn_ble_state_acs_enable.flag = 0;
}
// 只有非 _report_flag 时才立即清空
// _report_flag 的帧由 tcp_json_push_sensor 消费后清理
if (!_report_flag) {
InitPkgUart(&g_pkg_uart_2);
}
}
}