mirror of
https://github.com/liquidraver/ZephCore.git
synced 2026-10-15 08:20:11 +00:00
liquidraver
38f815a0a1
Server roles (slice 7) - CommonCLI split into upstream's shape; region CLI moved into CommonCLI; ClientACL, RegionMap, TransportKeyStore and both server meshes in upstream shape over an Arduino compat shim (helpers/compat: Arduino.h, Stream/Print, Serial, SHA256, FILESYSTEM/File over Zephyr fs) - room server processAck port; `get acl` prints as upstream - room: default name Room-XXXX, display/input rotation, live radio UI refresh Event loops (slice 7b) - repeater and room server share server_main_common with a ServerRole descriptor; shared event bits in src/mesh_events.h - room server deadline-driven (idle wakes 2.2/s -> 0.08/s); companion loop() runs on housekeeping (closes the lazy contact-flush gap) - `get loop.wakes` in debug builds (CONFIG_ZEPHCORE_LOOP_WAKE_STATS) Companion transports and WiFi (slice 8) - upstream MultiSerialInterface: BLE, USB/UART and TCP are each a BaseSerialInterface, every connected transport gets every frame; CompanionSerial holds a lossless reply; shared frame_txq for BLE/TCP - SerialCompanionTransport and LinuxTCPTransport replaced by TcpCompanionTransport; ZephyrBLE split (gatt layout, DFU) - WiFi companion (upstream wifi.ssid/pwd/enabled CLI, TCP port 5000) on boards declaring `capabilities: wifi` in zephcore.yml: the PSRAM ESP32-S3 boards, plus Heltec V3 (140 contacts), Wireless Tracker (130) and both C6 boards (280); ESP32-S3 without PSRAM gets bounded WiFi buffers and a measured 72 KB heap; PSRAM boards' internal heap 72 KB - TCP queues: own depth (ZEPHCORE_TCP_QUEUE_SIZE=8), RX waits instead of dropping - RAM: companion ClientACL dropped; main/BT-TX/TCP stacks sized from measured peaks (-7 KB nRF companions, -9 KB ESP32 companions) - ESP32 WiFi stopped working under ~200 frames/s unicast. Fixed by: patches/zephyr/0017 never block the WiFi task in the RX callback; patches/zephyr/0018 lock shared_multi_heap (heap corruption with the WiFi heap in PSRAM); patches/modules/hal_espressif/0001 backport of hal_espressif af97fb02df (PSRAM realloc) Storage and prefs (slice 9) - prefs are now prefs.json through upstream's ConfigSerializer (ported verbatim), with upstream's key names for shared fields and ZephCore's own under "zc"; on first boot the binary new_prefs / repeater prefs is migrated and kept, so a downgrade still boots with the old settings - helpers/PrefsCodec: both legacy binary layouts (companion 272 B, server 311 B) as Zephyr-free codecs; sanitizeNodePrefs is the only validator - fix: server prefs could be replaced by a truncated file when a write failed; identity, prefs and channel writes go through one checked atomic replace (ZephyrFsUtil) - fix: a corrupt cad_auto byte turned adaptive CAD off instead of the default on - fix: a deliberate 300 s GPS duty on a repeater was rewritten to 48 h on every boot (that migration now runs on legacy files only) - one identity loader for all roles (IdentityFile); an unusable key file is always parked as .bad before regenerating - server store no longer stamps repeater defaults on room server and observer; companion first-boot volume policy moved into the store (adoptVolume) - ZephyrDataStore 1435 -> ~850 lines
97 lines
3.0 KiB
C++
97 lines
3.0 KiB
C++
/*
|
|
* SPDX-License-Identifier: MIT
|
|
* WiFi companion — see CompanionWifi.h. The CLI below is upstream's
|
|
* (examples/companion_radio/MyMesh.cpp, ENABLE_WIFI_INTERFACE), on our prefs
|
|
* and ZephyrWiFiStation instead of Arduino's WiFi class.
|
|
*/
|
|
|
|
#include "CompanionWifi.h"
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <zephyr/logging/log.h>
|
|
#include <helpers/TxtDataHelpers.h>
|
|
#include <ZephyrWiFiStation.h>
|
|
|
|
LOG_MODULE_REGISTER(zephcore_wifi_companion, CONFIG_ZEPHCORE_MAIN_LOG_LEVEL);
|
|
|
|
/* The station reads its SSID and password at every (re)connect; these copies
|
|
* keep a CLI change from taking effect before the reboot it asks for. */
|
|
static char s_ssid[sizeof(((NodePrefs *)0)->wifi_ssid)];
|
|
static char s_pwd[sizeof(((NodePrefs *)0)->wifi_pwd)];
|
|
|
|
void companion_wifi_start(const NodePrefs &prefs)
|
|
{
|
|
if (!prefs.wifi_enabled) {
|
|
LOG_INF("WiFi companion off (wifi.enabled 0)");
|
|
return;
|
|
}
|
|
if (prefs.wifi_ssid[0] == '\0') {
|
|
LOG_INF("WiFi companion: no network set (set wifi.ssid, wifi.pwd, reboot)");
|
|
return;
|
|
}
|
|
memcpy(s_ssid, prefs.wifi_ssid, sizeof(s_ssid));
|
|
memcpy(s_pwd, prefs.wifi_pwd, sizeof(s_pwd));
|
|
LOG_INF("WiFi companion: joining %s", s_ssid);
|
|
/* No SNTP time: the app sets the companion's clock, and time only moves
|
|
* forward (see time_sync.h). */
|
|
zc_wifi_station_start(s_ssid, s_pwd, nullptr);
|
|
}
|
|
|
|
bool companion_wifi_cli(const char *command, NodePrefs &prefs, void (*save)(void), char *reply)
|
|
{
|
|
if (memcmp(command, "set wifi.ssid ", 14) == 0) {
|
|
StrHelper::strncpy(prefs.wifi_ssid, &command[14], sizeof(prefs.wifi_ssid));
|
|
save();
|
|
sprintf(reply, "> wifi.ssid is now %s (set wifi.pwd too, then reboot)", prefs.wifi_ssid);
|
|
return true;
|
|
}
|
|
if (memcmp(command, "set wifi.pwd ", 13) == 0) {
|
|
StrHelper::strncpy(prefs.wifi_pwd, &command[13], sizeof(prefs.wifi_pwd));
|
|
save();
|
|
strcpy(reply, "> wifi.pwd updated (reboot to apply)");
|
|
return true;
|
|
}
|
|
if (strcmp(command, "get wifi.pwd") == 0) {
|
|
sprintf(reply, "> %s", prefs.wifi_pwd);
|
|
return true;
|
|
}
|
|
if (strcmp(command, "set wifi.clear") == 0) {
|
|
prefs.wifi_ssid[0] = 0;
|
|
prefs.wifi_pwd[0] = 0;
|
|
save();
|
|
strcpy(reply, "> wifi config cleared (reboot to apply)");
|
|
return true;
|
|
}
|
|
if (strcmp(command, "get wifi.ssid") == 0) {
|
|
sprintf(reply, "> %s", prefs.wifi_ssid[0] ? prefs.wifi_ssid : "(not set)");
|
|
return true;
|
|
}
|
|
if (memcmp(command, "set wifi.enabled ", 17) == 0) {
|
|
prefs.wifi_enabled = atoi(&command[17]) ? 1 : 0;
|
|
save();
|
|
sprintf(reply, "> wifi.enabled is now %d (reboot to apply)", prefs.wifi_enabled);
|
|
return true;
|
|
}
|
|
if (strcmp(command, "get wifi.enabled") == 0) {
|
|
sprintf(reply, "> %d", prefs.wifi_enabled);
|
|
return true;
|
|
}
|
|
if (strcmp(command, "get wifi.status") == 0) {
|
|
strcpy(reply, zc_wifi_station_is_connected() ? "> connected" : "> disconnected");
|
|
return true;
|
|
}
|
|
if (strcmp(command, "get wifi.ip") == 0) {
|
|
char ip[16];
|
|
|
|
if (zc_wifi_station_ip(ip, sizeof(ip))) {
|
|
sprintf(reply, "> %s", ip);
|
|
} else {
|
|
strcpy(reply, "> (not connected)");
|
|
}
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|