example change

davetcc · davetcc · commit 41cf3cb2d46a · 2023-01-25T08:58:32.000Z
diff --git a/examples/arduino32/picoAdafruitDashboard/picoAdafruitDashboard.emf b/examples/arduino32/picoAdafruitDashboard/picoAdafruitDashboard.emf
@@ -19,7 +19,8 @@
         "eepromAddress": -1,
         "readOnly": false,
         "localOnly": false,
-        "visible": true
+        "visible": true,
+        "staticDataInRAM": false
       }
     },
     {
@@ -34,7 +35,8 @@
         "eepromAddress": -1,
         "readOnly": false,
         "localOnly": false,
-        "visible": true
+        "visible": true,
+        "staticDataInRAM": false
       }
     },
     {
@@ -52,7 +54,8 @@
         "eepromAddress": -1,
         "readOnly": false,
         "localOnly": false,
-        "visible": true
+        "visible": true,
+        "staticDataInRAM": false
       }
     },
     {
@@ -67,7 +70,8 @@
         "eepromAddress": -1,
         "readOnly": false,
         "localOnly": false,
-        "visible": true
+        "visible": true,
+        "staticDataInRAM": false
       }
     },
     {
@@ -81,7 +85,8 @@
         "eepromAddress": -1,
         "readOnly": false,
         "localOnly": false,
-        "visible": true
+        "visible": true,
+        "staticDataInRAM": false
       }
     },
     {
@@ -95,7 +100,8 @@
         "functionName": "onSettingsAction",
         "readOnly": false,
         "localOnly": false,
-        "visible": true
+        "visible": true,
+        "staticDataInRAM": false
       }
     },
     {
@@ -110,7 +116,8 @@
         "eepromAddress": -1,
         "readOnly": false,
         "localOnly": false,
-        "visible": true
+        "visible": true,
+        "staticDataInRAM": false
       }
     }
   ],
