Support twenty runtime tiles and opt-in native LVGL page swipes

tests/test_action_feedback.cpp

@@ -1,3 +1,4 @@
 #include "components/smart_display/runtime_model.h"
 #include <cassert>
-int main(){runtime_tiles::Tile t;t.revision="off";t.begin(100);assert(t.loading(200));assert(t.awaiting_action(200));t.observe("off");assert(!t.confirmed);t.observe("on");assert(t.confirmed);assert(t.loading(999));assert(!t.loading(1100));t.begin(2000);t.observe("on");assert(t.loading(7999));assert(!t.loading(8000));assert(!t.awaiting_action(8000));t.begin(0xFFFFFFF0);assert(t.loading(20));t.begin(100,true);assert(t.loading(1099));assert(!t.awaiting_action(1099));assert(!t.loading(1100));}
+#include "components/smart_display/cyd_ui.h"
+int main(){cyd::TouchGuard guard;guard.begin(0);guard.consume();assert(!guard.accept(100,1));assert(!guard.accept_slider(100,1));guard.begin(200);assert(guard.accept(300,1));runtime_tiles::Tile t;t.revision="off";t.begin(100);assert(t.loading(200));assert(t.awaiting_action(200));t.observe("off");assert(!t.confirmed);t.observe("on");assert(t.confirmed);assert(t.loading(999));assert(!t.loading(1100));t.begin(2000);t.observe("on");assert(t.loading(7999));assert(!t.loading(8000));assert(!t.awaiting_action(8000));t.begin(0xFFFFFFF0);assert(t.loading(20));t.begin(100,true);assert(t.loading(1099));assert(!t.awaiting_action(1099));assert(!t.loading(1100));}

tests/test_portal.py

@@ -20,7 +20,7 @@ class ProtocolTests(unittest.TestCase):
         with self.assertRaises(ValueError): packets({'huge':'x'*4096})
 
     def test_layout_rejects_duplicates_unsupported_and_overflow(self):
-        for tiles in [[{'entity':'lock.front'}],[{'entity':'light.a'}]*2,[{'entity':f'light.a{i}'} for i in range(11)],[{'entity':'light.a;restart'}]]:
+        for tiles in [[{'entity':'lock.front'}],[{'entity':'light.a'}]*2,[{'entity':f'light.a{i}'} for i in range(21)],[{'entity':'light.a;restart'}]]:
             with self.assertRaises(ValueError): validate_layout({'title':'Thuis','tiles':tiles})
         self.assertEqual(validate_layout({'title':'Thuis','tiles':[]})['tiles'],[])
 
@@ -122,11 +122,11 @@ class ManagerTests(unittest.IsolatedAsyncioTestCase):
             with self.assertRaises(ValueError): fresh.save('text.screen',{**saved,'settings':{'brightness':0}})
             self.assertEqual(path.read_bytes(),before)
             await fresh.sync_one('text.screen',saved)
-            self.assertEqual(fresh.ha.messages[0][1]['settings'],settings)
+            self.assertEqual(fresh.ha.messages[0][1]['settings'],{k:v for k,v in settings.items() if k!='swipe_pages'})
             await fresh.sync_one('text.screen',saved)
             self.assertEqual(len(fresh.ha.messages),2)
             await fresh.sync_one('text.screen',saved,True)
-            self.assertEqual(fresh.ha.messages[2][1]['settings'],settings)
+            self.assertEqual(fresh.ha.messages[2][1]['settings'],{k:v for k,v in settings.items() if k!='swipe_pages'})
 
     async def test_reorder_aborts_old_batch(self):
         with tempfile.TemporaryDirectory() as temp:

tests/test_runtime_model.cpp

@@ -23,6 +23,10 @@ int main() {
   assert(!m.accepts(0, "light.a"));
   assert(m.set_layout({}, "Leeg", changed)); assert(changed && m.ready() && m.count == 0);
   std::vector<std::string> many;
-  for (int i = 0; i < 11; ++i) many.push_back("light.a" + std::to_string(i));
+  for (int i = 0; i < 21; ++i) many.push_back("light.a" + std::to_string(i));
   assert(!m.set_layout(many, "Te veel", changed)); assert(m.count == 0);
+  many.pop_back(); assert(m.set_layout(many,"Twintig",changed));
+  assert(m.count==20 && m.accepts(19,"light.a19"));
+  for(size_t i=0;i<m.count;++i){m.tiles[i].received=true;m.tiles[i].state="off";}
+  assert(m.ready());
 }

tests/test_twenty_tiles.py

@@ -0,0 +1,34 @@
+import json
+import tempfile
+import unittest
+from pathlib import Path
+import test_portal
+from core import validate_layout, validate_settings, packets
+
+class TwentyTiles(unittest.IsolatedAsyncioTestCase):
+    async def test_twenty_and_old_firmware_guard(self):
+        with tempfile.TemporaryDirectory() as tmp:
+            m=test_portal.ManagerTests().setup_manager(Path(tmp)/'screens.json')
+            layout={'title':'Twintig','tiles':[{'entity':f'light.item{i}'} for i in range(20)],
+                    'settings':validate_settings({'swipe_pages':True})}
+            for tile in layout['tiles']:m.ha.states[tile['entity']]={'state':'on','attributes':{}}
+            with self.assertRaises(ValueError):m.save('text.screen',layout)
+            m.ha.registry[0]['device_id']='screen-device'
+            m.ha.registry.append({'entity_id':'sensor.version','platform':'esphome','original_name':'Schermfirmware','device_id':'screen-device'})
+            m.ha.states['sensor.version']={'state':'0.2.7'}
+            m.save('text.screen',layout)
+            await m.sync_one('text.screen',m.layouts['text.screen'])
+            self.assertEqual(len(m.ha.messages),21)
+            wire=m.ha.messages[0][1]
+            self.assertEqual(len(wire['entities']),20)
+            self.assertEqual(len(wire['settings']),11)
+            self.assertTrue(wire['swipe_pages'])
+            for _,message in m.ha.messages:self.assertTrue(packets(message))
+            old=dict(layout);old['settings']={k:v for k,v in layout['settings'].items() if k!='swipe_pages'}
+            m.save('text.screen',old)
+            self.assertTrue(m.layouts['text.screen']['settings']['swipe_pages'])
+            m.ha.states['sensor.version']['state']='0.2.6'
+            m.ha.messages.clear()
+            await m.sync_one('text.screen',m.layouts['text.screen'],True)
+            self.assertEqual(m.ha.messages,[])
+            self.assertEqual(len(json.loads(m.path.read_text())['screens']['text.screen']['tiles']),20)