Skip to content

Commit ef48a54

Browse files
davetccdavetcc
committed
ready examples for release
1 parent 512b77d commit ef48a54

File tree

10 files changed

+98
-33
lines changed

10 files changed

+98
-33
lines changed

‎examples/arduino32/colorTftEthernet32/colorTftEthernet.emf‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@
66
{
77
"parentId": 0,
88
"type": "analogItem",
9+
"defaultValue": "0",
910
"item": {
1011
"maxValue": 255,
1112
"offset": -128,
1213
"divisor": 2,
1314
"unitName": "V",
15+
"step": 1,
1416
"name": "Voltage",
1517
"variableName": "",
1618
"id": 1,
@@ -24,11 +26,13 @@
2426
{
2527
"parentId": 0,
2628
"type": "analogItem",
29+
"defaultValue": "0",
2730
"item": {
2831
"maxValue": 255,
2932
"offset": 0,
3033
"divisor": 100,
3134
"unitName": "A",
35+
"step": 1,
3236
"name": "Current",
3337
"variableName": "",
3438
"id": 2,
@@ -42,6 +46,7 @@
4246
{
4347
"parentId": 0,
4448
"type": "enumItem",
49+
"defaultValue": "0",
4550
"item": {
4651
"enumEntries": [
4752
"Current",
@@ -74,6 +79,7 @@
7479
{
7580
"parentId": 4,
7681
"type": "boolItem",
82+
"defaultValue": "false",
7783
"item": {
7884
"naming": "YES_NO",
7985
"name": "Pwr Delay",
@@ -116,6 +122,7 @@
116122
{
117123
"parentId": 11,
118124
"type": "boolItem",
125+
"defaultValue": "false",
119126
"item": {
120127
"naming": "ON_OFF",
121128
"name": "S-Circuit Protect",
@@ -143,6 +150,7 @@
143150
{
144151
"parentId": 11,
145152
"type": "boolItem",
153+
"defaultValue": "false",
146154
"item": {
147155
"naming": "ON_OFF",
148156
"name": "Temp Check",
@@ -157,6 +165,7 @@
157165
{
158166
"parentId": 11,
159167
"type": "rgbItem",
168+
"defaultValue": "#000000FF",
160169
"item": {
161170
"includeAlphaChannel": false,
162171
"name": "RGB",
@@ -172,6 +181,7 @@
172181
{
173182
"parentId": 11,
174183
"type": "boolItem",
184+
"defaultValue": "false",
175185
"item": {
176186
"naming": "YES_NO",
177187
"name": "Show Hidden",
@@ -201,6 +211,7 @@
201211
{
202212
"parentId": 7,
203213
"type": "floatItem",
214+
"defaultValue": "0.0",
204215
"item": {
205216
"numDecimalPlaces": 2,
206217
"name": "Volt A0",
@@ -215,6 +226,7 @@
215226
{
216227
"parentId": 7,
217228
"type": "floatItem",
229+
"defaultValue": "0.0",
218230
"item": {
219231
"numDecimalPlaces": 2,
220232
"name": "Volt A1",
@@ -243,6 +255,7 @@
243255
{
244256
"parentId": 14,
245257
"type": "textItem",
258+
"defaultValue": "",
246259
"item": {
247260
"textLength": 20,
248261
"itemType": "IP_ADDRESS",
@@ -300,6 +313,7 @@
300313
{
301314
"parentId": 20,
302315
"type": "scrollItem",
316+
"defaultValue": "0-",
303317
"item": {
304318
"itemWidth": 10,
305319
"eepromOffset": 1024,
@@ -317,6 +331,7 @@
317331
{
318332
"parentId": 20,
319333
"type": "scrollItem",
334+
"defaultValue": "0-",
320335
"item": {
321336
"itemWidth": 10,
322337
"eepromOffset": 0,
@@ -335,6 +350,7 @@
335350
{
336351
"parentId": 20,
337352
"type": "textItem",
353+
"defaultValue": "",
338354
"item": {
339355
"textLength": 10,
340356
"itemType": "PLAIN_TEXT",
@@ -555,12 +571,13 @@
555571
"eepromDefinition": "at24:80:PAGESIZE_AT24C128",
556572
"authenticatorDefinition": "rom:100:6",
557573
"projectIoExpanders": [
558-
"pcf8574:io8574:32:0",
574+
"pcf8574:io8574:32:0:false",
559575
"deviceIO:"
560576
],
561577
"menuInMenuCollection": {
562578
"menuDefinitions": []
563579
},
564-
"packageNamespace": ""
580+
"packageNamespace": "",
581+
"appIsModular": false
565582
}
566583
}

‎examples/arduino32/colorTftEthernet32/colorTftEthernet32_menu.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ ActionMenuItem menuTakeDisplay(&minfoTakeDisplay, NULL);
3333
const AnyMenuInfo minfoSaveItem = { "Save item", 23, 0xffff, 0, onSaveItem };
3434
ActionMenuItem menuSaveItem(&minfoSaveItem, NULL);
3535
RENDERING_CALLBACK_NAME_INVOKE(fnRomTextRtCall, textItemRenderFn, "Rom Text", -1, NO_CALLBACK)
36-
TextMenuItem menuRomText(fnRomTextRtCall, 21, 10, &menuSaveItem);
36+
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);
@@ -46,7 +46,7 @@ RemoteMenuItem menuIoTMonitor(pgmStrIoTMonitorText, 29, NULL);
4646
const char pgmStrAuthenticatorText[] = { "Authenticator" };
4747
EepromAuthenticationInfoMenuItem menuAuthenticator(pgmStrAuthenticatorText, NO_CALLBACK, 28, &menuIoTMonitor);
4848
RENDERING_CALLBACK_NAME_INVOKE(fnIpAddressRtCall, ipAddressRenderFn, "Ip Address", 10, NO_CALLBACK)
49-
IpAddressMenuItem menuIpAddress(fnIpAddressRtCall, 15, &menuAuthenticator);
49+
IpAddressMenuItem menuIpAddress(fnIpAddressRtCall, IpAddressStorage(127, 0, 0, 1), 15, &menuAuthenticator);
5050
RENDERING_CALLBACK_NAME_INVOKE(fnConnectivityRtCall, backSubItemRenderFn, "Connectivity", -1, NO_CALLBACK)
5151
const SubMenuInfo minfoConnectivity = { "Connectivity", 14, 0xffff, 0, NO_CALLBACK };
5252
BackMenuItem menuBackConnectivity(fnConnectivityRtCall, &menuIpAddress);
@@ -62,7 +62,7 @@ SubMenuItem menuStatus(&minfoStatus, &menuBackStatus, &menuConnectivity);
6262
const BooleanMenuInfo minfoShowHidden = { "Show Hidden", 30, 0xffff, 1, onShowHidden, NAMING_YES_NO };
6363
BooleanMenuItem menuShowHidden(&minfoShowHidden, false, NULL);
6464
RENDERING_CALLBACK_NAME_INVOKE(fnRGBRtCall, rgbAlphaItemRenderFn, "RGB", 16, onRgbChanged)
65-
Rgb32MenuItem menuRGB(26, fnRGBRtCall, false, RgbColor32(0, 0, 0), &menuShowHidden);
65+
Rgb32MenuItem menuRGB(fnRGBRtCall, RgbColor32(0, 0, 0), 26, false, &menuShowHidden);
6666
const BooleanMenuInfo minfoTempCheck = { "Temp Check", 13, 9, 1, NO_CALLBACK, NAMING_ON_OFF };
6767
BooleanMenuItem menuTempCheck(&minfoTempCheck, false, &menuRGB);
6868
const AnyMenuInfo minfoHiddenItem = { "Hidden item", 16, 0xffff, 0, NO_CALLBACK };

‎examples/arduino32/dynamicMenuItems/dynamicMenuItems.emf‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
{
77
"parentId": 0,
88
"type": "boolItem",
9+
"defaultValue": "false",
910
"item": {
1011
"naming": "ON_OFF",
1112
"name": "Main Power",
@@ -48,6 +49,7 @@
4849
{
4950
"parentId": 3,
5051
"type": "analogItem",
52+
"defaultValue": "0",
5153
"item": {
5254
"maxValue": 300,
5355
"offset": 0,
@@ -66,6 +68,7 @@
6668
{
6769
"parentId": 3,
6870
"type": "scrollItem",
71+
"defaultValue": "0-",
6972
"item": {
7073
"itemWidth": 10,
7174
"eepromOffset": 0,
@@ -84,6 +87,7 @@
8487
{
8588
"parentId": 3,
8689
"type": "scrollItem",
90+
"defaultValue": "0-",
8791
"item": {
8892
"itemWidth": 10,
8993
"eepromOffset": 0,
@@ -102,6 +106,7 @@
102106
{
103107
"parentId": 3,
104108
"type": "scrollItem",
109+
"defaultValue": "0-",
105110
"item": {
106111
"itemWidth": 10,
107112
"eepromOffset": 0,
@@ -190,6 +195,7 @@
190195
{
191196
"parentId": 9,
192197
"type": "boolItem",
198+
"defaultValue": "false",
193199
"item": {
194200
"naming": "ON_OFF",
195201
"name": "Allow Observer",
@@ -232,6 +238,7 @@
232238
{
233239
"parentId": 9,
234240
"type": "boolItem",
241+
"defaultValue": "false",
235242
"item": {
236243
"naming": "TRUE_FALSE",
237244
"name": "Blocked Bool",
@@ -275,6 +282,7 @@
275282
{
276283
"parentId": 19,
277284
"type": "textItem",
285+
"defaultValue": "",
278286
"item": {
279287
"textLength": 5,
280288
"itemType": "PLAIN_TEXT",
@@ -290,6 +298,7 @@
290298
{
291299
"parentId": 19,
292300
"type": "textItem",
301+
"defaultValue": "",
293302
"item": {
294303
"textLength": 0,
295304
"itemType": "IP_ADDRESS",

‎examples/arduino32/dynamicMenuItems/dynamicMenuItems_menu.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ MenuEditingKeyListener tcMenuKeyListener('*', '#', 'A', 'B');
2525

2626
// Global Menu Item declarations
2727
RENDERING_CALLBACK_NAME_INVOKE(fnIpItemRtCall, ipAddressRenderFn, "IpItem", -1, NO_CALLBACK)
28-
IpAddressMenuItem menuIpItem(fnIpItemRtCall, 21, NULL);
28+
IpAddressMenuItem menuIpItem(fnIpItemRtCall, IpAddressStorage(127, 0, 0, 1), 21, NULL);
2929
RENDERING_CALLBACK_NAME_INVOKE(fnTextItemRtCall, textItemRenderFn, "TextItem", -1, NO_CALLBACK)
30-
TextMenuItem menuTextItem(fnTextItemRtCall, 20, 5, &menuIpItem);
30+
TextMenuItem menuTextItem(fnTextItemRtCall, "", 20, 5, &menuIpItem);
3131
RENDERING_CALLBACK_NAME_INVOKE(fnRuntimesRtCall, backSubItemRenderFn, "Runtimes", -1, NO_CALLBACK)
3232
const SubMenuInfo minfoRuntimes = { "Runtimes", 19, 0xffff, 0, NO_CALLBACK };
3333
BackMenuItem menuBackRuntimes(fnRuntimesRtCall, &menuTextItem);

‎examples/arduino32/piPicoTftEncoder/piPicoTftEncoder_menu.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ EditableLargeNumberMenuItem menuSettingsNlge(fnSettingsNlgeRtCall, 18, 8, 0, tru
4646
RENDERING_CALLBACK_NAME_INVOKE(fnSettingsLargeNumRtCall, largeNumItemRenderFn, "LargeNum", -1, NO_CALLBACK)
4747
EditableLargeNumberMenuItem menuSettingsLargeNum(fnSettingsLargeNumRtCall, 16, 8, 3, false, LargeFixedNumber(100U, 500U, false), &menuSettingsNlge);
4848
RENDERING_CALLBACK_NAME_INVOKE(fnSettingsRGBRtCall, rgbAlphaItemRenderFn, "RGB", -1, NO_CALLBACK)
49-
Rgb32MenuItem menuSettingsRGB(fnSettingsRGBRtCall, 15, RgbColor32(0, 0, 0), false, &menuSettingsLargeNum);
49+
Rgb32MenuItem menuSettingsRGB(fnSettingsRGBRtCall, RgbColor32(0, 0, 0), 15, false, &menuSettingsLargeNum);
5050
RENDERING_CALLBACK_NAME_INVOKE(fnSettingsIPRtCall, ipAddressRenderFn, "IP", 19, NO_CALLBACK)
5151
IpAddressMenuItem menuSettingsIP(fnSettingsIPRtCall, IpAddressStorage(192, 168, 0, 33), 14, &menuSettingsRGB);
5252
RENDERING_CALLBACK_NAME_INVOKE(fnSettingsTextRtCall, textItemRenderFn, "Text", 9, NO_CALLBACK)

‎examples/avr/analogJoystick1306Ascii/analogJoystick1306Ascii.emf‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
{
77
"parentId": 0,
88
"type": "actionMenu",
9-
"defaultValue": "false",
109
"item": {
1110
"name": "Instructions",
1211
"variableName": "Instructions",
@@ -21,7 +20,6 @@
2120
{
2221
"parentId": 0,
2322
"type": "actionMenu",
24-
"defaultValue": "false",
2523
"item": {
2624
"name": "Start Game",
2725
"variableName": "StartGame",
@@ -107,7 +105,6 @@
107105
{
108106
"parentId": 4,
109107
"type": "actionMenu",
110-
"defaultValue": "false",
111108
"item": {
112109
"name": "Save All",
113110
"variableName": "SettingsSaveAll",

‎examples/avr/takeOverDisplay/takeOverDisplay.emf‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
{
77
"parentId": 0,
88
"type": "textItem",
9+
"defaultValue": "",
910
"item": {
1011
"textLength": 10,
1112
"itemType": "TIME_12H",
@@ -33,6 +34,7 @@
3334
{
3435
"parentId": 0,
3536
"type": "enumItem",
37+
"defaultValue": "0",
3638
"item": {
3739
"enumEntries": [
3840
"Pizza",
@@ -51,10 +53,12 @@
5153
{
5254
"parentId": 0,
5355
"type": "textItem",
56+
"defaultValue": "boo",
5457
"item": {
5558
"textLength": 10,
5659
"itemType": "PLAIN_TEXT",
5760
"name": "Text",
61+
"variableName": "Text",
5862
"id": 7,
5963
"eepromAddress": -1,
6064
"readOnly": true,
@@ -104,9 +108,11 @@
104108
{
105109
"parentId": 3,
106110
"type": "boolItem",
111+
"defaultValue": "true",
107112
"item": {
108113
"naming": "TRUE_FALSE",
109114
"name": "Enabled",
115+
"variableName": "SettingsEnabled",
110116
"id": 4,
111117
"eepromAddress": 2,
112118
"readOnly": false,
@@ -117,13 +123,15 @@
117123
{
118124
"parentId": 3,
119125
"type": "analogItem",
126+
"defaultValue": "22",
120127
"item": {
121128
"maxValue": 250,
122129
"offset": 0,
123130
"divisor": 10,
124131
"unitName": "W",
125132
"step": 1,
126133
"name": "Power",
134+
"variableName": "SettingsPower",
127135
"id": 5,
128136
"eepromAddress": 5,
129137
"readOnly": false,
@@ -147,6 +155,7 @@
147155
{
148156
"parentId": 3,
149157
"type": "largeNumItem",
158+
"defaultValue": "0",
150159
"item": {
151160
"digitsAllowed": 9,
152161
"decimalPlaces": 0,
@@ -162,6 +171,7 @@
162171
{
163172
"parentId": 3,
164173
"type": "largeNumItem",
174+
"defaultValue": "0",
165175
"item": {
166176
"digitsAllowed": 10,
167177
"decimalPlaces": 4,
@@ -177,6 +187,7 @@
177187
{
178188
"parentId": 3,
179189
"type": "textItem",
190+
"defaultValue": "",
180191
"item": {
181192
"textLength": 10,
182193
"itemType": "TIME_12H",
@@ -191,6 +202,7 @@
191202
{
192203
"parentId": 3,
193204
"type": "textItem",
205+
"defaultValue": "",
194206
"item": {
195207
"textLength": 10,
196208
"itemType": "GREGORIAN_DATE",
@@ -218,6 +230,7 @@
218230
{
219231
"parentId": 11,
220232
"type": "textItem",
233+
"defaultValue": "",
221234
"item": {
222235
"textLength": 15,
223236
"itemType": "PLAIN_TEXT",
@@ -233,6 +246,7 @@
233246
{
234247
"parentId": 11,
235248
"type": "textItem",
249+
"defaultValue": "",
236250
"item": {
237251
"textLength": 20,
238252
"itemType": "IP_ADDRESS",

0 commit comments

Comments
 (0)