Skip to content

Commit 86665bf

Browse files
committed
more examples recompiled for next release.
1 parent e1dc92e commit 86665bf

File tree

7 files changed

+35
-26
lines changed

7 files changed

+35
-26
lines changed

examples/esp32s2Saola/esp32s2Saola.emf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"offset": 0,
1212
"divisor": 1,
1313
"unitName": "%",
14+
"step": 1,
1415
"name": "Int Edit",
1516
"variableName": "IntEdit",
1617
"id": 1,
@@ -28,6 +29,7 @@
2829
"offset": 0,
2930
"divisor": 10,
3031
"unitName": "oC",
32+
"step": 1,
3133
"name": "Dec Edit",
3234
"variableName": "DecEdit",
3335
"id": 2,
@@ -45,6 +47,7 @@
4547
"offset": 0,
4648
"divisor": 2,
4749
"unitName": "",
50+
"step": 1,
4851
"name": "Halves",
4952
"variableName": "Halves",
5053
"id": 3,

examples/esp32s2Saola/esp32s2Saola_menu.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ void setupMenu() {
8686
authManager.initialise(menuMgr.getEepromAbstraction(), 200);
8787
menuMgr.setAuthenticator(&authManager);
8888
// Now add any readonly, non-remote and visible flags.
89-
menuConnectivityAuthenticator.setLocalOnly(true);
9089
menuConnectivityIoTMonitor.setLocalOnly(true);
90+
menuConnectivityAuthenticator.setLocalOnly(true);
9191

9292
// Code generated by plugins.
9393
gfx.begin();

examples/keyboardEthernetShield/keyboardEthernetShield.emf

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"offset": -180,
2626
"divisor": 2,
2727
"unitName": "dB",
28+
"step": 1,
2829
"name": "Analog1",
2930
"id": 2,
3031
"eepromAddress": 2,
@@ -55,6 +56,7 @@
5556
"offset": 100,
5657
"divisor": 1,
5758
"unitName": "",
59+
"step": 1,
5860
"name": "Integer",
5961
"id": 3,
6062
"eepromAddress": 4,
@@ -72,6 +74,7 @@
7274
"offset": 0,
7375
"divisor": 10,
7476
"unitName": "V",
77+
"step": 1,
7578
"name": "DecimalTens",
7679
"id": 4,
7780
"eepromAddress": 28,
@@ -103,6 +106,7 @@
103106
"offset": 0,
104107
"divisor": 5,
105108
"unitName": "A",
109+
"step": 1,
106110
"name": "Fiths",
107111
"id": 5,
108112
"eepromAddress": 6,
@@ -572,6 +576,11 @@
572576
"latestValue": "-1",
573577
"subsystem": "INPUT"
574578
},
579+
{
580+
"name": "MK_KEYBOARD_DEVICE",
581+
"latestValue": "devicePins",
582+
"subsystem": "INPUT"
583+
},
575584
{
576585
"name": "MK_REPEAT_START",
577586
"latestValue": "850",
@@ -582,11 +591,6 @@
582591
"latestValue": "350",
583592
"subsystem": "INPUT"
584593
},
585-
{
586-
"name": "MK_KEYBOARD_DEVICE",
587-
"latestValue": "devicePins",
588-
"subsystem": "INPUT"
589-
},
590594
{
591595
"name": "MK_KEYBOARD_INTERRUPTS",
592596
"latestValue": "false",

examples/keyboardEthernetShield/tcMenuLiquidCrystal.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ void LiquidCrystalRenderer::drawingCommand(RenderDrawingCommand command) {
153153
case DRAW_COMMAND_ENDED:
154154
if(lcdEditorCursorX != 0xFF) {
155155
lcd->setCursor(lcdEditorCursorX, lcdEditorCursorY);
156-
//serlogF3(SER_TCMENU_DEBUG, "Editor cursor: ", lcdEditorCursorX, lcdEditorCursorY);
156+
serlogF3(SER_TCMENU_DEBUG, "Editor cursor: ", lcdEditorCursorX, lcdEditorCursorY);
157157
lcd->cursor(); // re-enable the cursor after drawing.
158158
}
159159
break;

examples/nokia5110/EthernetTransport.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -100,16 +100,6 @@ void EthernetTagValTransport::close() {
100100

101101
#endif
102102

103-
104-
int tcremote::fromWiFiRSSITo4StateIndicator(int strength) {
105-
int qualityIcon = 0;
106-
if(strength > -50) qualityIcon = 4;
107-
else if(strength > -60) qualityIcon = 3;
108-
else if(strength > -75) qualityIcon = 2;
109-
else if(strength > -90) qualityIcon = 1;
110-
return qualityIcon;
111-
}
112-
113103
bool EthernetInitialisation::attemptInitialisation() {
114104
#ifdef ARDUINO_ARCH_STM32
115105
// we'll keep checking if the link is up before trying to initialise further

examples/nokia5110/nokia5110_menu.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ void setupMenu() {
8484
gfx.setRotation(0);
8585
renderer.setUpdatesPerSecond(4);
8686
renderer.setUseSliderForAnalog(false);
87-
switches.initialise(internalDigitalIo(), true);
87+
switches.init(internalDigitalIo(), SWITCHES_POLL_EVERYTHING, true);
8888
menuMgr.initForEncoder(&renderer, &menuHall, 2, 3, 4);
8989
remoteServer.addConnection(&ethernetConnection);
9090
renderer.setTitleMode(BaseGraphicalRenderer::TITLE_FIRST_ROW);
@@ -93,5 +93,8 @@ void setupMenu() {
9393

9494
// We have an IoT monitor, register the server
9595
menuIoTMonitor.setRemoteServer(remoteServer);
96+
97+
// We have an EEPROM authenticator, it needs initialising
98+
menuAuthenticator.init();
9699
}
97100

examples/nokia5110/securitySystem.emf

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"offset": 0,
1212
"divisor": 1,
1313
"unitName": "%",
14+
"step": 1,
1415
"name": "Hall",
1516
"variableName": "",
1617
"id": 1,
@@ -29,6 +30,7 @@
2930
"offset": 0,
3031
"divisor": 1,
3132
"unitName": "%",
33+
"step": 1,
3234
"name": "Living",
3335
"variableName": "",
3436
"id": 2,
@@ -47,6 +49,7 @@
4749
"offset": 0,
4850
"divisor": 1,
4951
"unitName": "%",
52+
"step": 1,
5053
"name": "Kitchen",
5154
"variableName": "",
5255
"id": 3,
@@ -110,6 +113,7 @@
110113
"offset": 0,
111114
"divisor": 1,
112115
"unitName": "S",
116+
"step": 1,
113117
"name": "Delay",
114118
"variableName": "",
115119
"id": 7,
@@ -333,13 +337,8 @@
333337
"subsystem": "DISPLAY"
334338
},
335339
{
336-
"name": "PULLUP_LOGIC",
337-
"latestValue": "true",
338-
"subsystem": "INPUT"
339-
},
340-
{
341-
"name": "INTERRUPT_SWITCHES",
342-
"latestValue": "false",
340+
"name": "SW_POLLING_MODE",
341+
"latestValue": "SWITCHES_POLL_EVERYTHING",
343342
"subsystem": "INPUT"
344343
},
345344
{
@@ -372,6 +371,11 @@
372371
"latestValue": "-1",
373372
"subsystem": "INPUT"
374373
},
374+
{
375+
"name": "PULLUP_LOGIC",
376+
"latestValue": "true",
377+
"subsystem": "INPUT"
378+
},
375379
{
376380
"name": "ENCODER_IS_QUARTER_CYCLE",
377381
"latestValue": "false",
@@ -435,6 +439,11 @@
435439
"authenticatorDefinition": "rom:100:6",
436440
"projectIoExpanders": [
437441
"deviceIO:"
438-
]
442+
],
443+
"menuInMenuCollection": {
444+
"menuDefinitions": []
445+
},
446+
"packageNamespace": "",
447+
"appIsModular": false
439448
}
440449
}

0 commit comments

Comments
 (0)