Refresh effect per page

Pages choose their own refresh effect (or the Hardware setting), used when
the page appears and for its own changes. Schedule blocks that switch
instantly and rules still switch instantly. The ESP32 sends page effects
to the Nano with a new no-save flag (E ...,2), so page switches don't wear
the Nano's EEPROM. Page format 7 (version 6 pages are converted).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

src/esp32/app.cpp

@@ -44,6 +44,7 @@ static bool time_known = false;
 static void showDynamicPage()
 {
 	frames.setDynamicPage(loaded_page);
+	frames.setPageEffect(loaded_page.effect);
 	haApiWatch(&loaded_page);
 	controller.setPage(Page::Dynamic);
 }
@@ -63,6 +64,7 @@ static void applyPage(bool instant = false)
 	if (loadBitmap(shown, bitmap))
 	{
 		frames.setPageBitmap(bitmap);
+		frames.setPageEffect(PAGE_EFFECT_DEFAULT);
 		haApiWatch(nullptr);
 		controller.setPage(Page::Bitmap);
 		return;

src/esp32/config.h

@@ -118,7 +118,7 @@ const uint32_t SETUP_AP_DELAY = 20000;        // open the AP when WiFi fails thi
 const uint32_t WIFI_CONNECT_TIMEOUT = 30000;
 const uint32_t WIFI_RESTART_TIME = 10UL * 60 * 1000;
 
-#define FIRMWARE_VERSION "2.13.0"
+#define FIRMWARE_VERSION "2.14.0"
 
 // Home Assistant device id (do not change: Home Assistant's entities are linked to it)
 const uint8_t HA_DEVICE_ID[] = {0x34, 0x86, 0x5d, 0x3a, 0x08, 0x28};

src/esp32/display/frames.cpp

@@ -18,6 +18,7 @@ uint32_t FlipdotFrames::dynamicPage(const LocalTime &time, uint32_t now, bool re
 	bool moving = wait != 0;
 	// The Nano has no acknowledgement: the next frame waits until it has received this one
 	// and flipped its dots, or the next frame overflows its serial buffer
+	_useEffect(_page_effect, redraw);
 	uint32_t busy = _show(bitmap, !redraw, moving || _instant_next);
 	_instant_next = false;
 	return moving && wait < busy ? busy : wait;
@@ -26,6 +27,19 @@ uint32_t FlipdotFrames::dynamicPage(const LocalTime &time, uint32_t now, bool re
 void FlipdotFrames::setDrive(uint16_t flip_time, const DriveSettings &drive)
 {
 	_dot_us = (uint32_t)drive.pulses * (flip_time + drive.flip_gap);
+	_drive = drive;
+	_nano_effect = EFFECT_UNKNOWN;
+}
+
+void FlipdotFrames::_useEffect(uint8_t effect, bool full)
+{
+	if (effect == PAGE_EFFECT_DEFAULT || effect >= DRIVE_EFFECT_COUNT)
+		effect = _drive.effect;
+	if (effect == _nano_effect && !full)
+		return;
+	uint8_t flags = EFFECT_FLAG_NO_SAVE | (_drive.effect_small_only ? EFFECT_FLAG_SMALL_ONLY : 0);
+	_display.setEffect(effect, _drive.effect_time, flags);
+	_nano_effect = effect;
 }
 
 // Sends the bitmap; returns about how long the Nano takes to receive and show it in ms
@@ -45,12 +59,14 @@ void FlipdotFrames::noWifi(int hour, int minute)
 {
 	char time[6];
 	snprintf(time, sizeof(time), "%02d:%02d", hour, minute);
+	_useEffect(PAGE_EFFECT_DEFAULT, false);
 	drawTextLines(_display, "No WiFi", time);
 	_display.display();
 }
 
 void FlipdotFrames::page()
 {
+	_useEffect(_page_effect, true);
 	_show(_page, false, _instant_next);
 	_instant_next = false;
 }
@@ -90,5 +106,6 @@ void FlipdotFrames::setOffBitmap(const uint8_t *bitmap)
 
 void FlipdotFrames::_drawFullScreen(const uint8_t *bitmap)
 {
+	_useEffect(PAGE_EFFECT_DEFAULT, true);
 	_show(bitmap, false, false);
 }

src/esp32/display/frames.h

@@ -29,8 +29,15 @@ public:
 	// The next page frame is shown without the refresh effect (a rule's page, a schedule
 	// block that switches instantly)
 	void showNextInstant() { _instant_next = true; }
-	// How the Nano flips the dots: for the time a frame takes
+	// How the Nano flips the dots: for the time a frame takes, and the refresh effect
 	void setDrive(uint16_t flip_time, const DriveSettings &drive);
+	// The refresh effect of the shown page (PAGE_EFFECT_DEFAULT: the one of the drive
+	// settings). Sent to the Nano before page frames, without storing it in its EEPROM;
+	// the other screens (off, live, No WiFi) use the drive settings' effect.
+	void setPageEffect(uint8_t effect) { _page_effect = effect; }
+	// The Nano got the stored drive settings again (StatusScreen): its effect is the
+	// default one now
+	void driveSent() { _nano_effect = EFFECT_UNKNOWN; }
 	void setPageBitmap(const uint8_t *bitmap);
 	void setLiveBitmap(const uint8_t *bitmap);
 	// nullptr: blank
@@ -40,6 +47,10 @@ private:
 	BROSE9323 &_display;
 	PageResources &_resources;
 	DynamicPage _dynamic;
+	static const uint8_t EFFECT_UNKNOWN = 254;
+	DriveSettings _drive;
+	uint8_t _page_effect = PAGE_EFFECT_DEFAULT;
+	uint8_t _nano_effect = EFFECT_UNKNOWN; // the effect last sent by _useEffect()
 	uint32_t _dot_us = 1000;
 	bool _instant_next = false; // per changed dot: pulses x (flip time + gap)
 	uint8_t _page[BITMAP_BYTES] = {};
@@ -47,5 +58,8 @@ private:
 	uint8_t _off[BITMAP_BYTES] = {}; // all zero: blank
 
 	void _drawFullScreen(const uint8_t *bitmap);
+	// Makes the Nano use this effect (PAGE_EFFECT_DEFAULT: the drive settings' one). Sent
+	// when it changed, and always with full frames: a restarted Nano has the stored one.
+	void _useEffect(uint8_t effect, bool full);
 	uint32_t _show(const uint8_t *bitmap, bool changes_only, bool instant);
 };

src/esp32/display/page_store.cpp

@@ -8,7 +8,7 @@
 static const char *DIR = "/pages";
 static const char *EXTENSION = ".pg";
 // Increase when DynamicPage changes; older files are ignored unless converted below
-static const uint16_t VERSION = 6;
+static const uint16_t VERSION = 7;
 // Elements per page up to version 5 (the old formats below are frozen with it)
 static const int OLD_PAGE_ELEMENTS = 8;
 
@@ -356,9 +356,40 @@ static void convert(const Page &old, DynamicPage &page)
 }
 } // namespace v5
 
