Skip to content

Commit 92c093b

Browse files
davetccdavetcc
committed
rebuild examples for release
1 parent 93c1e43 commit 92c093b

File tree

20 files changed

+113
-43
lines changed

20 files changed

+113
-43
lines changed

‎examples/arduino32/colorTftEthernet32/colorTftEthernet32_menu.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
#include <RuntimeMenuItem.h>
2020
#include <ScrollChoiceMenuItem.h>
2121
#include <RemoteMenuItem.h>
22-
#include <IoAbstractionWire.h>
2322
#include <IoAbstraction.h>
23+
#include <IoAbstractionWire.h>
2424
#include <EepromAbstractionWire.h>
2525
#include <RemoteAuthentication.h>
2626

‎examples/arduino32/dynamicMenuItems/dynamicMenuItems_menu.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
#include <tcMenuKeyboard.h>
1818
#include <RuntimeMenuItem.h>
1919
#include <ScrollChoiceMenuItem.h>
20-
#include <IoAbstraction.h>
2120
#include <IoAbstractionWire.h>
21+
#include <IoAbstraction.h>
2222

2323
// variables we declare that you may need to access
2424
extern const PROGMEM ConnectorLocalInfo applicationInfo;

‎examples/arduino32/piPicoTftEncoder/piPicoTftEncoder_menu.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ const SubMenuInfo minfoStatus = { "Status", 7, 0xffff, 0, NO_CALLBACK };
4242
BackMenuItem menuBackStatus(fnStatusRtCall, &menuStatusAmpStatus);
4343
SubMenuItem menuStatus(&minfoStatus, &menuBackStatus, &menuDialogs);
4444
RENDERING_CALLBACK_NAME_INVOKE(fnSettingsNlgeRtCall, largeNumItemRenderFn, "NLge", -1, NO_CALLBACK)
45-
EditableLargeNumberMenuItem menuSettingsNlge(fnSettingsNlgeRtCall, 18, 8, 0, true, LargeFixedNumber(0U, 0U, false), NULL);
45+
EditableLargeNumberMenuItem menuSettingsNlge(fnSettingsNlgeRtCall, LargeFixedNumber(8, 0, 0U, 0U, false), 18, true, NULL);
4646
RENDERING_CALLBACK_NAME_INVOKE(fnSettingsLargeNumRtCall, largeNumItemRenderFn, "LargeNum", -1, NO_CALLBACK)
47-
EditableLargeNumberMenuItem menuSettingsLargeNum(fnSettingsLargeNumRtCall, 16, 8, 3, false, LargeFixedNumber(100U, 500U, false), &menuSettingsNlge);
47+
EditableLargeNumberMenuItem menuSettingsLargeNum(fnSettingsLargeNumRtCall, LargeFixedNumber(8, 3, 100U, 500U, false), 16, false, &menuSettingsNlge);
4848
RENDERING_CALLBACK_NAME_INVOKE(fnSettingsRGBRtCall, rgbAlphaItemRenderFn, "RGB", -1, NO_CALLBACK)
4949
Rgb32MenuItem menuSettingsRGB(fnSettingsRGBRtCall, RgbColor32(0, 0, 0), 15, false, &menuSettingsLargeNum);
5050
RENDERING_CALLBACK_NAME_INVOKE(fnSettingsIPRtCall, ipAddressRenderFn, "IP", 19, NO_CALLBACK)

‎examples/arduino32/stm32DuinoDemo/stm32DuinoDemo_menu.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ const SubMenuInfo minfoMoreItems = { "More Items", 4, 0xffff, 0, NO_CALLBACK };
6565
BackMenuItem menuBackMoreItems(fnMoreItemsRtCall, &menuMoreItemsOptions);
6666
SubMenuItem menuMoreItems(&minfoMoreItems, &menuBackMoreItems, &menuRuntimes);
6767
RENDERING_CALLBACK_NAME_INVOKE(fnLgeNumRtCall, largeNumItemRenderFn, "Lge Num", 6, largeNumDidChange)
68-
EditableLargeNumberMenuItem menuLgeNum(fnLgeNumRtCall, 3, 9, 3, true, LargeFixedNumber(0U, 0U, false), &menuMoreItems);
68+
EditableLargeNumberMenuItem menuLgeNum(fnLgeNumRtCall, LargeFixedNumber(9, 3, 0U, 0U, false), 3, true, &menuMoreItems);
6969
const AnalogMenuInfo minfoHalves = { "Halves", 2, 4, 255, NO_CALLBACK, 0, 2, "dB" };
7070
AnalogMenuItem menuHalves(&minfoHalves, 0, &menuLgeNum);
7171
const AnalogMenuInfo minfoDecimal = { "Decimal", 1, 2, 1000, decimalDidChange, 0, 10, "d" };

