@@ -18,14 +18,14 @@ namespace config { | |||||
if (CONFIG_SEED != value.seed) reset(); //todo : reset network if seed for network is not right | if (CONFIG_SEED != value.seed) reset(); //todo : reset network if seed for network is not right | ||||
hardware::i2c::powerOff(); | 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 | #if BACKUP_ENABLE_NETWORK | ||||
VERBOSE_FORMAT("read", "%d, %d, %s, %s", value.network.saveThreshold, value.network.lastSavedEntry, value.network.apn, value.network.url); | VERBOSE_FORMAT("read", "%d, %d, %s, %s", value.network.saveThreshold, value.network.lastSavedEntry, value.network.apn, value.network.url); | ||||
#endif | #endif | ||||
} | } | ||||
void write() { | 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 | #if BACKUP_ENABLE_NETWORK | ||||
VERBOSE_FORMAT("write", "%d, %d, %s, %s", value.network.saveThreshold, value.network.lastSavedEntry, value.network.apn, value.network.url); | VERBOSE_FORMAT("write", "%d, %d, %s, %s", value.network.saveThreshold, value.network.lastSavedEntry, value.network.apn, value.network.url); | ||||
#endif | #endif | ||||
@@ -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,,"; | 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(SEPARATOR, "----"); | ||||
MENU_ENTRY(RUN, "[R] Run"); | MENU_ENTRY(RUN, "[R] Run"); | ||||
@@ -136,26 +136,16 @@ namespace debug { | |||||
return GPSTRACKER_DEBUG_COMMAND::NONE; | return GPSTRACKER_DEBUG_COMMAND::NONE; | ||||
} | } | ||||
GPSTRACKER_DEBUG_COMMAND menu(uint16_t timeout) { | |||||
GPSTRACKER_DEBUG_COMMAND menu() { | |||||
GPSTRACKER_DEBUG_COMMAND command; | GPSTRACKER_DEBUG_COMMAND command; | ||||
size_t menuSize = flash::getArraySize(MENU_ENTRIES); | size_t menuSize = flash::getArraySize(MENU_ENTRIES); | ||||
uint8_t intermediate_timeout = 50; | |||||
do { | do { | ||||
for (uint8_t i = 0; i < menuSize; i++) { | for (uint8_t i = 0; i < menuSize; i++) { | ||||
Serial.println(reinterpret_cast<const __FlashStringHelper *>(pgm_read_word_near(&MENU_ENTRIES[i]))); | Serial.println(reinterpret_cast<const __FlashStringHelper *>(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()); | command = parseCommand(Serial.read()); | ||||
while (Serial.available()) Serial.read(); //flushing input | while (Serial.available()) Serial.read(); //flushing input | ||||
} while (command == GPSTRACKER_DEBUG_COMMAND::NONE); | } while (command == GPSTRACKER_DEBUG_COMMAND::NONE); | ||||
@@ -261,6 +251,6 @@ namespace debug { | |||||
SIM808_GPS_STATUS::OFF | SIM808_GPS_STATUS::OFF | ||||
}; | }; | ||||
for(int i = 0; i < 3; i++) positions::appendLast(metadata); | |||||
for(int i = 0; i < 10; i++) positions::appendLast(metadata); | |||||
} | } | ||||
} | } |
@@ -39,7 +39,7 @@ namespace debug { | |||||
int freeRam(); | int freeRam(); | ||||
void displayFreeRam(); | void displayFreeRam(); | ||||
GPSTRACKER_DEBUG_COMMAND menu(uint16_t timeout); | |||||
GPSTRACKER_DEBUG_COMMAND menu(); | |||||
void getAndDisplayBattery(); | void getAndDisplayBattery(); | ||||
void getAndDisplayGpsPosition(); | void getAndDisplayGpsPosition(); | ||||
@@ -4,7 +4,7 @@ | |||||
#if _DEBUG | #if _DEBUG | ||||
#define MENU_TIMEOUT 0 | #define MENU_TIMEOUT 0 | ||||
#else | #else | ||||
#define MENU_TIMEOUT 10000 | |||||
#define MENU_TIMEOUT 0 | |||||
#endif | #endif | ||||
bool bypassMenu = false; | bool bypassMenu = false; | ||||
@@ -22,7 +22,7 @@ void setup() { | |||||
void loop() { | void loop() { | ||||
debug::GPSTRACKER_DEBUG_COMMAND command = debug::GPSTRACKER_DEBUG_COMMAND::RUN; | 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; | bypassMenu = command == debug::GPSTRACKER_DEBUG_COMMAND::RUN; | ||||
@@ -9,8 +9,6 @@ namespace logging { | |||||
if (Serial) { | if (Serial) { | ||||
Serial.begin(LOG_SERIAL_SPEED); | Serial.begin(LOG_SERIAL_SPEED); | ||||
Serial.println(F("=============================")); | |||||
Log.begin(LOG_LEVEL, &Serial); | Log.begin(LOG_LEVEL, &Serial); | ||||
} | } | ||||
} | } | ||||