+// Version 6 (before the refresh effect per page): the current layout without effect.
+// Frozen copy; the elements did not change since, so they are copied as a block.
+namespace v6
+{
+struct Page
+{
+	uint8_t slot_count;
+	PageSlot slots[PAGE_SLOTS];
+	uint8_t element_count;
+	PageElement elements[PAGE_ELEMENTS];
+};
+
+struct Stored
+{
+	uint16_t version;
+	uint16_t size;
+	Page page;
+};
+
+static_assert(offsetof(DynamicPage, elements) == offsetof(Page, elements), "same layout up to the elements");
+
+static void convert(const Page &old, DynamicPage &page)
+{
+	clearPage(page); // the default effect
+	page.slot_count = old.slot_count;
+	memcpy(page.slots, old.slots, sizeof(page.slots));
+	page.element_count = old.element_count;
+	memcpy((void *)page.elements, old.elements, sizeof(page.elements));
+}
+} // namespace v6
+
 static_assert(sizeof(v1::Stored) != sizeof(v2::Stored) && sizeof(v2::Stored) != sizeof(v3::Stored) &&
 				  sizeof(v3::Stored) != sizeof(v4::Stored) && sizeof(v4::Stored) != sizeof(v5::Stored) &&
-				  sizeof(v5::Stored) != sizeof(StoredPage),
+				  sizeof(v5::Stored) != sizeof(v6::Stored) && sizeof(v6::Stored) != sizeof(StoredPage),
 			  "the versions are told apart by their size");
 
 static uint32_t revision = 0;
