rebuild examples before release.

Author: dave

examples/esp/esp32SimHub/esp32SimHub.emf

@@ -449,6 +449,11 @@
         "latestValue": "TOUCH_HVOLT_ATTEN_1V",
         "subsystem": "INPUT"
       },
+      {
+        "name": "TP_THRESHOLD_DETECTION",
+        "latestValue": "TOUCH_TRIGGER_BELOW",
+        "subsystem": "INPUT"
+      },
       {
         "name": "UP_SENSOR",
         "latestValue": "5",
@@ -539,5 +544,6 @@
     },
     "packageNamespace": "",
     "appIsModular": false
-  }
+  },
+  "stringLists": []
 }

examples/esp/esp32SimHub/generated/esp32SimHub_menu.cpp

@@ -21,12 +21,12 @@ TcMenuRemoteServer remoteServer(applicationInfo);
 Adafruit_ILI9341 gfx(22, 17, 16);
 AdafruitDrawable gfxDrawable(&gfx, 40);
 GraphicsDeviceRenderer renderer(30, applicationInfo.name, &gfxDrawable);
-ESP32TouchKeysAbstraction esp32Touch(300, TOUCH_HVOLT_2V7, TOUCH_LVOLT_0V5, TOUCH_HVOLT_ATTEN_1V);
+ESP32TouchKeysAbstraction esp32Touch(800, TOUCH_HVOLT_2V7, TOUCH_LVOLT_0V5, TOUCH_HVOLT_ATTEN_1V);
 SimHubRemoteConnection simhubConnection(&Serial, 3);
 
 // Global Menu Item declarations
 const PROGMEM AnyMenuInfo minfoEngineV836S = { "V8 3.6S", 20, 0xffff, 0, onEngineHasChanged };
-ActionMenuItem menuEngineV836S(&minfoEngineV836S, NULL, INFO_LOCATION_PGM);
+ActionMenuItem menuEngineV836S(&minfoEngineV836S, nullptr, INFO_LOCATION_PGM);
 const PROGMEM AnyMenuInfo minfoEngineV630T = { "V6 3.0T", 19, 0xffff, 0, onEngineHasChanged };
 ActionMenuItem menuEngineV630T(&minfoEngineV630T, &menuEngineV836S, INFO_LOCATION_PGM);
 const PROGMEM AnyMenuInfo minfoEngineI420T = { "I4 2.0T", 18, 0xffff, 0, onEngineHasChanged };
