makes some changes to the calibration data code.

Author: kdschlosser

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

@@ -1,4 +1,3 @@
-import lcd_utils
 import struct
 import sys
 
@@ -113,17 +112,9 @@ def __init__(self, name):
             self._mirrorY = None
         else:
             (
-                alphaX, betaX, deltaX, alphaY, betaY, deltaY, mirrorX, mirrorY
-            ) = struct.unpack("<IIIIIIBB", 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._mirrorX = bool(mirrorX)
-            self._mirrorY = bool(mirrorY)
+                self._alphaX, self._betaX, self._deltaX, self._alphaY,
+                self._betaY, self._deltaY, self._mirrorX, self._mirrorY
+            ) = struct.unpack("<ffffffBB", blob)
 
         self._is_dirty = False
 
@@ -142,17 +133,10 @@ def save(self):
                 self._config.erase('ts_config')
 
             else:
-                alphaX = lcd_utils.int_float_converter(self._alphaX)
-                betaX = lcd_utils.int_float_converter(self._betaX)
-                deltaX = lcd_utils.int_float_converter(self._deltaX)
-                alphaY = lcd_utils.int_float_converter(self._alphaY)
-                betaY = lcd_utils.int_float_converter(self._betaY)
-                deltaY = lcd_utils.int_float_converter(self._deltaY)
-
                 blob = struct.pack(
-                    '<IIIIIIBB',
-                    alphaX, betaX, deltaX, alphaY, betaY, deltaY,
-                    int(self._mirrorX), int(self._mirrorY)
+                    '<ffffffBB',
+                    self._alphaX, self._betaX, self._deltaX, self._alphaY,
+                    self._betaY, self._deltaY, self._mirrorX, self._mirrorY
                 )
 
                 blob = bytearray(blob)
@@ -164,27 +148,33 @@ def save(self):
 
     @property
     def mirrorX(self):
-        return self._mirrorX
+        if self._mirrorX is None:
+            return None
+
+        return bool(self._mirrorX)
 
     @mirrorX.setter
     def mirrorX(self, value):
         if value is None:
             self._mirrorX = None
         else:
-            self._mirrorX = bool(value)
+            self._mirrorX = int(value)
 
         self._is_dirty = True
 
     @property
     def mirrorY(self):
-        return self._mirrorY
+        if self._mirrorY is None:
+            return None
+
+        return bool(self._mirrorY)
 
     @mirrorY.setter
     def mirrorY(self, value):
         if value is None:
             self._mirrorY = None
         else:
-            self._mirrorY = bool(value)
+            self._mirrorY = int(value)
 
         self._is_dirty = True
 

ext_mod/lcd_utils/src/binary_float.c

@@ -18,10 +18,17 @@ static mp_obj_t mp_lcd_utils_int_float_converter(size_t n_args, const mp_obj_t *
         u.f = mp_obj_get_float_to_f(args[0]);
         return mp_obj_new_int_from_uint(u.i);
     } else {
-        u.i = (uint32_t)mp_obj_get_int(args[0]);
+        u.i = (uint32_t)mp_obj_get_int_truncated(args[0]);
         return mp_obj_new_float_from_f(u.f);
     }
 }
 
+alphaX: 0.9185965     7
+betaX: -0.03718129    8
+deltaX: 13.55056      5
+alphaY: 0.003533064   9
+betaY: 0.999857       6
+deltaY: 2.936733      6
+
 
 MP_DEFINE_CONST_FUN_OBJ_VAR(mp_lcd_utils_int_float_converter_obj, 1, mp_lcd_utils_int_float_converter);