diff --git a/GpsTracker/Config.cpp b/GpsTracker/Config.cpp index 4c5c21a..cc3a236 100644 --- a/GpsTracker/Config.cpp +++ b/GpsTracker/Config.cpp @@ -18,14 +18,14 @@ namespace config { if (CONFIG_SEED != value.seed) reset(); //todo : reset network if seed for network is not right hardware::i2c::powerOff(); - VERBOSE_FORMAT("read", "%d, %s, %d, %d", value.seed, value.version, value.firstEntry, value.lastEntry); + NOTICE_FORMAT("read", "%d, %s, %d, %d", value.seed, value.version, value.firstEntry, value.lastEntry); #if BACKUP_ENABLE_NETWORK VERBOSE_FORMAT("read", "%d, %d, %s, %s", value.network.saveThreshold, value.network.lastSavedEntry, value.network.apn, value.network.url); #endif } void write() { - VERBOSE_FORMAT("write", "%d, %s, %d, %d", value.seed, value.version, value.firstEntry, value.lastEntry); + NOTICE_FORMAT("write", "%d, %s, %d, %d", value.seed, value.version, value.firstEntry, value.lastEntry); #if BACKUP_ENABLE_NETWORK VERBOSE_FORMAT("write", "%d, %d, %s, %s", value.network.saveThreshold, value.network.lastSavedEntry, value.network.apn, value.network.url); #endif diff --git a/GpsTracker/Debug.cpp b/GpsTracker/Debug.cpp index a095885..ef2a0a4 100644 --- a/GpsTracker/Debug.cpp +++ b/GpsTracker/Debug.cpp @@ -9,7 +9,7 @@ const char FAKE_GPS_ENTRY[] PROGMEM = "1,1,20170924184842.000,49.454862,1.144537,71.900,67.99,172.6,1,,1.3,2.2,1.8,,11,7,,,37,,"; -MENU_ENTRY(HEADER, "-- Menu --"); +MENU_ENTRY(HEADER, "========================\n-- Menu --"); MENU_ENTRY(SEPARATOR, "----"); MENU_ENTRY(RUN, "[R] Run"); @@ -136,26 +136,16 @@ namespace debug { return GPSTRACKER_DEBUG_COMMAND::NONE; } - GPSTRACKER_DEBUG_COMMAND menu(uint16_t timeout) { + GPSTRACKER_DEBUG_COMMAND menu() { GPSTRACKER_DEBUG_COMMAND command; size_t menuSize = flash::getArraySize(MENU_ENTRIES); - uint8_t intermediate_timeout = 50; do { for (uint8_t i = 0; i < menuSize; i++) { Serial.println(reinterpret_cast(pgm_read_word_near(&MENU_ENTRIES[i]))); } - while (!Serial.available()) { - if (timeout > 0) { - delay(intermediate_timeout); - timeout -= intermediate_timeout; - if (timeout <= 0) { - NOTICE_MSG("menu", "Timeout expired."); - return GPSTRACKER_DEBUG_COMMAND::RUN; - } - } - } + while (!Serial.available()); delay(50); command = parseCommand(Serial.read()); while (Serial.available()) Serial.read(); //flushing input } while (command == GPSTRACKER_DEBUG_COMMAND::NONE); @@ -261,6 +251,6 @@ namespace debug { SIM808_GPS_STATUS::OFF }; - for(int i = 0; i < 3; i++) positions::appendLast(metadata); + for(int i = 0; i < 10; i++) positions::appendLast(metadata); } } \ No newline at end of file diff --git a/GpsTracker/Debug.h b/GpsTracker/Debug.h index 71644bc..a9ddd38 100644 --- a/GpsTracker/Debug.h +++ b/GpsTracker/Debug.h @@ -39,7 +39,7 @@ namespace debug { int freeRam(); void displayFreeRam(); - GPSTRACKER_DEBUG_COMMAND menu(uint16_t timeout); + GPSTRACKER_DEBUG_COMMAND menu(); void getAndDisplayBattery(); void getAndDisplayGpsPosition(); diff --git a/GpsTracker/GpsTracker.ino b/GpsTracker/GpsTracker.ino index 6d2cde8..6f5d4f2 100644 --- a/GpsTracker/GpsTracker.ino +++ b/GpsTracker/GpsTracker.ino @@ -4,7 +4,7 @@ #if _DEBUG #define MENU_TIMEOUT 0 #else -#define MENU_TIMEOUT 10000 +#define MENU_TIMEOUT 0 #endif bool bypassMenu = false; @@ -22,7 +22,7 @@ void setup() { void loop() { debug::GPSTRACKER_DEBUG_COMMAND command = debug::GPSTRACKER_DEBUG_COMMAND::RUN; - if (Serial && !bypassMenu) command = debug::menu(MENU_TIMEOUT); + if (Serial && !bypassMenu) command = debug::menu(); bypassMenu = command == debug::GPSTRACKER_DEBUG_COMMAND::RUN; diff --git a/GpsTracker/Logging.cpp b/GpsTracker/Logging.cpp index 0c1d2d9..b1f8db3 100644 --- a/GpsTracker/Logging.cpp +++ b/GpsTracker/Logging.cpp @@ -9,8 +9,6 @@ namespace logging { if (Serial) { Serial.begin(LOG_SERIAL_SPEED); - Serial.println(F("=============================")); - Log.begin(LOG_LEVEL, &Serial); } }