chore: update screenshots and device frames for next gen pebbles (#142)

Closes #141

Author: mattrossman

.gitignore

@@ -10,11 +10,13 @@ build
 src/pkjs/dev-config.js
 src/pkjs/active-fixture.generated.js
 screenshot/**/*
-!screenshot/snowy-red.png
-!screenshot/steel-black.png
-!screenshot/composite_bw.sh
-!screenshot/composite_color.sh
 !screenshot/**/
+!screenshot/frames/*.svg
+!screenshot/v*/*.png
+!screenshot/v*/raw/*.png
+!screenshot/v*/composite/*.png
+screenshot/tmp/**
+screenshot/out/**
 !.agents
 node_modules
 package.json

CONTRIBUTING.md

@@ -172,6 +172,9 @@ PEBBLE_EMULATOR=aplite mise install-emulator
 # Legacy pass-through separator (still works)
 mise install-emulator -- --logs
 
+# Stop running emulator and phone simulator
+mise kill-emulator
+
 # Take a screenshot from emulator (default platform: basalt)
 mise screenshot-emulator
 
@@ -258,6 +261,8 @@ Set `FIXTURE=<name>` in `.env` to load deterministic app-state data from `fixtur
 Fixtures currently support:
 
 - `watch.now`: local date/time fields used for C-rendered time/date UI.
+- `watch.battery.percent`: battery level used for C-rendered battery UI, 0-100.
+- `watch.battery.charging`: optional battery charging/plugged state, `true` or `false`.
 - `watchSettings.timeFormat`: watch-level time display preference, `"12h"` or `"24h"`.
 - `claySettings`: Clay-compatible settings keyed by `messageKey`, such as `"axisTimeFormat": "12h"`. Color settings use Pebble SDK color constants like `"GColorFolly"` from the Rebble color definitions: https://developer.rebble.io/docs/c/Graphics/Graphics_Types/Color_Definitions/
 - `weather.city`: weather status city label.
@@ -275,26 +280,14 @@ FIXTURE=readme
 
 Fixture data is tracked in git inside `fixtures/`.
 
-### Emulator time overrides (applied automatically)
-
-`scripts/install-emulator.sh` reads these keys from `dev-config.js` after install:
-
-- `emuTimeFormat`: `12h` or `24h`
-- `emuTime`: `HH:MM:SS` or Unix seconds (e.g. `1772870400`)
+### Fixture emulator installs
 
-Then run:
+Fixture time and battery state are compiled into the app through `watch.now` and `watch.battery`; `scripts/install-emulator.sh` does not call Pebble's emulator setting controls.
 
 ```bash
 mise install-emulator --logs
 ```
 
-Reset behavior when keys are removed:
-
-- `emuTimeFormat` defaults to `24h`
-- `emuTime` fallback order is:
-  1. explicit `emuTime` in `dev-config.js`
-  2. current host time
-
 ## Upgrading pebble-tool
 
 This project pins `pipx:pebble-tool` to an exact version in `mise.toml` (fully resolved in `mise.lock`).

README.md

@@ -16,10 +16,9 @@ The developer, RCY, is nowhere to be found in the Rebble era. I plan to continue
 
 ## Screenshots
 
-<div>
-    <img src="screenshot/v1.14.0/color-composite.png" alt="Color screenshot" style="display:inline-block;vertical-align: middle;">
-    <img src="screenshot/v1.14.0/bw-composite.png" alt="Black and white screenshot" style="display:inline-block;vertical-align: middle;">
-</div>
+| Pebble Time | Pebble 2 Duo | Pebble Time 2 |
+| --- | --- | --- |
+| <img src="screenshot/v1.33.0/composite/pebble-time-red.png" alt="Pebble Time screenshot"> | <img src="screenshot/v1.33.0/composite/pebble2-duo-white.png" alt="Pebble 2 Duo screenshot"> | <img src="screenshot/v1.33.0/composite/pebble-time2-red.png" alt="Pebble Time 2 screenshot"> |
 
 ## Features
 

RELEASE.md

@@ -19,4 +19,15 @@ Flow:
 
 Device frames and banner templates were originally obtained from [Appstore Assets](https://developer.rebble.io/guides/appstore-publishing/appstore-assets/) in Pebble docs.
 
-Those download links are since broken (see https://github.com/pebble-dev/developer.rebble.io/issues/37), but you can still download from the wayback machine (e.g. [banner templates](https://web.archive.org/web/20161207160612/https://s3.amazonaws.com/developer.getpebble.com/assets/other/banner-templates-design.zip)).
+Those download links are since broken (see https://github.com/pebble-dev/developer.rebble.io/issues/37), but you can still download from the wayback machine (e.g. [banner templates](https://web.archive.org/web/20161207160612/https://s3.amazonaws.com/developer.getpebble.com/assets/other/banner-templates-design.zip)).
+
+Composite screenshots with:
+
+```sh
+mise composite <version>
+mise composite-screenshot <pebble-time-red|pebble2-duo-white|pebble-time2-red> <screenshot.png> <output.png>
+```
+
+`mise composite <version>` reads `screenshot/<version>/raw/*.png` and writes the matching framed PNGs to `screenshot/<version>/composite/`.
+
+Some downloaded frame assets used older names. Track them with the modern device names: `core-time2-red.svg` becomes `pebble-time2-red.svg`, and `pebble2-white.svg` becomes `pebble2-duo-white.svg`. The Pebble Time 2 rename is noted in Eric Migicovsky's July Pebble update: https://ericmigi.com/blog/july-pebble-update/

fixtures/readme.json

@@ -7,6 +7,9 @@
       "hour": 12,
       "minute": 34,
       "second": 0
+    },
+    "battery": {
+      "percent": 100
     }
   },
   "watchSettings": {

mise.lock

@@ -15,6 +15,10 @@ deno = "2.1.4"
 # https://mise.jdx.dev/dev-tools/backends/aqua.html
 "aqua:supabase/cli" = "2.84.2"
 
+# https://github.com/linebender/resvg
+# https://mise.jdx.dev/dev-tools/backends/aqua.html
+resvg = "0.47.0"
+
 [env]
 _.file = ".env"
 
@@ -53,12 +57,24 @@ description = "Build and install on emulator (default profile: dev, emulator: ba
 alias = "emu"
 run = "pebble wipe && scripts/install-emulator.sh"
 
+[tasks.kill-emulator]
+description = "Stop running emulator and phone simulator"
+alias = "kill"
+run = "pebble kill"
+
 [tasks.screenshot-phone]
 description = "Take a screenshot from phone"
-alias = "screenshot"
 run = "scripts/screenshot-phone.sh"
 
 [tasks.screenshot-emulator]
 description = "Take a screenshot from emulator (default: basalt)"
-alias = "screenshot-emu"
+alias = "screenshot"
 run = "scripts/screenshot-emulator.sh"
+
+[tasks.composite-screenshot]
+description = "Composite a screenshot PNG into an SVG Pebble frame"
+run = "screenshot/composite_svg.sh"
+
+[tasks.composite]
+description = "Composite all raw screenshots for a screenshot version"
+run = "scripts/composite-version.sh"