Merge branch 'dev' into rep-room-acl

# Conflicts: # examples/simple_repeater/main.cpp
2025-09-09 19:02:23 +10:00
parent 08f91f8d95 5344f04d89
commit e35183ae41
3 changed files with 15 additions and 17 deletions
--- a/examples/simple_repeater/MyMesh.h
+++ b/examples/simple_repeater/MyMesh.h
@@ -102,6 +102,11 @@ class MyMesh : public mesh::Mesh, public CommonCLICallbacks {
  uint8_t pending_sf;
  uint8_t pending_cr;
  int  matching_peer_indexes[MAX_CLIENTS];
+#if defined(WITH_RS232_BRIDGE)
+  RS232Bridge bridge;
+#elif defined(WITH_ESPNOW_BRIDGE)
+  ESPNowBridge bridge;
+#endif

  ClientInfo* putClient(const mesh::Identity& id);
  void putNeighbour(const mesh::Identity& id, uint32_t timestamp, float snr);