From 0912f56702c3059c0691efadbf555d45b95c61bf Mon Sep 17 00:00:00 2001
From: Chris <cryptophoto@gmail.com>
Date: Thu, 8 Aug 2024 23:51:13 +1000
Subject: [PATCH] Add touch-screen rotation support, binary versions for
 MicroPython 1.24, and recipe to make them

---
 xpt2046.mpy | Bin 1786 -> 1906 bytes
 xpt2046.py  |   8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/xpt2046.mpy b/xpt2046.mpy
index 1b550471c64c460c771ecf92aee0566eb3943e6b..f9ab9340c854163331edc90e49ef57c7522b2286 100644
GIT binary patch
delta 418
zcmeyx`-zX$myJQ*eIx4?Mn1OO#0mzs+{`?N#>yt+&5szDGfMPHTwv8uvaqriYOq&z
z@m7`BP?y(Jm)Dp)k6E%lUC5?E$adofVV=g%CQK$wVD1KC-c6qyKLaU<pcYf|W~GLx
zn=ZLnrJ;g68^L;@27&c7n%s1O*Z{NuMH;MU(*^?+E1LLjx+FqnU=m<1!hMs!G3y%I
zZ8BjrVLZI)NW;;FV@~fIwr#oTQYmC_#JCwGzU7-bCy>Jg<8TStPYz+RV6>gw%c9Ka
zHhCk9xP)6ngf_#5cyEq_8yiCPMV!o%8#Np`jNK+bU=d?>b90;glSPfuVX^{i5x?UG
zVUdkrHVBJ;GGRO@<T!aDt0a??^W;6Oj}=`uh$wH~V#Xu{WGI0cCX7HupOOQUn=7=$
M)Gb^mA7HZr02>F2H2?qr

delta 356
zcmeyw_luX+myJQ*Z6oUyM$X2{CS$hT%sht8&l#69*0(e4U{zAGu(B3vuvc~QR@GKF
zRM%GD9C**gWrMKL;SD0n8#kFT8896@w7KD?i}%J2!n~V4H-6S)O5Uv05Ovcf5Gt@i
zm}etQywL=x5-P9>tg?ykri<&QjX-u_a#v2_7Dg3|27d)5C9TN~EYgNHn@ku@7!Pkc
z(r~olnA7`)ZCh@-R0`P|F>VHlZ~3Oq3FI)rI9x)ulh3eNFxpLKWmT4RZ3xn4*bwi{
zd9a~Dn@L~9$uzl9!;!<-b+RL?n3QWnBv_W?;Ks&Kprl!HlR-3}v8$`=<U&?8M*GP#
zSc|kAHVBJs{IWq<^pgqWK_MVdY!i?t4&)u$2y*@ejnfktEmSQWohF;GJ?3%-hRNnF
TW=ulPlNH&;7+oe?uv-BD{la{n

diff --git a/xpt2046.py b/xpt2046.py
index 1f59e11..88ceae2 100644
--- a/xpt2046.py
+++ b/xpt2046.py
@@ -67,13 +67,13 @@ class Touch(object):
         x,y = self.normalize(x,y)
 
         if rotation == 0:
-            return x, self.height - y - 1
+            return max(0, min(x,self.width- 1)), max(0, min(self.height - y - 1,self.height- 1))
         elif rotation == 90:
-            return self.height - y - 1, self.width - x - 1
+            return max(0, min(self.height - y - 1,self.height- 1)), max(0, min(self.width - x - 1,self.width- 1))
         elif rotation == 180:
-            return self.width - x - 1, y
+            return max(0, min(self.width - x - 1,self.width- 1)), max(0, min(y,self.height- 1))
         elif rotation == 270:
-            return y , x
+            return max(0, min(y,self.height- 1)) , max(0, min(x,self.width- 1))
 
 
     def get_touch(self):