‎examples/avr/analogDfRobot/analogDfRobot_menu.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ScrollChoiceMenuItem menuChooseItem(8, fnChooseItemRtCall, 0, 20, &menuCommits);
2424
RENDERING_CALLBACK_NAME_INVOKE(fnTextRtCall, textItemRenderFn, "Text", 4, NO_CALLBACK)
2525
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, LargeFixedNumber(0U, 0U, false), &menuText);
27+
EditableLargeNumberMenuItem menuLgeNum(fnLgeNumRtCall, LargeFixedNumber(8, 4, 0U, 0U, false), 5, true, &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_menu.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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, LargeFixedNumber(0U, 0U, false), &menuFiths);
96+
EditableLargeNumberMenuItem menuLargeNum(fnLargeNumRtCall, LargeFixedNumber(8, 4, 0U, 0U, false), 12, true, &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, "" };

‎examples/avr/takeOverDisplay/takeOverDisplay_menu.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ const PROGMEM SubMenuInfo minfoConnectivity = { "Connectivity", 11, 0xffff, 0, N
4040
BackMenuItem menuBackConnectivity(fnConnectivityRtCall, &menuConnectivityChangePin);
4141
SubMenuItem menuConnectivity(&minfoConnectivity, &menuBackConnectivity, NULL);
4242
RENDERING_CALLBACK_NAME_INVOKE(fnSettingsDateRtCall, dateItemRenderFn, "Date", -1, NO_CALLBACK)
43-
DateFormattedMenuItem menuSettingsDate(fnSettingsDateRtCall, DateStorage(2020, 1, 1), 18, NULL);
43+
DateFormattedMenuItem menuSettingsDate(fnSettingsDateRtCall, DateStorage(1, 1, 2020), 18, NULL);
4444
RENDERING_CALLBACK_NAME_INVOKE(fnSettingsTimeRtCall, timeItemRenderFn, "Time", -1, NO_CALLBACK)
4545
TimeFormattedMenuItem menuSettingsTime(fnSettingsTimeRtCall, TimeStorage(0, 0, 0, 0), 17, (MultiEditWireType)3, &menuSettingsDate);
4646
RENDERING_CALLBACK_NAME_INVOKE(fnSettingsNum6x4RtCall, largeNumItemRenderFn, "Num6x4", -1, NO_CALLBACK)
47-
EditableLargeNumberMenuItem menuSettingsNum6x4(fnSettingsNum6x4RtCall, 16, 10, 4, true, LargeFixedNumber(0U, 0U, false), &menuSettingsTime);
47+
EditableLargeNumberMenuItem menuSettingsNum6x4(fnSettingsNum6x4RtCall, LargeFixedNumber(10, 4, 0U, 0U, false), 16, true, &menuSettingsTime);
4848
RENDERING_CALLBACK_NAME_INVOKE(fnSettingsPositiveIntsRtCall, largeNumItemRenderFn, "PositiveInts", -1, NO_CALLBACK)
49-
EditableLargeNumberMenuItem menuSettingsPositiveInts(fnSettingsPositiveIntsRtCall, 15, 9, 0, false, LargeFixedNumber(0U, 0U, false), &menuSettingsNum6x4);
49+
EditableLargeNumberMenuItem menuSettingsPositiveInts(fnSettingsPositiveIntsRtCall, LargeFixedNumber(9, 0, 0U, 0U, false), 15, false, &menuSettingsNum6x4);
5050
const PROGMEM AnyMenuInfo minfoSettingsSaveSettings = { "Save Settings", 6, 0xffff, 0, onSaveSettings };
5151
ActionMenuItem menuSettingsSaveSettings(&minfoSettingsSaveSettings, &menuSettingsPositiveInts);
5252
const PROGMEM AnalogMenuInfo minfoSettingsPower = { "Power", 5, 5, 250, NO_CALLBACK, 0, 10, "W" };

‎examples/esp/esp32Amplifier/esp32Amplifier.emf‎

Lines changed: 16 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": 255,
1112
"offset": -180,
@@ -25,6 +26,7 @@
2526
{
2627
"parentId": 0,
2728
"type": "scrollItem",
29+
"defaultValue": "0-",
2830
"item": {
2931
"itemWidth": 16,
3032
"eepromOffset": 150,
@@ -43,6 +45,7 @@
4345
{
4446
"parentId": 0,
4547
"type": "boolItem",
48+
"defaultValue": "false",
4649
"item": {
4750
"naming": "TRUE_FALSE",
4851
"name": "Direct",
@@ -58,6 +61,7 @@
5861
{
5962
"parentId": 0,
6063
"type": "boolItem",
64+
"defaultValue": "false",
6165
"item": {
6266
"naming": "TRUE_FALSE",
6367
"name": "Mute",
@@ -101,6 +105,7 @@
101105
{
102106
"parentId": 7,
103107
"type": "scrollItem",
108+
"defaultValue": "0-",
104109
"item": {
105110
"itemWidth": 10,
106111
"eepromOffset": 0,
@@ -119,6 +124,7 @@
119124
{
120125
"parentId": 7,
121126
"type": "analogItem",
127+
"defaultValue": "0",
122128
"item": {
123129
"maxValue": 20,
124130
"offset": -10,
@@ -137,6 +143,7 @@
137143
{
138144
"parentId": 7,
139145
"type": "textItem",
146+
"defaultValue": "",
140147
"item": {
141148
"textLength": 15,
142149
"itemType": "PLAIN_TEXT",
@@ -167,6 +174,7 @@
167174
{
168175
"parentId": 5,
169176
"type": "analogItem",
177+
"defaultValue": "0",
170178
"item": {
171179
"maxValue": 300,
172180
"offset": 0,
@@ -186,6 +194,7 @@
186194
{
187195
"parentId": 5,
188196
"type": "analogItem",
197+
"defaultValue": "0",
189198
"item": {
190199
"maxValue": 600,
191200
"offset": 0,
@@ -233,6 +242,7 @@
233242
{
234243
"parentId": 6,
235244
"type": "enumItem",
245+
"defaultValue": "0",
236246
"item": {
237247
"enumEntries": [
238248
"Warm up",
@@ -254,6 +264,7 @@
254264
{
255265
"parentId": 6,
256266
"type": "analogItem",
267+
"defaultValue": "0",
257268
"item": {
258269
"maxValue": 30000,
259270
"offset": -20000,
@@ -272,6 +283,7 @@
272283
{
273284
"parentId": 6,
274285
"type": "analogItem",
286+
"defaultValue": "0",
275287
"item": {
276288
"maxValue": 30000,
277289
"offset": -20000,
@@ -319,6 +331,7 @@
319331
{
320332
"parentId": 6,
321333
"type": "analogItem",
334+
"defaultValue": "0",
322335
"item": {
323336
"maxValue": 65535,
324337
"offset": -5000,
@@ -351,6 +364,7 @@
351364
{
352365
"parentId": 12,
353366
"type": "textItem",
367+
"defaultValue": "",
354368
"item": {
355369
"textLength": 5,
356370
"itemType": "IP_ADDRESS",
@@ -366,6 +380,7 @@
366380
{
367381
"parentId": 12,
368382
"type": "textItem",
383+
"defaultValue": "",
369384
"item": {
370385
"textLength": 20,
371386
"itemType": "PLAIN_TEXT",
@@ -381,6 +396,7 @@
381396
{
382397
"parentId": 12,
383398
"type": "textItem",
399+
"defaultValue": "",
384400
"item": {
385401
"textLength": 20,
386402
"itemType": "PLAIN_TEXT",

‎examples/esp/esp32Amplifier/esp32Amplifier_menu.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ EepromAuthenticationInfoMenuItem menuConnectivityAuthenticator(pgmStrConnectivit
3333
const PROGMEM char pgmStrConnectivityIoTMonitorText[] = { "IoT Monitor" };
3434
RemoteMenuItem menuConnectivityIoTMonitor(pgmStrConnectivityIoTMonitorText, 26, &menuConnectivityAuthenticator);
3535
RENDERING_CALLBACK_NAME_INVOKE(fnConnectivityPasscodeRtCall, textItemRenderFn, "Passcode", 37, NO_CALLBACK)
36-
TextMenuItem menuConnectivityPasscode(fnConnectivityPasscodeRtCall, 19, 20, &menuConnectivityIoTMonitor);
36+
TextMenuItem menuConnectivityPasscode(fnConnectivityPasscodeRtCall, "", 19, 20, &menuConnectivityIoTMonitor);
3737
RENDERING_CALLBACK_NAME_INVOKE(fnConnectivitySSIDRtCall, textItemRenderFn, "SSID", 17, NO_CALLBACK)
38-
TextMenuItem menuConnectivitySSID(fnConnectivitySSIDRtCall, 18, 20, &menuConnectivityPasscode);
38+
TextMenuItem menuConnectivitySSID(fnConnectivitySSIDRtCall, "", 18, 20, &menuConnectivityPasscode);
3939
RENDERING_CALLBACK_NAME_INVOKE(fnConnectivityIPAddressRtCall, ipAddressRenderFn, "IP address", -1, NO_CALLBACK)
40-
IpAddressMenuItem menuConnectivityIPAddress(fnConnectivityIPAddressRtCall, 13, &menuConnectivitySSID);
40+
IpAddressMenuItem menuConnectivityIPAddress(fnConnectivityIPAddressRtCall, IpAddressStorage(127, 0, 0, 1), 13, &menuConnectivitySSID);
4141
RENDERING_CALLBACK_NAME_INVOKE(fnConnectivityRtCall, backSubItemRenderFn, "Connectivity", -1, NO_CALLBACK)
4242
const PROGMEM SubMenuInfo minfoConnectivity = { "Connectivity", 12, 0xffff, 0, NO_CALLBACK };
4343
BackMenuItem menuBackConnectivity(fnConnectivityRtCall, &menuConnectivityIPAddress);
@@ -73,7 +73,7 @@ AnalogMenuItem menuSettingsWarmUpTime(&minfoSettingsWarmUpTime, 0, &menuSettings
7373
const PROGMEM AnyMenuInfo minfoChannelSettingsUpdateSettings = { "Update Settings", 24, 0xffff, 0, onChannelSetttingsUpdate };
7474
ActionMenuItem menuChannelSettingsUpdateSettings(&minfoChannelSettingsUpdateSettings, NULL);
7575
RENDERING_CALLBACK_NAME_INVOKE(fnChannelSettingsNameRtCall, textItemRenderFn, "Name", -1, NO_CALLBACK)
76-
TextMenuItem menuChannelSettingsName(fnChannelSettingsNameRtCall, 22, 15, &menuChannelSettingsUpdateSettings);
76+
TextMenuItem menuChannelSettingsName(fnChannelSettingsNameRtCall, "", 22, 15, &menuChannelSettingsUpdateSettings);
7777
const PROGMEM AnalogMenuInfo minfoChannelSettingsLevelTrim = { "Level Trim", 8, 9, 20, NO_CALLBACK, -10, 2, "dB" };
7878
AnalogMenuItem menuChannelSettingsLevelTrim(&minfoChannelSettingsLevelTrim, 0, &menuChannelSettingsName);
7979
ScrollChoiceMenuItem menuChannelSettingsChannel(23, fnChannelSettingsChannelRtCall, 0, 3, &menuChannelSettingsLevelTrim);
@@ -101,8 +101,8 @@ void setupMenu() {
101101
menuMgr.setAuthenticator(&authManager);
102102
// Now add any readonly, non-remote and visible flags.
103103
menuConnectivityIPAddress.setReadOnly(true);
104-
menuConnectivityAuthenticator.setLocalOnly(true);
105104
menuConnectivityIoTMonitor.setLocalOnly(true);
105+
menuConnectivityAuthenticator.setLocalOnly(true);
106106

107107
// Code generated by plugins.
108108
tft.begin();

‎examples/esp/esp32SimHub/esp32SimHub.emf‎

Lines changed: 21 additions & 0 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": 1000,
1112
"offset": 0,
1213
"divisor": 1,
1314
"unitName": "",
15+
"step": 1,
1416
"name": "Speed",
1517
"variableName": "",
1618
"id": 1,
@@ -23,11 +25,13 @@
2325
{
2426
"parentId": 0,
2527
"type": "analogItem",
28+
"defaultValue": "0",
2629
"item": {
2730
"maxValue": 32000,
2831
"offset": 0,
2932
"divisor": 1,
3033
"unitName": "",
34+
"step": 1,
3135
"name": "RPM",
3236
"variableName": "",
3337
"id": 2,
@@ -40,6 +44,7 @@
4044
{
4145
"parentId": 0,
4246
"type": "textItem",
47+
"defaultValue": "",
4348
"item": {
4449
"textLength": 2,
4550
"itemType": "PLAIN_TEXT",
@@ -56,11 +61,13 @@
5661
{
5762
"parentId": 0,
5863
"type": "analogItem",
64+
"defaultValue": "0",
5965
"item": {
6066
"maxValue": 255,
6167
"offset": 0,
6268
"divisor": 0,
6369
"unitName": "C",
70+
"step": 1,
6471
"name": "Tyre Temp",
6572
"variableName": "",
6673
"id": 7,
@@ -74,6 +81,7 @@
7481
{
7582
"parentId": 0,
7683
"type": "boolItem",
84+
"defaultValue": "false",
7785
"item": {
7886
"naming": "ON_OFF",
7987
"name": "SimHub Link",
@@ -104,11 +112,13 @@
104112
{
105113
"parentId": 4,
106114
"type": "analogItem",
115+
"defaultValue": "0",
107116
"item": {
108117
"maxValue": 255,
109118
"offset": -180,
110119
"divisor": 2,
111120
"unitName": "dB",
121+
"step": 1,
112122
"name": "Test Item 1",
113123
"variableName": "SettingsTestItem1",
114124
"id": 5,
@@ -135,6 +145,7 @@
135145
{
136146
"parentId": 4,
137147
"type": "boolItem",
148+
"defaultValue": "false",
138149
"item": {
139150
"naming": "ON_OFF",
140151
"name": "Overboost",
@@ -149,6 +160,7 @@
149160
{
150161
"parentId": 4,
151162
"type": "largeNumItem",
163+
"defaultValue": "0",
152164
"item": {
153165
"digitsAllowed": 12,
154166
"decimalPlaces": 4,
@@ -178,6 +190,7 @@
178190
{
179191
"parentId": 4,
180192
"type": "largeNumItem",
193+
"defaultValue": "0",
181194
"item": {
182195
"digitsAllowed": 4,
183196
"decimalPlaces": 1,
@@ -194,6 +207,7 @@
194207
{
195208
"parentId": 0,
196209
"type": "enumItem",
210+
"defaultValue": "0",
197211
"item": {
198212
"enumEntries": [
199213
"F1 Wheel",
@@ -213,11 +227,13 @@
213227
{
214228
"parentId": 0,
215229
"type": "analogItem",
230+
"defaultValue": "0",
216231
"item": {
217232
"maxValue": 999,
218233
"offset": 0,
219234
"divisor": 0,
220235
"unitName": "",
236+
"step": 1,
221237
"name": "Lap",
222238
"variableName": "",
223239
"id": 10,
@@ -364,6 +380,11 @@
364380
"latestValue": "6",
365381
"subsystem": "INPUT"
366382
},
383+
{
384+
"name": "TS_KEY_REPEAT",
385+
"latestValue": "20",
386+
"subsystem": "INPUT"
387+
},
367388
{
368389
"name": "SH_SERIAL_PORT",
369390
"latestValue": "Serial",

0 commit comments

Comments
 (0)