Compare commits

3 Commits

Author SHA1 Message Date
football2801 22c9edb09e fix(13e6): pre-rotate LANDSCAPE diagram for CCW-to-landscape rotation
The user rotates the frame 90° CCW into landscape (not CW as the
previous comment block assumed), so the LANDSCAPE orientation diagram
needs to be pre-rotated the opposite direction to land upright.

- Previous: ribbon on bottom edge, LEFT arrow, label rotated 90° CCW on
  the diagram's left side (matched CW user rotation; rendered upside-
  down once the user actually rotates CCW into landscape).
- Now: ribbon on top edge, RIGHT arrow, label rotated 90° CW down the
  diagram's right side. After the user's 90° CCW rotation it lands as
  wide rect, ribbon-left, up-arrow — correct upright landscape.

Adds right_arrow() helper as the mirror of left_arrow(). Regenerated
all three setup-screen .bins.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-17 21:15:59 -04:00
football2801 a31a39fdc4 feat(13e6): v1.0.0 — first known-good public release with WeVisto branding
Re-versions the 13.3" driver to a fresh v1.0.0 baseline. This is the
firmware/payload combination that's been verified end-to-end with the
WeVisto branding on a properly-powered Pi setup:

- 180° rotation of setup screens for ribbon-at-bottom mounting (from
  55ee5aa) — render path matches the server-side V2 physicalRotation=180.
- Clear-to-white pre-pass before each setup-screen draw (the d23f331
  change) so a transition from a full-color photo into the
  mostly-yellow AP screen doesn't leave ghost particles from the
  previous image.
- Setup screen renders the WeVisto wordmark (with yellow V), the
  Camogli harbor backdrop, two QRs, and the orientation tiles in full
  color over the existing hardware-SPI path.

A prior diagnostic detour (bit-banged SPI / multi-stage ghost_clear
cycles) was chasing what turned out to be a Pi 5 USB-A current budget
issue, not a firmware bug. With the host on a 27 W PSU and
usb_max_current_enable=1, hardware SPI at 4 MHz renders all six
Spectra-6 colors faithfully.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-17 17:41:37 -04:00
football2801 55ee5aa95c fix(13e6): 180° rotate setup screens for ribbon-at-bottom mounting
Matches the server-side V2 physicalRotationDegrees=180° introduced in
pictureFrame-webApp@b355572. The setup screens are firmware-drawn (not
server-rendered) so they need their own compensation:

- scripts/gen_screens_13e6.py rotates the PIL image 180° in save_bin()
  before packing to 4bpp; preview PNGs reflect the rotated layout too.
- All three bg .bins regenerated (ap_bg, ap_bg_retry, setup_bg).
- epd_driver.cpp QR overlay coords updated to the post-rotation
  positions (AP 642,590 → 40,492; Setup 313,750 → 313,276).
- PANEL_FW_VERSION → v1.0.2

To deploy: pio run -e <env> -t upload AND pio run -e <env> -t uploadfs
so the rotated .bins land in LittleFS alongside the new code.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-17 13:19:52 -04:00
9 changed files with 63 additions and 28 deletions
Binary file not shown.
Binary file not shown.

Before

Width:  |  Height:  |  Size: 251 KiB

After

Width:  |  Height:  |  Size: 248 KiB

Binary file not shown.
Binary file not shown.

Before

Width:  |  Height:  |  Size: 250 KiB

After

Width:  |  Height:  |  Size: 248 KiB

Binary file not shown.
Binary file not shown.

Before

Width:  |  Height:  |  Size: 240 KiB

After

Width:  |  Height:  |  Size: 238 KiB

