68d4cc4017
One cut, no dual path. Closes ALIGNMENT defect 3 ("Arduino-CLI build
machinery is actively hostile") and vision bullet 4.
platformio.ini carries 16 [env:], one per variant, each passing
-DMEMLNAUT_MODE_TYPE; selftest passes -DNISPS_SELFTEST=1 instead. The env list
IS the registry now — the .ino comment-registry and the NISPS_ST_* token-paste
table are deleted rather than migrated. L12 noted that table was already
silently missing the currently-shipped SLPWorkshop variant, which is the whole
argument against having a second list.
Also deleted: the Python/sed machinery that rewrote the COMMITTED .ino on every
build, the sketch symlink forest, the global TFT_eSPI User_Setup.h mutation
(now -D flags — TFT_eSPI's own documented PlatformIO recipe), the UF2
boot-mount detection stack (upload_protocol=picotool talks to the bootloader
directly), and build-firmware-arch.sh entirely. Scripts 683 -> 435 lines.
memllib is vendored at lib/memllib/ from upstream e291192; no submodules
remain. VENDORED.md records provenance and the re-sync procedure.
S9: a firmware-build CI job compiles three representative envs against a cached
toolchain and reports per-variant flash/RAM. Firmware is in an automated gate
for the FIRST time. The old ci.yml comment justified excluding it as "low
verification value" — an assessment that did not survive contact, since the
SelfTest variant sat broken for an unknown period calling a DisplayDriver
method that did not exist at the pinned memllib commit, and nothing noticed
because nothing built it.
Verified: all 16 envs build from an empty cache, each within ~520 bytes of the
arduino-cli binary it replaces, flash and RAM. Measured as .text+.rodata /
.data+.bss+vector+uninitialized — NOT PlatformIO's console line, which
double-counts .data on this board. This does not prove the hardware boots; no
flash+smoke test was possible and that stays an operator chokepoint.
slpworkshop 248232/145028 pafsynth 256880/149716 selftest 216228/17960
(all 16 in the CI log format; none exceeds 2% of a 16 MB flash)
Two traps recorded so nobody rediscovers them: vendoring memllib's subdirs
without a src/ wrapper makes PlatformIO's library builder silently compile
NOTHING while still linking; and project build_flags land BEFORE the
framework's own -std=gnu++17 -Os, so build_unflags is required.
CORRECTION carried in this commit: the firmware sizes in c19d846's message and
the first version of the memllib recon doc were wrong — SLPWorkshop 145348,
PAFSynth 145300, SelfTest 141840. They came from building variants in sequence
through a SHARED incremental arduino-cli build directory, which reused stale
objects and under-reported by ~75 KB. Clean-cache rebuilds of the identical
commit give 216736/18492 for SelfTest. The real cost of the memllib upstream
bump is +216 bytes flash, not +316. Never measure firmware size through a
reused build dir.
HISTORY NOTE: this commit and the docs commit before it were rebuilt (force-push,
2026-07-21) so that each contains only what its message describes. The first
versions had the firmware deletions stranded in the docs commit by a shared-index
race between concurrent agents; content is byte-identical to the originals.
Gates: run-all-tests.sh ALL GREEN (nisps/ untouched by this change beyond
include paths); 16/16 pio envs build.
69 lines
1.9 KiB
C++
69 lines
1.9 KiB
C++
#include "UIElements.hpp"
|
|
|
|
Button::Button(const char* label, uint16_t color, bool is_toggle)
|
|
: UIElementBase(label)
|
|
, color_(color)
|
|
, is_toggle_(is_toggle)
|
|
, pressedCallback_()
|
|
, pressed_(false)
|
|
, toggleState_(false)
|
|
, button_(nullptr)
|
|
, current_x_(0)
|
|
, current_y_(0)
|
|
, current_w_(0)
|
|
, current_h_(0)
|
|
{
|
|
strncpy(labelBuffer_, label, sizeof(labelBuffer_) - 1);
|
|
labelBuffer_[sizeof(labelBuffer_) - 1] = '\0';
|
|
}
|
|
|
|
void Button::Draw() {
|
|
if (button_) {
|
|
button_->drawSmoothButton(toggleState_, kBorder, TFT_BLACK);
|
|
}
|
|
}
|
|
|
|
void Button::OnSetup() {
|
|
current_x_ = grid_.widthStep * pos_x_;
|
|
current_y_ = grid_.heightStep * pos_y_;
|
|
current_w_ = grid_.widthStep;
|
|
current_h_ = grid_.heightStep;
|
|
|
|
button_ = std::make_unique<ButtonWidget>(scr);
|
|
button_->initButtonUL(current_x_, current_y_, current_w_, current_h_,
|
|
TFT_WHITE, color_, TFT_BLACK, labelBuffer_, kTextSize);
|
|
button_->drawSmoothButton(pressed_, kBorder, TFT_BLACK);
|
|
}
|
|
|
|
void Button::SetCallback(std::function<void(bool)> callback) {
|
|
pressedCallback_ = callback;
|
|
}
|
|
|
|
void Button::Interact(size_t x, size_t y) {
|
|
if (button_) {
|
|
if (button_->contains(x, y)) {
|
|
if (!pressed_) {
|
|
pressed_ = true;
|
|
if (is_toggle_) {
|
|
toggleState_ = !toggleState_;
|
|
} else {
|
|
toggleState_ = true;
|
|
}
|
|
button_->drawSmoothButton(toggleState_, kBorder, TFT_BLACK);
|
|
if (pressedCallback_) {
|
|
pressedCallback_(toggleState_);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void Button::Release() {
|
|
if (button_) {
|
|
pressed_ = false;
|
|
if (!is_toggle_) {
|
|
toggleState_ = false;
|
|
}
|
|
button_->drawSmoothButton(toggleState_, kBorder, TFT_BLACK);
|
|
}
|
|
}
|