Files
MeshCore-Solo/variants/sim/target.cpp
T
JakubandClaude Sonnet 5 97a86216c6 feat(sim): board feature parity (reset/GPS/sensors/admin/keyboard) + input fixes
Rounds out the browser sim harness with the rest of the physical board's
interactions: a reset button (JS-driven, since board.reboot() is inert
under -sEXIT_RUNTIME=0), GPS input wired into a real LocationProvider via
new SimSensorManager, JS-settable battery/environment telemetry, an
admin/repeater-login test hook (sendRoomLogin against the default
"password"), and full physical-keyboard text entry (printable ASCII
passthrough into the existing KeyboardWidget, Tab->KEY_KB_ENTER submit).

Also fixes three real bugs found while exercising all of this in a real
browser:
- UITask.cpp's native-only stdin poll branch had no __EMSCRIPTEN__
  exclusion, so it also compiled into the wasm build and called a real,
  blocking window.prompt() on nearly every frame -- the actual cause of
  the reported time/controls jumping. Now gated to native only.
- 'n'/'p' were mapped as Next/Prev keyboard shortcuts, colliding with
  typing those literal letters. Removed the shortcuts; added explicit
  Next/Prev buttons to mesh.html (previously relied solely on them).
- Buttons grabbed native browser keyboard focus on click, so a later
  stray Enter/Space could silently re-trigger a previously-clicked button
  (e.g. Reset). mousedown now calls preventDefault() on all buttons.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-09-03 11:31:42 +02:00

131 lines
5.6 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];
SimGfxCanvas() : Adafruit_GFX(128, 64) { memset(px, 0, sizeof(px)); }
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;
}
};
void SimDisplayDriverCanvas::print(const char* str) {
if (!str) return;
static SimGfxCanvas gfx;
memset(gfx.px, 0, sizeof(gfx.px));
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 whole 128x64 buffer
// (reading it directly out of wasm memory, same pattern as drawXbm()
// below) rather than one call per glyph pixel.
EM_ASM({
if (!Module.__simCtx) return;
var ctx = Module.__simCtx;
var buf = $0;
ctx.fillStyle = UTF8ToString($1) === 'L' ? '#ffb000' : '#000';
for (var y = 0; y < 64; y++) {
for (var x = 0; x < 128; x++) {
if (HEAPU8[buf + y * 128 + x]) ctx.fillRect(x, y, 1, 1);
}
}
}, gfx.px, (_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__