Skip to content

Commit e14ca6a

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

File tree

6 files changed

+15
-20
lines changed

6 files changed

+15
-20
lines changed

examples/esp32s3TftEncoder/esp32s3TftEncoder.emf

Lines changed: 3 additions & 1 deletion
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": "Percent",
1516
"variableName": "Percent",
1617
"id": 1,
@@ -28,6 +29,7 @@
2829
"offset": 0,
2930
"divisor": 10,
3031
"unitName": "",
32+
"step": 1,
3133
"name": "Tenths",
3234
"variableName": "Tenths",
3335
"id": 2,
@@ -177,7 +179,7 @@
177179
},
178180
{
179181
"name": "SW_POLLING_MODE",
180-
"latestValue": "SWITCHES_POLL_EVERYTHING",
182+
"latestValue": "SWITCHES_NO_POLLING",
181183
"subsystem": "INPUT"
182184
},
183185
{

examples/esp32s3TftEncoder/esp32s3TftEncoder_menu.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void setupMenu() {
5252
gfx.begin();
5353
gfx.setRotation(1);
5454
renderer.setUpdatesPerSecond(15);
55-
switches.init(internalDigitalIo(), SWITCHES_POLL_EVERYTHING, true);
55+
switches.init(internalDigitalIo(), SWITCHES_NO_POLLING, true);
5656
menuMgr.initForEncoder(&renderer, &menuPercent, 3, 4, 5);
5757
renderer.setTitleMode(BaseGraphicalRenderer::TITLE_FIRST_ROW);
5858
renderer.setUseSliderForAnalog(true);

examples/esp8266WifiOled/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/esp8266WifiOled/Greenhouse.emf

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"offset": -20,
1212
"divisor": 4,
1313
"unitName": "C",
14+
"step": 1,
1415
"name": "Tomato Temp",
1516
"id": 1,
1617
"eepromAddress": -1,
@@ -27,6 +28,7 @@
2728
"offset": -20,
2829
"divisor": 4,
2930
"unitName": "C",
31+
"step": 1,
3032
"name": "Cucumber Temp",
3133
"id": 2,
3234
"eepromAddress": -1,
@@ -434,12 +436,13 @@
434436
"eepromDefinition": "eeprom:",
435437
"authenticatorDefinition": "rom:100:6",
436438
"projectIoExpanders": [
437-
"pcf8574:io8574:32:12",
438-
"deviceIO:"
439+
"deviceIO:",
440+
"pcf8574:io8574:32:12:false"
439441
],
440442
"menuInMenuCollection": {
441443
"menuDefinitions": []
442444
},
443-
"packageNamespace": ""
445+
"packageNamespace": "",
446+
"appIsModular": false
444447
}
445448
}

examples/esp8266WifiOled/esp8266WifiOled_menu.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ BackMenuItem menuBackConnectivity(fnConnectivityRtCall, &menuSSID);
4848
SubMenuItem menuConnectivity(&minfoConnectivity, &menuBackConnectivity, NULL);
4949
const PROGMEM AnyMenuInfo minfoLoadFiles = { "Load Files", 15, 0xffff, 0, onLoadFiles };
5050
ActionMenuItem menuLoadFiles(&minfoLoadFiles, &menuConnectivity);
51-
extern const char* fileChoicesArray;
51+
extern char fileChoicesArray[];
5252
RENDERING_CALLBACK_NAME_INVOKE(fnFileRtCall, enumItemRenderFn, "File", -1, onFileChoice)
5353
ScrollChoiceMenuItem menuFile(14, fnFileRtCall, 0, fileChoicesArray, 10, 1, &menuLoadFiles);
5454
const PROGMEM BooleanMenuInfo minfoSecretEntry = { "Secret Entry", 13, 0xffff, 1, NO_CALLBACK, NAMING_TRUE_FALSE };
@@ -86,13 +86,13 @@ void setupMenu() {
8686
authManager.initialise(menuMgr.getEepromAbstraction(), 100);
8787
menuMgr.setAuthenticator(&authManager);
8888
// Now add any readonly, non-remote and visible flags.
89+
menuCucumberTemp.setReadOnly(true);
8990
menuTomatoTemp.setReadOnly(true);
9091
menuIpAddress.setReadOnly(true);
91-
menuCucumberTemp.setReadOnly(true);
92-
menuSSID.setLocalOnly(true);
9392
menuPwd.setLocalOnly(true);
94-
menuAuthenticator.setLocalOnly(true);
93+
menuSSID.setLocalOnly(true);
9594
menuIoTMonitor.setLocalOnly(true);
95+
menuAuthenticator.setLocalOnly(true);
9696
menuSecretEntry.setVisible(false);
9797

9898
// Code generated by plugins.

examples/esp8266WifiOled/esp8266WifiOled_menu.h

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

0 commit comments

Comments
 (0)