#177 clean up touch support

Author: davetcc

examples/arduino32/piPicoTftEncoder/ThemeCoolBlueModern.h renamed to examples/arduino32/piPicoTftTouch/ThemeCoolBlueModern.h

@@ -335,7 +335,7 @@
   "codeOptions": {
     "embeddedPlatform": "ARDUINO32",
     "lastDisplayUuid": "e6342680-6fab-4d1b-ac08-ce8dbfc0974c",
-    "lastInputUuid": "6dd87e7d-e751-4912-a70d-91793b1d3d87",
+    "lastInputUuid": "89cd7f70-0457-4884-97c2-0db904ccb0ba",
     "lastRemoteUuid": "2c101fec-1f7d-4ff3-8d2b-992ad41e7fcb",
     "lastRemoteUuids": [
       "2c101fec-1f7d-4ff3-8d2b-992ad41e7fcb"
@@ -365,69 +365,64 @@
         "subsystem": "DISPLAY"
       },
       {
-        "name": "INCLUDE_TOUCH_INBUILT",
-        "latestValue": "false",
+        "name": "TOUCH_SEPARATOR",
+        "latestValue": "",
         "subsystem": "DISPLAY"
       },
       {
-        "name": "TOUCH_ROTATION",
-        "latestValue": "PORTRAIT",
+        "name": "TFT_TOUCH_SCREEN_REQUIRED",
+        "latestValue": "true",
         "subsystem": "DISPLAY"
       },
       {
         "name": "TOUCH_CALIB_WIDTH",
-        "latestValue": "320",
+        "latestValue": "4096",
         "subsystem": "DISPLAY"
       },
       {
         "name": "TOUCH_CALIB_HEIGHT",
-        "latestValue": "240",
+        "latestValue": "4096",
         "subsystem": "DISPLAY"
       },
       {
-        "name": "SW_POLLING_MODE",
-        "latestValue": "SWITCHES_POLL_EVERYTHING",
-        "subsystem": "INPUT"
-      },
-      {
-        "name": "SWITCH_IODEVICE",
-        "latestValue": "devicePins",
-        "subsystem": "INPUT"
+        "name": "TOUCH_USE_RAW_TFT_FUNCTION",
+        "latestValue": "true",
+        "subsystem": "DISPLAY"
       },
       {
-        "name": "ENCODER_PIN_A",
-        "latestValue": "16",
-        "subsystem": "INPUT"
+        "name": "ORIENTATION_SEPARATOR",
+        "latestValue": "",
+        "subsystem": "DISPLAY"
       },
       {
-        "name": "ENCODER_PIN_B",
-        "latestValue": "17",
-        "subsystem": "INPUT"
+        "name": "TFT_TOUCH_SWAP_XY",
+        "latestValue": "true",
+        "subsystem": "DISPLAY"
       },
       {
-        "name": "ENCODER_PIN_OK",
-        "latestValue": "21",
-        "subsystem": "INPUT"
+        "name": "TFT_TOUCH_X_INVERTED",
+        "latestValue": "false",
+        "subsystem": "DISPLAY"
       },
       {
-        "name": "ENCODER_BACK_PIN",
-        "latestValue": "-1",
-        "subsystem": "INPUT"
+        "name": "TFT_TOUCH_Y_INVERTED",
+        "latestValue": "false",
+        "subsystem": "DISPLAY"
       },
       {
-        "name": "ENCODER_NEXT_PIN",
-        "latestValue": "-1",
-        "subsystem": "INPUT"
+        "name": "CALIB_SEPARATOR",
+        "latestValue": "",
+        "subsystem": "DISPLAY"
       },
       {
-        "name": "PULLUP_LOGIC",
+        "name": "TFT_TOUCH_SCREEN_CALIBRATE",
         "latestValue": "true",
-        "subsystem": "INPUT"
+        "subsystem": "DISPLAY"
       },
       {
-        "name": "ENCODER_IS_QUARTER_CYCLE",
-        "latestValue": "false",
-        "subsystem": "INPUT"
+        "name": "TFT_TOUCH_CALIBRATION_STORAGE_LOC",
+        "latestValue": "400",
+        "subsystem": "DISPLAY"
       },
       {
         "name": "ITEM_FONT",

examples/arduino32/piPicoTftEncoder/piPicoTftEncoder.emf renamed to examples/arduino32/piPicoTftTouch/piPicoTftEncoder.emf

@@ -4,7 +4,7 @@
  *
  * Getting started: https://www.thecoderscorner.com/products/arduino-libraries/tc-menu/tcmenu-overview-quick-start/
  */
-#include "piPicoTftEncoder_menu.h"
+#include "piPicoTftTouch_menu.h"
 #include <PlatformDetermination.h>
 #include <IoLogging.h>
 #include <TaskManagerIO.h>
@@ -226,4 +226,4 @@ void CALLBACK_FUNCTION onRestart(int /*id*/) {
     serdebugF("Restart selected");
     strncpy(minfoStatusRestart.name, "Restarting", NAME_SIZE_T);
     menuStatusRestart.setChanged(true);
-}
+}

examples/arduino32/piPicoTftEncoder/piPicoTftEncoder.ino renamed to examples/arduino32/piPicoTftTouch/piPicoTftTouch.ino

@@ -9,7 +9,7 @@
  */
 
 #include <tcMenu.h>
-#include "piPicoTftEncoder_menu.h"
+#include "piPicoTftTouch_menu.h"
 #include "ThemeCoolBlueModern.h"
 #include <Fonts/OpenSansCyrillicLatin18.h>
 #include <Fonts/RobotoMedium24.h>
@@ -20,6 +20,10 @@ const  ConnectorLocalInfo applicationInfo = { "RPiPico Tft Encoder", "0c6972c4-a
 TFT_eSPI gfx;
 TfteSpiDrawable gfxDrawable(&gfx, 45);
 GraphicsDeviceRenderer renderer(30, applicationInfo.name, &gfxDrawable);
+iotouch::TftSpiTouchInterrogator touchInterrogator(&gfx, 4096, 4096, true);
+iotouch::TouchOrientationSettings touchOrientation(true, false, false);
+MenuTouchScreenManager touchScreen(&touchInterrogator, &renderer, touchOrientation);
+tcextras::IoaTouchScreenCalibrator touchCalibrator(&touchScreen, &renderer, 400);
 
 // Global Menu Item declarations
 ListRuntimeMenuItem menuRootList(17, 0, fnRootListRtCall, NULL);
@@ -80,8 +84,8 @@ void setupMenu() {
     gfx.begin();
     gfx.setRotation(1);
     renderer.setUpdatesPerSecond(15);
-    switches.init(internalDigitalIo(), SWITCHES_POLL_EVERYTHING, true);
-    menuMgr.initForEncoder(&renderer, &menuVolume, 16, 17, 21);
+    touchScreen.start();
+    menuMgr.initWithoutInput(&renderer, &menuVolume);
     renderer.setTitleMode(BaseGraphicalRenderer::TITLE_FIRST_ROW);
     renderer.setUseSliderForAnalog(true);
     renderer.enableTcUnicode();

examples/arduino32/piPicoTftEncoder/piPicoTftEncoder_menu.cpp renamed to examples/arduino32/piPicoTftTouch/piPicoTftTouch_menu.cpp

@@ -16,6 +16,7 @@
 #include <tcUnicodeHelper.h>
 #include "tcMenuTfteSpi.h"
 #include <graphics/MenuTouchScreenEncoder.h>
+#include <extras/DrawableTouchCalibrator.h>
 #include <RuntimeMenuItem.h>
 #include <EditableLargeNumberMenuItem.h>
 #include <ScrollChoiceMenuItem.h>
@@ -27,6 +28,9 @@ extern const PROGMEM ConnectorLocalInfo applicationInfo;
 extern TFT_eSPI gfx;
 extern TfteSpiDrawable gfxDrawable;
 extern GraphicsDeviceRenderer renderer;
+extern iotouch::TftSpiTouchInterrogator touchInterrogator;
+extern MenuTouchScreenManager touchScreen;
+extern tcextras::IoaTouchScreenCalibrator touchCalibrator;
 extern const UnicodeFont OpenSansCyrillicLatin18[];
 extern const GFXfont RobotoMedium24;
 

examples/arduino32/piPicoTftEncoder/piPicoTftEncoder_menu.h renamed to examples/arduino32/piPicoTftTouch/piPicoTftTouch_menu.h

@@ -16,6 +16,8 @@
 #include "tcUnicodeHelper.h"
 #include <TFT_eSPI.h>
 
+using namespace iotouch;
+
 TfteSpiDrawable::TfteSpiDrawable(TFT_eSPI *tft, int spriteHeight) : tft(tft), spriteWithConfig(nullptr), spriteHeight(spriteHeight) {}
 
 DeviceDrawable *TfteSpiDrawable::getSubDeviceFor(const Coord &where, const Coord& size, const color_t *palette, int paletteSize) {
@@ -163,3 +165,27 @@ void TftSpriteAndConfig::transaction(bool isStarting, bool redrawNeeded) {
         sprite.pushSprite(where.x, where.y, 0, 0, currentSize.x, currentSize.y);
     }
 }
+
+#if TC_TFT_ESPI_NEEDS_TOUCH == true
+
+TouchState TftSpiTouchInterrogator::internalProcessTouch(float *ptrX, float *ptrY, const TouchOrientationSettings& rotation, const iotouch::CalibrationHandler& calib) {
+
+    uint16_t touchX=0, touchY=0;
+    bool pressed;
+    if(usingRawTouch) {
+        tft->getTouchRaw(&touchX, &touchY);
+        pressed = tft->getTouchRawZ() > 600;
+        *ptrX = calib.calibrateX(float(touchX) / XPT_2046_MAX, rotation.isXInverted());
+        *ptrY = calib.calibrateY(float(touchY) / XPT_2046_MAX, rotation.isYInverted());
+    } else {
+        pressed = tft->getTouch(&touchX, &touchY);
+        *ptrX = calib.calibrateX(float(touchX) / maxWidthDim, rotation.isXInverted());
+        *ptrY = calib.calibrateY(float(touchY) / maxHeightDim, rotation.isYInverted());
+    }
+
+    if(!pressed) return iotouch::NOT_TOUCHED;
+    //serdebugF3("point at ", touchX, touchY);
+
+    return iotouch::TOUCHED;
+}
+#endif // TC_TFT_ESPI_NEEDS_TOUCH == true

examples/arduino32/piPicoTftEncoder/tcMenuTfteSpi.cpp renamed to examples/arduino32/piPicoTftTouch/tcMenuTfteSpi.cpp

@@ -16,6 +16,7 @@
 #include <graphics/GraphicsDeviceRenderer.h>
 #include <TFT_eSPI.h>
 #include <SPI.h>
+#include <ResistiveTouchScreen.h>
 
 #define TFT_SPRITE_BITS 4
 #define SPRITE_PALETTE_SIZE (1 << TFT_SPRITE_BITS)
@@ -76,4 +77,34 @@ class TftSpriteAndConfig : public TfteSpiDrawable {
     color_t getUnderlyingColor(color_t col) override;
 };
 
+#define TC_TFT_ESPI_NEEDS_TOUCH true
+#if TC_TFT_ESPI_NEEDS_TOUCH == true
+
+#define XPT_2046_MAX 4096
+
+namespace iotouch {
+
+    /**
+     * Implements the touch interrogator class, this purely gets the current reading from the device when requested. This
+     * implementation works with the TFT_eSPI touch functions providing tcMenu support for it. It is your responsibility
+     * to have run whatever calibration is needed before calling this function.  The X and Y values to the constructor
+     * are the maximum values that can be returned by calling getTouch.
+     */
+    class TftSpiTouchInterrogator : public iotouch::TouchInterrogator {
+    private:
+        TFT_eSPI* tft;
+        float maxWidthDim;
+        float maxHeightDim;
+        bool usingRawTouch;
+    public:
+        TftSpiTouchInterrogator(TFT_eSPI* tft, uint16_t xMax, uint16_t yMax, bool rawTouch)
+                : tft(tft), maxWidthDim(xMax), maxHeightDim(yMax), usingRawTouch(rawTouch) { }
+
+        iotouch::TouchState internalProcessTouch(float *ptrX, float *ptrY, const TouchOrientationSettings& touchOrientationSettings,
+                                                 const iotouch::CalibrationHandler& calib) override;
+    };
+
+}
+#endif // TC_TFT_ESPI_NEEDS_TOUCH == true
+
 #endif //TCMENU_PLUGIN_TCMENUTFTESPI_H

examples/arduino32/piPicoTftEncoder/tcMenuTfteSpi.h renamed to examples/arduino32/piPicoTftTouch/tcMenuTfteSpi.h

@@ -13,7 +13,7 @@ namespace tcgfx {
 
 DialogMultiPartEditor dialogMultiPartEditor;
 
-MenuTouchScreenManager::MenuTouchScreenManager(TouchInterrogator* interrogator, BaseGraphicalRenderer* renderer, iotouch::TouchInterrogator::TouchRotation rotation)
+MenuTouchScreenManager::MenuTouchScreenManager(TouchInterrogator* interrogator, BaseGraphicalRenderer* renderer, const TouchOrientationSettings& rotation)
         : TouchScreenManager(interrogator, rotation),
           currentlySelected(nullptr), localStart(0,0), localSize(0,0), encoder(renderer), renderer(renderer),
           observer(&encoder), lastX(0.0F), lastY(0.0F), currentState(NOT_TOUCHED) {

src/graphics/MenuTouchScreenEncoder.cpp

@@ -105,7 +105,7 @@ namespace tcgfx {
          * @param rotation the rotation of the touch interface
          */
         MenuTouchScreenManager(iotouch::TouchInterrogator* interrogator, BaseGraphicalRenderer* renderer,
-                               iotouch::TouchInterrogator::TouchRotation rotation);
+                               const iotouch::TouchOrientationSettings& rotation);
 
         void sendEvent(float locationX, float locationY, float touchPressure, iotouch::TouchState touched) override;