Add persistent native Guition rotation to screen settings

screen_manager/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.2.9
+
+- Guition: kies 0°, 90°, 180° of 270° onder Scherminstellingen. Na opslaan draait de interface direct mee, inclusief touch. De hoek blijft bewaard na herstart; een nieuwe flash per hoek is niet nodig.
+- Installeer eerst Guition-firmware 0.2.9 voor deze optie. De CYD behoudt zijn vaste oriëntatie en kalibratie.
+
 ## 0.2.8
 
 - Firmware: vaste tekstbreedtes voor nette afkapping met puntjes. Ondertitels gebruiken de beschikbare ruimte, ook bij korte titels.

screen_manager/app/core.py

@@ -24,6 +24,7 @@ SETTING_RULES = {
     'clock_24h': (True, None, None),
     'home_on_standby': (False, None, None),
     'swipe_pages': (False, None, None),
+    'rotation': (0, 0, 270),
 }
 
 def validate_settings(data):
@@ -36,6 +37,7 @@ def validate_settings(data):
             valid = type(value) is bool
         else:
             valid = type(value) is int and minimum <= value <= maximum
+        if key == "rotation": valid = valid and value in (0, 90, 180, 270)
         if not valid:
             raise ValueError(f'Ongeldige waarde voor {key}.')
         clean[key] = value
@@ -129,6 +131,8 @@ def discover(registry, states, devices, areas):
     area_map = {a['area_id']: a['name'] for a in areas}
     versions = {item.get('device_id'): states.get(item['entity_id'], {}).get('state', 'onbekend') for item in registry
                 if item.get('platform') == 'esphome' and item.get('original_name') == 'Schermfirmware'}
+    boards = {item.get("device_id"): "guition" for item in registry
+              if item.get("platform") == "esphome" and item.get("original_name") == "Guition schermtype"}
     screens, entities = [], []
     for item in registry:
         eid = item['entity_id']
@@ -138,6 +142,7 @@ def discover(registry, states, devices, areas):
         if item.get('platform') == 'esphome' and eid.startswith('text.') and item.get('original_name') == 'Tegelinstellingen' and not item.get('disabled_by'):
             screens.append({'id': eid, 'name': device.get('name_by_user') or device.get('name') or eid,
                             'firmware': versions.get(item.get('device_id'), 'onbekend'),
+                            'board': boards.get(item.get('device_id'), 'unknown'),
                             'area': area, 'online': state.get('state') not in (None, 'unknown', 'unavailable'),
                             'status': state.get('state', 'Niet verbonden')})
         if not entity_id(eid) or item.get('disabled_by'):

screen_manager/app/server.py

@@ -184,6 +184,11 @@ class Manager:
             layout['settings'] = self.layouts[inbox]['settings'].copy()
         if 'settings' in layout and 'swipe_pages' not in data.get('settings',{}):
             layout['settings']['swipe_pages']=self.layouts.get(inbox,{}).get('settings',{}).get('swipe_pages',False)
+        if 'settings' in layout and 'rotation' not in data.get('settings',{}):
+            layout['settings']['rotation']=self.layouts.get(inbox,{}).get('settings',{}).get('rotation',0)
+        screen=next(s for s in self.inventory()[0] if s['id']==inbox)
+        if layout.get('settings',{}).get('rotation',0) and screen.get('board')!='guition':
+            raise ValueError('Rotatie vereist een Guition met firmware 0.2.9 of nieuwer.')
         old_tiles = {t['entity']:t for t in self.layouts.get(inbox,{}).get('tiles',[])}
         for tile in layout['tiles']:
             if 'options' not in tile and 'options' in old_tiles.get(tile['entity'],{}):
@@ -211,8 +216,10 @@ class Manager:
             return
         messages = [{'v': 1, 'op': 'layout', 'inbox': inbox, 'title': layout['title'], 'entities': [t['entity'] for t in layout['tiles']]}]
         if 'settings' in layout:
-            messages[0]['settings'] = {k:v for k,v in layout['settings'].items() if k!='swipe_pages'}
+            messages[0]['settings'] = {k:v for k,v in layout['settings'].items() if k not in ('swipe_pages','rotation')}
             messages[0]['swipe_pages'] = layout['settings'].get('swipe_pages',False)
+            if next((s.get('board') for s in self.inventory()[0] if s['id']==inbox),None)=='guition':
+                messages[0]['rotation'] = layout['settings'].get('rotation',0)
         for i,tile in enumerate(layout['tiles']):
             message=state_message(i,tile,self.ha.states)
             if tile['entity'].startswith('sensor.') and hasattr(self.ha,'history'):

screen_manager/app/static/app.js

@@ -81,6 +81,7 @@ const settingDefinitions = [
   ["show_clock", "Klok tonen", "check", true],
   ["clock_24h", "24-uursklok (uit = 12 uur)", "check", true],
   ["home_on_standby", "Na standby terug naar pagina 1", "check", false],
+  ["rotation", "Scherm draaien (met de klok mee)", "rotation", 0],
   ["swipe_pages", "Vegen tussen pagina’s (firmware 0.2.7+)", "check", false],
 ];
 function renderSettings() {
@@ -93,20 +94,25 @@ function renderSettings() {
   const container = $("#settings-fields");
   container.replaceChildren();
   for (const [key, title, kind, , min, max] of settingDefinitions) {
+    if(key === "rotation" && inventory.screens.find(s => s.id === selected)?.board !== "guition") continue;
     const label = node(
       "label",
       undefined,
       `setting ${kind === "check" ? "setting-check" : ""}`,
     );
     const caption = node("span", title),
-      input = node("input"),
+      input = node(kind === "rotation" ? "select" : "input"),
       output = node("output");
     input.id = `setting-${key}`;
-    input.type =
+    if(kind !== "rotation") input.type =
       kind === "check" ? "checkbox" : kind === "minutes" ? "number" : kind;
     input.setAttribute("aria-label", title);
     input.required = kind === "minutes" || kind === "time";
-    if (kind === "check") input.checked = values[key];
+    if(kind === "rotation") {
+      for(const angle of [0,90,180,270]) { const option=node("option", `${angle}°`); option.value=angle; input.append(option); }
+      input.value=values[key];
+    }
+    else if (kind === "check") input.checked = values[key];
     else if (kind === "time")
       input.value = `${String(Math.floor(values[key] / 60)).padStart(2, "0")}:${String(values[key] % 60).padStart(2, "0")}`;
     else {

screen_manager/config.yaml

@@ -1,5 +1,5 @@
 name: ESP Screen Manager
-version: "0.2.8"
+version: "0.2.9"
 slug: esp_screen_manager
 description: Kies tegels voor je CYD en Guition touchscreen, zonder opnieuw flashen.
 url: https://github.com/MaxGramser/homeassistant_espscreen