examples updated

Author: davetcc

examples/arduino32/piPicoTftTouch/piPicoTftEncoder.emf

@@ -320,6 +320,7 @@
       "type": "runtimeList",
       "item": {
         "initialRows": 0,
+        "listCreationMode": "CUSTOM_RTCALL",
         "name": "Root List",
         "variableName": "RootList",
         "id": 17,
@@ -336,7 +337,6 @@
     "embeddedPlatform": "ARDUINO32",
     "lastDisplayUuid": "e6342680-6fab-4d1b-ac08-ce8dbfc0974c",
     "lastInputUuid": "89cd7f70-0457-4884-97c2-0db904ccb0ba",
-    "lastRemoteUuid": "2c101fec-1f7d-4ff3-8d2b-992ad41e7fcb",
     "lastRemoteUuids": [
       "2c101fec-1f7d-4ff3-8d2b-992ad41e7fcb"
     ],
@@ -461,8 +461,8 @@
       }
     ],
     "namingRecursive": true,
-    "saveToSrc": false,
     "useCppMain": false,
+    "saveLocation": "ALL_TO_CURRENT",
     "usingSizedEEPROMStorage": false,
     "eepromDefinition": "",
     "authenticatorDefinition": "",
@@ -474,5 +474,6 @@
     },
     "packageNamespace": "",
     "appIsModular": false
-  }
+  },
+  "stringLists": []
 }

examples/arduino32/piPicoTftTouch/piPicoTftTouch_menu.cpp