@@ -238,7 +245,7 @@
       },
       {
         "name": "ITEM_FONT",
-        "latestValue": "ada:OpenSansCyrillicLatin18,0",
+        "latestValue": "ada:RobotoMedium24,1",
         "subsystem": "THEME"
       },
       {
@@ -258,7 +265,7 @@
       },
       {
         "name": "USE_TC_UNICODE",
-        "latestValue": "true",
+        "latestValue": "false",
         "subsystem": "THEME"
       },
       {
@@ -275,6 +282,7 @@
     "namingRecursive": true,
     "saveToSrc": false,
     "useCppMain": false,
+    "usingSizedEEPROMStorage": false,
     "eepromDefinition": "",
     "authenticatorDefinition": "",
     "projectIoExpanders": [
diff --git a/examples/arduino32/picoAdafruitDashboard/picoAdafruitDashboard_menu.cpp b/examples/arduino32/picoAdafruitDashboard/picoAdafruitDashboard_menu.cpp
@@ -11,7 +11,6 @@
 #include <tcMenu.h>
 #include "picoAdafruitDashboard_menu.h"
 #include "ThemeCoolBlueModern.h"
-#include <Fonts/OpenSansCyrillicLatin18.h>
 #include <Fonts/RobotoMedium24.h>
 
 // Global variable declarations
@@ -25,26 +24,25 @@ GraphicsDeviceRenderer renderer(30, applicationInfo.name, &gfxDrawable);
 RENDERING_CALLBACK_NAME_INVOKE(fnSettingsRGBRtCall, rgbAlphaItemRenderFn, "RGB", -1, NO_CALLBACK)
 Rgb32MenuItem menuSettingsRGB(fnSettingsRGBRtCall, RgbColor32(0, 0, 0), 7, false, NULL);
 const PROGMEM AnyMenuInfo minfoSettingsAction = { "Action", 6, 0xffff, 0, onSettingsAction };
-ActionMenuItem menuSettingsAction(&minfoSettingsAction, &menuSettingsRGB);
-RENDERING_CALLBACK_NAME_INVOKE(fnSettingsRtCall, backSubItemRenderFn, "Settings", -1, NO_CALLBACK)
+ActionMenuItem menuSettingsAction(&minfoSettingsAction, &menuSettingsRGB, INFO_LOCATION_PGM);
 const PROGMEM SubMenuInfo minfoSettings = { "Settings", 5, 0xffff, 0, NO_CALLBACK };
-BackMenuItem menuBackSettings(fnSettingsRtCall, &menuSettingsAction);
-SubMenuItem menuSettings(&minfoSettings, &menuBackSettings, NULL);
+BackMenuItem menuBackSettings(&minfoSettings, &menuSettingsAction, INFO_LOCATION_PGM);
+SubMenuItem menuSettings(&minfoSettings, &menuBackSettings, NULL, INFO_LOCATION_PGM);
 const PROGMEM BooleanMenuInfo minfoPower = { "Power", 4, 0xffff, 1, NO_CALLBACK, NAMING_ON_OFF };
-BooleanMenuItem menuPower(&minfoPower, false, &menuSettings);
+BooleanMenuItem menuPower(&minfoPower, false, &menuSettings, INFO_LOCATION_PGM);
 const char enumStrEnum_0[] PROGMEM = "Item1";
 const char enumStrEnum_1[] PROGMEM = "Item2";
 const char* const enumStrEnum[] PROGMEM  = { enumStrEnum_0, enumStrEnum_1 };
 const PROGMEM EnumMenuInfo minfoEnum = { "Enum", 3, 0xffff, 1, NO_CALLBACK, enumStrEnum };
-EnumMenuItem menuEnum(&minfoEnum, 0, &menuPower);
+EnumMenuItem menuEnum(&minfoEnum, 0, &menuPower, INFO_LOCATION_PGM);
 const PROGMEM FloatMenuInfo minfoFloat = { "Float", 2, 0xffff, 3, NO_CALLBACK };
-FloatMenuItem menuFloat(&minfoFloat, 33.123, &menuEnum);
+FloatMenuItem menuFloat(&minfoFloat, 33.123, &menuEnum, INFO_LOCATION_PGM);
 const PROGMEM AnalogMenuInfo minfoAnalog = { "Analog", 1, 0xffff, 1000, NO_CALLBACK, 0, 10, "V" };
-AnalogMenuItem menuAnalog(&minfoAnalog, 222, &menuFloat);
+AnalogMenuItem menuAnalog(&minfoAnalog, 222, &menuFloat, INFO_LOCATION_PGM);
 
 void setupMenu() {
     // First we set up eeprom and authentication (if needed).
-
+    setSizeBasedEEPROMStorageEnabled(false);
     // Code generated by plugins.
     gfx.begin();
     gfx.setRotation(1);
@@ -53,7 +51,6 @@ void setupMenu() {
     menuMgr.initForEncoder(&renderer, &menuAnalog, 16, 17, 21);
     renderer.setTitleMode(BaseGraphicalRenderer::TITLE_FIRST_ROW);
     renderer.setUseSliderForAnalog(true);
-    renderer.enableTcUnicode();
-    installCoolBlueModernTheme(renderer, MenuFontDef(&OpenSansCyrillicLatin18, 0), MenuFontDef(&RobotoMedium24, 1), false);
+    installCoolBlueModernTheme(renderer, MenuFontDef(&RobotoMedium24, 1), MenuFontDef(&RobotoMedium24, 1), false);
 }
 
diff --git a/examples/arduino32/picoAdafruitDashboard/picoAdafruitDashboard_menu.h b/examples/arduino32/picoAdafruitDashboard/picoAdafruitDashboard_menu.h
@@ -13,17 +13,16 @@
 
 #include <Arduino.h>
 #include <tcMenu.h>
-#include <tcUnicodeHelper.h>
 #include "tcMenuAdaFruitGfx.h"
 #include <ScrollChoiceMenuItem.h>
 #include <IoAbstraction.h>
+#include <EepromItemStorage.h>
 
 // variables we declare that you may need to access
 extern const PROGMEM ConnectorLocalInfo applicationInfo;
 extern Adafruit_ILI9341 gfx;
 extern AdafruitDrawable gfxDrawable;
 extern GraphicsDeviceRenderer renderer;
-extern const UnicodeFont OpenSansCyrillicLatin18[];
 extern const GFXfont RobotoMedium24;
 
 // Any externals needed by IO expanders, EEPROMs etc
diff --git a/examples/arduino32/picoAdafruitDashboard/tcMenuAdaFruitGfx.cpp b/examples/arduino32/picoAdafruitDashboard/tcMenuAdaFruitGfx.cpp
@@ -121,7 +121,7 @@ Coord AdafruitDrawable::internalTextExtents(const void *f, int mag, const char *
             auto allGlyphs = (GFXglyph*)pgm_read_ptr(&font->glyph);
             unsigned char glyphHeight = pgm_read_byte(&allGlyphs[glIdx].height);
             if (glyphHeight > height) height = glyphHeight;
-            bl = glyphHeight + pgm_read_byte(&allGlyphs[glIdx].yOffset);
+            bl = glyphHeight + (signed char)pgm_read_byte(&allGlyphs[glIdx].yOffset);
             current++;
         }
         if(baseline) *baseline = bl;

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,8 @@`
`19`	`19`	`"eepromAddress": -1,`
`20`	`20`	`"readOnly": false,`
`21`	`21`	`"localOnly": false,`
`22`		`- "visible": true`
	`22`	`+ "visible": true,`
	`23`	`+ "staticDataInRAM": false`
`23`	`24`	`}`
`24`	`25`	`},`
`25`	`26`	`{`
`@@ -34,7 +35,8 @@`
`34`	`35`	`"eepromAddress": -1,`
`35`	`36`	`"readOnly": false,`
`36`	`37`	`"localOnly": false,`
`37`		`- "visible": true`
	`38`	`+ "visible": true,`
	`39`	`+ "staticDataInRAM": false`
`38`	`40`	`}`
`39`	`41`	`},`
`40`	`42`	`{`
`@@ -52,7 +54,8 @@`
`52`	`54`	`"eepromAddress": -1,`
`53`	`55`	`"readOnly": false,`
`54`	`56`	`"localOnly": false,`
`55`		`- "visible": true`
	`57`	`+ "visible": true,`
	`58`	`+ "staticDataInRAM": false`
`56`	`59`	`}`
`57`	`60`	`},`
`58`	`61`	`{`
`@@ -67,7 +70,8 @@`
`67`	`70`	`"eepromAddress": -1,`
`68`	`71`	`"readOnly": false,`
`69`	`72`	`"localOnly": false,`
`70`		`- "visible": true`
	`73`	`+ "visible": true,`
	`74`	`+ "staticDataInRAM": false`
`71`	`75`	`}`
`72`	`76`	`},`
`73`	`77`	`{`
`@@ -81,7 +85,8 @@`
`81`	`85`	`"eepromAddress": -1,`
`82`	`86`	`"readOnly": false,`
`83`	`87`	`"localOnly": false,`
`84`		`- "visible": true`
	`88`	`+ "visible": true,`
	`89`	`+ "staticDataInRAM": false`
`85`	`90`	`}`
`86`	`91`	`},`
`87`	`92`	`{`
`@@ -95,7 +100,8 @@`
`95`	`100`	`"functionName": "onSettingsAction",`
`96`	`101`	`"readOnly": false,`
`97`	`102`	`"localOnly": false,`
`98`		`- "visible": true`
	`103`	`+ "visible": true,`
	`104`	`+ "staticDataInRAM": false`
`99`	`105`	`}`
`100`	`106`	`},`
`101`	`107`	`{`
`@@ -110,7 +116,8 @@`
`110`	`116`	`"eepromAddress": -1,`
`111`	`117`	`"readOnly": false,`
`112`	`118`	`"localOnly": false,`
`113`		`- "visible": true`
	`119`	`+ "visible": true,`
	`120`	`+ "staticDataInRAM": false`
`114`	`121`	`}`
`115`	`122`	`}`
`116`	`123`	`],`
`@@ -238,7 +245,7 @@`
`238`	`245`	`},`
`239`	`246`	`{`
`240`	`247`	`"name": "ITEM_FONT",`
`241`		`- "latestValue": "ada:OpenSansCyrillicLatin18,0",`
	`248`	`+ "latestValue": "ada:RobotoMedium24,1",`
`242`	`249`	`"subsystem": "THEME"`
`243`	`250`	`},`
`244`	`251`	`{`
`@@ -258,7 +265,7 @@`
`258`	`265`	`},`
`259`	`266`	`{`
`260`	`267`	`"name": "USE_TC_UNICODE",`
`261`		`- "latestValue": "true",`
	`268`	`+ "latestValue": "false",`
`262`	`269`	`"subsystem": "THEME"`
`263`	`270`	`},`
`264`	`271`	`{`
`@@ -275,6 +282,7 @@`
`275`	`282`	`"namingRecursive": true,`
`276`	`283`	`"saveToSrc": false,`
`277`	`284`	`"useCppMain": false,`
	`285`	`+ "usingSizedEEPROMStorage": false,`
`278`	`286`	`"eepromDefinition": "",`
`279`	`287`	`"authenticatorDefinition": "",`
`280`	`288`	`"projectIoExpanders": [`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ Coord AdafruitDrawable::internalTextExtents(const void f, int mag, const char `
`121`	`121`	`auto allGlyphs = (GFXglyph*)pgm_read_ptr(&font->glyph);`
`122`	`122`	`unsigned char glyphHeight = pgm_read_byte(&allGlyphs[glIdx].height);`
`123`	`123`	`if (glyphHeight > height) height = glyphHeight;`
`124`		`- bl = glyphHeight + pgm_read_byte(&allGlyphs[glIdx].yOffset);`
	`124`	`+ bl = glyphHeight + (signed char)pgm_read_byte(&allGlyphs[glIdx].yOffset);`
`125`	`125`	`current++;`
`126`	`126`	`}`
`127`	`127`	`if(baseline) *baseline = bl;`