CYD compatibility

missing Bright control and battery status on CYD

lib/CYD-touch/CYD28_TouchscreenR.cpp

@@ -0,0 +1,237 @@
+/* Touchscreen library for XPT2046 Touch Controller Chip
+ * Copyright (c) 2015, Paul Stoffregen, [email protected]
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice, development funding notice, and this permission
+ * notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ * 
+ * ----------------------- CYD28 (2.8" cheap yellow display) version --------------------------
+ *   using software bit banged SPI and fixed GPIOs  + manual calibration
+ * 08.2023 - Piotr Zapart www.hexefx.com
+ * 
+ * 
+ */
+
+#include "CYD28_TouchscreenR.h"
+
+#define ISR_PREFIX IRAM_ATTR
+#define MSEC_THRESHOLD 3
+
+static CYD28_TouchR *isrPinptr;
+void isrPin(void);
+// ------------------------------------------------------------
+bool CYD28_TouchR::begin()
+{
+  pinMode(CYD28_TouchR_MOSI, OUTPUT);
+  pinMode(CYD28_TouchR_MISO, INPUT);
+  pinMode(CYD28_TouchR_CLK, OUTPUT);
+  pinMode(CYD28_TouchR_CS, OUTPUT);
+  digitalWrite(CYD28_TouchR_CLK, LOW);
+  digitalWrite(CYD28_TouchR_CS, HIGH);
+  pinMode(CYD28_TouchR_IRQ, INPUT);
+  attachInterrupt(digitalPinToInterrupt(CYD28_TouchR_IRQ), isrPin, FALLING);
+  isrPinptr = this;
+  return true;
+}
+// ------------------------------------------------------------
+ISR_PREFIX
+void isrPin(void)
+{
+  CYD28_TouchR *o = isrPinptr;
+  o->isrWake = true;
+}
+// ------------------------------------------------------------
+uint8_t CYD28_TouchR::transfer(uint8_t val)
+{
+  uint8_t out = 0;
+  uint8_t del = _delay >> 1;
+  uint8_t bval = 0;
+  int sck = LOW;
+
+  int8_t bit = 8;
+  while (bit)
+  {
+    bit--;
+    digitalWrite(CYD28_TouchR_MOSI, ((val & (1 << bit)) ? HIGH : LOW)); // Write bit
+    wait(del);
+    sck ^= 1u;
+    digitalWrite(CYD28_TouchR_CLK, sck);
+    /* ... Read bit */
+    bval = digitalRead(CYD28_TouchR_MISO);    
+    out <<= 1;
+    out |= bval;
+    wait(del);
+    sck ^= 1u;
+    digitalWrite(CYD28_TouchR_CLK, sck);
+  }
+  return out;
+}
+// ------------------------------------------------------------
+uint16_t CYD28_TouchR::transfer16(uint16_t data)
+{
+  union
+  {
+    uint16_t val;
+    struct
+    {
+      uint8_t lsb;
+      uint8_t msb;
+    };
+  } in, out;
+
+  in.val = data;
+  out.msb = transfer(in.msb);
+  out.lsb = transfer(in.lsb);
+  return out.val;
+}
+// ------------------------------------------------------------
+void CYD28_TouchR::wait(uint_fast8_t del)
+{
+  for (uint_fast8_t i = 0; i < del; i++)
+  {
+    asm volatile("nop");
+  }
+}
+// ------------------------------------------------------------
+CYD28_TS_Point CYD28_TouchR::getPointScaled()
+{
+  update();
+  int16_t x = xraw, y = yraw;
+  convertRawXY(&x, &y);
+  return CYD28_TS_Point(x, y, zraw);
+}
+// ------------------------------------------------------------
+CYD28_TS_Point CYD28_TouchR::getPointRaw()
+{
+  update();
+  return CYD28_TS_Point(xraw, yraw, zraw);
+}
+// ------------------------------------------------------------
+bool CYD28_TouchR::touched()
+{
+  update();
+  return ((zraw >= threshold) && isrWake);
+}
+// ------------------------------------------------------------
+void CYD28_TouchR::readData(uint16_t *x, uint16_t *y, uint8_t *z)
+{
+  update();
+  *x = xraw;
+  *y = yraw;
+  *z = zraw;
+}
+// ------------------------------------------------------------
+static int16_t besttwoavg(int16_t x, int16_t y, int16_t z)
+{
+  int16_t da, db, dc;
+  int16_t reta = 0;
+  if (x > y)  da = x - y;
+  else    da = y - x;
+  if (x > z)  db = x - z;
+  else    db = z - x;
+  if (z > y)  dc = z - y;
+  else    dc = y - z;
+
+  if (da <= db && da <= dc)     reta = (x + y) >> 1;
+  else if (db <= da && db <= dc)  reta = (x + z) >> 1;
+  else              reta = (y + z) >> 1;
+
+  return (reta);
+}
+// ------------------------------------------------------------
+void CYD28_TouchR::update()
+{
+  int16_t data[6];
+  int z;
+  if (!isrWake)
+    return;
+  uint32_t now = millis();
+  if (now - msraw < MSEC_THRESHOLD)
+    return;
+
+  digitalWrite(CYD28_TouchR_CS, LOW);
+  transfer(0xB1 /* Z1 */);
+  int16_t z1 = transfer16(0xC1 /* Z2 */) >> 3;
+  z = z1 + 4095;
+  int16_t z2 = transfer16(0x91 /* X */) >> 3;
+  z -= z2;
+  if (z >= threshold)
+  {
+    transfer16(0x91 /* X */); // dummy X measure, 1st is always noisy
+    data[0] = transfer16(0xD1 /* Y */) >> 3;  
+    data[1] = transfer16(0x91 /* X */) >> 3;  // make 3 x-y measurements
+    data[2] = transfer16(0xD1 /* Y */) >> 3;
+    data[3] = transfer16(0x91 /* X */) >> 3;
+  }
+  else  data[0] = data[1] = data[2] = data[3] = 0;
+  data[4] = transfer16(0xD0 /* Y */) >> 3;
+  data[5] = transfer16(0) >> 3;
+  digitalWrite(CYD28_TouchR_CS, HIGH);
+
+  if (z < 0) z = 0;
+  if (z < threshold)
+  {
+    zraw = 0;
+    if (z < CYD28_TouchR_Z_THRES_INT)
+    { 
+      isrWake = false;
+    }
+    return;
+  }
+  zraw = z;
+
+  int16_t x = besttwoavg(data[0], data[2], data[4]);
+  int16_t y = besttwoavg(data[1], data[3], data[5]);
+
+  if (z >= threshold)
+  {
+    msraw = now; // good read completed, set wait
+    xraw = x;
+    yraw = y;
+    //log_i("xraw= %d, yraw= %d", xraw, yraw);
+  }
+}
+// ------------------------------------------------------------
+void CYD28_TouchR::convertRawXY(int16_t *x, int16_t *y)
+{
+  int16_t x_tmp = *x, y_tmp = *y, xx, yy;
+  switch (rotation)
+  {
+  case 0: // PORT0
+    xx = ((y_tmp - CYD28_TouchR_CAL_YMIN) * sizeY_px) / (CYD28_TouchR_CAL_YMAX - CYD28_TouchR_CAL_YMIN);
+    yy = ((x_tmp - CYD28_TouchR_CAL_XMIN) * sizeX_px) / (CYD28_TouchR_CAL_XMAX - CYD28_TouchR_CAL_XMIN);
+    xx = sizeY_px - xx;
+    break;
+  case 1: // LANDSC0
+    xx = ((x_tmp - CYD28_TouchR_CAL_XMIN) * sizeX_px) / (CYD28_TouchR_CAL_XMAX - CYD28_TouchR_CAL_XMIN);
+    yy = ((y_tmp - CYD28_TouchR_CAL_YMIN) * sizeY_px) / (CYD28_TouchR_CAL_YMAX - CYD28_TouchR_CAL_YMIN);
+    break;      
+  case 2: // PORT1
+    xx = ((y_tmp - CYD28_TouchR_CAL_YMIN) * sizeY_px) / (CYD28_TouchR_CAL_YMAX - CYD28_TouchR_CAL_YMIN);
+    yy = ((x_tmp - CYD28_TouchR_CAL_XMIN) * sizeX_px) / (CYD28_TouchR_CAL_XMAX - CYD28_TouchR_CAL_XMIN);
+    yy = sizeX_px - yy;
+    break;
+  default: // 3 LANDSC1
+    xx = ((x_tmp - CYD28_TouchR_CAL_XMIN) * sizeX_px) / (CYD28_TouchR_CAL_XMAX - CYD28_TouchR_CAL_XMIN);
+    yy = ((y_tmp - CYD28_TouchR_CAL_YMIN) * sizeY_px) / (CYD28_TouchR_CAL_YMAX - CYD28_TouchR_CAL_YMIN);
+    xx = sizeX_px - xx;
+    yy = sizeY_px - yy;
+    break;
+  } 
+  *x = xx;
+  *y = yy;
+}

