mirror of
https://github.com/MarekZegare4/MeshCore-Solo.git
synced 2026-07-26 23:08:11 +00:00
72c07df8b3
- DualSerialInterface: guard writeFrame/isWriteBusy/isBLEConnected with _ble_enabled to avoid BLE-after-disable race - NearbyScreen: initialize all fields in constructor; promote D_* layout constants to class scope; clamp _dscroll on result count change; replace hardcoded 2 with D_VISIBLE in scroll logic; allow re-scan from detail view via KEY_CONTEXT_MENU/KEY_ENTER - variant.cpp: fix inconsistent indentation in initVariant() Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
69 lines
2.4 KiB
C++
69 lines
2.4 KiB
C++
#pragma once
|
|
|
|
#include "../BaseSerialInterface.h"
|
|
#include "../ArduinoSerialInterface.h"
|
|
#include "SerialBLEInterface.h"
|
|
|
|
// Wraps BLE + USB serial interfaces: BLE takes priority when connected,
|
|
// USB is always ready as a fallback.
|
|
// enable()/disable() control BLE only — USB is always on.
|
|
// BLE state machine is only pumped when BLE is enabled; USB is not read while BLE is connected.
|
|
class DualSerialInterface : public BaseSerialInterface {
|
|
SerialBLEInterface _ble;
|
|
ArduinoSerialInterface _usb;
|
|
uint8_t _ble_buf[MAX_FRAME_SIZE];
|
|
uint8_t _usb_buf[MAX_FRAME_SIZE];
|
|
bool _ble_enabled;
|
|
bool _ble_was_connected;
|
|
|
|
public:
|
|
DualSerialInterface() : _ble_enabled(false), _ble_was_connected(false) {}
|
|
|
|
void begin(const char* ble_prefix, char* node_name, uint32_t pin_code, Stream& usb_stream) {
|
|
_ble.begin(ble_prefix, node_name, pin_code);
|
|
_usb.begin(usb_stream);
|
|
_usb.enable(); // USB is always on
|
|
}
|
|
|
|
void enable() override { _ble.enable(); _ble_enabled = true; }
|
|
void disable() override { _ble.disable(); _ble_enabled = false; }
|
|
bool isEnabled() const override { return _ble_enabled; }
|
|
|
|
// Always true — USB is always available as fallback, so the mesh can send.
|
|
bool isConnected() const override { return true; }
|
|
// True only when a BLE companion app is paired and connected.
|
|
bool isBLEConnected() const override { return _ble_enabled && _ble.isConnected(); }
|
|
|
|
bool isWriteBusy() const override {
|
|
return (_ble_enabled && _ble.isConnected()) ? _ble.isWriteBusy() : _usb.isWriteBusy();
|
|
}
|
|
|
|
size_t writeFrame(const uint8_t src[], size_t len) override {
|
|
return (_ble_enabled && _ble.isConnected()) ? _ble.writeFrame(src, len) : _usb.writeFrame(src, len);
|
|
}
|
|
|
|
size_t checkRecvFrame(uint8_t dest[]) override {
|
|
if (_ble_enabled) {
|
|
size_t ble_len = _ble.checkRecvFrame(_ble_buf);
|
|
bool ble_now = _ble.isConnected();
|
|
|
|
if (ble_now) {
|
|
_ble_was_connected = true;
|
|
if (ble_len > 0) { memcpy(dest, _ble_buf, ble_len); return ble_len; }
|
|
return 0; // BLE active — don't read USB to keep its state machine clean
|
|
}
|
|
|
|
if (_ble_was_connected) {
|
|
// BLE just disconnected — reset USB state machine so stale partial frames don't block it
|
|
_ble_was_connected = false;
|
|
_usb.enable();
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
size_t usb_len = _usb.checkRecvFrame(_usb_buf);
|
|
if (usb_len > 0) { memcpy(dest, _usb_buf, usb_len); return usb_len; }
|
|
return 0;
|
|
}
|
|
};
|