@@ -429,6 +460,18 @@ bool loadPage(const char *name, DynamicPage &page)
 			page = stored->page;
 		delete stored;
 	}
+	else if (size == sizeof(v6::Stored))
+	{
+		v6::Stored *stored = new v6::Stored;
+		ok = file.read((uint8_t *)stored, sizeof(v6::Stored)) == sizeof(v6::Stored) && stored->version == 6 &&
+			 stored->size == sizeof(v6::Page);
+		if (ok)
+		{
+			v6::convert(stored->page, page);
+			ok = validatePage(page) == nullptr;
+		}
+		delete stored;
+	}
 	else if (size == sizeof(v5::Stored))
 	{
 		v5::Stored *stored = new v5::Stored;

src/esp32/display/status_screen.cpp

@@ -22,16 +22,17 @@ void StatusScreen::sendDrive()
 	_drive_pending = true;
 }
 
-void StatusScreen::loop()
+bool StatusScreen::loop()
 {
 	if (!_drive_pending || !_started || !_nano.isOn())
-		return;
+		return false;
 	_drive_pending = false;
 	_display.setTiming(_flip_time);
 	_display.setGap(_drive.flip_gap);
 	_display.setPulses(_drive.pulses);
 	_display.setEffect(_drive.effect, _drive.effect_time, _drive.effect_small_only ? EFFECT_FLAG_SMALL_ONLY : 0);
 	_display.setRefreshInterval(_dot_refresh);
+	return true;
 }
 
 void StatusScreen::show(const char *line1, const char *line2, bool keep_on)

src/esp32/display/status_screen.h

@@ -21,7 +21,8 @@ public:
 	// Send them again (they changed), from loop()
 	void sendDrive();
 	// Sends changed drive settings once the display is on. Not while the Nano is flashed.
-	void loop();
+	// True when they were sent.
+	bool loop();
 
 private:
 	BROSE9323 &_display;

src/esp32/logic/page.cpp

@@ -161,6 +161,8 @@ const char *validatePage(const DynamicPage &page)
 		return "Too many time slots";
 	if (page.element_count > PAGE_ELEMENTS)
 		return "Too many elements";
