Skip to content

Commit 7e3c364

Browse files
davetccdavetcc
committed
ready examples for release
1 parent ef48a54 commit 7e3c364

File tree

7 files changed

+57
-19
lines changed

7 files changed

+57
-19
lines changed

‎examples/avr/analogDfRobot/analogDfRobot.emf‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
{
77
"parentId": 0,
88
"type": "analogItem",
9+
"defaultValue": "0",
910
"item": {
1011
"maxValue": 1024,
1112
"offset": 0,
@@ -37,6 +38,7 @@
3738
{
3839
"parentId": 2,
3940
"type": "boolItem",
41+
"defaultValue": "false",
4042
"item": {
4143
"naming": "ON_OFF",
4244
"name": "L1",
@@ -51,6 +53,7 @@
5153
{
5254
"parentId": 2,
5355
"type": "boolItem",
56+
"defaultValue": "false",
5457
"item": {
5558
"naming": "ON_OFF",
5659
"name": "L2",
@@ -65,6 +68,7 @@
6568
{
6669
"parentId": 0,
6770
"type": "largeNumItem",
71+
"defaultValue": "0",
6872
"item": {
6973
"digitsAllowed": 8,
7074
"decimalPlaces": 4,
@@ -80,6 +84,7 @@
8084
{
8185
"parentId": 0,
8286
"type": "textItem",
87+
"defaultValue": "",
8388
"item": {
8489
"textLength": 6,
8590
"itemType": "PLAIN_TEXT",
@@ -94,6 +99,7 @@
9499
{
95100
"parentId": 0,
96101
"type": "scrollItem",
102+
"defaultValue": "0-",
97103
"item": {
98104
"itemWidth": 10,
99105
"eepromOffset": 0,
@@ -110,6 +116,7 @@
110116
{
111117
"parentId": 0,
112118
"type": "analogItem",
119+
"defaultValue": "0",
113120
"item": {
114121
"maxValue": 65000,
115122
"offset": 0,

‎examples/avr/analogDfRobot/analogDfRobot_menu.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ const PROGMEM AnalogMenuInfo minfoCommits = { "Commits", 7, 0xffff, 65000, NO_CA
2222
AnalogMenuItem menuCommits(&minfoCommits, 0, NULL);
2323
ScrollChoiceMenuItem menuChooseItem(8, fnChooseItemRtCall, 0, 20, &menuCommits);
2424
RENDERING_CALLBACK_NAME_INVOKE(fnTextRtCall, textItemRenderFn, "Text", 4, NO_CALLBACK)
25-
TextMenuItem menuText(fnTextRtCall, 6, 6, &menuChooseItem);
25+
TextMenuItem menuText(fnTextRtCall, "", 6, 6, &menuChooseItem);
2626
RENDERING_CALLBACK_NAME_INVOKE(fnLgeNumRtCall, largeNumItemRenderFn, "LgeNum", 10, NO_CALLBACK)
27-
EditableLargeNumberMenuItem menuLgeNum(fnLgeNumRtCall, 5, 8, 4, true, &menuText);
27+
EditableLargeNumberMenuItem menuLgeNum(fnLgeNumRtCall, 5, 8, 4, true, LargeFixedNumber(0U, 0U, false), &menuText);
2828
const PROGMEM BooleanMenuInfo minfoL2 = { "L2", 4, 3, 1, onLed2, NAMING_ON_OFF };
2929
BooleanMenuItem menuL2(&minfoL2, false, NULL);
3030
const PROGMEM BooleanMenuInfo minfoL1 = { "L1", 3, 2, 1, onLed1, NAMING_ON_OFF };

‎examples/avr/keyboardEthernetShield/keyboardEthernetShield.emf‎

Lines changed: 22 additions & 2 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",
@@ -20,6 +21,7 @@
2021
{
2122
"parentId": 0,
2223
"type": "analogItem",
24+
"defaultValue": "0",
2325
"item": {
2426
"maxValue": 255,
2527
"offset": -180,
@@ -38,6 +40,7 @@
3840
{
3941
"parentId": 0,
4042
"type": "boolItem",
43+
"defaultValue": "false",
4144
"item": {
4245
"naming": "TRUE_FALSE",
4346
"name": "Hidden item",
@@ -51,6 +54,7 @@
5154
{
5255
"parentId": 0,
5356
"type": "analogItem",
57+
"defaultValue": "0",
5458
"item": {
5559
"maxValue": 1000,
5660
"offset": 100,
@@ -69,6 +73,7 @@
6973
{
7074
"parentId": 0,
7175
"type": "analogItem",
76+
"defaultValue": "0",
7277
"item": {
7378
"maxValue": 1000,
7479
"offset": 0,
@@ -86,6 +91,7 @@
8691
{
8792
"parentId": 0,
8893
"type": "largeNumItem",
94+
"defaultValue": "0",
8995
"item": {
9096
"digitsAllowed": 8,
9197
"decimalPlaces": 4,
@@ -101,6 +107,7 @@
101107
{
102108
"parentId": 0,
103109
"type": "analogItem",
110+
"defaultValue": "0",
104111
"item": {
105112
"maxValue": 200,
106113
"offset": 0,
@@ -119,6 +126,7 @@
119126
{
120127
"parentId": 0,
121128
"type": "enumItem",
129+
"defaultValue": "0",
122130
"item": {
123131
"enumEntries": [
124132
"Apples",
@@ -151,6 +159,7 @@
151159
{
152160
"parentId": 6,
153161
"type": "textItem",
162+
"defaultValue": "",
154163
"item": {
155164
"textLength": 15,
156165
"itemType": "PLAIN_TEXT",
@@ -166,6 +175,7 @@
166175
{
167176
"parentId": 6,
168177
"type": "textItem",
178+
"defaultValue": "",
169179
"item": {
170180
"textLength": 20,
171181
"itemType": "IP_ADDRESS",
@@ -180,6 +190,7 @@
180190
{
181191
"parentId": 6,
182192
"type": "textItem",
193+
"defaultValue": "",
183194
"item": {
184195
"textLength": 10,
185196
"itemType": "PLAIN_TEXT",
@@ -248,6 +259,7 @@
248259
{
249260
"parentId": 14,
250261
"type": "rgbItem",
262+
"defaultValue": "#000000FF",
251263
"item": {
252264
"includeAlphaChannel": true,
253265
"name": "RGB",
@@ -261,6 +273,7 @@
261273
{
262274
"parentId": 14,
263275
"type": "scrollItem",
276+
"defaultValue": "0-",
264277
"item": {
265278
"itemWidth": 10,
266279
"eepromOffset": 500,
@@ -278,6 +291,7 @@
278291
{
279292
"parentId": 14,
280293
"type": "scrollItem",
294+
"defaultValue": "0-",
281295
"item": {
282296
"itemWidth": 10,
283297
"eepromOffset": 0,
@@ -322,6 +336,7 @@
322336
{
323337
"parentId": 24,
324338
"type": "boolItem",
339+
"defaultValue": "false",
325340
"item": {
326341
"naming": "ON_OFF",
327342
"name": "Flag1",
@@ -336,6 +351,7 @@
336351
{
337352
"parentId": 24,
338353
"type": "boolItem",
354+
"defaultValue": "false",
339355
"item": {
340356
"naming": "ON_OFF",
341357
"name": "Flag2",
@@ -350,6 +366,7 @@
350366
{
351367
"parentId": 24,
352368
"type": "boolItem",
369+
"defaultValue": "false",
353370
"item": {
354371
"naming": "YES_NO",
355372
"name": "Flag3",
@@ -364,6 +381,7 @@
364381
{
365382
"parentId": 24,
366383
"type": "boolItem",
384+
"defaultValue": "false",
367385
"item": {
368386
"naming": "YES_NO",
369387
"name": "Flag4",
@@ -391,6 +409,7 @@
391409
{
392410
"parentId": 20,
393411
"type": "scrollItem",
412+
"defaultValue": "0-",
394413
"item": {
395414
"itemWidth": 7,
396415
"eepromOffset": 0,
@@ -409,6 +428,7 @@
409428
{
410429
"parentId": 20,
411430
"type": "textItem",
431+
"defaultValue": "",
412432
"item": {
413433
"textLength": 10,
414434
"itemType": "PLAIN_TEXT",
@@ -703,8 +723,8 @@
703723
"eepromDefinition": "avr:",
704724
"authenticatorDefinition": "rom:100:6",
705725
"projectIoExpanders": [
706-
"deviceIO:",
707-
"mcp23017:io23017:32:2"
726+
"mcp23017:io23017:32:2",
727+
"deviceIO:"
708728
],
709729
"menuInMenuCollection": {
710730
"menuDefinitions": []

‎examples/avr/keyboardEthernetShield/keyboardEthernetShield_menu.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ TagValueRemoteServerConnection ethernetConnection2(ethernetTransport2, ethernetI
3636
const PROGMEM AnyMenuInfo minfoRomChoicesSave = { "Save", 23, 0xffff, 0, onSaveValue };
3737
ActionMenuItem menuRomChoicesSave(&minfoRomChoicesSave, NULL);
3838
RENDERING_CALLBACK_NAME_INVOKE(fnRomChoicesValueRtCall, textItemRenderFn, "Value", -1, NO_CALLBACK)
39-
TextMenuItem menuRomChoicesValue(fnRomChoicesValueRtCall, 22, 10, &menuRomChoicesSave);
39+
TextMenuItem menuRomChoicesValue(fnRomChoicesValueRtCall, "", 22, 10, &menuRomChoicesSave);
4040
extern char romSpaceNames[];
4141
RENDERING_CALLBACK_NAME_INVOKE(fnRomChoicesItemNumRtCall, enumItemRenderFn, "Item Num", -1, onItemChange)
4242
ScrollChoiceMenuItem menuRomChoicesItemNum(21, fnRomChoicesItemNumRtCall, 0, romSpaceNames, 7, 10, &menuRomChoicesValue);
@@ -61,7 +61,7 @@ ScrollChoiceMenuItem menuAdditionalNumChoices(17, fnAdditionalNumChoicesRtCall,
6161
RENDERING_CALLBACK_NAME_INVOKE(fnAdditionalRomChoiceRtCall, enumItemRenderFn, "Rom Choice", 30, NO_CALLBACK)
6262
ScrollChoiceMenuItem menuAdditionalRomChoice(19, fnAdditionalRomChoiceRtCall, 0, 500, 10, 9, &menuAdditionalNumChoices);
6363
RENDERING_CALLBACK_NAME_INVOKE(fnAdditionalRGBRtCall, rgbAlphaItemRenderFn, "RGB", 34, NO_CALLBACK)
64-
Rgb32MenuItem menuAdditionalRGB(15, fnAdditionalRGBRtCall, true, &menuAdditionalRomChoice);
64+
Rgb32MenuItem menuAdditionalRGB(fnAdditionalRGBRtCall, RgbColor32(0, 0, 0, 255), 15, true, &menuAdditionalRomChoice);
6565
RENDERING_CALLBACK_NAME_INVOKE(fnAdditionalRtCall, backSubItemRenderFn, "Additional", -1, NO_CALLBACK)
6666
const PROGMEM SubMenuInfo minfoAdditional = { "Additional", 14, 0xffff, 0, NO_CALLBACK };
6767
BackMenuItem menuBackAdditional(fnAdditionalRtCall, &menuAdditionalRGB);
@@ -73,11 +73,11 @@ RemoteMenuItem menuConnectivityIoTMonitor(pgmStrConnectivityIoTMonitorText, 29,
7373
const PROGMEM AnyMenuInfo minfoConnectivitySaveToEEPROM = { "Save to EEPROM", 10, 0xffff, 0, onSaveToEeprom };
7474
ActionMenuItem menuConnectivitySaveToEEPROM(&minfoConnectivitySaveToEEPROM, &menuConnectivityIoTMonitor);
7575
RENDERING_CALLBACK_NAME_INVOKE(fnConnectivityTextRtCall, textItemRenderFn, "Text", 16, NO_CALLBACK)
76-
TextMenuItem menuConnectivityText(fnConnectivityTextRtCall, 9, 10, &menuConnectivitySaveToEEPROM);
76+
TextMenuItem menuConnectivityText(fnConnectivityTextRtCall, "", 9, 10, &menuConnectivitySaveToEEPROM);
7777
RENDERING_CALLBACK_NAME_INVOKE(fnConnectivityIpAddressRtCall, ipAddressRenderFn, "IpAddress", 12, NO_CALLBACK)
78-
IpAddressMenuItem menuConnectivityIpAddress(fnConnectivityIpAddressRtCall, 7, &menuConnectivityText);
78+
IpAddressMenuItem menuConnectivityIpAddress(fnConnectivityIpAddressRtCall, IpAddressStorage(127, 0, 0, 1), 7, &menuConnectivityText);
7979
RENDERING_CALLBACK_NAME_INVOKE(fnConnectivityChangePinRtCall, textItemRenderFn, "Change Pin", -1, onChangePin)
80-
TextMenuItem menuConnectivityChangePin(fnConnectivityChangePinRtCall, 11, 15, &menuConnectivityIpAddress);
80+
TextMenuItem menuConnectivityChangePin(fnConnectivityChangePinRtCall, "", 11, 15, &menuConnectivityIpAddress);
8181
RENDERING_CALLBACK_NAME_INVOKE(fnConnectivityRtCall, backSubItemRenderFn, "Connectivity", -1, NO_CALLBACK)
8282
const PROGMEM SubMenuInfo minfoConnectivity = { "Connectivity", 6, 0xffff, 0, NO_CALLBACK };
8383
BackMenuItem menuBackConnectivity(fnConnectivityRtCall, &menuConnectivityChangePin);
@@ -93,7 +93,7 @@ EnumMenuItem menuFruits(&minfoFruits, 0, &menuConnectivity);
9393
const PROGMEM AnalogMenuInfo minfoFiths = { "Fiths", 5, 6, 200, onFiths, 0, 5, "A" };
9494
AnalogMenuItem menuFiths(&minfoFiths, 0, &menuFruits);
9595
RENDERING_CALLBACK_NAME_INVOKE(fnLargeNumRtCall, largeNumItemRenderFn, "Large Num", -1, NO_CALLBACK)
96-
EditableLargeNumberMenuItem menuLargeNum(fnLargeNumRtCall, 12, 8, 4, true, &menuFiths);
96+
EditableLargeNumberMenuItem menuLargeNum(fnLargeNumRtCall, 12, 8, 4, true, LargeFixedNumber(0U, 0U, false), &menuFiths);
9797
const PROGMEM AnalogMenuInfo minfoDecimalTens = { "DecimalTens", 4, 28, 1000, NO_CALLBACK, 0, 10, "V" };
9898
AnalogMenuItem menuDecimalTens(&minfoDecimalTens, 0, &menuLargeNum);
9999
const PROGMEM AnalogMenuInfo minfoInteger = { "Integer", 3, 4, 1000, onInteger, 100, 1, "" };
@@ -103,7 +103,7 @@ BooleanMenuItem menuHiddenItem(&minfoHiddenItem, false, &menuInteger);
103103
const PROGMEM AnalogMenuInfo minfoAnalog1 = { "Analog1", 2, 2, 255, onAnalog1, -180, 2, "dB" };
104104
AnalogMenuItem menuAnalog1(&minfoAnalog1, 0, &menuHiddenItem);
105105
RENDERING_CALLBACK_NAME_INVOKE(fnTimeRtCall, timeItemRenderFn, "Time", 8, NO_CALLBACK)
106-
TimeFormattedMenuItem menuTime(fnTimeRtCall, 1, (MultiEditWireType)3, &menuAnalog1);
106+
TimeFormattedMenuItem menuTime(fnTimeRtCall, TimeStorage(0, 0, 0, 0), 1, (MultiEditWireType)3, &menuAnalog1);
107107

108108
void setupMenu() {
109109
// First we set up eeprom and authentication (if needed).

‎examples/avr/keyboardEthernetShield/keyboardEthernetShield_menu.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
#include <ScrollChoiceMenuItem.h>
2222
#include <RemoteMenuItem.h>
2323
#include <EditableLargeNumberMenuItem.h>
24-
#include <IoAbstraction.h>
2524
#include <IoAbstractionWire.h>
25+
#include <IoAbstraction.h>
2626
#include <EepromAbstraction.h>
2727
#include <RemoteAuthentication.h>
2828
#include "tcMenuLiquidCrystal.h"

‎examples/avr/nokia5110/nokia5110_menu.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,23 @@ EepromAuthenticationInfoMenuItem menuAuthenticator(pgmStrAuthenticatorText, NO_C
3131
const PROGMEM char pgmStrIoTMonitorText[] = { "IoT Monitor" };
3232
RemoteMenuItem menuIoTMonitor(pgmStrIoTMonitorText, 18, &menuAuthenticator);
3333
RENDERING_CALLBACK_NAME_INVOKE(fnIPRtCall, ipAddressRenderFn, "IP", 13, NO_CALLBACK)
34-
IpAddressMenuItem menuIP(fnIPRtCall, 16, &menuIoTMonitor);
34+
IpAddressMenuItem menuIP(fnIPRtCall, IpAddressStorage(127, 0, 0, 1), 16, &menuIoTMonitor);
3535
RENDERING_CALLBACK_NAME_INVOKE(fnConnectivityRtCall, backSubItemRenderFn, "Connectivity", -1, NO_CALLBACK)
3636
const PROGMEM SubMenuInfo minfoConnectivity = { "Connectivity", 15, 0xffff, 0, NO_CALLBACK };
3737
BackMenuItem menuBackConnectivity(fnConnectivityRtCall, &menuIP);
3838
SubMenuItem menuConnectivity(&minfoConnectivity, &menuBackConnectivity, NULL);
3939
RENDERING_CALLBACK_NAME_INVOKE(fnTxtRtCall, textItemRenderFn, "Txt", -1, NO_CALLBACK)
40-
TextMenuItem menuTxt(fnTxtRtCall, 14, 6, NULL);
40+
TextMenuItem menuTxt(fnTxtRtCall, "", 14, 6, NULL);
4141
const PROGMEM FloatMenuInfo minfoCurrent = { "Current", 10, 0xffff, 2, NO_CALLBACK };
42-
FloatMenuItem menuCurrent(&minfoCurrent, &menuTxt);
42+
FloatMenuItem menuCurrent(&minfoCurrent, 0.0, &menuTxt);
4343
const PROGMEM FloatMenuInfo minfoVoltsIn = { "Volts in", 9, 0xffff, 2, NO_CALLBACK };
44-
FloatMenuItem menuVoltsIn(&minfoVoltsIn, &menuCurrent);
44+
FloatMenuItem menuVoltsIn(&minfoVoltsIn, 2.2, &menuCurrent);
4545
RENDERING_CALLBACK_NAME_INVOKE(fnStatusRtCall, backSubItemRenderFn, "Status", -1, NO_CALLBACK)
4646
const PROGMEM SubMenuInfo minfoStatus = { "Status", 8, 0xffff, 0, NO_CALLBACK };
4747
BackMenuItem menuBackStatus(fnStatusRtCall, &menuVoltsIn);
4848
SubMenuItem menuStatus(&minfoStatus, &menuBackStatus, &menuConnectivity);
4949
RENDERING_CALLBACK_NAME_INVOKE(fnRGBRtCall, rgbAlphaItemRenderFn, "RGB", 17, NO_CALLBACK)
50-
Rgb32MenuItem menuRGB(17, fnRGBRtCall, true, NULL);
50+
Rgb32MenuItem menuRGB(fnRGBRtCall, RgbColor32(136, 119, 85, 255), 17, true, NULL);
5151
const PROGMEM AnyMenuInfo minfoShutdownNow = { "Shutdown now", 11, 0xffff, 0, onPowerDownDetected };
5252
ActionMenuItem menuShutdownNow(&minfoShutdownNow, &menuRGB);
5353
const PROGMEM AnalogMenuInfo minfoDelay = { "Delay", 7, 11, 10, NO_CALLBACK, 0, 1, "S" };

0 commit comments

Comments
 (0)