lib/CYD-touch/CYD28_TouchscreenR.h

@@ -0,0 +1,88 @@
+/* Touchscreen library for XPT2046 Touch Controller Chip
+ * Copyright (c) 2015, Paul Stoffregen, [email protected]
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice, development funding notice, and this permission
+ * notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ * ----------------------- CYD28 (2.8" cheap yellow display) version --------------------------
+ *   using software bit banged SPI and fixed GPIOs  + manual calibration
+ * 08.2023 - Piotr Zapart www.hexefx.com
+ * 
+ * 
+ */
+
+#ifndef _CYD28_TOUCHSCREENR_H_
+#define _CYD28_TOUCHSCREENR_H_
+
+#include "Arduino.h"
+
+#define CYD28_TouchR_Z_THRESH       300
+#define CYD28_TouchR_Z_THRES_INT  75
+
+#define CYD28_TouchR_IRQ  36
+#define CYD28_TouchR_MOSI   32
+#define CYD28_TouchR_MISO   39
+#define CYD28_TouchR_CLK  25
+#define CYD28_TouchR_CS   33
+
+// CALIBRAION VALUES
+#define CYD28_TouchR_CAL_XMIN 185
+#define CYD28_TouchR_CAL_XMAX 3700
+#define CYD28_TouchR_CAL_YMIN 280
+#define CYD28_TouchR_CAL_YMAX 3850
+
+
+class CYD28_TS_Point {
+public:
+  CYD28_TS_Point(void) : x(0), y(0), z(0) {}
+  CYD28_TS_Point(int16_t x, int16_t y, int16_t z) : x(x), y(y), z(z) {}
+  bool operator==(CYD28_TS_Point p) { return ((p.x == x) && (p.y == y) && (p.z == z)); }
+  bool operator!=(CYD28_TS_Point p) { return ((p.x != x) || (p.y != y) || (p.z != z)); }
+  int16_t x, y, z;
+};
+
+class CYD28_TouchR {
+public:
+  constexpr CYD28_TouchR(int32_t w, int32_t h)
+    : _delay(2), sizeX_px(w), sizeY_px(h){ }
+  bool begin();
+
+  CYD28_TS_Point getPointScaled();
+  CYD28_TS_Point getPointRaw();
+  bool touched();
+  void readData(uint16_t *x, uint16_t *y, uint8_t *z);
+  void setRotation(uint8_t n) { rotation = n % 4; }
+    void setThreshold(uint16_t th) { threshold = th;}
+
+  volatile bool isrWake=true;
+
+private:
+  void update();
+  uint8_t transfer(uint8_t);
+  uint16_t transfer16(uint16_t data);
+  void wait(uint_fast8_t del);
+  void convertRawXY(int16_t *x, int16_t *y);
+  uint8_t rotation=1;
+  int16_t xraw=0, yraw=0, zraw=0;
+    uint16_t threshold = CYD28_TouchR_Z_THRESH;
+  uint32_t msraw=0x80000000;
+  uint8_t _delay;
+  const  int32_t sizeX_px;
+  const int32_t sizeY_px;
+};
+
+#endif 