+44 -24
View File
@@ -281,6 +281,15 @@ def left_arrow(draw, cx, cy, half_h=18, w=34, color=BK):
], fill=color)
def right_arrow(draw, cx, cy, half_h=18, w=34, color=BK):
"""Solid filled triangle pointing right, centered on (cx, cy)."""
draw.polygon([
(cx + w // 2, cy),
(cx - w // 2, cy - half_h),
(cx - w // 2, cy + half_h),
], fill=color)
def paste_rotated_text(img, text, font, fill, anchor_xy, ccw_degrees=90):
"""
Render `text` horizontally onto a transparent overlay, rotate ccw, and
@@ -304,17 +313,17 @@ def orientation_diagrams(img, cx, top_y, label_color=None, compact=False):
PORTRAIT = upright tall rect, ribbon along the bottom short edge,
up-arrow inside.
LANDSCAPE = pre-rotated 90° CCW from upright landscape. The frame
rotation portrait→landscape is 90° CW (ribbon moves
bottom→left as viewed by the user); the CCW pre-rotation
LANDSCAPE = pre-rotated 90° CW from upright landscape. The frame
rotation portrait→landscape is 90° CCW (ribbon moves
top→left as viewed by the user); the CW pre-rotation
cancels that, so when the user picks the frame up and
rotates it 90° CW into landscape the diagram lands
rotates it 90° CCW into landscape the diagram lands
upright (wide rect, ribbon-left, up-arrow).
In the portrait rendering that means: tall rect, ribbon
along bottom edge (was the LEFT edge upright), LEFT-
along TOP edge (was the LEFT edge upright), RIGHT-
pointing arrow (was UP upright), and the "LANDSCAPE"
label rotated 90° CCW so it runs up the long edge
reads horizontally once the frame is mounted landscape.
label rotated 90° CW so it runs DOWN the right long edge
reads horizontally once the frame is mounted landscape.
"""
if label_color is None:
label_color = BK
@@ -355,28 +364,29 @@ def orientation_diagrams(img, cx, top_y, label_color=None, compact=False):
pt_y + (diag_h - ribbon_thick) // 2)
text_center(draw, pt_x + diag_w // 2, diag_bottom + 14, "PORTRAIT", F_TINY, BK)
# LANDSCAPE — pre-rotated 90° CCW from upright.
# LANDSCAPE — pre-rotated 90° CW from upright (the user rotates 90° CCW
# into landscape; the CW pre-rotation cancels that so it lands upright).
# Upright landscape: wide rect, ribbon along LEFT long edge, UP arrow.
# After 90° CCW (in portrait rendering): tall rect, ribbon along BOTTOM
# short edge, LEFT-pointing arrow. Label runs up the LEFT long edge,
# rotated 90° CCW so it reads L→R once the frame is rotated to landscape.
# After 90° CW (in portrait rendering): tall rect, ribbon along TOP
# short edge, RIGHT-pointing arrow. Label runs DOWN the RIGHT long edge,
# rotated 90° CW so it reads L→R once the frame is rotated to landscape.
draw.rectangle([ls_x, ls_y, ls_x + diag_w - 1, ls_y + diag_h - 1],
outline=BK, width=3)
draw.rectangle([ls_x, ls_y + diag_h - ribbon_thick,
ls_x + diag_w - 1, ls_y + diag_h - 1], fill=BK)
left_arrow(draw, ls_x + diag_w // 2,
ls_y + (diag_h - ribbon_thick) // 2)
# Rotated label, anchored just left of the diagram's left long edge.
draw.rectangle([ls_x, ls_y,
ls_x + diag_w - 1, ls_y + ribbon_thick - 1], fill=BK)
right_arrow(draw, ls_x + diag_w // 2,
ls_y + ribbon_thick + (diag_h - ribbon_thick) // 2)
# Rotated label, anchored just right of the diagram's right long edge.
label_text = "LANDSCAPE"
bb = F_TINY.getbbox(label_text)
label_w = bb[2] - bb[0]
label_h = bb[3] - bb[1]
# Rotated label is `label_w` tall, `label_h` wide. Centred vertically
# against the rect, sitting just to its left.
rotated_x = ls_x - label_h - 16
# Rotated 90° CW: label is `label_w` tall, `label_h` wide. Centred
# vertically against the rect, sitting just to its right.
rotated_x = ls_x + diag_w + 16
rotated_y = ls_y + (diag_h - label_w) // 2
paste_rotated_text(img, label_text, F_TINY, BK, (rotated_x, rotated_y),
ccw_degrees=90)
ccw_degrees=-90)
# ═══════════════════════════════════════════════════════════════════════════════
@@ -564,6 +574,12 @@ def gen_setup():
# ── Save ─────────────────────────────────────────────────────────────────────
def save_bin(img, path, preview_path):
# Physical mount compensation: 13.3" panel ships ribbon-at-bottom of
# portrait, opposite the scan-zero corner. Rotate 180° before packing
# so the .bin's scan order maps to a right-side-up image on the panel.
# Server-side render does the same — see DeviceModel::physicalRotationDegrees().
img = img.rotate(180)
data = pack(img)
with open(path, "wb") as f:
f.write(data)
@@ -593,7 +609,11 @@ if __name__ == "__main__":
print("Generating setup screen…")
save_bin(gen_setup(), f"{out_dir}/setup_bg.bin", f"{out_dir}/setup_bg_preview.png")
print()
print("QR overlay constants — keep these in sync with epd_driver.cpp:")
print(f" AP_QR_X={AP_QR_X}, AP_QR_Y={AP_QR_Y}, AP_QR_CELL={AP_QR_CELL}, AP_QR_PX={AP_QR_PX}")
print(f" SETUP_QR_X={SETUP_QR_X}, SETUP_QR_Y={SETUP_QR_Y}, "
f"SETUP_QR_CELL={SETUP_QR_CELL}, SETUP_QR_PX={SETUP_QR_PX}")
# Post-180°-rotation coords for firmware (.bin is rotated in save_bin).
rot_ap_x = W - AP_QR_X - AP_QR_PX
rot_ap_y = H - AP_QR_Y - AP_QR_PX
rot_setup_x = W - SETUP_QR_X - SETUP_QR_PX
rot_setup_y = H - SETUP_QR_Y - SETUP_QR_PX
print("QR overlay constants (POST-180°-rotation) — keep these in sync with epd_driver.cpp:")
print(f" AP qr_x={rot_ap_x}, qr_y={rot_ap_y}, cell={AP_QR_CELL}, px={AP_QR_PX}")
print(f" Setup qr_x={rot_setup_x}, qr_y={rot_setup_y}, cell={SETUP_QR_CELL}, px={SETUP_QR_PX}")
+18 -3
View File
@@ -444,14 +444,29 @@ static void draw_from_lfs(const char* path, uint8_t fallback_color,
// rectangle exactly the size of QR_MODS × QR_CELL at (X, Y), and the
// firmware paints the live QR into it. Mismatch = the QR draws over
// decorative borders or the QR placeholder shows through.
//
// Coords are post-180°-rotation: the gen script rotates each .bin to
// compensate for the panel's ribbon-at-bottom physical mounting, so
// QR placeholders move to (W - old_x - QR_PX, H - old_y - QR_PX).
// AP (518 px QR): pre-rot 642,590 → post-rot 40,492
// Setup (574 px QR): pre-rot 313,750 → post-rot 313,276 (X centred)
// Setup screens (yellow AP / red retry / green setup) are mostly two-tone
// against a small palette. Transitioning from a full-color photo to one of
// these in a single DRF cycle leaves visible ghost of the previous image —
// Spectra-6's color particles need more discharge time than one refresh
// provides. Pre-clear to white first so the panel is fully reset, then draw
// the actual screen. Doubles the refresh time on setup events only.
void epd_draw_ap_screen(QRCode* qr) {
draw_from_lfs("/ap_bg.bin", COLOR_YELLOW, qr, 642, 590, 14);
epd_fill(COLOR_WHITE);
draw_from_lfs("/ap_bg.bin", COLOR_YELLOW, qr, 40, 492, 14);
}
void epd_draw_ap_screen_retry(QRCode* qr) {
draw_from_lfs("/ap_bg_retry.bin", COLOR_RED, qr, 642, 590, 14);
epd_fill(COLOR_WHITE);
draw_from_lfs("/ap_bg_retry.bin", COLOR_RED, qr, 40, 492, 14);
}
void epd_draw_setup_screen(QRCode* qr) {
draw_from_lfs("/setup_bg.bin", COLOR_GREEN, qr, 313, 750, 14);
epd_fill(COLOR_WHITE);
draw_from_lfs("/setup_bg.bin", COLOR_GREEN, qr, 313, 276, 14);
}
+1 -1
View File
@@ -3,4 +3,4 @@
// Panel-specific firmware version for the Waveshare 13.3" Spectra-6 driver.
// Bump on each driver change worth correlating with server-side reports.
// Independent of the shared firmware version (HTTP / NVS / sleep / etc.).
#define PANEL_FW_VERSION "v1.0.1"
#define PANEL_FW_VERSION "v1.0.0"