Fixes: themes RGB led colors, orientation for rev. B at restart

Author: mathoudebine

library/display.py

@@ -60,7 +60,7 @@ def initialize_display(self):
         self.lcd.SetBrightness(CONFIG_DATA["display"]["BRIGHTNESS"])
 
         # Set backplate RGB LED color (for supported HW only)
-        self.lcd.SetBackplateLedColor(THEME_DATA['display']["DISPLAY_RGB_LED"])
+        self.lcd.SetBackplateLedColor(THEME_DATA['display'].get("DISPLAY_RGB_LED", (255, 255, 255)))
 
         # Set orientation
         self.lcd.SetOrientation(_get_theme_orientation())

library/lcd_comm_rev_b.py

@@ -117,14 +117,21 @@ def InitializeComm(self):
         self.Hello()
 
     def Reset(self):
-        # HW revision B does not implement a command to reset it: clear the screen instead
-        self.Clear()
+        # HW revision B does not implement a command to reset it
+        pass
 
     def Clear(self):
         # HW revision B does not implement a Clear command: display a blank image on the whole screen
+        # Force an orientation in case the screen is currently configured with one different from the theme
+        backup_orientation = self.orientation
+        self.SetOrientation(orientation=Orientation.PORTRAIT)
+
         blank = Image.new("RGB", (self.get_width(), self.get_height()), (255, 255, 255))
         self.DisplayPILImage(blank)
 
+        # Restore orientation
+        self.SetOrientation(orientation=backup_orientation)
+
     def ScreenOff(self):
         # HW revision B does not implement a "ScreenOff" native command: using SetBrightness(0) instead
         self.SetBrightness(0)
@@ -148,8 +155,10 @@ def SetBrightness(self, level_user: int = 25):
         self.SendCommand(Command.SET_BRIGHTNESS, payload=[level])
 
     def SetBackplateLedColor(self, led_color: Tuple[int, int, int] = (255, 255, 255)):
+        if isinstance(led_color, str):
+            led_color = tuple(map(int, led_color.split(', ')))
         if self.is_flagship():
-            self.SendCommand(Command.SET_LIGHTING, payload=led_color)
+            self.SendCommand(Command.SET_LIGHTING, payload=list(led_color))
         else:
             logger.info("Only HW revision 'flagship' supports backplate LED color setting")
 

library/lcd_simulated.py

@@ -52,7 +52,7 @@ def InitializeComm(self):
         pass
 
     def Reset(self):
-        self.Clear()
+        pass
 
     def Clear(self):
         self.SetOrientation(self.orientation)

res/themes/3.5inchTheme2/theme.yaml

@@ -4,7 +4,7 @@ display:
   DISPLAY_ORIENTATION: portrait
 
   # Backplate RGB LED color (for HW revision 'flagship' devices only)
-  DISPLAY_RGB_LED: [0, 0, 255]
+  DISPLAY_RGB_LED: 0, 0, 255
 
 static_images:
   # Specify what static images we want to show on the display

res/themes/Cyberpunk/theme.yaml

@@ -4,7 +4,7 @@ display:
   DISPLAY_ORIENTATION: portrait
 
   # Backplate RGB LED color (for HW revision 'flagship' devices only)
-  DISPLAY_RGB_LED: 0, 0, 255
+  DISPLAY_RGB_LED: 255, 255, 0
 
 static_images:
   # Specify what static images we want to show on the display

res/themes/Landscape6Grid/theme.yaml

@@ -4,7 +4,7 @@ display:
   DISPLAY_ORIENTATION: landscape
 
   # Backplate RGB LED color (for HW revision 'flagship' devices only)
-  DISPLAY_RGB_LED: [0, 0, 255]
+  DISPLAY_RGB_LED: 0, 0, 255
 
 static_images:
   # Specify what static images we want to show on the display