Skip to content

Commit

Permalink
remove menu boot
Browse files Browse the repository at this point in the history
  • Loading branch information
nonik0 committed Mar 1, 2024
1 parent ce9207c commit da7d3bd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 17 deletions.
17 changes: 2 additions & 15 deletions main.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#include <esp_now.h>
#include <esp_wifi.h>
#include <M5Cardputer.h>
#include <M5StackUpdater.h>
#include <M5_LoRa_E220_JP.h>
#include <WiFi.h>

Expand Down Expand Up @@ -568,17 +567,6 @@ bool sdCardInit()
return sdInit;
}

void checkForMenuBoot()
{
M5Cardputer.update();

if (M5Cardputer.Keyboard.isKeyPressed('a') && sdCardInit())
{
updateFromFS(SD, "/menu.bin");
ESP.restart();
}
}

void readConfigFromSd()
{
M5Cardputer.update();
Expand Down Expand Up @@ -1204,9 +1192,6 @@ void setup()
auto cfg = M5.config();
M5Cardputer.begin(cfg, true);

checkForMenuBoot();
readConfigFromSd();

M5Cardputer.Display.init();
M5Cardputer.Display.setRotation(1);
M5Cardputer.Display.setBrightness(brightness);
Expand All @@ -1224,6 +1209,8 @@ void setup()
activeTabIndex = 0;
activeSettingIndex = 0;

readConfigFromSd();

drawSystemBar();
drawTabBar();
drawMainWindow();
Expand Down
2 changes: 0 additions & 2 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,4 @@ monitor_speed = 115200
build_flags = -DCORE_DEBUG_LEVEL=2 #{Non,Err,Wrn,Inf,Dbg,Ver}
lib_deps =
m5stack/M5Cardputer@^1.0.2
m5stack/M5Unified@^0.1.11
tobozo/M5Stack-SD-Updater@^1.2.8
m5stack/M5-LoRa-E220-JP@^1.0.0

0 comments on commit da7d3bd

Please sign in to comment.