- A12 单一命令处理器(cmd*.c):一行 JSON 进出、seq 全局判重(32 条按值)、
限幅 / 空槽一律拒 / 拒绝记事件;命令号与错误码冻结(进 flash)。新增 power 命令,
fan 改为只抬不压的下限(t_thermal_set_floor)。rail_set_mv 注明不拿锁,调用方包 xact。
- A13 USB-Serial-JTAG 分帧(ulink*.c):@C / @R 前缀 + CRC-16,日志行首 @ 垫空格,
任意切块可切;关掉 USB 副控制台(它绕开驱动写 FIFO)。PC 端客户端 tools/prlink.py。
- A14 + C1(netcfg / mlink / cmd_net):topic phonerail/<mac>/{cmd,rsp,tele,state},
mqtts(evse-ca 编进固件)、1 s 遥测、遗嘱离线;wifi / mqtt 配置只收 USB、存 NVS,
net 永不回显密码。
- 协议定稿写进需求文档 §10.8(A12 / A13 / A14 三节);N7 撤销改 D7(机架管理前后端)。
宿主机 23 个 ctest / 400 例全绿;板 B 已烧 0.1.0-a14,经 WiFi → 公网 → 8883 TLS 真连网验过。
固件 0xE2220 / 1 MB 分区只剩 12%,C2 前要重排分区表。
Co-Authored-By: Claude Opus 5.5 <[email protected]>
147 行
4.2 KiB
C
147 行
4.2 KiB
C
/* 网络配置与状态。契约(尤其「密码永不外泄」与跨任务那两段)在 netcfg.h。 */
|
||
#include "netcfg.h"
|
||
|
||
#include <string.h>
|
||
|
||
#include "hal_lock.h"
|
||
|
||
static netcfg_t s_cfg;
|
||
static netcfg_save_fn s_save;
|
||
static netcfg_changed_fn s_changed;
|
||
static void *s_ctx;
|
||
static net_status_t s_st;
|
||
|
||
void netcfg_init(const netcfg_t *loaded, netcfg_save_fn save, netcfg_changed_fn changed, void *ctx)
|
||
{
|
||
hal_crit_enter();
|
||
memset(&s_cfg, 0, sizeof(s_cfg));
|
||
if (loaded != NULL) {
|
||
s_cfg = *loaded;
|
||
}
|
||
/* 从 flash 读回来的东西不可信:强制收尾,免得一个没带 0 的字段把后面的读穿。 */
|
||
s_cfg.ssid[NETCFG_SSID_MAX] = '\0';
|
||
s_cfg.pass[NETCFG_PASS_MAX] = '\0';
|
||
s_cfg.uri[NETCFG_URI_MAX] = '\0';
|
||
s_cfg.user[NETCFG_USER_MAX] = '\0';
|
||
s_cfg.mpass[NETCFG_MPASS_MAX] = '\0';
|
||
if (s_cfg.tele_ms < NETCFG_TELE_MIN_MS || s_cfg.tele_ms > NETCFG_TELE_MAX_MS) {
|
||
s_cfg.tele_ms = NETCFG_TELE_DEFAULT_MS;
|
||
}
|
||
memset(&s_st, 0, sizeof(s_st));
|
||
hal_crit_exit();
|
||
s_save = save;
|
||
s_changed = changed;
|
||
s_ctx = ctx;
|
||
}
|
||
|
||
void netcfg_get(netcfg_t *out)
|
||
{
|
||
hal_crit_enter();
|
||
*out = s_cfg;
|
||
hal_crit_exit();
|
||
}
|
||
|
||
static bool len_in(const char *s, size_t lo, size_t hi)
|
||
{
|
||
if (s == NULL) {
|
||
return false;
|
||
}
|
||
const size_t n = strlen(s);
|
||
return n >= lo && n <= hi;
|
||
}
|
||
|
||
bool netcfg_wifi_ok(const char *ssid, const char *pass)
|
||
{
|
||
/* 口令:空(开放网络)或 8~63 —— WPA2 的规定。7 位的口令驱动会静默连不上,
|
||
现象是「一直在连」,在这里拒掉比在那里猜强。 */
|
||
return len_in(ssid, 1, NETCFG_SSID_MAX) &&
|
||
(len_in(pass, 0, 0) || len_in(pass, 8, NETCFG_PASS_MAX));
|
||
}
|
||
|
||
bool netcfg_mqtt_ok(const char *uri, const char *user, const char *mpass, uint32_t tele_ms)
|
||
{
|
||
if (!len_in(uri, 8, NETCFG_URI_MAX) || !len_in(user, 0, NETCFG_USER_MAX) ||
|
||
!len_in(mpass, 0, NETCFG_MPASS_MAX)) {
|
||
return false;
|
||
}
|
||
/* mqtts://(TLS,CA 编在固件里,mlink_esp.c)或明文 mqtt://(只该用在局域网里)。
|
||
板子与服务器不在同一个局域网时只能走公网,那就必须是 mqtts。 */
|
||
const size_t head = (strncmp(uri, "mqtts://", 8) == 0) ? 8 : (strncmp(uri, "mqtt://", 7) == 0) ? 7 : 0;
|
||
if (head == 0 || uri[head] == '\0') {
|
||
return false;
|
||
}
|
||
return tele_ms == 0 || (tele_ms >= NETCFG_TELE_MIN_MS && tele_ms <= NETCFG_TELE_MAX_MS);
|
||
}
|
||
|
||
static hal_err_t commit(const netcfg_t *next)
|
||
{
|
||
if (s_save != NULL) {
|
||
const hal_err_t e = s_save(s_ctx, next);
|
||
if (e != HAL_OK) {
|
||
return e; /* 没存下就不改内存:重启之后与现在一致,比「现在生效、重启回滚」好查 */
|
||
}
|
||
}
|
||
hal_crit_enter();
|
||
s_cfg = *next;
|
||
hal_crit_exit();
|
||
if (s_changed != NULL) {
|
||
s_changed(s_ctx);
|
||
}
|
||
return HAL_OK;
|
||
}
|
||
|
||
hal_err_t netcfg_set_wifi(const char *ssid, const char *pass)
|
||
{
|
||
if (!netcfg_wifi_ok(ssid, pass)) {
|
||
return HAL_ERR_ARG;
|
||
}
|
||
netcfg_t next;
|
||
netcfg_get(&next);
|
||
memset(next.ssid, 0, sizeof(next.ssid));
|
||
memset(next.pass, 0, sizeof(next.pass));
|
||
strcpy(next.ssid, ssid);
|
||
strcpy(next.pass, pass);
|
||
return commit(&next);
|
||
}
|
||
|
||
hal_err_t netcfg_set_mqtt(const char *uri, const char *user, const char *mpass, uint32_t tele_ms)
|
||
{
|
||
if (!netcfg_mqtt_ok(uri, user, mpass, tele_ms)) {
|
||
return HAL_ERR_ARG;
|
||
}
|
||
netcfg_t next;
|
||
netcfg_get(&next);
|
||
memset(next.uri, 0, sizeof(next.uri));
|
||
memset(next.user, 0, sizeof(next.user));
|
||
memset(next.mpass, 0, sizeof(next.mpass));
|
||
strcpy(next.uri, uri);
|
||
strcpy(next.user, user);
|
||
strcpy(next.mpass, mpass);
|
||
next.tele_ms = tele_ms ? tele_ms : NETCFG_TELE_DEFAULT_MS;
|
||
return commit(&next);
|
||
}
|
||
|
||
void net_status_set(const net_status_t *st)
|
||
{
|
||
hal_crit_enter();
|
||
s_st = *st;
|
||
hal_crit_exit();
|
||
}
|
||
|
||
void net_status_get(net_status_t *st)
|
||
{
|
||
hal_crit_enter();
|
||
*st = s_st;
|
||
hal_crit_exit();
|
||
}
|
||
|
||
const char *net_state_str(net_state_t s)
|
||
{
|
||
switch (s) {
|
||
case NET_OFF: return "off";
|
||
case NET_CONNECTING: return "connecting";
|
||
case NET_UP: return "up";
|
||
}
|
||
return "?";
|
||
}
|