@@ -35,7 +35,7 @@ const PROGMEM AnyMenuInfo minfoCardsI416T = { "I4 1.6T", 17, 0xffff, 0, onEngine
 ActionMenuItem menuCardsI416T(&minfoCardsI416T, &menuEngineI420T, INFO_LOCATION_PGM);
 const PROGMEM SubMenuInfo minfoEngine = { "Engine", 16, 0xffff, 0, NO_CALLBACK };
 BackMenuItem menuBackEngine(&minfoEngine, &menuCardsI416T, INFO_LOCATION_PGM);
-SubMenuItem menuEngine(&minfoEngine, &menuBackEngine, NULL, INFO_LOCATION_PGM);
+SubMenuItem menuEngine(&minfoEngine, &menuBackEngine, nullptr, INFO_LOCATION_PGM);
 const PROGMEM AnyMenuInfo minfoShowDashboard = { "Show dashboard", 9, 0xffff, 0, onShowDash };
 ActionMenuItem menuShowDashboard(&minfoShowDashboard, &menuEngine, INFO_LOCATION_PGM);
 const PROGMEM AnalogMenuInfo minfoLap = { "Lap", 10, 0xffff, 999, NO_CALLBACK, 0, 1, "" };
@@ -46,12 +46,12 @@ const char enumStrDashboard_2[] PROGMEM = "Custom";
 const char* const enumStrDashboard[] PROGMEM  = { enumStrDashboard_0, enumStrDashboard_1, enumStrDashboard_2 };
 const PROGMEM EnumMenuInfo minfoDashboard = { "Dashboard", 8, 0xffff, 2, onDashChanged, enumStrDashboard };
 EnumMenuItem menuDashboard(&minfoDashboard, 0, &menuLap, INFO_LOCATION_PGM);
-RENDERING_CALLBACK_NAME_INVOKE(fnSettingsNewLargeNumberRtCall, largeNumItemRenderFn, "New Large Number", -1, NO_CALLBACK)
-EditableLargeNumberMenuItem menuSettingsNewLargeNumber(fnSettingsNewLargeNumberRtCall, LargeFixedNumber(4, 1, 0U, 0U, false), 15, true, NULL);
+const PROGMEM AnyMenuInfo minfoSettingsNewLargeNumber = { "New Large Number", 15, 0xffff, 0, NO_CALLBACK };
+EditableLargeNumberMenuItem menuSettingsNewLargeNumber(&minfoSettingsNewLargeNumber, LargeFixedNumber(4, 1, 0U, 0U, false), true, nullptr, INFO_LOCATION_PGM);
 const PROGMEM char pgmStrSettingsIoTMonitorText[] = { "IoT Monitor" };
 RemoteMenuItem menuSettingsIoTMonitor(pgmStrSettingsIoTMonitorText, 14, &menuSettingsNewLargeNumber);
-RENDERING_CALLBACK_NAME_INVOKE(fnSettingsLargeTestRtCall, largeNumItemRenderFn, "LargeTest", -1, NO_CALLBACK)
-EditableLargeNumberMenuItem menuSettingsLargeTest(fnSettingsLargeTestRtCall, LargeFixedNumber(12, 4, 0U, 0U, false), 13, true, &menuSettingsIoTMonitor);
+const PROGMEM AnyMenuInfo minfoSettingsLargeTest = { "LargeTest", 13, 0xffff, 0, NO_CALLBACK };
+EditableLargeNumberMenuItem menuSettingsLargeTest(&minfoSettingsLargeTest, LargeFixedNumber(12, 4, 0U, 0U, false), true, &menuSettingsIoTMonitor, INFO_LOCATION_PGM);
 const PROGMEM BooleanMenuInfo minfoSettingsOverboost = { "Overboost", 12, 0xffff, 1, NO_CALLBACK, NAMING_ON_OFF };
 BooleanMenuItem menuSettingsOverboost(&minfoSettingsOverboost, false, &menuSettingsLargeTest, INFO_LOCATION_PGM);
 const PROGMEM AnyMenuInfo minfoSettingsShowDialogs = { "Show Dialogs", 11, 0xffff, 0, onShowDialogs };
@@ -65,8 +65,8 @@ const PROGMEM BooleanMenuInfo minfoSimHubLink = { "SimHub Link", 3, 0xffff, 1, o
 BooleanMenuItem menuSimHubLink(&minfoSimHubLink, false, &menuSettings, INFO_LOCATION_PGM);
 const PROGMEM AnalogMenuInfo minfoTyreTemp = { "Tyre Temp", 7, 0xffff, 255, NO_CALLBACK, 0, 1, "C" };
 AnalogMenuItem menuTyreTemp(&minfoTyreTemp, 0, &menuSimHubLink, INFO_LOCATION_PGM);
-RENDERING_CALLBACK_NAME_INVOKE(fnGearRtCall, textItemRenderFn, "Gear", -1, NO_CALLBACK)
-TextMenuItem menuGear(fnGearRtCall, "", 6, 2, &menuTyreTemp);
+const PROGMEM AnyMenuInfo minfoGear = { "Gear", 6, 0xffff, 0, NO_CALLBACK };
+TextMenuItem menuGear(&minfoGear, "", 2, &menuTyreTemp, INFO_LOCATION_PGM);
 const PROGMEM AnalogMenuInfo minfoRPM = { "RPM", 2, 0xffff, 32000, NO_CALLBACK, 0, 1, "" };
 AnalogMenuItem menuRPM(&minfoRPM, 0, &menuGear, INFO_LOCATION_PGM);
 const PROGMEM AnalogMenuInfo minfoSpeed = { "Speed", 1, 0xffff, 1000, NO_CALLBACK, 0, 1, "" };
@@ -84,7 +84,8 @@ void setupMenu() {
     gfx.begin();
     gfx.setRotation(1);
     renderer.setUpdatesPerSecond(5);
-    switches.init(&esp32Touch, SWITCHES_POLL_EVERYTHING, true);
+    esp32Touch.setTouchTriggerMode(TOUCH_TRIGGER_BELOW);
+    switches.init(&esp32Touch, SWITCHES_POLL_EVERYTHING, false);
     menuMgr.initFor4WayJoystick(&renderer, &menuSpeed, 7, 5, 2, 6, -1, 35);
     esp32Touch.ensureInterruptRegistered();
     remoteServer.addConnection(&simhubConnection);

examples/esp/esp32SimHub/generated/tcMenuAdaFruitGfx.cpp

@@ -98,8 +98,34 @@ void AdafruitDrawable::drawPolygon(const Coord points[], int numPoints, bool fil
     }
 }
 
+void AdafruitDrawable::computeBaselineIfNeeded(const GFXfont* font) {
+    // we cache the last baseline, if the font is unchanged, don't calculate again
+    if(computedFont == font && computedBaseline > 0) return;
+
+    // we need to work out the biggest glyph and maximum extent beyond the baseline, we use 4 chars 'Agj(' for this
+    const char sz[] = "Agj(";
+    int height = 0;
+    int bl = 0;
+    const char* current = sz;
+    auto fontLast = pgm_read_word(&font->last);
+    auto fontFirst = pgm_read_word(&font->first);
+    while(*current && (*current < fontLast)) {
+        size_t glIdx = *current - fontFirst;
+        auto allGlyphs = (GFXglyph*)pgm_read_ptr(&font->glyph);
+        int glyphHeight = int(pgm_read_byte(&allGlyphs[glIdx].height));
+        if (glyphHeight > height) height = glyphHeight;
+        auto yOffset = int8_t(pgm_read_byte(&allGlyphs[glIdx].yOffset));
+        bl += glyphHeight + yOffset;
+        current++;
+    }
+    computedFont = font;
+    computedBaseline = bl / 4;
+    computedHeight = height;
+}
 
 Coord AdafruitDrawable::internalTextExtents(const void *f, int mag, const char *text, int *baseline) {
+    if(mag == 0) mag = 1; // never allow 0 magnification
+
     graphics->setFont(static_cast<const GFXfont *>(f));
     graphics->setTextSize(mag);
     auto* font = (GFXfont *) f;
@@ -113,23 +139,9 @@ Coord AdafruitDrawable::internalTextExtents(const void *f, int mag, const char *
         return Coord(w, h);
     }
     else {
-        // we need to work out the biggest glyph and maximum extent beyond the baseline, we use 'Ay(' for this
-        const char sz[] = "AgyjK(";
-        int height = 0;
-        int bl = 0;
-        const char* current = sz;
-        auto fontLast = pgm_read_word(&font->last);
-        auto fontFirst = pgm_read_word(&font->first);
-        while(*current && (*current < fontLast)) {
-            size_t glIdx = *current - fontFirst;
-            auto allGlyphs = (GFXglyph*)pgm_read_ptr(&font->glyph);
-            unsigned char glyphHeight = pgm_read_byte(&allGlyphs[glIdx].height);
-            if (glyphHeight > height) height = glyphHeight;
-            bl = glyphHeight + (signed char)pgm_read_byte(&allGlyphs[glIdx].yOffset);
-            current++;
-        }
-        if(baseline) *baseline = bl;
-        return Coord((int)w, height);
+        computeBaselineIfNeeded(font);
+        if(baseline) *baseline = (computedBaseline * mag);
+        return Coord(int(w), (computedHeight * mag));
     }
 }
 

examples/esp/esp32SimHub/generated/tcMenuAdaFruitGfx.h

@@ -156,6 +156,9 @@ class AdafruitDrawable : public DeviceDrawable {
 private:
     Adafruit_GFX* graphics;
     AdafruitCanvasDrawable2bpp* canvasDrawable;
+    const GFXfont* computedFont = nullptr;
+    int16_t computedBaseline = 0;
+    int16_t computedHeight = 0;
 protected:
     int spriteHeight = 0;
 public:
@@ -180,6 +183,7 @@ class AdafruitDrawable : public DeviceDrawable {
     void drawPixel(uint16_t x, uint16_t y) override;
     Adafruit_GFX* getGfx() { return graphics; }
 protected:
+    void computeBaselineIfNeeded(const GFXfont* font);
     explicit AdafruitDrawable() : graphics(nullptr), canvasDrawable(nullptr), spriteHeight(0) {}
     void setGraphics(Adafruit_GFX* gfx) { graphics = gfx; }