The handhelds are named for their variant: picocalc-lyra and cardputer-zero
M5Stack makes three Cardputers and only the Zero runs Linux; the PicoCalc takes several cores and only the Luckfox Lyra runs MeshTerm. So the bare names were ambiguous, and every reference to the two devices now carries the variant: the --platform values and MESHTERM_PLATFORM, the Platform constants (PICOCALC_LYRA, CARDPUTER_ZERO), their lane decks and every screen's picocalc_lyra_lane / cardputer_zero_lane, the font inventories, the lane chips' theme styles, the scripts/ folders, the two chrome test files, and the docs and CLAUDE.md that name them. There is no alias: --platform picocalc is refused with the three real choices listed, rather than falling back to the desktop layout. The PicoCalc is auto-detected from its device tree, so it needs nothing. What names hardware or a user's data keeps its name: the PicoCalc keyboard's input-device name, its battery's sysfs supply, and the serial profile the Lyra setup script writes. .gitignore follows the firmware's folder, and the changelog keeps the words each release used. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
a4619aa17d
commit
b6e7cd5c16
104 files changed
+587
-542
No files matched your search
+2
-2
@@ -5,9 +5,9 @@ Repo-side tools. None of these ship in the wheel.
|
||||
| Script | What it is for |
|
||||
|---|---|
|
||||
| `basemap-doctor.py` | Why a user's map has no basemap — certificates, DNS, proxy, or colour depth |
|
||||
| `picocalc/` | Calculinux device setup: console font, palette, Wi-Fi; `xiao-radio/` is the XIAO radio kit (firmware build, flashing, UART setup) |
|
||||
| `picocalc-lyra/` | Calculinux device setup: console font, palette, Wi-Fi; `xiao-radio/` is the XIAO radio kit (firmware build, flashing, UART setup) |
|
||||
| `uconsole/` | The uConsole's always-on SPI bridge service (MeshTerm can also drive that radio directly, with no script at all — see `docs/devices/uconsole.md`) |
|
||||
| `cardputer/` | The Cardputer Zero's console host: `fetch-terminus.py` installs the 12-pixel Terminus fonts it draws in (OFL, so never shipped with MeshTerm) |
|
||||
| `cardputer-zero/` | The Cardputer Zero's console host: `fetch-terminus.py` installs the 12-pixel Terminus fonts it draws in (OFL, so never shipped with MeshTerm) |
|
||||
|
||||
## basemap-doctor.py
|
||||
|
||||
|
||||
@@ -9,12 +9,12 @@ reads (``$MESHTERM_HOST_FONTS``, else ``fonts`` under the MeshTerm config direct
|
||||
|
||||
Run it once on a machine that will run the host or its desktop simulator:
|
||||
|
||||
python scripts/cardputer/fetch-terminus.py
|
||||
python scripts/cardputer-zero/fetch-terminus.py
|
||||
|
||||
Where Python can't fetch it (a certificate store that rejects the mirror), download the
|
||||
archive any other way and hand it over; it is checked against the same digest:
|
||||
|
||||
python scripts/cardputer/fetch-terminus.py --archive terminus-font-4.49.1.tar.gz
|
||||
python scripts/cardputer-zero/fetch-terminus.py --archive terminus-font-4.49.1.tar.gz
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
File renamed without changes.
+2
-2
@@ -262,7 +262,7 @@ PYEOF
|
||||
|
||||
# --- the 6x8 companion, out of its own (GPL-2.0) file -----------------------------------
|
||||
# Kept separate because its base bitmap is the kernel's font_6x8 and the produced PSF is
|
||||
# therefore GPL-2.0 -- see scripts/picocalc/calculinux-console-font-6x8.sh and scripts/picocalc/LICENSE.GPL-2.0.
|
||||
# therefore GPL-2.0 -- see scripts/picocalc-lyra/calculinux-console-font-6x8.sh and scripts/picocalc-lyra/LICENSE.GPL-2.0.
|
||||
# It re-uses the shared generator block above rather than carrying a second copy of the
|
||||
# donor/alias/keeper tables, so a run here still produces both fonts, as it always did.
|
||||
# A failure there is not a failure here: the 6x12 default is the font the device boots in.
|
||||
@@ -271,7 +271,7 @@ if [ "${SKIP_6X8:-0}" = 1 ]; then
|
||||
elif [ -f "$BUILD8" ]; then
|
||||
sh "$BUILD8" || echo "warning: the 6x8 build failed; $OUT is installed either way" >&2
|
||||
else
|
||||
echo "note: $BUILD8 not found -- only $OUT was built (copy the whole scripts/picocalc/ dir)" >&2
|
||||
echo "note: $BUILD8 not found -- only $OUT was built (copy the whole scripts/picocalc-lyra/ dir)" >&2
|
||||
fi
|
||||
|
||||
# --- apply live: setfont re-renders the whole console immediately -----------------------
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
# LICENCE -- READ THIS FIRST. The base bitmap embedded below is the Linux kernel's own
|
||||
# font_6x8 (lib/fonts/font_6x8.c), which is GPL-2.0. This script is therefore GPL-2.0-only
|
||||
# and so is the PSF it produces; the full licence text sits beside it as
|
||||
# scripts/picocalc/LICENSE.GPL-2.0. The rest of MeshTerm is Apache-2.0 and stays that way: the
|
||||
# scripts/picocalc-lyra/LICENSE.GPL-2.0. The rest of MeshTerm is Apache-2.0 and stays that way: the
|
||||
# produced meshterm8.psf.gz is a DATA FILE the Linux kernel console reads with setfont, on
|
||||
# the device, at run time. MeshTerm never links it, never bundles it, and never
|
||||
# redistributes it -- it is built on the machine it runs on, from this script, and the
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -17,13 +17,13 @@ Three steps on two machines:
|
||||
|
||||
```bash
|
||||
# 1. dev machine: build (needs git + PlatformIO)
|
||||
cd scripts/picocalc/xiao-radio && sh build-firmware.sh
|
||||
cd scripts/picocalc-lyra/xiao-radio && sh build-firmware.sh
|
||||
|
||||
# 2. dev machine: flash, with the XIAO's own USB-C plugged in
|
||||
python flash.py # double-tap reset if the touch doesn't take
|
||||
|
||||
# 3. the Lyra, as root
|
||||
sh scripts/picocalc/xiao-radio/lyra-setup.sh # MT_USER=meshterm by default
|
||||
sh scripts/picocalc-lyra/xiao-radio/lyra-setup.sh # MT_USER=meshterm by default
|
||||
|
||||
# then, as that user
|
||||
meshterm
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Reference in new issue
Block a user