dandri/HaloKeymind
1
0
Fork 0
mirror of https://github.com/mikecarper/MeshCore.git synced 2026-07-28 12:59:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update MQTT presets to include 'nashmesh' and adjust related documentation. Modify error messages in CommonCLI for improved clarity.

Browse Source
This commit is contained in:
agessaman
2026-04-14 21:19:19 -07:00
parent ff2df2b712
commit 13fbcd9162
4 changed files with 2611 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/certs/x509_crt_bundle.bin
BIN
View File
Binary file not shown.
src/helpers/CommonCLI.cpp
+1 -1
View File
@@ -1467,7 +1467,7 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
}
}
} else {
strcpy(reply, "Error: valid presets are: analyzer-us, analyzer-eu, meshmapper, meshrank, waev, meshomatic, cascadiamesh, tennmesh, custom, none");
strcpy(reply, "Error: valid presets are: analyzer-us, analyzer-eu, meshmapper, meshrank, waev, meshomatic, cascadiamesh, tennmesh, nashmesh, custom, none");
}
} else if (memcmp(subcmd, "server ", 7) == 0) {
StrHelper::strncpy(_prefs->mqtt_slot_host[slot], &subcmd[7], sizeof(_prefs->mqtt_slot_host[slot]));
src/helpers/MQTTPresets.h
+3 -2
View File
@@ -27,7 +27,7 @@ enum MQTTTopicStyle : uint8_t {
};
struct MQTTPresetDef {
const char* name; // Preset identifier: "analyzer-us", "analyzer-eu", "meshmapper", "meshrank", "waev"
const char* name; // Preset identifier: "analyzer-us", "analyzer-eu", "meshmapper", "meshrank", "waev", ...
const char* server_url; // Full URL including scheme: "wss://host:port/path" or "mqtts://host:port"
const char* jwt_audience; // JWT audience field (only for MQTT_AUTH_JWT, nullptr otherwise)
const char* ca_cert; // PEM CA certificate (nullptr to skip cert pinning)
@@ -99,7 +99,7 @@ static const char ISRG_ROOT_X1[] PROGMEM =
"-----END CERTIFICATE-----\n";
// Number of built-in presets
static const int MQTT_PRESET_COUNT = 8;
static const int MQTT_PRESET_COUNT = 9;
// Built-in preset definitions (stored in flash)
static const MQTTPresetDef MQTT_PRESETS[MQTT_PRESET_COUNT] = {
@@ -111,6 +111,7 @@ static const MQTTPresetDef MQTT_PRESETS[MQTT_PRESET_COUNT] = {
{ "meshomatic", "wss://us-east.meshomatic.net:443/mqtt", "us-east.meshomatic.net", ISRG_ROOT_X1, MQTT_AUTH_JWT, MQTT_TOPIC_MESHCORE, 0, true, 55, nullptr, nullptr },
{ "cascadiamesh", "wss://mqtt-v1.cascadiamesh.org:443/mqtt", "mqtt-v1.cascadiamesh.org", ISRG_ROOT_X1, MQTT_AUTH_JWT, MQTT_TOPIC_MESHCORE, 0, true, 55, nullptr, nullptr },
{ "tennmesh", "mqtt://mqtt.tennmesh.com:1883", nullptr, nullptr, MQTT_AUTH_USERPASS, MQTT_TOPIC_MESHCORE, 0, true, 55, "mqttfeed", "tc2live" },
{ "nashmesh", "mqtt://mqtt.nashme.sh:1883", nullptr, nullptr, MQTT_AUTH_USERPASS, MQTT_TOPIC_MESHCORE, 0, true, 55, "meshdev", "large4cats" },
};
// Find a preset by name, returns nullptr if not found
ssl_certs/cacert.pem
+2607
View File
File diff suppressed because it is too large Load Diff