Skip to content

Commit dea77d7

Browse files
author
dave
committed
rebuild all examples for release
1 parent c3139fc commit dea77d7

File tree

79 files changed

+1281
-1726
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+1281
-1726
lines changed

‎examples/arduino32/colorTftEthernet32/colorTftEthernet.emf‎

Lines changed: 61 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
"functionName": "onVoltageChange",
2121
"readOnly": false,
2222
"localOnly": false,
23-
"visible": true
23+
"visible": true,
24+
"staticDataInRAM": false
2425
}
2526
},
2627
{
@@ -40,7 +41,8 @@
4041
"functionName": "onCurrentChange",
4142
"readOnly": false,
4243
"localOnly": false,
43-
"visible": true
44+
"visible": true,
45+
"staticDataInRAM": false
4446
}
4547
},
4648
{
@@ -59,7 +61,8 @@
5961
"functionName": "onLimitMode",
6062
"readOnly": false,
6163
"localOnly": false,
62-
"visible": true
64+
"visible": true,
65+
"staticDataInRAM": false
6366
}
6467
},
6568
{
@@ -73,7 +76,8 @@
7376
"eepromAddress": -1,
7477
"readOnly": false,
7578
"localOnly": false,
76-
"visible": true
79+
"visible": true,
80+
"staticDataInRAM": false
7781
}
7882
},
7983
{
@@ -88,7 +92,8 @@
8892
"eepromAddress": -1,
8993
"readOnly": false,
9094
"localOnly": false,
91-
"visible": true
95+
"visible": true,
96+
"staticDataInRAM": false
9297
}
9398
},
9499
{
@@ -102,7 +107,8 @@
102107
"functionName": "onSaveRom",
103108
"readOnly": false,
104109
"localOnly": false,
105-
"visible": true
110+
"visible": true,
111+
"staticDataInRAM": false
106112
}
107113
},
108114
{
@@ -116,7 +122,8 @@
116122
"eepromAddress": -1,
117123
"readOnly": false,
118124
"localOnly": false,
119-
"visible": true
125+
"visible": true,
126+
"staticDataInRAM": false
120127
}
121128
},
122129
{
@@ -131,7 +138,8 @@
131138
"eepromAddress": 8,
132139
"readOnly": false,
133140
"localOnly": false,
134-
"visible": true
141+
"visible": true,
142+
"staticDataInRAM": false
135143
}
136144
},
137145
{
@@ -144,7 +152,8 @@
144152
"eepromAddress": -1,
145153
"readOnly": false,
146154
"localOnly": false,
147-
"visible": true
155+
"visible": true,
156+
"staticDataInRAM": false
148157
}
149158
},
150159
{
@@ -159,7 +168,8 @@
159168
"eepromAddress": 9,
160169
"readOnly": false,
161170
"localOnly": false,
162-
"visible": true
171+
"visible": true,
172+
"staticDataInRAM": false
163173
}
164174
},
165175
{
@@ -175,7 +185,8 @@
175185
"functionName": "onRgbChanged",
176186
"readOnly": false,
177187
"localOnly": false,
178-
"visible": true
188+
"visible": true,
189+
"staticDataInRAM": false
179190
}
180191
},
181192
{
@@ -191,7 +202,8 @@
191202
"functionName": "onShowHidden",
192203
"readOnly": false,
193204
"localOnly": false,
194-
"visible": true
205+
"visible": true,
206+
"staticDataInRAM": false
195207
}
196208
},
197209
{
@@ -205,7 +217,8 @@
205217
"eepromAddress": -1,
206218
"readOnly": false,
207219
"localOnly": false,
208-
"visible": true
220+
"visible": true,
221+
"staticDataInRAM": false
209222
}
210223
},
211224
{
@@ -220,7 +233,8 @@
220233
"eepromAddress": -1,
221234
"readOnly": false,
222235
"localOnly": false,
223-
"visible": true
236+
"visible": true,
237+
"staticDataInRAM": false
224238
}
225239
},
226240
{
@@ -235,7 +249,8 @@
235249
"eepromAddress": -1,
236250
"readOnly": false,
237251
"localOnly": false,
238-
"visible": true
252+
"visible": true,
253+
"staticDataInRAM": false
239254
}
240255
},
241256
{
@@ -249,7 +264,8 @@
249264
"eepromAddress": -1,
250265
"readOnly": false,
251266
"localOnly": false,
252-
"visible": true
267+
"visible": true,
268+
"staticDataInRAM": false
253269
}
254270
},
255271
{
@@ -265,7 +281,8 @@
265281
"eepromAddress": 10,
266282
"readOnly": false,
267283
"localOnly": false,
268-
"visible": true
284+
"visible": true,
285+
"staticDataInRAM": false
269286
}
270287
},
271288
{
@@ -279,7 +296,8 @@
279296
"eepromAddress": -1,
280297
"readOnly": false,
281298
"localOnly": true,
282-
"visible": true
299+
"visible": true,
300+
"staticDataInRAM": false
283301
}
284302
},
285303
{
@@ -292,7 +310,8 @@
292310
"eepromAddress": -1,
293311
"readOnly": false,
294312
"localOnly": false,
295-
"visible": true
313+
"visible": true,
314+
"staticDataInRAM": false
296315
}
297316
},
298317
{
@@ -307,7 +326,8 @@
307326
"functionName": "",
308327
"readOnly": false,
309328
"localOnly": false,
310-
"visible": true
329+
"visible": true,
330+
"staticDataInRAM": false
311331
}
312332
},
313333
{
@@ -325,7 +345,8 @@
325345
"eepromAddress": 14,
326346
"readOnly": false,
327347
"localOnly": false,
328-
"visible": true
348+
"visible": true,
349+
"staticDataInRAM": false
329350
}
330351
},
331352
{
@@ -344,7 +365,8 @@
344365
"functionName": "",
345366
"readOnly": false,
346367
"localOnly": false,
347-
"visible": true
368+
"visible": true,
369+
"staticDataInRAM": false
348370
}
349371
},
350372
{
@@ -360,7 +382,8 @@
360382
"eepromAddress": -1,
361383
"readOnly": false,
362384
"localOnly": false,
363-
"visible": true
385+
"visible": true,
386+
"staticDataInRAM": false
364387
}
365388
},
366389
{
@@ -374,7 +397,8 @@
374397
"functionName": "onSaveItem",
375398
"readOnly": false,
376399
"localOnly": false,
377-
"visible": true
400+
"visible": true,
401+
"staticDataInRAM": false
378402
}
379403
},
380404
{
@@ -388,7 +412,8 @@
388412
"functionName": "onTakeDisplay",
389413
"readOnly": false,
390414
"localOnly": false,
391-
"visible": true
415+
"visible": true,
416+
"staticDataInRAM": false
392417
}
393418
}
394419
],
@@ -464,6 +489,11 @@
464489
"latestValue": "5",
465490
"subsystem": "DISPLAY"
466491
},
492+
{
493+
"name": "DISPLAY_BUFFER_SIZE",
494+
"latestValue": "0",
495+
"subsystem": "DISPLAY"
496+
},
467497
{
468498
"name": "SW_POLLING_MODE",
469499
"latestValue": "SWITCHES_POLL_KEYS_ONLY",
@@ -554,6 +584,11 @@
554584
"latestValue": "TITLE_ALWAYS",
555585
"subsystem": "THEME"
556586
},
587+
{
588+
"name": "USE_TC_UNICODE",
589+
"latestValue": "false",
590+
"subsystem": "THEME"
591+
},
557592
{
558593
"name": "USE_SLIDER_ANALOG",
559594
"latestValue": "true",
@@ -568,6 +603,7 @@
568603
"namingRecursive": false,
569604
"saveToSrc": false,
570605
"useCppMain": false,
606+
"usingSizedEEPROMStorage": false,
571607
"eepromDefinition": "at24:80:PAGESIZE_AT24C128",
572608
"authenticatorDefinition": "rom:100:6",
573609
"projectIoExpanders": [

‎examples/arduino32/colorTftEthernet32/colorTftEthernet32_menu.cpp‎

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -29,70 +29,66 @@ TagValueRemoteServerConnection ethernetConnection(ethernetTransport, ethernetIni
2929

3030
// Global Menu Item declarations
3131
const AnyMenuInfo minfoTakeDisplay = { "Take display", 17, 0xffff, 0, onTakeDisplay };
32-
ActionMenuItem menuTakeDisplay(&minfoTakeDisplay, NULL);
32+
ActionMenuItem menuTakeDisplay(&minfoTakeDisplay, NULL, INFO_LOCATION_PGM);
3333
const AnyMenuInfo minfoSaveItem = { "Save item", 23, 0xffff, 0, onSaveItem };
34-
ActionMenuItem menuSaveItem(&minfoSaveItem, NULL);
34+
ActionMenuItem menuSaveItem(&minfoSaveItem, NULL, INFO_LOCATION_PGM);
3535
RENDERING_CALLBACK_NAME_INVOKE(fnRomTextRtCall, textItemRenderFn, "Rom Text", -1, NO_CALLBACK)
3636
TextMenuItem menuRomText(fnRomTextRtCall, "", 21, 10, &menuSaveItem);
3737
ScrollChoiceMenuItem menuRomLocation(24, fnRomLocationRtCall, 0, 10, &menuRomText);
3838
RENDERING_CALLBACK_NAME_INVOKE(fnRomChoiceRtCall, enumItemRenderFn, "Rom Choice", 14, NO_CALLBACK)
3939
ScrollChoiceMenuItem menuRomChoice(25, fnRomChoiceRtCall, 0, 1024, 10, 10, &menuRomLocation);
40-
RENDERING_CALLBACK_NAME_INVOKE(fnRomValuesRtCall, backSubItemRenderFn, "Rom Values", -1, NO_CALLBACK)
4140
const SubMenuInfo minfoRomValues = { "Rom Values", 20, 0xffff, 0, NO_CALLBACK };
42-
BackMenuItem menuBackRomValues(fnRomValuesRtCall, &menuRomChoice);
43-
SubMenuItem menuRomValues(&minfoRomValues, &menuBackRomValues, &menuTakeDisplay);
41+
BackMenuItem menuBackRomValues(&minfoRomValues, &menuRomChoice, INFO_LOCATION_PGM);
42+
SubMenuItem menuRomValues(&minfoRomValues, &menuBackRomValues, &menuTakeDisplay, INFO_LOCATION_PGM);
4443
const char pgmStrIoTMonitorText[] = { "IoT Monitor" };
4544
RemoteMenuItem menuIoTMonitor(pgmStrIoTMonitorText, 29, NULL);
4645
const char pgmStrAuthenticatorText[] = { "Authenticator" };
4746
EepromAuthenticationInfoMenuItem menuAuthenticator(pgmStrAuthenticatorText, NO_CALLBACK, 28, &menuIoTMonitor);
4847
RENDERING_CALLBACK_NAME_INVOKE(fnIpAddressRtCall, ipAddressRenderFn, "Ip Address", 10, NO_CALLBACK)
4948
IpAddressMenuItem menuIpAddress(fnIpAddressRtCall, IpAddressStorage(127, 0, 0, 1), 15, &menuAuthenticator);
50-
RENDERING_CALLBACK_NAME_INVOKE(fnConnectivityRtCall, backSubItemRenderFn, "Connectivity", -1, NO_CALLBACK)
5149
const SubMenuInfo minfoConnectivity = { "Connectivity", 14, 0xffff, 0, NO_CALLBACK };
52-
BackMenuItem menuBackConnectivity(fnConnectivityRtCall, &menuIpAddress);
53-
SubMenuItem menuConnectivity(&minfoConnectivity, &menuBackConnectivity, &menuRomValues);
50+
BackMenuItem menuBackConnectivity(&minfoConnectivity, &menuIpAddress, INFO_LOCATION_PGM);
51+
SubMenuItem menuConnectivity(&minfoConnectivity, &menuBackConnectivity, &menuRomValues, INFO_LOCATION_PGM);
5452
const FloatMenuInfo minfoVoltA1 = { "Volt A1", 9, 0xffff, 2, NO_CALLBACK };
55-
FloatMenuItem menuVoltA1(&minfoVoltA1, 0.0, NULL);
53+
FloatMenuItem menuVoltA1(&minfoVoltA1, 0.0, NULL, INFO_LOCATION_PGM);
5654
const FloatMenuInfo minfoVoltA0 = { "Volt A0", 8, 0xffff, 2, NO_CALLBACK };
57-
FloatMenuItem menuVoltA0(&minfoVoltA0, 0.0, &menuVoltA1);
58-
RENDERING_CALLBACK_NAME_INVOKE(fnStatusRtCall, backSubItemRenderFn, "Status", -1, NO_CALLBACK)
55+
FloatMenuItem menuVoltA0(&minfoVoltA0, 0.0, &menuVoltA1, INFO_LOCATION_PGM);
5956
const SubMenuInfo minfoStatus = { "Status", 7, 0xffff, 0, NO_CALLBACK };
60-
BackMenuItem menuBackStatus(fnStatusRtCall, &menuVoltA0);
61-
SubMenuItem menuStatus(&minfoStatus, &menuBackStatus, &menuConnectivity);
57+
BackMenuItem menuBackStatus(&minfoStatus, &menuVoltA0, INFO_LOCATION_PGM);
58+
SubMenuItem menuStatus(&minfoStatus, &menuBackStatus, &menuConnectivity, INFO_LOCATION_PGM);
6259
const BooleanMenuInfo minfoShowHidden = { "Show Hidden", 30, 0xffff, 1, onShowHidden, NAMING_YES_NO };
63-
BooleanMenuItem menuShowHidden(&minfoShowHidden, false, NULL);
60+
BooleanMenuItem menuShowHidden(&minfoShowHidden, false, NULL, INFO_LOCATION_PGM);
6461
RENDERING_CALLBACK_NAME_INVOKE(fnRGBRtCall, rgbAlphaItemRenderFn, "RGB", 16, onRgbChanged)
6562
Rgb32MenuItem menuRGB(fnRGBRtCall, RgbColor32(0, 0, 0), 26, false, &menuShowHidden);
6663
const BooleanMenuInfo minfoTempCheck = { "Temp Check", 13, 9, 1, NO_CALLBACK, NAMING_ON_OFF };
67-
BooleanMenuItem menuTempCheck(&minfoTempCheck, false, &menuRGB);
64+
BooleanMenuItem menuTempCheck(&minfoTempCheck, false, &menuRGB, INFO_LOCATION_PGM);
6865
const AnyMenuInfo minfoHiddenItem = { "Hidden item", 16, 0xffff, 0, NO_CALLBACK };
69-
ActionMenuItem menuHiddenItem(&minfoHiddenItem, &menuTempCheck);
66+
ActionMenuItem menuHiddenItem(&minfoHiddenItem, &menuTempCheck, INFO_LOCATION_PGM);
7067
const BooleanMenuInfo minfoSCircuitProtect = { "S-Circuit Protect", 12, 8, 1, NO_CALLBACK, NAMING_ON_OFF };
71-
BooleanMenuItem menuSCircuitProtect(&minfoSCircuitProtect, false, &menuHiddenItem);
72-
RENDERING_CALLBACK_NAME_INVOKE(fnAdvancedRtCall, backSubItemRenderFn, "Advanced", -1, NO_CALLBACK)
68+
BooleanMenuItem menuSCircuitProtect(&minfoSCircuitProtect, false, &menuHiddenItem, INFO_LOCATION_PGM);
7369
const SubMenuInfo minfoAdvanced = { "Advanced", 11, 0xffff, 0, NO_CALLBACK };
74-
BackMenuItem menuBackAdvanced(fnAdvancedRtCall, &menuSCircuitProtect);
75-
SubMenuItem menuAdvanced(&minfoAdvanced, &menuBackAdvanced, NULL);
70+
BackMenuItem menuBackAdvanced(&minfoAdvanced, &menuSCircuitProtect, INFO_LOCATION_PGM);
71+
SubMenuItem menuAdvanced(&minfoAdvanced, &menuBackAdvanced, NULL, INFO_LOCATION_PGM);
7672
const AnyMenuInfo minfoSaveAll = { "Save all", 10, 0xffff, 0, onSaveRom };
77-
ActionMenuItem menuSaveAll(&minfoSaveAll, &menuAdvanced);
73+
ActionMenuItem menuSaveAll(&minfoSaveAll, &menuAdvanced, INFO_LOCATION_PGM);
7874
const BooleanMenuInfo minfoPwrDelay = { "Pwr Delay", 5, 0xffff, 1, NO_CALLBACK, NAMING_YES_NO };
79-
BooleanMenuItem menuPwrDelay(&minfoPwrDelay, false, &menuSaveAll);
80-
RENDERING_CALLBACK_NAME_INVOKE(fnSettingsRtCall, backSubItemRenderFn, "Settings", -1, NO_CALLBACK)
75+
BooleanMenuItem menuPwrDelay(&minfoPwrDelay, false, &menuSaveAll, INFO_LOCATION_PGM);
8176
const SubMenuInfo minfoSettings = { "Settings", 4, 0xffff, 0, NO_CALLBACK };
82-
BackMenuItem menuBackSettings(fnSettingsRtCall, &menuPwrDelay);
83-
SubMenuItem menuSettings(&minfoSettings, &menuBackSettings, &menuStatus);
77+
BackMenuItem menuBackSettings(&minfoSettings, &menuPwrDelay, INFO_LOCATION_PGM);
78+
SubMenuItem menuSettings(&minfoSettings, &menuBackSettings, &menuStatus, INFO_LOCATION_PGM);
8479
const char enumStrLimit_0[] = "Current";
8580
const char enumStrLimit_1[] = "Voltage";
8681
const char* const enumStrLimit[] = { enumStrLimit_0, enumStrLimit_1 };
8782
const EnumMenuInfo minfoLimit = { "Limit", 3, 6, 1, onLimitMode, enumStrLimit };
88-
EnumMenuItem menuLimit(&minfoLimit, 0, &menuSettings);
83+
EnumMenuItem menuLimit(&minfoLimit, 0, &menuSettings, INFO_LOCATION_PGM);
8984
const AnalogMenuInfo minfoCurrent = { "Current", 2, 4, 255, onCurrentChange, 0, 100, "A" };
90-
AnalogMenuItem menuCurrent(&minfoCurrent, 0, &menuLimit);
85+
AnalogMenuItem menuCurrent(&minfoCurrent, 0, &menuLimit, INFO_LOCATION_PGM);
9186
const AnalogMenuInfo minfoVoltage = { "Voltage", 1, 2, 255, onVoltageChange, -128, 2, "V" };
92-
AnalogMenuItem menuVoltage(&minfoVoltage, 0, &menuCurrent);
87+
AnalogMenuItem menuVoltage(&minfoVoltage, 0, &menuCurrent, INFO_LOCATION_PGM);
9388

9489
void setupMenu() {
9590
// First we set up eeprom and authentication (if needed).
91+
setSizeBasedEEPROMStorageEnabled(false);
9692
menuMgr.setEepromRef(&glI2cRom);
9793
authManager.initialise(menuMgr.getEepromAbstraction(), 100);
9894
menuMgr.setAuthenticator(&authManager);

‎examples/arduino32/colorTftEthernet32/colorTftEthernet32_menu.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@
1919
#include <RuntimeMenuItem.h>
2020
#include <ScrollChoiceMenuItem.h>
2121
#include <RemoteMenuItem.h>
22-
#include <IoAbstractionWire.h>
2322
#include <IoAbstraction.h>
23+
#include <IoAbstractionWire.h>
24+
#include <EepromItemStorage.h>
2425
#include <EepromAbstractionWire.h>
2526
#include <RemoteAuthentication.h>
2627

‎examples/arduino32/colorTftEthernet32/tcMenuAdaFruitGfx.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ Coord AdafruitDrawable::internalTextExtents(const void *f, int mag, const char *
121121
auto allGlyphs = (GFXglyph*)pgm_read_ptr(&font->glyph);
122122
unsigned char glyphHeight = pgm_read_byte(&allGlyphs[glIdx].height);
123123
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);
125125
current++;
126126
}
127127
if(baseline) *baseline = bl;

0 commit comments

Comments
 (0)