#104 fix touch integration with renderer, #103 nearly all examples now recompiled with 2.1

Author: dave

examples/colorTftEthernet32/colorTftEthernet.emf

@@ -339,7 +339,7 @@
     "lastDisplayUuid": "4dcb12ec-13d8-4466-b8b6-bd575eae4612",
     "lastInputUuid": "6dd87e7d-e751-4912-a70d-91793b1d3d87",
     "lastRemoteUuid": "0877131c-e03e-426b-8eaf-228e01f5e7f1",
-    "lastThemeUuid": "03c6b25f-db63-402a-8447-a5ce1484c14d",
+    "lastThemeUuid": "e4524028-edd8-4e0a-ae15-a1f2ba05354f",
     "applicationUUID": "22813e5e-88b1-42d5-9601-4831b2be369b",
     "applicationName": "Ada32 Ethernet",
     "lastProperties": [
@@ -465,7 +465,7 @@
       },
       {
         "name": "TITLE_SHOW_MODE",
-        "latestValue": "TITLE_FIRST_ROW",
+        "latestValue": "TITLE_ALWAYS",
         "subsystem": "THEME"
       },
       {

examples/esp32Amplifier/TouchCalibrator.h

@@ -22,8 +22,6 @@ class TouchScreenCalibrator : public CustomDrawing {
     MenuTouchScreenManager* touchScreen;
     int oldX= 0, oldY=0;
     unsigned int takeOverCount=0;
-    iotouch::TouchInterrogator::TouchRotation oldRotation = iotouch::TouchInterrogator::PORTRAIT;
-    uint8_t oldTftRotation = 0;
 public:
     explicit TouchScreenCalibrator(MenuTouchScreenManager *touchScreen)
             : drawable(nullptr), touchScreen(touchScreen) {}
@@ -36,9 +34,6 @@ class TouchScreenCalibrator : public CustomDrawing {
         if(renderer.getRendererType() != RENDER_TYPE_CONFIGURABLE) {
             renderer.giveBackDisplay(); // we cannot work with non configurable rendering
         }
-        oldTftRotation = tft.getRotation();
-        oldRotation = touchScreen->changeRotation(iotouch::TouchInterrogator::RAW);
-        tft.setRotation(0);
         drawable = reinterpret_cast<GraphicsDeviceRenderer*>(currentRenderer)->getDeviceDrawable();
         drawable->startDraw();
         drawable->setDrawColor(TFT_BLACK);
@@ -48,6 +43,7 @@ class TouchScreenCalibrator : public CustomDrawing {
     }
 
     void renderLoop(unsigned int currentValue, RenderPressMode userClick) override {
+
         drawable->startDraw();
         drawable->setDrawColor(TFT_BLACK);
         drawable->drawCircle(Coord(oldX, oldY), 10, true);
@@ -73,8 +69,6 @@ class TouchScreenCalibrator : public CustomDrawing {
         drawable->drawCircle(Coord(oldX, oldY), 10, true);
 
         if(oldX < 40 && oldY < 40 && touchScreen->getLastTouchState() == iotouch::HELD) {
-            tft.setRotation(oldTftRotation);
-            touchScreen->changeRotation(oldRotation);
             renderer.giveBackDisplay();
         }
     }