This might fix an issue with the touch being mirrored

Author: kdschlosser

api_drivers/py_api_drivers/frozen/indev/pointer_framework.py

@@ -63,7 +63,9 @@ def is_calibrated(self):
  cal.deltaX,
  cal.alphaY,
  cal.betaY,
- cal.deltaY
+ cal.deltaY,
+ cal.mirrorX,
+ cal.mirrorY
  )
 
  def _get_coords(self):
@@ -77,6 +79,11 @@ def _calc_coords(self, x, y):
  cal = self._cal
  x = int(round(x * cal.alphaX + y * cal.betaX + cal.deltaX))
  y = int(round(x * cal.alphaY + y * cal.betaY + cal.deltaY))
+
+ if cal.mirrorX:
+ x = self._orig_width - x - 1
+ if cal.mirrorY:
+ y = self._orig_height - y - 1
  else:
  if (
  self._startup_rotation == lv.DISPLAY_ROTATION._180 or # NOQA
@@ -114,9 +121,15 @@ def _read(self, drv, data): # NOQA
 
  if (
  self._debug and
- (x != self._last_x or y != self._last_y or self._last_state != state) # NOQA
+ (x != self._last_x or
+ y != self._last_y or
+ self._last_state != state)
  ):
- print(f'{self.__class__.__name__}(raw_x={self._last_x}, raw_y={self._last_y}, x={data.point.x}, y={data.point.y}, state={"PRESSED" if data.state else "RELEASED"})') # NOQA
+ template = '{}(raw_x={}, raw_y={}, x={}, y={}, state={})'
+ print(template.format(
+ self.__class__.__name__,
+ x, y, data.point.x, data.point.y,
+ "PRESSED" if data.state else "RELEASED"))
 
  self._last_state = state
  self._last_x, self._last_y = x, y

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

@@ -98,16 +98,6 @@ def __init__(self, name):
  blob = bytearray(24)
  try:
  self._config.get_blob("ts_config", blob)
- (
- alphaX, betaX, deltaX, alphaY, betaY, deltaY
- ) = struct.unpack("<IIIIII", blob)
-
- self._alphaX = round(lcd_utils.int_float_converter(alphaX), 7)
- self._betaX = round(lcd_utils.int_float_converter(betaX), 7)
- self._deltaX = round(lcd_utils.int_float_converter(deltaX), 7)
- self._alphaY = round(lcd_utils.int_float_converter(alphaY), 7)
- self._betaY = round(lcd_utils.int_float_converter(betaY), 7)
- self._deltaY = round(lcd_utils.int_float_converter(deltaY), 7)
 
  except OSError:
  self._alphaX = None
@@ -116,6 +106,19 @@ def __init__(self, name):
  self._alphaY = None
  self._betaY = None
  self._deltaY = None
+ self._mirror = None
+ else:
+ (
+ alphaX, betaX, deltaX, alphaY, betaY, deltaY, mirror
+ ) = struct.unpack("<IIIIIIB", blob)
+
+ self._alphaX = round(lcd_utils.int_float_converter(alphaX), 7)
+ self._betaX = round(lcd_utils.int_float_converter(betaX), 7)
+ self._deltaX = round(lcd_utils.int_float_converter(deltaX), 7)
+ self._alphaY = round(lcd_utils.int_float_converter(alphaY), 7)
+ self._betaY = round(lcd_utils.int_float_converter(betaY), 7)
+ self._deltaY = round(lcd_utils.int_float_converter(deltaY), 7)
+ self._mirror = mirror
 
  self._is_dirty = False
 
@@ -127,7 +130,8 @@ def save(self):
  self._deltaX,
  self._alphaY,
  self._betaY,
- self._deltaY
+ self._deltaY,
+ self._mirror
  ):
  self._config.erase('ts_config')
 
@@ -140,14 +144,52 @@ def save(self):
  deltaY = lcd_utils.int_float_converter(self._deltaY)
 
  blob = struct.pack(
- '<IIIIII',
- alphaX, betaX, deltaX, alphaY, betaY, deltaY
+ '<IIIIIIB',
+ alphaX, betaX, deltaX, alphaY, betaY, deltaY, self._mirror
  )
 
  self._config.set_blob("ts_config", blob)
 
  self._config.commit()
 
+ @property
+ def mirrorX(self):
+ if self._mirror is None:
+ return None
+
+ return bool(self._mirror >> 1 & 0x1)
+
+ @mirrorX.setter
+ def mirrorX(self, value):
+ if self._mirror is None:
+ self._mirror = 0
+
+ if value:
+ self._mirror |= 0x2
+ else:
+ self._mirror &= ~0x2
+
+ self._is_dirty = True
+
+ @property
+ def mirrorY(self):
+ if self._mirror is None:
+ return None
+
+ return bool(self._mirror & 0x1)
+
+ @mirrorY.setter
+ def mirrorY(self, value):
+ if self._mirror is None:
+ self._mirror = 0
+
+ if value:
+ self._mirror |= 0x1
+ else:
+ self._mirror &= ~0x1
+
+ self._is_dirty = True
+
  @property
  def alphaX(self):
  return self._alphaX
@@ -233,4 +275,5 @@ def reset(self):
  self.alphaY = None
  self.betaY = None
  self.deltaY = None
+ self._mirror = None
  self.save()

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

@@ -115,6 +115,7 @@ def calibrate(indev, cal_data):
 
  print(' ', j + 1, 'of 8:', (x, y))
 
+
  print()
  print('averaged trimmed points')
  for i, points in enumerate(captured_points):
@@ -128,6 +129,16 @@ def calibrate(indev, cal_data):
 
  print(' point', i + 1, 'of 3:', (points['x'], points['y']))
 
+ if captured_points[0]['x'] > captured_points[1]['x']:
+ mirror_x = True
+ else:
+ mirror_x = False
+
+ if captured_points[0]['y'] > captured_points[2]['y']:
+ mirror_y = True
+ else:
+ mirror_y = False
+
  tp1, tp2, tp3 = captured_points
  sp1, sp2, sp3 = target_points
  print()
@@ -177,6 +188,9 @@ def calibrate(indev, cal_data):
  cal_data.betaY = betaY
  cal_data.deltaY = deltaY
 
+ cal_data.mirrorX = mirror_x
+ cal_data.mirrorY = mirror_y
+
  except ZeroDivisionError:
  print('Error in calculation please try again.')
  res = False