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

Fixed clock update 

https://github.com/SpacehuhnTech/esp8266_deauther/issues/1385

https://github.com/SpacehuhnTech/esp8266_deauther/issues/1384
This commit is contained in:
Spacehuhn 2021-01-23 11:52:16 +01:00
parent 333e3ebd86
commit 0272e83c3d
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
esp8266_deauther/A_config.h
View File

@ -563,7 +563,7 @@
// ===== Reset ====== // // ===== Reset ====== //
#ifndef RESET_BUTTON #ifndef RESET_BUTTON
#if BUTTON_UP != 0 && BUTTON_DOWN != 0 && BUTTON_A != 0 && BUTTON_B != 0 && BUTTON_B != 0 #if BUTTON_UP != 0 && BUTTON_DOWN != 0 && BUTTON_A != 0 && BUTTON_B != 0
#define RESET_BUTTON 0 #define RESET_BUTTON 0
#else // if BUTTON_UP != 0 && BUTTON_DOWN != 0 && BUTTON_A != 0 && BUTTON_B != 0 #else // if BUTTON_UP != 0 && BUTTON_DOWN != 0 && BUTTON_A != 0 && BUTTON_B != 0
#define RESET_BUTTON 255 #define RESET_BUTTON 255

21
esp8266_deauther/DisplayUI.cpp
View File

@ -88,7 +88,7 @@ void DisplayUI::setup() {
mode = DISPLAY_MODE::PACKETMONITOR; mode = DISPLAY_MODE::PACKETMONITOR;
}); });
addMenuNode(&mainMenu, D_CLOCK, [this]() { // PACKET MONITOR addMenuNode(&mainMenu, D_CLOCK, [this]() { // CLOCK
mode = DISPLAY_MODE::CLOCK; mode = DISPLAY_MODE::CLOCK;
display.setFont(ArialMT_Plain_24); display.setFont(ArialMT_Plain_24);
display.setTextAlignment(TEXT_ALIGN_CENTER); display.setTextAlignment(TEXT_ALIGN_CENTER);
@ -523,7 +523,7 @@ void DisplayUI::setupButtons() {
else currentMenu->selected = currentMenu->list->size() - 1; else currentMenu->selected = currentMenu->list->size() - 1;
} else if (mode == DISPLAY_MODE::PACKETMONITOR) { // when in packet monitor, change channel } else if (mode == DISPLAY_MODE::PACKETMONITOR) { // when in packet monitor, change channel
scan.setChannel(wifi_channel + 1); scan.setChannel(wifi_channel + 1);
} else if (mode == DISPLAY_MODE::CLOCK) { } else if (mode == DISPLAY_MODE::CLOCK) { // when in clock, change time
setTime(clockHour, clockMinute + 1, clockSecond); setTime(clockHour, clockMinute + 1, clockSecond);
} }
} }
@ -539,7 +539,7 @@ void DisplayUI::setupButtons() {
else currentMenu->selected = currentMenu->list->size() - 1; else currentMenu->selected = currentMenu->list->size() - 1;
} else if (mode == DISPLAY_MODE::PACKETMONITOR) { // when in packet monitor, change channel } else if (mode == DISPLAY_MODE::PACKETMONITOR) { // when in packet monitor, change channel
scan.setChannel(wifi_channel + 1); scan.setChannel(wifi_channel + 1);
} else if (mode == DISPLAY_MODE::CLOCK) { // when in packet monitor, change channel } else if (mode == DISPLAY_MODE::CLOCK) { // when in clock, change time
setTime(clockHour, clockMinute + 10, clockSecond); setTime(clockHour, clockMinute + 10, clockSecond);
} }
} }
@ -662,12 +662,19 @@ void DisplayUI::draw(bool force) {
updatePrefix(); updatePrefix();
#ifndef RTC_DS3231 if (currentTime - clockTime >= 1000) {
if (clockTime < currentTime - 1000) { #ifdef RTC_DS3231
setTime(clockHour, clockMinute++, clockSecond + 1); bool h12;
bool PM_time;
clockHour = clock.getHour(h12, PM_time);
clockMinute = clock.getMinute();
clockSecond = clock.getSecond();
#else // ifdef RTC_DS3231
++clockSecond;
#endif // ifdef RTC_DS3231
setTime(clockHour, clockMinute, clockSecond);
clockTime += 1000; clockTime += 1000;
} }
#endif // ifndef RTC_DS3231
switch (mode) { switch (mode) {
case DISPLAY_MODE::BUTTON_TEST: case DISPLAY_MODE::BUTTON_TEST: