mirrors
/
esp8266_deauther
mirror of https://github.com/SpacehuhnTech/esp8266_deauther.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cleaned up display class & fixed timeout

This commit is contained in:
Stefan Kremser 2018-10-12 21:07:59 +02:00
parent 7610db9534
commit 763bff53d4
5 changed files with 1418 additions and 1421 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
esp8266_deauther/CLI.cpp
View File

@ -1137,10 +1137,10 @@ void CLI::runCommand(String input) {
// ===== SCREEN ===== //
// screen mode <menu/packetmonitor/buttontest/loading>
else if (eqlsCMD(0, CLI_SCREEN) && eqlsCMD(1, CLI_MODE)) {
if (eqlsCMD(2, CLI_MODE_BUTTONTEST)) displayUI.mode = SCREEN_MODE_BUTTON_TEST;
else if (eqlsCMD(2, CLI_MODE_PACKETMONITOR)) displayUI.mode = SCREEN_MODE_PACKETMONITOR;
else if (eqlsCMD(2, CLI_MODE_LOADINGSCREEN)) displayUI.mode = SCREEN_MODE_LOADSCAN;
else if (eqlsCMD(2, CLI_MODE_MENU)) displayUI.mode = SCREEN_MODE_MENU;
if (eqlsCMD(2, CLI_MODE_BUTTONTEST)) displayUI.mode = displayUI.DISPLAY_MODE::BUTTON_TEST;
else if (eqlsCMD(2, CLI_MODE_PACKETMONITOR)) displayUI.mode = displayUI.DISPLAY_MODE::PACKETMONITOR;
else if (eqlsCMD(2, CLI_MODE_LOADINGSCREEN)) displayUI.mode = displayUI.DISPLAY_MODE::LOADSCAN;
else if (eqlsCMD(2, CLI_MODE_MENU)) displayUI.mode = displayUI.DISPLAY_MODE::MENU;
else parameterError(list->get(2));
prntln(CLI_CHANGED_SCREEN);
}

1563
esp8266_deauther/DisplayUI.cpp
View File

File diff suppressed because it is too large Load Diff

1264
esp8266_deauther/DisplayUI.h
View File

File diff suppressed because it is too large Load Diff

2
esp8266_deauther/esp8266_deauther.ino
View File

@ -91,7 +91,7 @@ void setup() {
// start display
if (settings.getDisplayInterface()) {
displayUI.setup();
displayUI.mode = SCREEN_MODE_INTRO;
displayUI.mode = displayUI.DISPLAY_MODE::INTRO;
}
// copy web files to SPIFFS

2
esp8266_deauther/language.h
View File

@ -1,6 +1,8 @@
#ifndef language_h
#define language_h
#include "Arduino.h"
extern String str(const char* ptr);
extern String keyword(const char* keywordPtr);
extern bool eqls(const char* str, const char* keywordPtr);