@@ -26,11 +26,12 @@ MenuTouchScreenManager touchScreen(&touchInterrogator, &renderer, touchOrientati
 tcextras::IoaTouchScreenCalibrator touchCalibrator(&touchScreen, &renderer, 400);
 
 // Global Menu Item declarations
-ListRuntimeMenuItem menuRootList(17, 0, fnRootListRtCall, NULL);
+const AnyMenuInfo minfoRootList = { "Root List", 17, 0xffff, 0, NO_CALLBACK };
+ListRuntimeMenuItem menuRootList(&minfoRootList, 0, fnRootListRtCall, nullptr, INFO_LOCATION_PGM);
 const AnyMenuInfo minfoDialogs = { "Dialogs", 12, 0xffff, 0, onShowDialogs };
 ActionMenuItem menuDialogs(&minfoDialogs, &menuRootList, INFO_LOCATION_PGM);
 RENDERING_CALLBACK_NAME_OVERRIDDEN(fnStatusInfoRtCall, infoRenderingRtCall, "Info", -1)
-TextMenuItem menuStatusInfo(fnStatusInfoRtCall, "", 19, 5, NULL);
+TextMenuItem menuStatusInfo(fnStatusInfoRtCall, "", 19, 5, nullptr);
 AnyMenuInfo minfoStatusRestart = { "Restart", 11, 0xffff, 0, onRestart };
 ActionMenuItem menuStatusRestart(&minfoStatusRestart, &menuStatusInfo, INFO_LOCATION_RAM);
 const FloatMenuInfo minfoStatusLineVoltage = { "Line Voltage", 10, 0xffff, 2, NO_CALLBACK };
@@ -48,16 +49,16 @@ EnumMenuItem menuStatusAmpStatus(&minfoStatusAmpStatus, 0, &menuStatusAmpPower,
 const SubMenuInfo minfoStatus = { "Status", 7, 0xffff, 0, NO_CALLBACK };
 BackMenuItem menuBackStatus(&minfoStatus, &menuStatusAmpStatus, INFO_LOCATION_PGM);
 SubMenuItem menuStatus(&minfoStatus, &menuBackStatus, &menuDialogs, INFO_LOCATION_PGM);
-RENDERING_CALLBACK_NAME_INVOKE(fnSettingsNlgeRtCall, largeNumItemRenderFn, "NLge", -1, NO_CALLBACK)
-EditableLargeNumberMenuItem menuSettingsNlge(fnSettingsNlgeRtCall, LargeFixedNumber(8, 0, 0U, 0U, false), 18, true, NULL);
-RENDERING_CALLBACK_NAME_INVOKE(fnSettingsLargeNumRtCall, largeNumItemRenderFn, "LargeNum", -1, NO_CALLBACK)
-EditableLargeNumberMenuItem menuSettingsLargeNum(fnSettingsLargeNumRtCall, LargeFixedNumber(8, 3, 100U, 500U, false), 16, false, &menuSettingsNlge);
-RENDERING_CALLBACK_NAME_INVOKE(fnSettingsRGBRtCall, rgbAlphaItemRenderFn, "RGB", -1, NO_CALLBACK)
-Rgb32MenuItem menuSettingsRGB(fnSettingsRGBRtCall, RgbColor32(0, 0, 0), 15, false, &menuSettingsLargeNum);
-RENDERING_CALLBACK_NAME_INVOKE(fnSettingsIPRtCall, ipAddressRenderFn, "IP", 19, NO_CALLBACK)
-IpAddressMenuItem menuSettingsIP(fnSettingsIPRtCall, IpAddressStorage(192, 168, 0, 33), 14, &menuSettingsRGB);
-RENDERING_CALLBACK_NAME_INVOKE(fnSettingsTextRtCall, textItemRenderFn, "Text", 9, NO_CALLBACK)
-TextMenuItem menuSettingsText(fnSettingsTextRtCall, "hello", 13, 10, &menuSettingsIP);
+const AnyMenuInfo minfoSettingsNlge = { "NLge", 18, 0xffff, 0, NO_CALLBACK };
+EditableLargeNumberMenuItem menuSettingsNlge(&minfoSettingsNlge, LargeFixedNumber(8, 0, 0U, 0U, false), true, nullptr, INFO_LOCATION_PGM);
+const AnyMenuInfo minfoSettingsLargeNum = { "LargeNum", 16, 0xffff, 0, NO_CALLBACK };
+EditableLargeNumberMenuItem menuSettingsLargeNum(&minfoSettingsLargeNum, LargeFixedNumber(8, 3, 100U, 500U, false), false, &menuSettingsNlge, INFO_LOCATION_PGM);
+const AnyMenuInfo minfoSettingsRGB = { "RGB", 15, 0xffff, 0, NO_CALLBACK };
+Rgb32MenuItem menuSettingsRGB(&minfoSettingsRGB, RgbColor32(0, 0, 0), false, &menuSettingsLargeNum, INFO_LOCATION_PGM);
+const AnyMenuInfo minfoSettingsIP = { "IP", 14, 19, 0, NO_CALLBACK };
+IpAddressMenuItem menuSettingsIP(&minfoSettingsIP, IpAddressStorage(192, 168, 0, 33), &menuSettingsRGB, INFO_LOCATION_PGM);
+const AnyMenuInfo minfoSettingsText = { "Text", 13, 9, 0, NO_CALLBACK };
+TextMenuItem menuSettingsText(&minfoSettingsText, "hello", 10, &menuSettingsIP, INFO_LOCATION_PGM);
 const BooleanMenuInfo minfoSettingsProtection = { "Protection", 6, 0xffff, 1, NO_CALLBACK, NAMING_ON_OFF };
 BooleanMenuItem menuSettingsProtection(&minfoSettingsProtection, false, &menuSettingsText, INFO_LOCATION_PGM);
 const AnalogMenuInfo minfoSettingsMaxOnVolume = { "Max On Volume", 5, 7, 255, NO_CALLBACK, -180, 2, "dB" };

examples/arduino32/piPicoTftTouch/tcMenuTfteSpi.cpp

@@ -13,10 +13,11 @@
  */
 
 #include "tcMenuTfteSpi.h"
-#include "tcUnicodeHelper.h"
+#include "tcUnicodeTFT_eSPI.h"
 #include <TFT_eSPI.h>
 
 using namespace iotouch;
+using namespace tcgfx;
 
 TfteSpiDrawable::TfteSpiDrawable(TFT_eSPI *tft, int spriteHeight) : tft(tft), spriteWithConfig(nullptr), spriteHeight(spriteHeight) {}
 
@@ -110,7 +111,7 @@ void TfteSpiDrawable::fontPtrToNum(const void* font, int mag) {
 }
 
 UnicodeFontHandler *TfteSpiDrawable::createFontHandler() {
-    return fontHandler = new UnicodeFontHandler(tft, tccore::ENCMODE_UTF8);
+    return fontHandler = new UnicodeFontHandler(newTFT_eSPITextPipeline(tft), tccore::ENCMODE_UTF8);
 }
 
 //
@@ -126,7 +127,7 @@ bool TftSpriteAndConfig::initSprite(const Coord &spriteWhere, const Coord &sprit
     if(spriteSize.x > size.x || spriteSize.y > size.y) return false;
 
     if(root->isTcUnicodeEnabled() && fontHandler == nullptr) {
-        fontHandler = new UnicodeFontHandler(&sprite, tccore::ENCMODE_UTF8);
+        fontHandler = new UnicodeFontHandler(newTFT_eSPITextPipeline(&sprite), tccore::ENCMODE_UTF8);
     }
 
     // create the sprite if needed

examples/arduino32/picoAdafruitDashboard/generated/picoAdafruitDashboard_menu.cpp

@@ -22,16 +22,16 @@ GraphicsDeviceRenderer renderer(30, applicationInfo.name, &gfxDrawable);
 
 // Global Menu Item declarations
 const PROGMEM BooleanMenuInfo minfoSettingsCheckBox = { "CheckBox", 9, 0xffff, 1, NO_CALLBACK, NAMING_CHECKBOX };
-BooleanMenuItem menuSettingsCheckBox(&minfoSettingsCheckBox, false, NULL, INFO_LOCATION_PGM);
+BooleanMenuItem menuSettingsCheckBox(&minfoSettingsCheckBox, false, nullptr, INFO_LOCATION_PGM);
 const PROGMEM BooleanMenuInfo minfoSettingsYesNo = { TC_I18N_MENU_8_NAME, 8, 0xffff, 1, NO_CALLBACK, NAMING_YES_NO };
 BooleanMenuItem menuSettingsYesNo(&minfoSettingsYesNo, false, &menuSettingsCheckBox, INFO_LOCATION_PGM);
-RENDERING_CALLBACK_NAME_INVOKE(fnSettingsRGBRtCall, rgbAlphaItemRenderFn, TC_I18N_MENU_7_NAME, -1, NO_CALLBACK)
-Rgb32MenuItem menuSettingsRGB(fnSettingsRGBRtCall, RgbColor32(0, 0, 0), 7, false, &menuSettingsYesNo);
+const PROGMEM AnyMenuInfo minfoSettingsRGB = { TC_I18N_MENU_7_NAME, 7, 0xffff, 0, NO_CALLBACK };
+Rgb32MenuItem menuSettingsRGB(&minfoSettingsRGB, RgbColor32(0, 0, 0), false, &menuSettingsYesNo, INFO_LOCATION_PGM);
 const PROGMEM AnyMenuInfo minfoSettingsAction = { "Action", 6, 0xffff, 0, onSettingsAction };
 ActionMenuItem menuSettingsAction(&minfoSettingsAction, &menuSettingsRGB, INFO_LOCATION_PGM);
 const PROGMEM SubMenuInfo minfoSettings = { TC_I18N_MENU_5_NAME, 5, 0xffff, 0, NO_CALLBACK };
 BackMenuItem menuBackSettings(&minfoSettings, &menuSettingsAction, INFO_LOCATION_PGM);
-SubMenuItem menuSettings(&minfoSettings, &menuBackSettings, NULL, INFO_LOCATION_PGM);
+SubMenuItem menuSettings(&minfoSettings, &menuBackSettings, nullptr, INFO_LOCATION_PGM);
 const PROGMEM BooleanMenuInfo minfoPower = { "Power", 4, 0xffff, 1, NO_CALLBACK, NAMING_ON_OFF };
 BooleanMenuItem menuPower(&minfoPower, false, &menuSettings, INFO_LOCATION_PGM);
 const char enumStrEnum_0[] PROGMEM = TC_I18N_MENU_3_ENUM_0;

examples/arduino32/picoAdafruitDashboard/picoAdafruitDashboard.emf

@@ -325,5 +325,6 @@
     },
     "packageNamespace": "",
     "appIsModular": false
-  }
+  },
+  "stringLists": []
 }