diff --git a/ESPboyMenuGUI.cpp b/ESPboyMenuGUI.cpp index 4b02c60..eda7d7f 100644 --- a/ESPboyMenuGUI.cpp +++ b/ESPboyMenuGUI.cpp @@ -123,7 +123,7 @@ uint16_t ESPboyMenuGUI::menuInit(const char** menuLinesF, uint16_t menuLineColor } if (keyPressed&MenuGUI_PAD_ACT && menuList.menuLine[menuList.menuCurrent][0] != '-') { #ifdef buttonclicks - tone(SOUNDPIN,100,100); + tone(SOUNDPIN,200,10); #endif tft->drawRect(0, (menuList.menuCurrent+menuList.menuOffset)*MENU_SPACE_BETWEEN_LINES, 122, MENU_SPACE_BETWEEN_LINES, TFT_BLACK); @@ -140,7 +140,7 @@ uint16_t ESPboyMenuGUI::menuInit(const char** menuLinesF, uint16_t menuLineColor } if (keyPressed&MenuGUI_PAD_ESC){ #ifdef buttonclicks - tone(SOUNDPIN,100,100); + tone(SOUNDPIN,200,10); #endif tft->fillScreen(TFT_BLACK); return(0); diff --git a/ESPboy_Sub1GHzInspector.ino b/ESPboy_Sub1GHzInspector.ino index 6be8afc..c8d3937 100644 --- a/ESPboy_Sub1GHzInspector.ino +++ b/ESPboy_Sub1GHzInspector.ino @@ -51,7 +51,7 @@ const char *menuMain[] PROGMEM = { }; const char *menuRecord[] PROGMEM = { - "-SEND", //send selected record + "SEND", //send selected record "SHOW", "SET REPEAT", "RENAME", @@ -495,10 +495,7 @@ gotolabel: while (!userInput) userInput = getUserInputLocal().toInt(); if (userInput > DEFAULT_SIGNAL_REPEAT_NUMBER*10) userInput = DEFAULT_SIGNAL_REPEAT_NUMBER; recordStoredVector[selectedSignal-1].recordRepeatno = userInput; - printConsoleLocal(F("DONE"), TFT_MAGENTA, 1, 0); - while (!myESPboy.getKeys())delay(10); - while (myESPboy.getKeys())delay(10); - printConsoleLocal("", TFT_MAGENTA, 1, 0); + printInfoMessage(F("DONE")); break; case rename_: printConsoleLocal(F("Enter new name"), TFT_MAGENTA, 1, 0); @@ -508,10 +505,7 @@ gotolabel: while (!userInputName.length()) userInputName = getUserInputLocal(); userInputName = userInputName.substring(0,18); memcpy(&recordStoredVector[selectedSignal-1].recordName, userInputName.c_str(), userInputName.length()+1); - printConsoleLocal(F("DONE"), TFT_MAGENTA, 1, 0); - while (!myESPboy.getKeys())delay(10); - while (myESPboy.getKeys())delay(10); - printConsoleLocal("", TFT_MAGENTA, 1, 0); + printInfoMessage(F("DONE")); break; case delete_: recordStoredVector.erase(recordStoredVector.begin()+(selectedSignal-1)); @@ -533,6 +527,15 @@ gotolabel: } +void printInfoMessage(String messageToPrint){ + toggleDisplayModeLocal(1); + printConsoleLocal(messageToPrint, TFT_MAGENTA, 1, 0); + while (!myESPboy.getKeys())delay(10); + while (myESPboy.getKeys())delay(10); + printConsoleLocal("", TFT_MAGENTA, 1, 0); +} + + void loop(){ switch (menuInitLocal(menuMain, TFT_YELLOW, TFT_BLUE, TFT_BLUE)){ case listen_: @@ -545,29 +548,19 @@ void loop(){ if(!recordStoredVector.empty()) listofstored_f(); else{ - toggleDisplayModeLocal(1); - printConsoleLocal(F("Records not found"), TFT_MAGENTA, 1, 0); - while (!myESPboy.getKeys())delay(10); - while (myESPboy.getKeys())delay(10); - printConsoleLocal("", TFT_MAGENTA, 1, 0);} + printInfoMessage(F("Records not found"));} break; case saveall_: toggleDisplayModeLocal(1); printConsoleLocal(F("Save to EEPROM..."), TFT_MAGENTA, 1, 0); writeEEPROMall(); - printConsoleLocal(F("DONE"), TFT_MAGENTA, 1, 0); - while (!myESPboy.getKeys())delay(10); - while (myESPboy.getKeys())delay(10); - printConsoleLocal("", TFT_MAGENTA, 1, 0); + printInfoMessage(F("DONE")); break; case clearall_: toggleDisplayModeLocal(1); printConsoleLocal(F("Clearing memory..."), TFT_MAGENTA, 1, 0); recordStoredVector.clear(); - printConsoleLocal(F("DONE"), TFT_MAGENTA, 1, 0); - while (!myESPboy.getKeys())delay(10); - while (myESPboy.getKeys())delay(10); - printConsoleLocal("", TFT_MAGENTA, 1, 0); + printInfoMessage(F("DONE")); break; default: delay(150);