updates some display drivers and updates the touch calibration to handle the rotation better

Author: kdschlosser

api_drivers/common_api_drivers/display/hx8369/hx8369.py

@@ -13,10 +13,6 @@
 BYTE_ORDER_RGB = display_driver_framework.BYTE_ORDER_RGB
 BYTE_ORDER_BGR = display_driver_framework.BYTE_ORDER_BGR
 
-
-_MADCTL_MH = const(0x04)  # Refresh 0=Left to Right, 1=Right to Left
-_MADCTL_BGR = const(0x08)  # BGR color order
-_MADCTL_ML = const(0x10)  # Refresh 0=Top to Bottom, 1=Bottom to Top
 _MADCTL_MV = const(0x20)  # 0=Normal, 1=Row/column exchange
 _MADCTL_MX = const(0x40)  # 0=Left to Right, 1=Right to Left
 _MADCTL_MY = const(0x80)  # 0=Top to Bottom, 1=Bottom to Top

api_drivers/common_api_drivers/display/ili9488/ili9488.py

@@ -9,9 +9,6 @@
 BYTE_ORDER_RGB = display_driver_framework.BYTE_ORDER_RGB
 BYTE_ORDER_BGR = display_driver_framework.BYTE_ORDER_BGR
 
-_MADCTL_MH = const(0x04)  # Refresh 0=Left to Right, 1=Right to Left
-_MADCTL_BGR = const(0x08)  # BGR color order
-_MADCTL_ML = const(0x10)  # Refresh 0=Top to Bottom, 1=Bottom to Top
 _MADCTL_MV = const(0x20)  # 0=Normal, 1=Row/column exchange
 _MADCTL_MX = const(0x40)  # 0=Left to Right, 1=Right to Left
 _MADCTL_MY = const(0x80)  # 0=Top to Bottom, 1=Bottom to Top
@@ -21,7 +18,7 @@ class ILI9488(display_driver_framework.DisplayDriver):
 
     _ORIENTATION_TABLE = (
         _MADCTL_MX,
-        _MADCTL_MV,
+        _MADCTL_MV | _MADCTL_MY | _MADCTL_MX,
         _MADCTL_MY,
-        _MADCTL_MX | _MADCTL_MY | _MADCTL_MV
+        _MADCTL_MV
     )

api_drivers/common_api_drivers/display/st7789/st7789.py

@@ -11,9 +11,6 @@
 BYTE_ORDER_RGB = display_driver_framework.BYTE_ORDER_RGB
 BYTE_ORDER_BGR = display_driver_framework.BYTE_ORDER_BGR
 
-_MADCTL_MH = const(0x04)  # Refresh 0=Left to Right, 1=Right to Left
-_MADCTL_BGR = const(0x08)  # BGR color order
-_MADCTL_ML = const(0x10)  # Refresh 0=Top to Bottom, 1=Bottom to Top
 _MADCTL_MV = const(0x20)  # 0=Normal, 1=Row/column exchange
 _MADCTL_MX = const(0x40)  # 0=Left to Right, 1=Right to Left
 _MADCTL_MY = const(0x80)  # 0=Top to Bottom, 1=Bottom to Top
@@ -47,7 +44,7 @@ def __init__(
         rgb565_byte_swap=False,
     ):
 
-        if color_space != lv.COLOR_FORMAT.RGB565:
+        if color_space != lv.COLOR_FORMAT.RGB565:  # NOQA
             rgb565_byte_swap = False
 
         self._rgb565_byte_swap = rgb565_byte_swap
@@ -80,4 +77,3 @@ def __init__(
             _init_bus=True
         )
 
-

api_drivers/py_api_drivers/frozen/display/display_driver_framework.py

@@ -40,6 +40,7 @@
 class DisplayDriver:
     _INVON = 0x21
     _INVOFF = 0x20
+
     _ORIENTATION_TABLE = (
         _MADCTL_MX,
         _MADCTL_MV,

api_drivers/py_api_drivers/frozen/indev/pointer_framework.py

@@ -11,6 +11,7 @@ class PointerDriver(_indev_base.IndevBase):
     def __init__(self, touch_cal=None, startup_rotation=lv.DISPLAY_ROTATION._0, debug=False):  # NOQA
         self._last_x = -1
         self._last_y = -1
+
         self._last_state = self.RELEASED
 
         super().__init__(debug=debug)

api_drivers/py_api_drivers/frozen/indev/touch_calibration/touch_calibrate.py

@@ -33,7 +33,6 @@
 
 
 def calibrate(indev, cal_data):
-    indev.enable(False)
 
     if not task_handler.TaskHandler.is_running():
         th_running = False
@@ -63,6 +62,15 @@ def calibrate(indev, cal_data):
     ]
 
     old_scrn = lv.screen_active()
+
+    disp = old_scrn.get_display()
+    rotation = disp.get_rotation()
+
+    if rotation != lv.DISPLAY_ROTATION._0:
+        disp.set_rotation(lv.DISPLAY_ROTATION._0)
+
+    indev.enable(False)
+
     new_scrn = lv.obj()
     lv.screen_load(new_scrn)
 
@@ -115,7 +123,6 @@ def calibrate(indev, cal_data):
 
             print('  ', j + 1, 'of 8:', (x, y))
 
-
     print()
     print('averaged trimmed points')
     for i, points in enumerate(captured_points):
@@ -139,6 +146,10 @@ def calibrate(indev, cal_data):
     else:
         mirror_y = False
 
+    print('mirroring')
+    print('  mirrored x:', mirror_x)
+    print('  mirrored y:', mirror_y)
+
     tp1, tp2, tp3 = captured_points
     sp1, sp2, sp3 = target_points
     print()
@@ -207,4 +218,7 @@ def calibrate(indev, cal_data):
 
     indev.enable(True)
 
+    if rotation != lv.DISPLAY_ROTATION._0:
+        disp.set_rotation(rotation)
+
     return res