merge_files.bat

@@ -9,4 +9,7 @@ esptool --chip esp32s3 merge_bin --output Launcher/Launcher_2.0_CoreS3.bin
 
 
 
-esptool --chip esp32s3 merge_bin --output Launcher/Launcher_2.0_T-Display-S3-Touchscreen.bin      0x0 .pio/build/lilygo-t-display-S3/bootloader.bin        0x8000 .pio/build/lilygo-t-display-S3/partitions.bin     0x10000 .pio/build/lilygo-t-display-S3/firmware.bin
+esptool --chip esp32s3 merge_bin --output Launcher/Launcher_2.0_T-Display-S3-Touchscreen.bin      0x0 .pio/build/lilygo-t-display-S3/bootloader.bin        0x8000 .pio/build/lilygo-t-display-S3/partitions.bin     0x10000 .pio/build/lilygo-t-display-S3/firmware.bin
+
+esptool --chip esp32 merge_bin --output Launcher/Launcher_2.0_CYD-2432S028.bin      0x1000 .pio/build/CYD-2432S028/bootloader.bin        0x8000 .pio/build/CYD-2432S028/partitions.bin     0x10000 .pio/build/CYD-2432S028/firmware.bin
+esptool --chip esp32 merge_bin --output Launcher/Launcher_2.0_T-CYD-2-USB.bin      0x1000 .pio/build/CYD-2-USB/bootloader.bin        0x8000 .pio/build/CYD-2-USB/partitions.bin     0x10000 .pio/build/CYD-2-USB/firmware.bin