+	if (page.effect != PAGE_EFFECT_DEFAULT && page.effect >= PAGE_EFFECT_COUNT)
+		return "Unknown refresh effect";
 
 	for (int i = 0; i < page.slot_count; i++)
 	{

src/esp32/logic/page.h

@@ -24,6 +24,9 @@ const int ELEMENT_ENTITY_SIZE = 65;
 const int ELEMENT_ATTRIBUTE_SIZE = 33;
 const int ELEMENT_MAP_SIZE = 64;
 const char DEGREE_SIGN = 127;
+// DynamicPage::effect: the refresh effect of the Hardware settings
+const uint8_t PAGE_EFFECT_DEFAULT = 255;
+const uint8_t PAGE_EFFECT_COUNT = 10; // DRIVE_EFFECT_COUNT (checked in logic/settings.cpp)
 
 enum class ElementType : uint8_t
 {
@@ -184,6 +187,10 @@ struct DynamicPage
 	PageSlot slots[PAGE_SLOTS];
 	uint8_t element_count = 0;
 	PageElement elements[PAGE_ELEMENTS];
+	// Added in page format 7 (keep new fields at the end, see display/page_store.cpp).
+	// The refresh effect while the page is shown (switching to it and its own changes):
+	// PAGE_EFFECT_DEFAULT or a DRIVE_EFFECT_* number of logic/settings.h
+	uint8_t effect = PAGE_EFFECT_DEFAULT;
 };
 
 // Back to an empty page with the defaults, without `page = DynamicPage()`: that can put a

src/esp32/logic/settings.cpp

@@ -5,6 +5,8 @@
 
 #include "logic/bitmap_format.h"
 
+static_assert(PAGE_EFFECT_COUNT == DRIVE_EFFECT_COUNT, "pages choose from the same effects");
+
 static bool terminated(const char *text, int size)
 {
 	return memchr(text, '\0', size) != nullptr;

src/esp32/main.cpp

@@ -95,7 +95,8 @@ void loop()
 	// While the Nano is being flashed, nothing else may talk to it
 	if (flashBridge.handle())
 		return;
-	status.loop(); // changed flip settings, once the display is on
+	if (status.loop()) // changed flip settings, once the display is on
+		frames.driveSent(); // the effect of a page is sent again
 
 	LocalTime now;
 	bool time_valid = appLocalTime(now);

src/esp32/web/page_json.cpp

@@ -40,6 +40,7 @@ void pageToJson(const DynamicPage &page, JsonObject out)
 		slot["start"] = String(time);
 		slot["bitmap"] = page.slots[i].bitmap;
 	}
+	out["effect"] = page.effect == PAGE_EFFECT_DEFAULT ? -1 : page.effect; // -1: Hardware setting
 	JsonArray elements = out["elements"].to<JsonArray>();
 	for (int i = 0; i < page.element_count; i++)
 	{
@@ -96,7 +97,11 @@ const char *pageFromJson(JsonVariantConst in, DynamicPage &page)
 	if (slots.size() > (size_t)PAGE_SLOTS)
 		return "Too many time slots (8 at most)";
 	if (elements.size() > (size_t)PAGE_ELEMENTS)
-		return "Too many elements (8 at most)";
+		return "Too many elements (16 at most)";
+	int effect = in["effect"] | -1;
+	if (effect < -1 || effect >= DRIVE_EFFECT_COUNT)
+		return "Unknown refresh effect";
+	page.effect = effect < 0 ? PAGE_EFFECT_DEFAULT : effect;
 
 	for (JsonVariantConst s : slots)
 	{

src/esp32/web/web_page.h

@@ -73,6 +73,8 @@ details{margin-top:10px}summary{cursor:pointer;color:var(--dim);font-size:13px;m
 <h3>Background</h3><div id="pe_slots"></div>
 <div class="row"><button class="s" onclick="peAddSlot()">Add time slot</button></div>
 <p class="hint">Each background is shown from its time until the next one; the last one continues after midnight.</p>
+<h3>Refresh effect</h3><div class="row"><select id="pe_effect" onchange="pe.page.effect=+this.value"></select></div>
+<p class="hint">Used when this page appears and for its own changes (like the clock's minutes). A schedule block that switches instantly and rules still switch instantly; "small changes only" and the effect time are in Settings, Hardware.</p>
 <h3>Elements</h3><div id="pe_elems"></div>
 <div class="row"><button class="s" onclick="peAdd('clock')">+ Clock</button><button class="s" onclick="peAdd('date')">+ Date</button>
 <button class="s" onclick="peAdd('ha')">+ Home Assistant value</button><button class="s" onclick="peAdd('text')">+ Text</button>
@@ -367,7 +369,10 @@ function peShow(title,name){$('pe_title').textContent=title;$('pe_name').value=n
 function peOpen(pg,copy){pe={orig:copy?'':pg.name,page:JSON.parse(JSON.stringify(pg.page)),sel:-1,boxes:[],pos:[]};peShow(copy?'Copy of '+pg.name:'Edit '+pg.name,copy?'':pg.name)}
 function peNew(){pe={orig:'',page:{slots:[{start:'00:00',bitmap:''}],elements:[newEl('clock')]},sel:-1,boxes:[],pos:[]};peShow('New page','')}
 function peClose(){pe=null;$('pe').style.display='none';$('t-pages').scrollIntoView({behavior:'smooth'})}
-function peBuild(){peSlots();peElems()}
+function peBuild(){peSlots();peElems();peEffect()}
+function peEffect(){const s=$('pe_effect');if(!s.options.length){s.append(mk('option',{value:-1,textContent:'Default (Hardware setting)'}));
+ for(const o of $('h_effect').options)s.append(mk('option',{value:o.value,textContent:o.textContent}))}
+ if(pe.page.effect==null)pe.page.effect=-1;s.value=pe.page.effect}
 function field(label,input){return mk('label',{},label+' ',input)}
 function inp(o,k,type,props){const i=mk('input',Object.assign({type:type||'text',value:o[k]},props||{}));i.oninput=()=>{o[k]=type=='number'?Math.round(+i.value||0):i.value;pePreview()};return i}
 function chk(o,k,label){const c=mk('input',{type:'checkbox',checked:!!o[k]});c.onchange=()=>{o[k]=c.checked;pePreview()};return mk('label',{},c,' '+label)}

src/nano/command_parser.cpp

@@ -307,13 +307,14 @@ void CommandParser::_effect()
 	long t = comma ? atol(comma + 1) : 0;
 	long flags = comma2 ? atol(comma2 + 1) : 0;
 	if (_line_len < 2 || !comma || effect < 0 || effect >= EFFECT_COUNT || t < EFFECT_TIME_MIN ||
-		t > EFFECT_TIME_MAX || flags < 0 || flags > EFFECT_FLAGS_MAX)
+		t > EFFECT_TIME_MAX || flags < 0 || flags > EFFECT_COMMAND_FLAGS_MAX)
 	{
-		_error(F("Invalid effect (Ee,ms,flags: e 0-9, 100-10000 ms, flags 0-1)"));
+		_error(F("Invalid effect (Ee,ms,flags: e 0-9, 100-10000 ms, flags 0-3)"));
 		return;
 	}
-	_display.setEffect(effect, t, flags);
-	saveEffect(effect, t, flags);
+	_display.setEffect(effect, t, flags & EFFECT_FLAG_SMALL_ONLY);
+	if (!(flags & EFFECT_FLAG_NO_SAVE))
+		saveEffect(effect, t, flags);
 }
 
 // C: replies "C xxxx", the bufferCrc() of the image received so far as 4 hex digits. The

src/nano/config.h

@@ -40,7 +40,8 @@ const uint8_t EFFECT_DEFAULT = 0; // instant
 const uint16_t EFFECT_TIME_DEFAULT = 1500;
 const uint16_t EFFECT_TIME_MIN = 100;
 const uint16_t EFFECT_TIME_MAX = 10000;
-const uint8_t EFFECT_FLAGS_MAX = 1; // EFFECT_FLAG_SMALL_ONLY
+const uint8_t EFFECT_FLAGS_MAX = 1; // EFFECT_FLAG_SMALL_ONLY (stored)
+const uint8_t EFFECT_COMMAND_FLAGS_MAX = 3; // plus EFFECT_FLAG_NO_SAVE (E command)
 
 // Full redraw interval in minutes, fixes dots that did not flip (I command, EEPROM;
 // 0 = never). It runs from update() between frames and never blocks the serial port.