mirror of
https://github.com/MarekZegare4/MeshCore-Solo.git
synced 2026-09-14 15:16:40 +00:00
Code-review pass over the buzzer/sim commits turned up several real bugs,
plus two issues found afterward from manual browser testing:
Rendering (SimDisplayDriverCanvas, variants/sim/SimDisplayDriver.h + target.cpp):
- getTextWidth() measured UTF-8 BYTES (strlen()*6), not codepoints. Since
b067e95b stopped stripping accents, any accented string now measures
double its real width -- mis-centred titles, premature ellipsis/marquee,
badges pushed off-screen. Now uses the real MiscFixedRenderer measurement
(miscFixedTextWidth()), same as SH1106Display/SSD1306Display.
- Added the matching getCodepointWidth() override (O(1) single-glyph
advance), same pattern as SSD1306Display.
- isSingleFont() was left at the base class's `false`, though this backend
only ever renders MiscFixed -- UITask.cpp's status-bar indicator height
keys off this (`lh-2` vs `lh`), so the sim drew it 2px taller than a real
board.
- print() blitted the full 128x64 canvas on every call (dozens per frame,
60fps) -- now tracks a dirty bounding box and only clears/blits the
region actually touched.
Web Audio (buzzer bridge, index.html + mesh.html):
- No AudioContext.resume() -- a context created (or later suspended) in the
'suspended' state (Safari/Firefox, or any browser backgrounding the tab)
stayed silent forever. Now resumed on every gesture.
- linearRampToValueAtTime with no anchoring setValueAtTime interpolates
from the LAST scheduled event, not "now" -- so the anti-click ramps could
effectively snap instead of fading. Fixed with cancelScheduledValues +
setValueAtTime(current) before each ramp.
- mesh.html: a gesture only armed the clicked instance's audio. Click A,
send A->B, and B (the one actually meant to beep on receipt) stayed
silent. Now any gesture arms both A and B.
- RTTTL rests (freq=0, still "playing") now explicitly hold pitch and drop
gain instead of it happening to work by coincidence.
Misc: sim_test_get_num_contacts() was missing the g_sim_ready gate every
other sim_test_* hook has, so it could return a bogus negative count before
setup() finishes seeding num_contacts.
Splash screen missing "Solo <version>" bar: variants/sim never defined
FIRMWARE_SOLO_BUILD (every real Solo board does), so SplashScreen silently
skipped that whole line -- the sim looked like a plain non-Solo companion
build. Added -D FIRMWARE_SOLO_BUILD=1 to platformio.ini and build_wasm.sh.
Verified on a real canvas screenshot: "MESHCORE 1.17.1 / 19 Aug 2026 /
Solo v1.27".
Wasm-fetch error message: "failed to start: RuntimeError: Aborted(both
async and sync fetching of the wasm failed)" is Emscripten's own opaque
message for the single most common real cause -- the page opened via
file://...index.html instead of served over http(s) (fetch() on a local
file is blocked by CORS in both Chrome and Safari, confirmed by reproducing
the exact same error/stack via file://). Both harnesses now detect
location.protocol === 'file:' and show an actionable message with the
one-line fix instead of the raw stack trace.
Battery-set latency: SimMainBoard's battery value is an exact, instantaneous
JS-set integer (see sim_battery_set_mv()), but UITask's battery-check code
polls it every 8s and runs it through an EMA (alpha=0.2) meant to smooth a
REAL board's noisy ADC -- so a value typed into the demo UI could take tens
of seconds to visibly settle. SIM_PLATFORM now checks every 250ms and skips
the EMA (nothing to smooth), since the reading is already clean. Measured
on real canvas pixels: indicator update now lands within one screen-refresh
cycle instead of up to 8s+.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
161 lines
6.9 KiB
C++
161 lines
6.9 KiB
C++
#include <Arduino.h>
|
|
#include <cstring>
|
|
#include "target.h"
|
|
#include "SimRNG.h"
|
|
|
|
// Global stdout-backed Serial object, declared extern in Arduino.h.
|
|
SimSerialClass Serial;
|
|
|
|
SimMainBoard board;
|
|
SimRadio radio_driver;
|
|
SimRTCClock rtc_clock;
|
|
// Phase 4: SimSensorManager wires in the sim's GPS + one JS-settable
|
|
// environment channel -- see SimSensorManager.h (its methods' bodies are
|
|
// defined further down in this file, not there, for the reason explained
|
|
// in that header's comment).
|
|
SimSensorManager sensors;
|
|
|
|
#ifdef DISPLAY_CLASS
|
|
DISPLAY_CLASS display;
|
|
#endif
|
|
|
|
// SimSensorManager's methods (see that header's comment on why they're
|
|
// defined here rather than inline).
|
|
LocationProvider* SimSensorManager::getLocationProvider() {
|
|
return &sim_location_provider();
|
|
}
|
|
|
|
bool SimSensorManager::querySensors(uint8_t requester_permissions, CayenneLPP& telemetry) {
|
|
if ((requester_permissions & TELEM_PERM_LOCATION) && sim_location_provider().isValid()) {
|
|
telemetry.addGPS(TELEM_CHANNEL_SELF, (float)node_lat, (float)node_lon, (float)node_altitude);
|
|
}
|
|
if (requester_permissions & TELEM_PERM_ENVIRONMENT) {
|
|
telemetry.addTemperature(TELEM_CHANNEL_SELF + 1, envTemperatureRef());
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool radio_init() {
|
|
// No real radio hardware to initialise -- always succeeds (see
|
|
// variants/sim/SimRadio.h; Phase 3 of the sim plan is where two SimRadio
|
|
// instances actually exchange bytes through a shared in-memory "ether").
|
|
return true;
|
|
}
|
|
|
|
mesh::LocalIdentity radio_new_identity() {
|
|
static SimRNG rng;
|
|
rng.begin();
|
|
return mesh::LocalIdentity(&rng);
|
|
}
|
|
|
|
// DISPLAY_CLASS too, not just __EMSCRIPTEN__: SimDisplayDriverCanvas itself
|
|
// only exists when DISPLAY_CLASS is defined (target.h only #includes
|
|
// SimDisplayDriver.h -- where the class lives -- inside its own #ifdef
|
|
// DISPLAY_CLASS block), and the headless repeater/room_server wasm builds
|
|
// never define DISPLAY_CLASS at all. This was a latent gap from the
|
|
// pixel-perfect-font change (companion_radio's own build_wasm.sh happens to
|
|
// always define DISPLAY_CLASS, so it never surfaced there) -- only found now
|
|
// that build_wasm_repeater.sh got rebuilt for Phase 4.
|
|
#if defined(__EMSCRIPTEN__) && defined(DISPLAY_CLASS)
|
|
// Real bitmap-font text rendering for SimDisplayDriverCanvas::print()
|
|
// (declared in SimDisplayDriver.h, defined here -- the one TU allowed to
|
|
// include MiscFixedRenderer.h; see that header's own "include only from a
|
|
// .cpp" comment). Uses the exact same font tables + glyph-plotting math a
|
|
// real MeshCore-Solo board renders with OLED_MISC_FIXED_FONT=1 (see
|
|
// solo/heltec_v3/platformio.ini), instead of the browser's own system font.
|
|
// Adafruit_GFX.h/.cpp branch on `#if ARDUINO >= 100` in exactly two spots
|
|
// (which Arduino.h to #include, and whether write(uint8_t) returns size_t
|
|
// or void) -- our own Arduino.h shim deliberately never defines ARDUINO
|
|
// globally (other vendored libs branch on #ifdef ARDUINO to pick their
|
|
// portable std:: path instead of Arduino String/Stream), so define it here,
|
|
// scoped to this one translation unit, purely so Adafruit_GFX picks the
|
|
// modern branch that actually matches our Print.h shim's
|
|
// `size_t write(uint8_t)` signature.
|
|
#define ARDUINO 100
|
|
#include <Adafruit_GFX.h>
|
|
#include <helpers/ui/MiscFixedRenderer.h>
|
|
|
|
// Adafruit_GFX subclass that plots into a plain 128x64 byte buffer (one
|
|
// pixel per byte, 0/1) instead of real display hardware -- drawPixel() is
|
|
// the only thing MiscFixedRenderer.h's glyph-plotting code and
|
|
// Adafruit_GFX's own fillRect()/writeFillRect() (used for the "unmapped
|
|
// codepoint" substitution box) ultimately call down to.
|
|
class SimGfxCanvas : public Adafruit_GFX {
|
|
public:
|
|
uint8_t px[128 * 64];
|
|
// Inclusive bounding box of everything plotted since the last resetDirty().
|
|
// Without it, print() blitted all 8192 cells on every single call -- and a
|
|
// busy screen makes dozens of print() calls per frame, at 60fps, so the
|
|
// JS-side pixel loop dominated the whole frame budget for what is usually
|
|
// one short row of text.
|
|
int dx0, dy0, dx1, dy1;
|
|
SimGfxCanvas() : Adafruit_GFX(128, 64) { memset(px, 0, sizeof(px)); resetDirty(); }
|
|
void resetDirty() { dx0 = 128; dy0 = 64; dx1 = -1; dy1 = -1; }
|
|
bool isDirty() const { return dx1 >= dx0 && dy1 >= dy0; }
|
|
void drawPixel(int16_t x, int16_t y, uint16_t color) override {
|
|
if ((unsigned)x >= 128 || (unsigned)y >= 64) return;
|
|
px[y * 128 + x] = (color != 0) ? 1 : 0;
|
|
if (x < dx0) dx0 = x;
|
|
if (x > dx1) dx1 = x;
|
|
if (y < dy0) dy0 = y;
|
|
if (y > dy1) dy1 = y;
|
|
}
|
|
};
|
|
|
|
// Real MiscFixed metrics, same source of truth the glyph plotting above
|
|
// uses -- see SimDisplayDriver.h for why these are here and not inline.
|
|
uint16_t SimDisplayDriverCanvas::getTextWidth(const char* str) {
|
|
return str ? miscFixedTextWidth(str, _text_sz) : 0;
|
|
}
|
|
|
|
uint16_t SimDisplayDriverCanvas::getCodepointWidth(uint32_t cp) {
|
|
return miscFixedXAdvance(cp, _text_sz);
|
|
}
|
|
|
|
void SimDisplayDriverCanvas::print(const char* str) {
|
|
if (!str) return;
|
|
static SimGfxCanvas gfx;
|
|
// Only the previously-dirtied region needs clearing, not all 8 KB.
|
|
if (gfx.isDirty()) {
|
|
for (int y = gfx.dy0; y <= gfx.dy1; y++)
|
|
memset(&gfx.px[y * 128 + gfx.dx0], 0, (size_t)(gfx.dx1 - gfx.dx0 + 1));
|
|
}
|
|
gfx.resetDirty();
|
|
gfx.setCursor(_cursor_x, _cursor_y);
|
|
// color arg is just our own internal "lit" marker (1) -- the real on-screen
|
|
// amber/black choice is applied once at blit time below, from _color, same
|
|
// as every other primitive in this class. sz is the real current text
|
|
// size (set via setTextSize(), e.g. the Clock screen's big digits) --
|
|
// miscFixedPrint()/miscFixedDrawGlyph() scale both the glyph pixels and
|
|
// the advance width by it already.
|
|
miscFixedPrint(gfx, str, _text_sz, 1);
|
|
|
|
// startFrame() already blanks the whole canvas to black every frame, so
|
|
// only the lit pixels need drawing here -- unlit buffer cells are already
|
|
// correct background. One EM_ASM call blits the buffer (reading it directly
|
|
// out of wasm memory, same pattern as drawXbm() below) rather than one call
|
|
// per glyph pixel, and only over the rows/columns this string actually
|
|
// touched rather than the full 128x64.
|
|
if (gfx.isDirty()) {
|
|
EM_ASM({
|
|
if (!Module.__simCtx) return;
|
|
var ctx = Module.__simCtx;
|
|
var buf = $0;
|
|
ctx.fillStyle = UTF8ToString($5) === 'L' ? '#ffb000' : '#000';
|
|
for (var y = $2; y <= $4; y++) {
|
|
for (var x = $1; x <= $3; x++) {
|
|
if (HEAPU8[buf + y * 128 + x]) ctx.fillRect(x, y, 1, 1);
|
|
}
|
|
}
|
|
}, gfx.px, gfx.dx0, gfx.dy0, gfx.dx1, gfx.dy1, (_color != DARK) ? "L" : "D");
|
|
}
|
|
|
|
// Same external contract as every other DisplayDriver backend here (see
|
|
// SimDisplayDriver's own ASCII print()): only _cursor_x advances by the
|
|
// printed width; _cursor_y is left for the caller to manage via
|
|
// setCursor() between lines, even though miscFixedPrint() itself tracks a
|
|
// real y position across embedded '\n's internally.
|
|
_cursor_x += getTextWidth(str);
|
|
}
|
|
#endif // __EMSCRIPTEN__
|