mirror of
https://github.com/meshtastic/firmware.git
synced 2026-09-16 00:10:11 -04:00
* indicator: RP2040 peripherals for the main firmware The SenseCAP Indicator RP2040 co-processor serves as a generic peripheral bridge over a serial protobuf link (interdevice.proto): - FakeI2C implements TwoWire and tunnels write and read transactions, so the standard sensor drivers and the I2C scan work unmodified on the bridged second bus (WIRE1) - FakeUART forwards GPS NMEA to the regular GPS driver - SD card access with chunked file transfers, paged directory listings and card statistics; device-ui loads map tiles and map styles from the card behind the RP2040 - link at 2M baud with 4KB chunks, message structs kept off task stacks Log messages carrying their own bracket tag render it like a thread name. Replaces the earlier IndicatorSensor/COBS approach. * indicator: address review Correlate responses with request ids, serialize the shared TX buffer, reject oversized frames, fix RX buffer overflow and NMEA truncation, full-length file paths. * indicator: assign the GPS FakeUART at runtime Static initialization order across translation units is undefined, so createGps() assigns and null-checks the bridged serial instead. Bound the NMEA length defensively. * indicator: bump device-ui pin to 27e6c0c * indicator: ping/pong link probe, non-blocking runOnce, FakeI2C locking The RP2040 sends nothing unsolicited without a GPS module attached, so wait_ready now probes with the new ping message instead of listening passively. runOnce skips its pump while a requester holds link_lock, keeping the main loop from blocking for a full request timeout. FakeI2C serializes transactions between the UI task and the main loop with an owner-tracked lock held from beginTransmission to transaction end. * indicator: link resync, config-honoring GPS, bridged-bus routing, stats validity Frame resync scans to the next magic instead of flushing the RX buffer, and the pump handles all buffered frames per pass. The RX drain reads in bulk and the protobuf encoder gets the correct buffer bound. GPS honors the gps_mode setting on the Indicator instead of always running. RTC, I2C keyboard and motion sensor drivers resolve WIRE1 through ScanI2CTwoWire::fetchI2CBus so bridged buses reach the right transport. FakeUART implements flush/availableForWrite/const-write from the Stream contract and fences its cross-core ring buffer. SdCardInfo.stats_valid is passed through to device-ui, and the remote FS backend gains the remove operation used for cleanup of failed tile saves. * indicator: retry lost link round trips, I2CResult UNSPECIFIED Remote FS operations retry once on a transport timeout. Correlation ids drop late responses of the first attempt; a retried append whose first attempt landed is recognized by the offset conflict carrying the resulting file size. Definitive failures are not retried, missing-tile probes stay a single round trip. Regenerated bindings add the I2CResult.Status UNSPECIFIED zero value so an empty result cannot decode as success. * indicator: nack responses, rename bridge classes to I2CProxy/UARTProxy A request the co-processor cannot decode or handle is nacked, so the requester fails fast instead of burning its timeout. All requests stage the shared tx_message under link_lock. FakeI2C and FakeUART are renamed to I2CProxy and UARTProxy after the pattern they implement, with their instances following suit. Drops dead code (unused NO_NEWS_PAUSE, unreachable not-running branches, doubled include guards) and the GPS pin log line that is meaningless on the tunneled port. * indicator: refuse a co-processor that speaks another protocol version The ping/pong handshake now carries InterdeviceVersion. A pong reporting a version other than ours means the RP2040 runs firmware that does not match this build, so the bridge stays shut down for the session and the mismatch is logged with both versions. Requests fail fast instead of being misinterpreted by the other side. * indicator: regen protos, interdevice protocol version 2 * indicator: per-task I2C contexts, gated handshake, retryable link failures The bridged I2C bus is shared between the main loop and the UI task, and TwoWire has no transaction bracket a lock can span: drivers drain the read buffer with available()/read() long after requestFrom() returned. Each calling task therefore gets its own staging and read buffers instead of a lock that could be left held (or that could not protect the read buffer anyway). The transaction is staged inside the link, under its lock. No request is sent before the co-processor has completed the version handshake, and runOnce keeps probing until it does, so a co-processor that boots slowly or reboots on its watchdog no longer leaves the bridge dead for the session. Requests in flight are counted, not flagged: two threads can be in a request and the first one out must not clear the other's state. File operations are retried on a lost frame and on a co-processor busy with card maintenance, but not on a refusal (nack) or a definitive failure, and they release the SPI lock while they wait so a slow link does not starve the radio. * indicator: fail safe on a peer mismatch, wait out card maintenance FileStatus moved to a fresh tag: reusing the tag of the removed success flag made every failure status decode as success on a peer that predates it. A card being mounted (busy) is retried rather than reported as an empty slot, and a co-processor busy with card maintenance is waited out: mounting takes seconds and the free space scan of a large card walks its whole FAT, which is not a reason to report a missing tile. The bridged I2C bus releases the SPI lock as well, so the keyboard scan on the UI task cannot starve the radio either. Slot claims in the I2C proxy are atomic, NMEA is not sent to a peer we refuse to talk to, and the handshake is completed by the unsolicited ping the co-processor sends when it has booted, which also reports a reboot. * indicator: regen protos, FileStatus back on the original tags * indicator: regen protos, ping/pong carry the InterdeviceVersion enum * indicator: point the protobufs submodule at the merged interdevice protos * indicator: pin device-ui to the branch with the remote SD support * indicator: honor the txOnly flag of flush, report dropped GPS writes flush() through a Stream pointer discarded the receive buffer: the flag is txOnly, and HardwareSerial::flush() keeps what has been received. write() reported bytes as written even when the link refused to send them. The link probe uses Throttle for its rate limit. * indicator: decide the log tag on the formatted message, hex request ids The thread tag was suppressed based on the printf template, which disagrees with the rendered message it is compared against: a format starting with a conversion could produce two tags, and one without a trailing bracket-space lost the tag entirely. vprintf now receives the thread name and picks. Also shifts only the bytes actually buffered after a frame, throttles with Throttle and logs request ids as hex. * indicator: SD mount, eject and format commands over the link * indicator: bound how long a busy card state blocks the UI task * indicator: a busy co-processor must not block the UI task for ever The busy retry re-armed its own budget on every busy answer, so a co-processor that stayed busy kept the caller in the loop with no way out. Transport retries and the wait for a busy card are now separate budgets that only count down. * indicator: start each request from an aligned receive buffer A byte run lost mid-response (a UART overflow during a 4KB tile chunk, when the display starves the RX interrupt) misaligns the assembly buffer. The buffer was never reset, so the poison outlived the request and cascaded into the following chunks of the same tile: one glitch dropped a whole multi-chunk tile, while single-chunk tiles resynced in the idle gap and survived. Each request now flushes the buffer first, bounding a glitch to the one chunk it hit. Adds resync/decode/timeout counters, logged rarely, to see the rate. * indicator: enlarge the LVGL heap for low-zoom map tiles The heap was 3MB and the image cache reserves 1.5MB of it, so a low-zoom map tile could not find a large enough contiguous block to decode and rendered white. 5MB of the 8MB PSRAM fixes it with room to spare. * indicator: advance the device-ui and protobufs pins to the merged commits Point the protobufs submodule at the merged SD command protos (protobufs #986) so it matches the checked in interdevice sources, and bump the device-ui archive to the current indicator branch tip that carries the SD button and format UI. * Update device-ui library dependency URL * remove cutom sdkconfig * remove duplicated synchronisation (after PR11278 is in place) * set commit reference to updated RemoteSDService class * Add board_level configuration for release * fix cppcheck errors --------- Co-authored-by: Manuel <71137295+mverch67@users.noreply.github.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: CodeRabbit <noreply@coderabbit.ai> Co-authored-by: mverch67 <manuel.verch@gmx.de>
145 lines
7.3 KiB
C++
145 lines
7.3 KiB
C++
#pragma once
|
|
|
|
#ifdef SENSECAP_INDICATOR
|
|
|
|
#include "concurrency/Lock.h"
|
|
#include "concurrency/OSThread.h"
|
|
#include "configuration.h"
|
|
|
|
#include "mesh/generated/meshtastic/interdevice.pb.h"
|
|
#include <atomic>
|
|
|
|
// Magic number at the start of all MT packets
|
|
#define MT_MAGIC_0 0x94
|
|
#define MT_MAGIC_1 0xc3
|
|
|
|
// The header is the magic number plus a 16-bit payload-length field
|
|
#define MT_HEADER_SIZE 4
|
|
|
|
#define PB_BUFSIZE (meshtastic_InterdeviceMessage_size + MT_HEADER_SIZE)
|
|
|
|
class SensecapIndicator : public concurrency::OSThread
|
|
{
|
|
public:
|
|
explicit SensecapIndicator(HardwareSerial &serial);
|
|
int32_t runOnce() override;
|
|
// Standalone send (e.g. NMEA from UARTProxy), takes link_lock to
|
|
// serialize the shared TX buffer against the request methods
|
|
bool send_uplink(const meshtastic_InterdeviceMessage &message);
|
|
|
|
// Run one tunneled I2C transaction: an optional write of wlen bytes
|
|
// followed by an optional read of rlen bytes with repeated start. The
|
|
// request is staged under the link lock, so callers need no locking.
|
|
bool i2c_transact(uint8_t address, const uint8_t *wbuf, size_t wlen, size_t rlen, meshtastic_I2CResult *result,
|
|
uint32_t timeout_ms = 100);
|
|
|
|
// Synchronous file operations against the SD card attached to the RP2040.
|
|
// The response (chunk data, file size, status) is written to *out.
|
|
// Returns false when the link is down or the request timed out; a
|
|
// request the co-processor answered is true, with out->status carrying
|
|
// the outcome (FILE_BUSY is worth retrying, the other failures are not).
|
|
bool file_read(const char *path, uint32_t offset, uint32_t length, meshtastic_FileTransfer *out, uint32_t timeout_ms = 1000);
|
|
// Sequential chunked write: create=true starts a new file (offset must be 0),
|
|
// create=false appends (offset must equal the current file size)
|
|
bool file_write(const char *path, uint32_t offset, const uint8_t *data, size_t len, bool create, meshtastic_FileTransfer *out,
|
|
uint32_t timeout_ms = 1000);
|
|
bool file_remove(const char *path, meshtastic_FileTransfer *out, uint32_t timeout_ms = 1000);
|
|
// List directory entries starting at entry number `offset` (paged,
|
|
// subdirectories get a trailing slash)
|
|
// the first page of a large directory has to walk it to the end to count
|
|
// the entries, so this one gets a longer budget
|
|
bool list_directory(const char *path, uint32_t offset, meshtastic_DirectoryListing *out, uint32_t timeout_ms = 5000);
|
|
// SD card statistics, answered from state the co-processor cached at
|
|
// mount time, so this never waits on the card. used/free are only
|
|
// meaningful once stats_valid is set: the FAT scan behind them runs in
|
|
// the background. `busy` means a card is being mounted right now.
|
|
bool sd_info(meshtastic_SdCardInfo *out, uint32_t timeout_ms = 500);
|
|
// Mount the card, or release it so it can be pulled safely. Answered with
|
|
// the card state as it is right now (a mount is still busy at that point).
|
|
bool sd_command(meshtastic_SdCommand command, meshtastic_SdCardInfo *out, uint32_t timeout_ms = 500);
|
|
|
|
// True when the last request was refused by the co-processor rather than
|
|
// lost: retrying it would only be refused again
|
|
bool last_request_nacked() const { return request_nacked; }
|
|
|
|
// True once the co-processor has answered and speaks our protocol
|
|
// version. Actively probes it (it never speaks unsolicited unless a GPS
|
|
// module is attached) and pumps the link until a pong arrives or the
|
|
// timeout expires. Used to defer bridge traffic until the co-processor
|
|
// has booted. A version mismatch fails permanently: no request is sent
|
|
// to a co-processor running incompatible firmware.
|
|
bool wait_ready(uint32_t timeout_ms);
|
|
|
|
private:
|
|
// The UI task requests map tiles while the main loop pumps the link;
|
|
// every send/pump sequence must hold this lock
|
|
concurrency::Lock link_lock;
|
|
pb_byte_t pb_tx_buf[PB_BUFSIZE] = {};
|
|
pb_byte_t pb_rx_buf[PB_BUFSIZE] = {};
|
|
size_t pb_rx_size = 0; // Number of bytes currently in the buffer
|
|
HardwareSerial *_serial = nullptr;
|
|
uint32_t packets_received = 0;
|
|
// The handshake gates the bridge: no request is sent before the
|
|
// co-processor has answered a ping with the protocol version we speak.
|
|
// A mismatch is permanent, a missing answer is retried by runOnce (the
|
|
// co-processor may boot slower than we do, or reboot on its watchdog).
|
|
bool link_compatible = false;
|
|
bool handshake_done = false;
|
|
uint32_t last_probe = 0;
|
|
// link health diagnostics for the map-tile transfers, reported rarely
|
|
uint32_t link_resyncs = 0;
|
|
uint32_t link_decode_fail = 0;
|
|
uint32_t link_timeouts = 0;
|
|
uint32_t last_link_report = 0;
|
|
meshtastic_I2CResult i2c_result = meshtastic_I2CResult_init_zero;
|
|
bool i2c_result_ready = false;
|
|
// Statically allocated message structs: with 4KB file chunks an
|
|
// InterdeviceMessage is ~4.6KB, too large for task stacks. Both are
|
|
// only touched while link_lock is held, so requests staged by one
|
|
// thread cannot be overwritten by another.
|
|
meshtastic_InterdeviceMessage rx_message = meshtastic_InterdeviceMessage_init_zero;
|
|
meshtastic_InterdeviceMessage tx_message = meshtastic_InterdeviceMessage_init_zero;
|
|
// Response destinations for the file operation in flight
|
|
meshtastic_FileTransfer *pending_file = NULL;
|
|
meshtastic_DirectoryListing *pending_dir = NULL;
|
|
meshtastic_SdCardInfo *pending_sd_info = NULL;
|
|
bool file_response_ready = false;
|
|
bool dir_response_ready = false;
|
|
bool sd_info_ready = false;
|
|
// responses echo the id of the request they answer, so a reply that
|
|
// arrives after its request timed out cannot satisfy a later request
|
|
uint32_t next_request_id = 0;
|
|
uint32_t expected_id = 0;
|
|
// a nack response fails the request in flight without its timeout
|
|
bool request_nacked = false;
|
|
// Number of requesters inside a request/response round trip, each
|
|
// holding link_lock for up to its timeout. runOnce skips its pump while
|
|
// this is nonzero so the cooperative main loop is not blocked on the
|
|
// lock for that long. A counter, not a flag: the UI task and the main
|
|
// loop can both be in a request, and the first one out must not clear
|
|
// the state of the other.
|
|
std::atomic<int> requests_in_flight{0};
|
|
struct InFlight {
|
|
std::atomic<int> &count;
|
|
explicit InFlight(std::atomic<int> &c) : count(c) { count++; }
|
|
~InFlight() { count--; }
|
|
};
|
|
bool link_ready();
|
|
void probe_link(); // caller holds link_lock
|
|
void note_handshake(uint32_t peer_version); // caller holds link_lock
|
|
uint32_t stamp_request(meshtastic_InterdeviceMessage &request);
|
|
bool send_uplink_unlocked(const meshtastic_InterdeviceMessage &message);
|
|
// callers hold link_lock (the request was staged in the shared tx_message)
|
|
bool file_request(meshtastic_InterdeviceMessage &request, meshtastic_FileTransfer *out, uint32_t timeout_ms);
|
|
bool wait_response(const bool &flag, uint32_t timeout_ms);
|
|
void pump();
|
|
size_t serial_check(char *buf, size_t space_left);
|
|
void check_packet();
|
|
bool handle_packet(size_t payload_len);
|
|
bool send(const char *buf, size_t len);
|
|
};
|
|
|
|
extern SensecapIndicator *sensecapIndicator;
|
|
|
|
#endif // SENSECAP_INDICATOR
|