Retain independent RS232 in Full MQTT repeaters
This commit is contained in:
1 parent
292834c9b1
commit
6765100c3a
37 files changed
+1572
-196
No files matched your search
@@ -721,7 +721,7 @@ uint8_t MyMesh::handleAnonClockReq(const mesh::Identity& sender, uint32_t sender
|
||||
memcpy(&reply_data[4], &now, 4); // include our clock (for easy clock sync, and packet hash uniqueness)
|
||||
reply_data[8] = 0; // features
|
||||
#ifdef WITH_RS232_BRIDGE
|
||||
if (isBridgeRunning()) reply_data[8] |= 0x01; // is bridge, type UART
|
||||
if (isRs232BridgeRunning()) reply_data[8] |= 0x01; // is bridge, type UART
|
||||
#ifdef WITH_ESPNOW_BRIDGE
|
||||
if (isEspNowBridgeRunning()) reply_data[8] |= 0x03; // ESP-NOW may run alongside UART
|
||||
#endif
|
||||
@@ -1198,6 +1198,12 @@ void MyMesh::logRx(mesh::Packet *pkt, int len, float score) {
|
||||
active_bridge->sendPacket(pkt);
|
||||
}
|
||||
#endif
|
||||
#if defined(WITH_MQTT_BRIDGE) && defined(WITH_RS232_BRIDGE)
|
||||
// UART output remains independent of MQTT's RX/TX and enabled settings.
|
||||
if (_prefs.bridge_pkt_src == 1 && isRs232BridgeRunning()) {
|
||||
bridge->sendPacket(pkt);
|
||||
}
|
||||
#endif
|
||||
#if defined(WITH_ESPNOW_BRIDGE) \
|
||||
&& (defined(WITH_MQTT_BRIDGE) || defined(WITH_RS232_BRIDGE))
|
||||
// ESP-NOW follows bridge.source independently of the other transport's state.
|
||||
@@ -1250,6 +1256,11 @@ void MyMesh::logTx(mesh::Packet *pkt, int len) {
|
||||
active_bridge->sendPacket(pkt);
|
||||
}
|
||||
#endif
|
||||
#if defined(WITH_MQTT_BRIDGE) && defined(WITH_RS232_BRIDGE)
|
||||
if (_prefs.bridge_pkt_src == 0 && isRs232BridgeRunning()) {
|
||||
bridge->sendPacket(pkt);
|
||||
}
|
||||
#endif
|
||||
#if defined(WITH_ESPNOW_BRIDGE) \
|
||||
&& (defined(WITH_MQTT_BRIDGE) || defined(WITH_RS232_BRIDGE))
|
||||
if (_prefs.bridge_pkt_src == 0 && espnow_bridge.isRunning()) {
|
||||
@@ -3464,13 +3475,14 @@ MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondCloc
|
||||
, espnow_bridge(&_prefs, _mgr, &rtc)
|
||||
, shared_espnow_retry_at(0)
|
||||
#endif
|
||||
#elif defined(WITH_RS232_BRIDGE)
|
||||
#endif
|
||||
#if defined(WITH_RS232_BRIDGE)
|
||||
, bridge(nullptr)
|
||||
#if defined(WITH_ESPNOW_BRIDGE)
|
||||
#if defined(WITH_ESPNOW_BRIDGE) && !defined(WITH_MQTT_BRIDGE)
|
||||
, espnow_bridge(&_prefs, _mgr, &rtc)
|
||||
, shared_espnow_retry_at(0)
|
||||
#endif
|
||||
#elif defined(WITH_ESPNOW_BRIDGE)
|
||||
#elif defined(WITH_ESPNOW_BRIDGE) && !defined(WITH_MQTT_BRIDGE)
|
||||
, bridge(&_prefs, _mgr, &rtc)
|
||||
, shared_espnow_retry_at(0)
|
||||
#endif
|
||||
@@ -3655,11 +3667,17 @@ MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondCloc
|
||||
|
||||
// bridge defaults
|
||||
#if defined(WITH_RS232_BRIDGE) && defined(RS232_BRIDGE_MERGED) \
|
||||
&& !defined(RS232_BRIDGE_DEFAULT_ON)
|
||||
&& !defined(RS232_BRIDGE_DEFAULT_ON) && !defined(WITH_MQTT_BRIDGE)
|
||||
_prefs.bridge_enabled = 0; // normal repeater until explicitly enabled
|
||||
#else
|
||||
_prefs.bridge_enabled = 1; // enabled
|
||||
#endif
|
||||
#if defined(WITH_RS232_BRIDGE) && defined(RS232_BRIDGE_MERGED) \
|
||||
&& !defined(RS232_BRIDGE_DEFAULT_ON)
|
||||
_prefs.rs232_bridge_enabled = 0;
|
||||
#elif defined(WITH_RS232_BRIDGE)
|
||||
_prefs.rs232_bridge_enabled = 1;
|
||||
#endif
|
||||
#if defined(ESPNOW_BRIDGE_MERGED) && !defined(ESPNOW_BRIDGE_DEFAULT_ON)
|
||||
_prefs.espnow_bridge_enabled = 0; // merged normal repeater until explicitly enabled
|
||||
#else
|
||||
@@ -3828,7 +3846,7 @@ void MyMesh::begin(FILESYSTEM *fs) {
|
||||
mqtt_bridge = new MQTTBridge(node_info, _cli.getObserverPrefs(),
|
||||
getRTCClock(), &self_id);
|
||||
#endif
|
||||
#ifdef WITH_RS232_BRIDGE
|
||||
#if defined(WITH_RS232_BRIDGE) && !defined(WITH_MQTT_BRIDGE)
|
||||
if (!bridge) {
|
||||
bridge = createRS232Bridge();
|
||||
}
|
||||
@@ -3837,7 +3855,7 @@ void MyMesh::begin(FILESYSTEM *fs) {
|
||||
// partial object/GPS ownership. Advertisements and bridge.running report
|
||||
// the actual stopped state rather than the saved preference.
|
||||
MESH_DEBUG_PRINTLN("RS232 bridge configured on but failed to start");
|
||||
if (!setBridgeState(false)) {
|
||||
if (!setRs232BridgeState(false)) {
|
||||
MESH_DEBUG_PRINTLN(
|
||||
"RS232 bridge cleanup failed; UART/GPS ownership remains tracked");
|
||||
}
|
||||
@@ -3883,6 +3901,14 @@ void MyMesh::begin(FILESYSTEM *fs) {
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(WITH_MQTT_BRIDGE) && defined(WITH_RS232_BRIDGE)
|
||||
if (rs232BridgeEnabled() && !setRs232BridgeState(true)) {
|
||||
MESH_DEBUG_PRINTLN("RS232 bridge configured on but failed to start");
|
||||
if (!setRs232BridgeState(false)) {
|
||||
MESH_DEBUG_PRINTLN("RS232 bridge cleanup failed; UART/GPS ownership remains tracked");
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#if defined(WITH_ESPNOW_BRIDGE) \
|
||||
&& (defined(WITH_MQTT_BRIDGE) || defined(WITH_RS232_BRIDGE))
|
||||
if (_prefs.espnow_bridge_enabled) setEspNowBridgeState(true);
|
||||
@@ -12845,9 +12871,10 @@ void __attribute__((noinline)) MyMesh::servicePostMeshLoop() {
|
||||
else startSharedEspNowBridgeIfReady();
|
||||
#endif
|
||||
#endif
|
||||
#if defined(WITH_RS232_BRIDGE) \
|
||||
|| (defined(WITH_BRIDGE) && !defined(WITH_MQTT_BRIDGE) \
|
||||
&& !defined(WITH_ESPNOW_BRIDGE))
|
||||
#if defined(WITH_RS232_BRIDGE)
|
||||
if (isRs232BridgeRunning()) bridge->loop();
|
||||
#elif defined(WITH_BRIDGE) && !defined(WITH_MQTT_BRIDGE) \
|
||||
&& !defined(WITH_ESPNOW_BRIDGE)
|
||||
AbstractBridge* active_bridge = activeBridge();
|
||||
if (active_bridge && active_bridge->isRunning()) active_bridge->loop();
|
||||
#endif
|
||||
@@ -13515,6 +13542,9 @@ bool MyMesh::hasPendingWork() const {
|
||||
#if defined(WITH_BRIDGE)
|
||||
const AbstractBridge* active_bridge = activeBridge();
|
||||
if (active_bridge && active_bridge->isRunning()) return true;
|
||||
#if defined(WITH_MQTT_BRIDGE) && defined(WITH_RS232_BRIDGE)
|
||||
if (isRs232BridgeRunning()) return true;
|
||||
#endif
|
||||
#if defined(WITH_ESPNOW_BRIDGE) \
|
||||
&& (defined(WITH_MQTT_BRIDGE) || defined(WITH_RS232_BRIDGE))
|
||||
if (espnow_bridge.isRunning()) return true;
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <Arduino.h>
|
||||
#include <new>
|
||||
#include <Mesh.h>
|
||||
#if defined(ENABLE_OTA)
|
||||
#include <helpers/ota/OtaContext.h>
|
||||
@@ -583,14 +584,15 @@ class MyMesh : public mesh::Mesh, public CommonCLICallbacks
|
||||
ESPNowBridge espnow_bridge;
|
||||
uint32_t shared_espnow_retry_at = 0;
|
||||
#endif
|
||||
#elif defined(WITH_RS232_BRIDGE)
|
||||
#endif
|
||||
#if defined(WITH_RS232_BRIDGE)
|
||||
RS232Bridge* bridge;
|
||||
uint8_t active_rs232_bridge_uart = 0;
|
||||
#if defined(WITH_ESPNOW_BRIDGE)
|
||||
#if defined(WITH_ESPNOW_BRIDGE) && !defined(WITH_MQTT_BRIDGE)
|
||||
ESPNowBridge espnow_bridge;
|
||||
uint32_t shared_espnow_retry_at = 0;
|
||||
#endif
|
||||
#elif defined(WITH_ESPNOW_BRIDGE)
|
||||
#elif defined(WITH_ESPNOW_BRIDGE) && !defined(WITH_MQTT_BRIDGE)
|
||||
ESPNowBridge bridge;
|
||||
uint32_t shared_espnow_retry_at = 0;
|
||||
#endif
|
||||
@@ -1207,12 +1209,12 @@ public:
|
||||
RS232Bridge* createRS232Bridge() {
|
||||
#ifdef WITH_RS232_BRIDGE_ALT
|
||||
if (_prefs.bridge_uart == WITH_RS232_BRIDGE_ALT_UART) {
|
||||
return new RS232Bridge(&_prefs, WITH_RS232_BRIDGE_ALT,
|
||||
return new (std::nothrow) RS232Bridge(&_prefs, WITH_RS232_BRIDGE_ALT,
|
||||
WITH_RS232_BRIDGE_ALT_RX,
|
||||
WITH_RS232_BRIDGE_ALT_TX, _mgr, getRTCClock());
|
||||
}
|
||||
#endif
|
||||
return new RS232Bridge(&_prefs, WITH_RS232_BRIDGE,
|
||||
return new (std::nothrow) RS232Bridge(&_prefs, WITH_RS232_BRIDGE,
|
||||
WITH_RS232_BRIDGE_RX, WITH_RS232_BRIDGE_TX,
|
||||
_mgr, getRTCClock());
|
||||
}
|
||||
@@ -1278,11 +1280,55 @@ public:
|
||||
if (stopped && gps_released) active_rs232_bridge_uart = 0;
|
||||
return stopped && gps_released;
|
||||
}
|
||||
|
||||
bool rs232BridgeEnabled() const {
|
||||
#ifdef WITH_MQTT_BRIDGE
|
||||
return _prefs.rs232_bridge_enabled != 0;
|
||||
#else
|
||||
return _prefs.bridge_enabled != 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
bool isRs232BridgeRunning() const override {
|
||||
return bridge && bridge->isRunning();
|
||||
}
|
||||
|
||||
bool setRs232BridgeState(bool enable) override {
|
||||
if (!enable) {
|
||||
const bool stopped = endRS232Bridge();
|
||||
if (stopped) {
|
||||
delete bridge;
|
||||
bridge = nullptr;
|
||||
}
|
||||
return stopped;
|
||||
}
|
||||
if (isRs232BridgeRunning()) return true;
|
||||
// Retry any tracked GPS release before constructing a new UART owner.
|
||||
if (active_rs232_bridge_uart != 0 && !endRS232Bridge()) return false;
|
||||
if (!bridge) bridge = createRS232Bridge();
|
||||
return bridge && beginRS232Bridge();
|
||||
}
|
||||
|
||||
bool restartRs232Bridge() override {
|
||||
// Apply UART changes synchronously so a failed CLI change can restore
|
||||
// the previous pins/baud without disturbing MQTT or ESP-NOW.
|
||||
if (!endRS232Bridge()) return false;
|
||||
delete bridge;
|
||||
bridge = nullptr;
|
||||
return !rs232BridgeEnabled() || setRs232BridgeState(true);
|
||||
}
|
||||
#endif
|
||||
|
||||
bool isBridgeRunning() const override {
|
||||
#if defined(WITH_MQTT_BRIDGE) && defined(WITH_ESPNOW_BRIDGE)
|
||||
return (mqtt_bridge && mqtt_bridge->isRunning()) || espnow_bridge.isRunning();
|
||||
#if defined(WITH_MQTT_BRIDGE)
|
||||
return (mqtt_bridge && mqtt_bridge->isRunning())
|
||||
#ifdef WITH_ESPNOW_BRIDGE
|
||||
|| espnow_bridge.isRunning()
|
||||
#endif
|
||||
#ifdef WITH_RS232_BRIDGE
|
||||
|| isRs232BridgeRunning()
|
||||
#endif
|
||||
;
|
||||
#else
|
||||
const AbstractBridge* active_bridge = activeBridge();
|
||||
return active_bridge != nullptr && active_bridge->isRunning();
|
||||
@@ -1385,7 +1431,11 @@ public:
|
||||
|
||||
bool setBridgeState(bool enable) override {
|
||||
#if defined(WITH_MQTT_BRIDGE) && defined(WITH_ESPNOW_BRIDGE)
|
||||
if (!enable) return setEspNowBridgeState(false) && setMqttBridgeState(false);
|
||||
if (!enable) {
|
||||
const bool espnow_stopped = setEspNowBridgeState(false);
|
||||
const bool mqtt_stopped = setMqttBridgeState(false);
|
||||
return espnow_stopped && mqtt_stopped;
|
||||
}
|
||||
const bool mqtt_ok = _prefs.bridge_enabled
|
||||
? setMqttBridgeState(true) : setMqttBridgeState(false);
|
||||
const bool espnow_ok = _prefs.espnow_bridge_enabled
|
||||
@@ -1417,7 +1467,7 @@ public:
|
||||
if (!mqtt_bridge) return false;
|
||||
}
|
||||
#endif
|
||||
#ifdef WITH_RS232_BRIDGE
|
||||
#if defined(WITH_RS232_BRIDGE) && !defined(WITH_MQTT_BRIDGE)
|
||||
if (enable && !bridge) {
|
||||
bridge = createRS232Bridge();
|
||||
if (!bridge) return false;
|
||||
@@ -1449,7 +1499,7 @@ public:
|
||||
mqtt_bridge->setBuildDate(getBuildDate());
|
||||
mqtt_bridge->setStatsSources(this, _radio, _cli.getBoard(), _ms);
|
||||
#endif
|
||||
#ifdef WITH_RS232_BRIDGE
|
||||
#if defined(WITH_RS232_BRIDGE) && !defined(WITH_MQTT_BRIDGE)
|
||||
const bool started = beginRS232Bridge();
|
||||
#else
|
||||
configureBridgeFilter(active_bridge);
|
||||
@@ -1463,7 +1513,7 @@ public:
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifdef WITH_RS232_BRIDGE
|
||||
#if defined(WITH_RS232_BRIDGE) && !defined(WITH_MQTT_BRIDGE)
|
||||
const bool stopped = endRS232Bridge();
|
||||
delete bridge;
|
||||
bridge = nullptr;
|
||||
@@ -1487,13 +1537,15 @@ public:
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
return restartEspNowBridge() && restartMqttBridge();
|
||||
const bool mqtt_ok = restartMqttBridge();
|
||||
const bool espnow_ok = restartEspNowBridge();
|
||||
return mqtt_ok && espnow_ok;
|
||||
#else
|
||||
#if defined(WITH_ESPNOW_BRIDGE) && !defined(WITH_RS232_BRIDGE)
|
||||
if (_cli.getBoard()->isOTAUpdateRunning()) return false;
|
||||
shared_espnow_retry_at = 0;
|
||||
#endif
|
||||
#ifdef WITH_RS232_BRIDGE
|
||||
#if defined(WITH_RS232_BRIDGE) && !defined(WITH_MQTT_BRIDGE)
|
||||
// RS-232 changes must be applied synchronously so the CLI can commit or
|
||||
// roll back the selected pins/baud. This branch also reconstructs a bridge
|
||||
// after a prior allocation/start failure and is not WebConfig-coalesced.
|
||||
|
||||
Reference in new issue
Block a user