gitea-mirror/esp8266_deauther
1
0
Fork 0
mirror of https://github.com/SpacehuhnTech/esp8266_deauther.git synced 2025-12-21 06:43:16 -08:00
Code Issues Packages Projects Releases Wiki Activity

Bootlop fix

Browse Source 
Changed few lines from: String(SOME_PROGMEM_VAR)
Into: str(SOME_PROGMEM_VAR)
This commit is contained in:
michalmonday
2018-12-12 23:43:39 +00:00
parent 34915e2138
commit e65c1da239
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
esp8266_deauther/CLI.cpp
View File

@@ -13,7 +13,7 @@ CLI::CLI() {
CLI::~CLI() {}
void CLI::load() {
String defaultValue = String(CLI_DEFAULT_AUTOSTART);
String defaultValue = str(CLI_DEFAULT_AUTOSTART);
checkFile(execPath, defaultValue);
execFile(execPath);
}

18
esp8266_deauther/DisplayUI.cpp
View File

@@ -734,13 +734,13 @@ void DisplayUI::drawLoadingScan() {
if (scan.isScanning()) {
percentage = String(scan.getPercentage()) + '%';
} else {
percentage = String(DSP_SCAN_DONE);
percentage = str(DSP_SCAN_DONE);
}
drawString(0, leftRight(String(DSP_SCAN_FOR), scan.getMode(), maxLen));
drawString(1, leftRight(String(DSP_APS), String(accesspoints.count()), maxLen));
drawString(2, leftRight(String(DSP_STS), String(stations.count()), maxLen));
drawString(3, leftRight(String(DSP_PKTS), String(scan.getPacketRate()) + String(DSP_S), maxLen));
drawString(0, leftRight(str(DSP_SCAN_FOR), scan.getMode(), maxLen));
drawString(1, leftRight(str(DSP_APS), String(accesspoints.count()), maxLen));
drawString(2, leftRight(str(DSP_STS), String(stations.count()), maxLen));
drawString(3, leftRight(str(DSP_PKTS), String(scan.getPacketRate()) + str(DSP_S), maxLen));
drawString(4, center(percentage, maxLen));
}
@@ -772,10 +772,10 @@ void DisplayUI::drawPacketMonitor() {
}
void DisplayUI::drawIntro() {
drawString(0, center(String(D_INTRO_0), maxLen));
drawString(1, center(String(D_INTRO_1), maxLen));
drawString(2, center(String(D_INTRO_2), maxLen));
drawString(3, center(String(D_INTRO_3), maxLen));
drawString(0, center(str(D_INTRO_0), maxLen));
drawString(1, center(str(D_INTRO_1), maxLen));
drawString(2, center(str(D_INTRO_2), maxLen));
drawString(3, center(str(D_INTRO_3), maxLen));
drawString(4, center(settings.getVersion(), maxLen));
}

10
esp8266_deauther/Scan.cpp
View File

@@ -411,19 +411,19 @@ uint32_t Scan::getPackets(int i) {
String Scan::getMode() {
switch (scanMode) {
case SCAN_MODE_OFF:
return String(SC_MODE_OFF);
return str(SC_MODE_OFF);
case SCAN_MODE_APS:
return String(SC_MODE_AP);
return str(SC_MODE_AP);
case SCAN_MODE_STATIONS:
return String(SC_MODE_ST);
return str(SC_MODE_ST);
case SCAN_MODE_ALL:
return String(SC_MODE_ALL);
return str(SC_MODE_ALL);
case SCAN_MODE_SNIFFER:
return String(SC_MODE_SNIFFER);
return str(SC_MODE_SNIFFER);
default:
return String();