Save calibration data in settings.toml

Author: RetiredWizard

calibrate.py

@@ -0,0 +1,2 @@
+from pydos_ui import Pydos_ui
+Pydos_ui.calibrate()

demo.py

@@ -33,7 +33,7 @@
 import time
 import busio
 import board
-import adafruit_focaltouch
+#import adafruit_focaltouch
 import displayio
 import dotclockframebuffer
 import framebufferio
@@ -53,7 +53,7 @@
 
 
 #ft = adafruit_focaltouch.Adafruit_FocalTouch(i2c, debug=False)
-ft = Pydos_ui.ft
+ft = Pydos_ui.ts
 
 displayio.release_displays()
 
@@ -96,7 +96,7 @@
 #    bounce_buffer_size_px = 1000 * 15, # 15000
 #    )
 
-fb=dotclockframebuffer.DotClockFramebuffer(**board.TFT,**board.TIMINGS800)
+fb=dotclockframebuffer.DotClockFramebuffer(**board.TFT_PINS,**board.TFT_TIMINGS)
 
 
 print('Creating DotClockFrameBuffer Display.')
@@ -113,8 +113,8 @@
 
 box_size=50
 corner_box_size=20
-width=800
-height=480
+width=display.width
+height=display.height
 
 color_count=0 
 

lib/gt911_touch.py

@@ -49,7 +49,6 @@
 
 _GT_COMMAND = const(0x8040)
 
-
 _GT_REG_STATUS = const(0x814E)
 _GT_POINT1_COORD = const(0x814F)
 _GT_REG_PRODID_1 = const(0x8140)
@@ -138,9 +137,11 @@ def touched(self) -> int:
         curr_touch = self._read_last_touch()
         if self._last_touch != curr_touch:
             self._last_touch = curr_touch
-            """ If this extra call to _read_last_touch() 
+            """ 
+            If this extra call to _read_last_touch() 
             isn't made then the next touch is missed ?????
-            I have no idea why """
+            I have no idea why 
+            """
             self._read_last_touch()
             return 1
         else:
@@ -149,7 +150,7 @@ def touched(self) -> int:
     def _read_last_touch(self):
         self._write(_GT_REG_STATUS,[0])
         test = self._read(_GT_REG_STATUS,1)[0]
-        timeout = 1000
+        timeout = 250
         while not (test & 0x80) and (timeout := timeout-1) > 0:
             if test == 0:
                 break
@@ -235,7 +236,7 @@ def _read(self, register, length, irq_pin=None) -> bytearray:
 
             i2c.write(bytes([((register & 0xFF00) >> 8),(register & 0xFF)]))
             result = bytearray(length)
-            time.sleep(.1)
+            time.sleep(.06)
 
             i2c.readinto(result)
             if self._debug:

lib/pydos_ui_virt.py

@@ -1,4 +1,5 @@
 from sys import stdin,stdout,implementation
+from os import getenv
 
 import board
 import displayio
@@ -83,22 +84,29 @@ def __init__(self):
 
         self._touched = False
 
-        self._row1Keys = [665,615,565,515,465,415,365,315,265,215,165,115,68,0]
+        self._row1Keys = [665,615,565,515,465,415,365,315,265,215,165,115,68,-99999]
         self._row1Letters = ['\x08','=','-','0','9','8','7','6','5','4','3','2','1','`']
         self._row1Uppers = ['\x08','+','_',')','(','*','&','^','%','$','#','@','!','~']
-        self._row2Keys = [695,645,595,545,495,445,395,345,295,245,195,145,95,0]
+        self._row2Keys = [695,645,595,545,495,445,395,345,295,245,195,145,95,-99999]
         self._row2Letters = ['\\',']','[','p','o','i','u','y','t','r','e','w','q','\x09']
         self._row2Uppers = ['|','}','{']
-        self._row3Keys = [650,600,550,500,450,400,350,300,250,200,150,100,0]
+        self._row3Keys = [650,600,550,500,450,400,350,300,250,200,150,100,-99999]
         self._row3Letters = ['\n',"'",';','l','k','j','h','g','f','d','s',"a",'C']
         self._row3Uppers = ['\n','"',':']
-        self._row4Keys = [635,585,535,485,435,385,335,285,235,185,135,0]
+        self._row4Keys = [635,585,535,485,435,385,335,285,235,185,135,-99999]
         self._row4Letters = ['S','/','.',',','m','n','b','v','c','x','z','S']
         self._row4Uppers = ['S','?','>','<']
-        self._row5Keys = [710,520,220,125,0]
+        self._row5Keys = [710,520,220,125,-99999]
         self._row5Letters = ['X','',' ','','\x1b']
 
-        ts_calib = self.calibrate()
+        ts_calib = getenv('PYDOS_TS_CALIB')
+        try:
+            ts_calib = eval(ts_calib)
+            self._calibrated = True
+        except:
+            ts_calib = self.calibrate()
+        if len(ts_calib) != 4:
+            ts_calib = self.calibrate()
         self._calibXfact = self._display.width/(ts_calib[2]-ts_calib[0]+1)
         self._calibXadj = ts_calib[0]
         self._calibYfact = self._display.height/(ts_calib[3]-ts_calib[1]+1)
@@ -181,6 +189,27 @@ def calibrate(self):
         largest_X += 5
         largest_Y += 5
 
+        envline = {}
+        defaults = True
+        try:
+            envfile = open('/settings.toml')
+        except:
+            defaults = False
+
+        if defaults:
+            for line in envfile:
+                try:
+                    envline[line.split('=')[0].strip()] = line.split('=')[1].strip()
+                except:
+                    pass
+            envfile.close()
+
+        with open('/settings.toml','w') as envfile:
+            for param in envline:
+                if param != 'PYDOS_TS_CALIB':
+                    envfile.write(param+"="+envline.get(param,"")+"\n")
+            envfile.write('PYDOS_TS_CALIB="(%s,%s,%s,%s)"'%(smallest_X,smallest_Y,largest_X,largest_Y))
+
         self._display.root_group=displayio.CIRCUITPYTHON_TERMINAL
         self._calibrated = True
         print("Screen Calibrated: (%s,%s) (%s,%s)" % (smallest_X,smallest_Y,largest_X,largest_Y))