agessaman
8d7a47abf7
Append mqtt_neighbors_enabled(u8) + mqtt_neighbors_interval(u32) to the observer tail of MQTTPrefs. The layout is kept byte-identical to the flex neighbors build: the enable flag lands in the old struct's zeroed trailing padding (offset 2857) and the interval begins exactly at the former baseline (2860), so sizeof grows 2860 -> 2864 (net +4 bytes). offsetof static_asserts lock the layout so a mismatch fails the build. The codec now accepts three v1 payload sizes: register 2860 as a "pre-neighbors" Current payload so an in-lineage upgrade reads its existing /mqtt_prefs and defaults the neighbors tail (off / 24h). Because 2864 is the shared Current baseline, a /mqtt_prefs written by either the flex build or this firmware is interchangeable. Add the 12/24/336h interval constants, neighbors defaults, and a load-time interval clamp that keeps persisted values inside the signed-delta millis() scheduling window. Extend the host codec suite with a pre-neighbors migration case and neighbors round-trip coverage.
111 lines
3.8 KiB
C
111 lines
3.8 KiB
C
#pragma once
|
|
|
|
#ifdef WITH_MQTT_BRIDGE
|
|
|
|
#include <string.h>
|
|
#include <MeshCore.h>
|
|
#include "CommonCLI.h"
|
|
#include "MQTTPresets.h"
|
|
|
|
// Compile-time defaults for fresh /mqtt_prefs (override via platformio build_flags).
|
|
// Example:
|
|
// -D MQTT_DEFAULT_SLOT1_PRESET='"meshcore-ca-1"'
|
|
// -D MQTT_DEFAULT_IATA='"YYZ"'
|
|
// -D MQTT_DEFAULT_TIMEZONE='"America/Toronto"'
|
|
// -D MQTT_DEFAULT_TIMEZONE_OFFSET=-5
|
|
|
|
#ifndef MQTT_DEFAULT_SLOT1_PRESET
|
|
#define MQTT_DEFAULT_SLOT1_PRESET "analyzer-us"
|
|
#endif
|
|
#ifndef MQTT_DEFAULT_SLOT2_PRESET
|
|
#define MQTT_DEFAULT_SLOT2_PRESET "analyzer-eu"
|
|
#endif
|
|
#ifndef MQTT_DEFAULT_SLOT3_PRESET
|
|
#define MQTT_DEFAULT_SLOT3_PRESET "none"
|
|
#endif
|
|
#ifndef MQTT_DEFAULT_SLOT4_PRESET
|
|
#define MQTT_DEFAULT_SLOT4_PRESET "none"
|
|
#endif
|
|
#ifndef MQTT_DEFAULT_SLOT5_PRESET
|
|
#define MQTT_DEFAULT_SLOT5_PRESET "none"
|
|
#endif
|
|
#ifndef MQTT_DEFAULT_SLOT6_PRESET
|
|
#define MQTT_DEFAULT_SLOT6_PRESET "none"
|
|
#endif
|
|
|
|
#ifndef MQTT_DEFAULT_IATA
|
|
#define MQTT_DEFAULT_IATA ""
|
|
#endif
|
|
|
|
#ifndef MQTT_DEFAULT_TIMEZONE
|
|
#define MQTT_DEFAULT_TIMEZONE ""
|
|
#endif
|
|
|
|
#ifndef MQTT_DEFAULT_TIMEZONE_OFFSET
|
|
#define MQTT_DEFAULT_TIMEZONE_OFFSET 0
|
|
#endif
|
|
|
|
static inline void mqttDefaultSlotPreset(char* dest, size_t dest_size, const char* preset) {
|
|
const char* resolved = MQTT_PRESET_NONE;
|
|
if (preset && preset[0] != '\0') {
|
|
if (strcmp(preset, MQTT_PRESET_NONE) == 0 ||
|
|
strcmp(preset, MQTT_PRESET_CUSTOM) == 0 ||
|
|
findMQTTPreset(preset) != nullptr) {
|
|
resolved = preset;
|
|
} else {
|
|
MESH_DEBUG_PRINTLN("MQTT: invalid default preset '%s', using none", preset);
|
|
}
|
|
}
|
|
strncpy(dest, resolved, dest_size - 1);
|
|
dest[dest_size - 1] = '\0';
|
|
}
|
|
|
|
static inline void applyMQTTDefaults(MQTTPrefs* prefs) {
|
|
memset(prefs, 0, sizeof(MQTTPrefs));
|
|
prefs->mqtt_status_enabled = 1;
|
|
prefs->mqtt_packets_enabled = 1;
|
|
prefs->mqtt_raw_enabled = 0;
|
|
prefs->mqtt_tx_enabled = 2;
|
|
prefs->mqtt_rx_enabled = 1;
|
|
prefs->mqtt_status_interval = 300000;
|
|
prefs->wifi_power_save = 1;
|
|
|
|
mqttDefaultSlotPreset(prefs->mqtt_slot_preset[0], sizeof(prefs->mqtt_slot_preset[0]),
|
|
MQTT_DEFAULT_SLOT1_PRESET);
|
|
mqttDefaultSlotPreset(prefs->mqtt_slot_preset[1], sizeof(prefs->mqtt_slot_preset[1]),
|
|
MQTT_DEFAULT_SLOT2_PRESET);
|
|
mqttDefaultSlotPreset(prefs->mqtt_slot_preset[2], sizeof(prefs->mqtt_slot_preset[2]),
|
|
MQTT_DEFAULT_SLOT3_PRESET);
|
|
mqttDefaultSlotPreset(prefs->mqtt_slot_preset[3], sizeof(prefs->mqtt_slot_preset[3]),
|
|
MQTT_DEFAULT_SLOT4_PRESET);
|
|
mqttDefaultSlotPreset(prefs->mqtt_slot_preset[4], sizeof(prefs->mqtt_slot_preset[4]),
|
|
MQTT_DEFAULT_SLOT5_PRESET);
|
|
mqttDefaultSlotPreset(prefs->mqtt_slot_preset[5], sizeof(prefs->mqtt_slot_preset[5]),
|
|
MQTT_DEFAULT_SLOT6_PRESET);
|
|
|
|
if (MQTT_DEFAULT_IATA[0] != '\0') {
|
|
strncpy(prefs->mqtt_iata, MQTT_DEFAULT_IATA, sizeof(prefs->mqtt_iata) - 1);
|
|
prefs->mqtt_iata[sizeof(prefs->mqtt_iata) - 1] = '\0';
|
|
}
|
|
|
|
if (MQTT_DEFAULT_TIMEZONE[0] != '\0') {
|
|
strncpy(prefs->timezone_string, MQTT_DEFAULT_TIMEZONE, sizeof(prefs->timezone_string) - 1);
|
|
prefs->timezone_string[sizeof(prefs->timezone_string) - 1] = '\0';
|
|
}
|
|
prefs->timezone_offset = MQTT_DEFAULT_TIMEZONE_OFFSET;
|
|
|
|
// Observer non-MQTT defaults (moved out of NodePrefs/MyMesh ctor in Phase 2).
|
|
strncpy(prefs->snmp_community, "public", sizeof(prefs->snmp_community) - 1);
|
|
prefs->radio_watchdog_minutes = 5;
|
|
prefs->alert_wifi_minutes = 30;
|
|
prefs->alert_mqtt_minutes = 240;
|
|
prefs->alert_min_interval_min = 60;
|
|
|
|
// Neighbors publishing defaults off; a defaulted tail is a valid 24h interval
|
|
// (not 0) so an in-lineage upgrade from a pre-neighbors payload is sane.
|
|
prefs->mqtt_neighbors_enabled = 0;
|
|
prefs->mqtt_neighbors_interval = MQTT_NEIGHBORS_DEFAULT_INTERVAL_MS;
|
|
}
|
|
|
|
#endif // WITH_MQTT_BRIDGE
|