fix: 出厂默认 topic 使用真实设备序列号 + PRINT 修正
- cfig_flash.c: factory_dev_info() 用 gMacAddr 生成真实主题 dld960/{SN}/srv + dld960/{SN}/dev
- net_srv.h: TOPIC_DEFAULT 加注释标明为格式模板
- net_srv.c: 修复上次提交的 PRINT 宏转义异常
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
* @author wfq
|
||||
* @version V1.0
|
||||
* @date 2025-02-07
|
||||
* @brief ??????????¡ã?¡À???????????????
|
||||
* @brief ??????????��?��???????????????
|
||||
* @attention
|
||||
******************************************************************************
|
||||
*/
|
||||
@@ -89,11 +89,23 @@ void factory_dev_info(void)
|
||||
"password",
|
||||
0
|
||||
};
|
||||
|
||||
// 使用实际设备序列号生成默认 topic(V1.01 双主题协议)
|
||||
char sn_str[13];
|
||||
sprintf(sn_str, "%02X%02X%02X%02X%02X%02X",
|
||||
gMacAddr[0], gMacAddr[1], gMacAddr[2],
|
||||
gMacAddr[3], gMacAddr[4], gMacAddr[5]);
|
||||
char default_pub[64], default_sub[64];
|
||||
sprintf(default_pub, "dld960/%s/dev", sn_str);
|
||||
sprintf(default_sub, "dld960/%s/srv", sn_str);
|
||||
|
||||
IOT_Topic _topic = {
|
||||
0,
|
||||
TOPIC_DEFAULT_PUBLISH,
|
||||
TOPIC_DEFAULT_SUBSCRIBE
|
||||
{0},
|
||||
{0}
|
||||
};
|
||||
strncpy((char *)_topic.topic_pub, default_pub, MAX_TOPIC_LENGTH - 1);
|
||||
strncpy((char *)_topic.topic_sub, default_sub, MAX_TOPIC_LENGTH - 1);
|
||||
|
||||
write_net_config(&lcfg, &ccfg, &icfg, &_topic);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user