From 4a1a9e8669bf9692ff4b470c6413fca0f8c2f26e Mon Sep 17 00:00:00 2001
From: Chris <cryptophoto@gmail.com>
Date: Thu, 8 Aug 2024 23:40:51 +1000
Subject: [PATCH] Add touch-screen rotation support, binary versions for
 MicroPython 1.24, and recipe to make themImproved clock/time and file date
 handling

---
 Makefile       |  19 +++++++++++++++++++
 ili9341.mpy    | Bin 0 -> 8525 bytes
 ili9341.py     |  22 ++++++++++++++++++++++
 urequests2.mpy | Bin 0 -> 2100 bytes
 xglcd_font.mpy | Bin 0 -> 1263 bytes
 xglcd_font.py  |  16 ++++++++++++++++
 xpt2046.mpy    | Bin 0 -> 1786 bytes
 xpt2046.py     |  42 +++++++++++++++++++++++++++++++++++++++---
 8 files changed, 96 insertions(+), 3 deletions(-)
 create mode 100644 Makefile
 create mode 100644 ili9341.mpy
 create mode 100644 urequests2.mpy
 create mode 100644 xglcd_font.mpy
 create mode 100644 xpt2046.mpy

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..bcc45ec
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,19 @@
+# Define variables
+MPY_CROSS = ../micropython/mpy-cross/build/mpy-cross
+
+SRC_DIR = .
+OUT_DIR = .
+SRC = $(wildcard $(SRC_DIR)/*.py)
+OUT = $(patsubst $(SRC_DIR)/%.py, $(OUT_DIR)/%.mpy, $(SRC))
+
+# Default target
+# all: $(OUT) $(OUT_DIR)/sh.txt
+all: $(OUT)
+
+# Rule to create .mpy from .py
+$(OUT_DIR)/%.mpy: $(SRC_DIR)/%.py
+	$(MPY_CROSS) $< -o $@
+
+# Phony targets
+.PHONY: all
+
diff --git a/ili9341.mpy b/ili9341.mpy
new file mode 100644
index 0000000000000000000000000000000000000000..d4b4ed3c1df2a7485f7c57e17f174563b07f5408
GIT binary patch
literal 8525
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

literal 0
HcmV?d00001

diff --git a/ili9341.py b/ili9341.py
index 86482ae..4fa84d6 100644
--- a/ili9341.py
+++ b/ili9341.py
@@ -1074,3 +1074,25 @@ class Display(object):
         self.spi.write(data)
         self.spi.unlock()
         self.cs.value = True
+
+
+"""
+
+from ili9341 import Display, color565
+from machine import Pin, SPI, ADC, PWM, SDCard, SoftSPI
+from xpt2046 import Touch
+hspi = SPI(1, baudrate=40000000, sck=Pin(14), mosi=Pin(13))
+display = Display(hspi, dc=Pin(2), cs=Pin(15), rst=Pin(0), width=320, height=240, rotation=270)
+tft_bl = Pin(21, Pin.OUT)
+tft_bl.value(1)
+display.fill_rectangle(0, 0, 320, 240, 1234)
+display.draw_circle(120,160,50,0)
+display.draw_ellipse(125,165,90,20,9999)
+display.draw_hline(20,40,100,8888)
+from xglcd_font import XglcdFont
+robotron = XglcdFont('fonts/EspressoDolce18x24.c', 18, 24 )
+display.draw_text(100,160,"Hello World",robotron,2016,1234)
+display.draw_text8x8(160,100,"Hello World",0,1234)
+display.fill_circle(10,10,10,0b0000011111100000)
+
+"""
diff --git a/urequests2.mpy b/urequests2.mpy
new file mode 100644
index 0000000000000000000000000000000000000000..fc1b623fcd3cbfea64fbc73663f0539768778256
GIT binary patch
literal 2100
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

literal 0
HcmV?d00001

diff --git a/xglcd_font.mpy b/xglcd_font.mpy
new file mode 100644
index 0000000000000000000000000000000000000000..6d7d0c4098365d105a3f7e3c296944f3a4a79244
GIT binary patch
literal 1263
zcmYLHOH3O_7@l48FvcP4*=6JM2!3o9W6UG4MQYVnXfZU2p~WT8BDLLk*Bj%;*p|I%
z;Kc0Kibzvc9HJb0%Ar!Lp4J9TAP)pdNZ&|3rEM-fkV{onGM0Mn*m+5#nSZ|TpYNal
zo0+Hs9fM@cLM)*~rSqwz)|*}gN3Dt)PXOEbL@Jd5*7=Aw2jB;llrfwEytYg6D2D8F
zYCJZl0cTc=WHc$EYMPn>&Zn!Sq%PuIm%ON{St+e%p7S0_N~9uD>19dK^z=v;kQrc{
ztm$6>dS^{vAJ99<05H5%BCbhtT+4zc@$^|~^4%%G#MBoBjo0ercnmn_)kyYYMwK*m
zK?CrOn3_}<(wVn_exa}DRfD#sD{a)xN3c4<%&YUM%;KkU^%BtM_4mmnus^%MO-Uti
z*NhxdF2pjpi70@HNHUsLB54)qDgBbQTA?YMjwtbD3^eL**19XkxS}aF>q@3Hmx6bZ
zc+#cJMKTcuyYjjV*erDb)D!)97=qJAxH4D2K@>?@{A6oQ8_AMw7S=L*b^uVdj&{Mq
z)`k`0GDjV+of}55W9%x-wdd-uoN*jyJE&UL6=*=ZY#4GbCtqHcmsjM^Z^&PG(6Ica
zM+fqX#{e>W?1l%O^OIA9fUO%KSo;9UvS_jbSXig-C#D8#*w(O8n>)3eBRq9(PrbFl
zhFVYq*Tr!jp<p`ep?7szAWf%r&2%=bn@$_Fn6y<tT>eiW^pZ)}m+|auG#Pt-h?os4
zSMArSUc1|a0_TQ<0iVY|$_t|JM5t?m6HK~s7jgxYwv`3KbRK~xO!|mG+(Y*vpQoAx
z^6m74bt&}8UXeLE1omKOQ6SLoBcUQPddX>udK?r*cad>WaEN%gvGh2InGMWTvx^K(
zF+)UfqKK*o^+U|;L2dvPndS=fu|NpK>e^bN)Jx8+6%Ou;*OtN`euQ1tCwGReZ70#_
zlsPpOYTSVX`4xeT&5DCz#qfPM3|Y4iopyOTJH_|%`QP-?zq=-VtS}v$%@_XK$&Yl0
zmFo*vz9ynhcbC6AfF_asOlOyu<5FBO=nbD55Bf$zfzIwRZmv7-#j!8Y!}amJj~|0Q
zd29vUaQI*y+wx~{9QJxaz9bN{UP8fs?X4Hf534?HY!vaurv>8sn`rt6{02X6ZI*vp
z4Td4N%DiGwEkoojZ0pbBDahS2DpBDX+)w`U>ss&+gwZXde7L{GQ#bW6){;Uayu)Nz
z&M`ztA%=%{ZgX(EG;_DQ=%pFa&r!>dg5%pO2m3gB!c*cq+grIZM`4{O6(RA~lK2lo
zJPpaM%9q$fJo8+9hIeqxW_hK|H@_(2;~@t(%N%W#OI&kl|IY30nHPXwh3;ZVWI0AZ
z;2AuZijRV)IU4V1tSx@KbbE8lZ&5z;{Y|vAy8HUkSIFua^^XP6y}T4^zYlxXUOL)X
S-dn|gtT<gL9o!S$tIGdMS*H{L

literal 0
HcmV?d00001

diff --git a/xglcd_font.py b/xglcd_font.py
index 5d28853..225fa20 100644
--- a/xglcd_font.py
+++ b/xglcd_font.py
@@ -168,3 +168,19 @@ class XglcdFont(object):
             # Add length of letter and spacing
             length += self.letters[offset] + spacing
         return length
+
+"""
+
+display = Display(hspi, dc=Pin(2), cs=Pin(15), rst=Pin(0), width=320, height=240, rotation=270)
+tft_bl = Pin(21, Pin.OUT)
+tft_bl.value(1)
+display.fill_rectangle(0, 0, 320, 240, 1234)
+display.draw_circle(120,160,50,0)
+display.draw_ellipse(125,165,90,20,9999)
+display.draw_hline(20,40,100,8888)
+from xglcd_font import XglcdFont
+robotron = XglcdFont('fonts/EspressoDolce18x24.c', 18, 24 )
+display.draw_text(100,160,"Hello World",robotron,2016,1234)
+display.draw_text8x8(160,100,"Hello World",0,1234)
+
+"""
diff --git a/xpt2046.mpy b/xpt2046.mpy
new file mode 100644
index 0000000000000000000000000000000000000000..1b550471c64c460c771ecf92aee0566eb3943e6b
GIT binary patch
literal 1786
zcmYk5T~HfU6vyu_5Fn%>>~6PfKj|hRUl2kFTeM#gHbqKX2!u-LL%>adorWY$wo~Xh
z<8F#tt)qSMQO8%`Zn6nq)y@F@P-~rWd?|hK(YKBYjOd$p7f|oRp7a0hJ$KJN=j>$z
zIB@}|W;2rC7vQ{^IZ$6Ci8BdcjHGW0)4*!TWkgUZ<Uoy>5+z_57>R&<$dsLpy?t{M
zn5126yd}n^X<(X8h*Q%NFwVwi#FTC(W`S{TS0RIxC7YHeBr%-=RB|FG#U%YZ42rm!
zl*CL@Ok}mdiFh0^DB^!`PKRbOCB-u6^vb>~fY!wHL@J&{QIsZ<Y2kVz4h&-U1~5xm
zacT;^q5Foyu?yXoF7;jM1(YU+`i3>%ydO*Gr)Cqm95A2+0g*~)XC{*3?F1mE68l*a
z*@;_w2^(|CL?Q#2Tp|^Z3F(;`lmsyLh9a@iT@wW+O^vnfSwA2&9SL0?^!?|y0a~NM
z?nopw6a{8YbdQVzizEuybFrBmpmx2uI5`Q9-pYznB9=`|#8JL!K%Gg7ISG9|a}Fri
zTU$Evq=MnI0G|WOT)y3)HNl|ON;zwqolB>ZbHJ2J-%e!HAb;AtpLJbLrO)f@sHyOI
z+mr}n#2P2>eI<vF;4~ib14~6iAW%V9gazzwq|0A1-8F9CU7>em_g%~Uv3YZR{KI1n
z9W-aDpii;NAnjxo3+-YRAMIw9F51H?fNo}$4Bf&ijkK3l#_85@7y&ll#maH^Q@8f~
zBq_UVhuZ;N8FpjC?HJAaaoXmupilZMY3tyS8y{}3qV0YI?Fb9iA5Y)?Y+l9&D?6(U
z%wf|3bG@a3kSW=0v$Z*$Hr}Q$r_0&bWb@c;-U4K*ijXlt(m++C2U%mORk%DBC0@T1
zz#wDXvvp<2m=+*&U=cFrCCJn-L&mZKnT7|DA!Nvq<)y`~9mr6NkfeUvhRnf*m1Pak
z%aEisa7YdR@-v@QA;UnDp{iB#H4clGAai&SGDlSEsO6YS9#_c|uPlv_Jju<2Xju3F
zELE{==NqR9`MjO)w|g9I4vzz!#Pg6O)*)pr6gk|7udb=`2H#(R<bmRrvgO7Fm6gXf
z`0yTpq^Ypal>pkg2a5X6ym^BU6${7@3m+wKlrUSTJkZFpZkA=O_Li1`ri%_cZ)@sv
zd1{UM)%VuW)Sf8@umHARd?Y`Xp9FuC7fKua9C6l<sTwc+>8M2l-xo&W?D9%u#h%`I
zy2$!p@)uG1_FB7<!v#p$hdAupCGBG9xZx$We6_4>mi~H7oLfLPfIlH{s>upa$qH8R
z>uN!M(R1(Juu!S^x@+1)@{k9>Sby!REPL=)D%c??PMweHyaw$bL73ae(S5A!;=J#g
zxjhsL$z!b^P>l7{>#96r2V42SRb|AEA-jpfox=NX29KZYJTE63n{B;K9;c_-RiJ7)
z&?7<eNKbkQb#nJAYelWw!{~-Z<rL<_*B?RZuv+5qsD2L&-6MES59K2$lppvPYts<y
z3Jdvh4`D@}mv1+Ey+juptHL%U4{ipqRZY=Fqz)mqR?wPw-}&r5)@kqT4$AU)m&;{6
z;RuCX`tk+XCWprcDF-B-9EOGlIW7)+RNym^G^=l2dwBuPfBnl~a4gD?Lef&&Lk+tq
zq?Yv22!5gHv2G4~tUDeKd!jqd9QIUqT2K>p$ID^g=}s$$eP5Pe@O^4|VQag*6YLH@
z)AVJP{Sxdfly{V^ZNz>EKYyTA>?*2*j{`p<)AkUOB!@qLi2kkzYN@=ixU{_T&DZWa
zq6d{#tEJ|!niIfKAvV$U-kEjNj!s_wT&`|%cze<RP$yr7ltD)IhGZ4xM*xy&;-UyD
SIy5RH^S>jOADRE-mGBQh!9Df>

literal 0
HcmV?d00001

diff --git a/xpt2046.py b/xpt2046.py
index 11493a0..1f59e11 100644
--- a/xpt2046.py
+++ b/xpt2046.py
@@ -17,7 +17,7 @@ class Touch(object):
 
     def __init__(self, spi, cs, int_pin=None, int_handler=None,
                  width=240, height=320,
-                 x_min=100, x_max=1962, y_min=100, y_max=1900):
+                 x_min=100, x_max=1962, y_min=100, y_max=1900, rotation=0):
         """Initialize touch screen controller.
 
         Args:
@@ -44,6 +44,7 @@ class Touch(object):
         self.x_max = x_max
         self.y_min = y_min
         self.y_max = y_max
+        self.rotation = rotation
         self.last_touch=0
         self.x_multiplier = width / (x_max - x_min)
         self.x_add = x_min * -self.x_multiplier
@@ -58,6 +59,23 @@ class Touch(object):
             int_pin.irq(trigger=int_pin.IRQ_FALLING | int_pin.IRQ_RISING,
                         handler=self.int_press)
 
+
+    def rot(self,x,y,rotation=None): # convert touch locations to possibly-rotated screen locations.
+        if rotation is None:
+            rotation=self.rotation
+
+        x,y = self.normalize(x,y)
+
+        if rotation == 0:
+            return x, self.height - y - 1
+        elif rotation == 90:
+            return self.height - y - 1, self.width - x - 1
+        elif rotation == 180:
+            return self.width - x - 1, y
+        elif rotation == 270:
+            return y , x
+
+
     def get_touch(self):
         """Take multiple samples to get accurate touch reading."""
         timeout = 2  # set timeout to 2 seconds
@@ -107,7 +125,7 @@ class Touch(object):
         y = int(self.y_multiplier * y + self.y_add)
         return x, y
 
-    def raw_touch(self,xyonly=False):
+    def raw_touch(self,xyonly=False,nozero=True):
         """Read raw X,Y touch values.
 
         Returns:
@@ -128,12 +146,13 @@ class Touch(object):
             b = self.send_command(self.GET_BATTERY)
             a = self.send_command(self.GET_AUX) # chip aux ADC input
             p = x * (z1 - z2) / z1 if z1>0 else None # touch-pressure is a formula based on x
+            p2 = x/4096 * (z2/z1-1) if z1>0 else None # touch-pressure is a formula based on x
             d = None
             if p is not None:
                 now=time.ticks_ms()
                 d = time.ticks_diff(now, self.last_touch) # timediff since last (for debounce)
                 self.last_touch=now
-            return (p, x, y, z1, z2, t0, t1, b, a, d)
+            return (p, x, y, z1, z2, t0, t1, b, a, d, p2) + tuple(self.normalize(x,y) + tuple(self.rot(x,y))) # cnd
 
     def send_command(self, command):
         """Write command to XT2046 (MicroPython).
@@ -149,3 +168,20 @@ class Touch(object):
         self.cs(1)
 
         return (self.rx_buf[1] << 4) | (self.rx_buf[2] >> 4)
+
+
+
+""" Examples
+
+import time
+from xpt2046 import Touch
+from machine import Pin, SPI, ADC, PWM, SDCard, SoftSPI
+sspi = SoftSPI(baudrate=500000, sck=Pin(25), mosi=Pin(32), miso=Pin(39))
+touch = Touch(sspi, cs=Pin(33)) # a, int_pin=Pin(36), int_handler=self._touch_handler)
+while True:
+time.sleep(0.1)
+t = touch.raw_touch() # (p, x, y, z1, z2, t0, t1, b, a, d)
+if t[-1] is not None:
+print(t)
+
+"""