mirror of
https://github.com/MarekZegare4/MeshCore-Solo.git
synced 2026-07-26 23:08:11 +00:00
f5b3213f80
Merge 254 upstream commits. Highlights relevant to the Wio fork: native NRF52 companion power-saving (sleep when !hasPendingWork), preamble 16->32 for SF<9, generic sensor-registration model, CMD_SEND_RAW_PACKET, isEink() display abstraction, KEEP_DISPLAY_ON_USB, contacts-sync/transient fixes. Conflicts resolved (11 files): - buzzer.h/.cpp: keep NRF52 include guard + our begin()->startup(); fold in upstream doc comment. - platformio (wio + eink): keep our slim env layout, add upstream kiss_modem env (+ debug_tool=stlink on eink ble). - GxEPDDisplay.h: take upstream isEink() override. - EnvironmentSensorManager.h: take upstream's wider #if guard. - DataStore.cpp: take upstream saveContacts(filter) signature, keep our ::openWrite (member openWrite would shadow the global 2-arg overload). - main.cpp: keep our watchdog init + add board.onBootComplete(); adopt upstream's `if(!hasPendingWork()) sleep` loop. - MyMesh.h: version -> v1.16-solo.0, build date 6 Jun 2026. - MyMesh.cpp: keep both CMD codes (SCREENSHOT 66 + RAW_PACKET 65), both field inits, both handlers, our screenshot fns + upstream saveContacts/save_filter, upstream hasPendingWork() + our MyMeshBot include. - UITask.cpp: keep our solo splash/clock page/snprintf/buzzer init; merge auto-off (+ opt-in KEEP_DISPLAY_ON_USB); merge low-batt shutdown (our EMA + prefs threshold + upstream's !isExternalPowered() guard and eink-aware delay). Post-merge drift fixes (upstream API/architecture changes, not conflicts): - applyTxPower(): radio_set_tx_power() removed upstream -> radio_driver.setTxPower(). - Sensor refactor dropped the per-sensor *_initialized flags our getAvailableLPPTypes() relied on; removed that override and the SENSORS page now derives available LPP types from the populated sensors_lpp buffer. README kept ours via .gitattributes merge=ours. Builds verified on all 5 Wio envs (dual, eink dual, radio_ble, dual_dev, eink_dual_dev). Not yet hardware-verified. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
32 lines
1.2 KiB
C++
32 lines
1.2 KiB
C++
#pragma once
|
|
|
|
#include <Arduino.h>
|
|
|
|
#define MAX_FRAME_SIZE 176 // +4 for transport codes (region scoping)
|
|
|
|
class BaseSerialInterface {
|
|
protected:
|
|
BaseSerialInterface() { }
|
|
|
|
public:
|
|
virtual void enable() = 0;
|
|
virtual void disable() = 0;
|
|
virtual bool isEnabled() const = 0;
|
|
|
|
virtual bool isConnected() const = 0;
|
|
// Returns true when a BLE companion app is connected. Default delegates to
|
|
// isConnected(); override in dual-interface wrappers that always report
|
|
// isConnected()=true but still need to distinguish BLE from USB state.
|
|
virtual bool isBLEConnected() const { return isConnected(); }
|
|
// True when a companion app is actually connected over *any* transport
|
|
// (BLE bonded or a host holding the USB-CDC port open). Distinct from
|
|
// isConnected(), which a dual interface hardcodes true as a send fallback.
|
|
// Used for app-connected UI (Auto buzzer mute, message-wake). Default =
|
|
// isConnected() so single-transport interfaces are unchanged.
|
|
virtual bool isClientConnected() const { return isConnected(); }
|
|
|
|
virtual bool isWriteBusy() const = 0;
|
|
virtual size_t writeFrame(const uint8_t src[], size_t len) = 0;
|
|
virtual size_t checkRecvFrame(uint8_t dest[]) = 0;
|
|
};
|