Skip to content

Commit 1f9c4ce

Browse files
author
dave
committed
#101 various list rendering fixes, and a fix to prevent recursive error in base dialog when invoking on a list.
1 parent a6c36f7 commit 1f9c4ce

File tree

8 files changed

+321
-265
lines changed

8 files changed

+321
-265
lines changed

examples/esp32Amplifier/esp32Amplifier_main.cpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,13 @@ void setup() {
4141

4242
EEPROM.begin(512);
4343
menuMgr.setEepromRef(new ArduinoEEPROMAbstraction(&EEPROM));
44+
menuMgr.setRootMenu(&menuVolume);
4445
authManager.initialise(menuMgr.getEepromAbstraction(), 200);
45-
46-
prepareWifiForUse();
46+
menuMgr.setAuthenticator(&authManager);
47+
remoteServer.setAuthenticator(&authManager);
4748

4849
renderer.setFirstWidget(&wifiWidget);
4950

50-
setupMenu();
51-
5251
menuMgr.load(MENU_MAGIC_KEY, [] {
5352
// when the eeprom is not initialised, put sensible defaults in there.
5453
menuMgr.getEepromAbstraction()->writeArrayToRom(150, reinterpret_cast<const uint8_t *>(pgmDefaultChannelNames), sizeof pgmDefaultChannelNames);
@@ -58,8 +57,11 @@ void setup() {
5857
menuDirect.setBoolean(true, true);
5958
});
6059

61-
controller.initialise();
60+
prepareWifiForUse();
61+
62+
setupMenu();
6263

64+
controller.initialise();
6365
touchScreen.calibrateMinMaxValues(0.240F, 0.895F, 0.09F, 0.88F);
6466

6567
renderer.setCustomDrawingHandler(new TouchScreenCalibrator(&touchScreen));

0 commit comments

Comments
 (0)