From 5d9920d3c44707a9a87ceba1b3da1ef71ecc98ee Mon Sep 17 00:00:00 2001
From: Bertrand Lemasle <blemasle@gmail.com>
Date: Wed, 14 Mar 2018 14:49:40 +1300
Subject: [PATCH] Added doBackup debug command

---
 GpsTracker/Debug.cpp      | 4 +++-
 GpsTracker/Debug.h        | 5 +++--
 GpsTracker/Gps.cpp        | 1 +
 GpsTracker/GpsTracker.ino | 2 ++
 GpsTracker/Network.cpp    | 2 ++
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/GpsTracker/Debug.cpp b/GpsTracker/Debug.cpp
index cbbf7c3..6d69f53 100644
--- a/GpsTracker/Debug.cpp
+++ b/GpsTracker/Debug.cpp
@@ -28,6 +28,7 @@ MENU_ENTRY(EEPROM_GET_CONTENT,		"[E] Get EEPROM content");
 MENU_ENTRY(EEPROM_GET_ENTRIES,		"[P] Get EEPROM entries");
 MENU_ENTRY(EEPROM_GET_LAST_ENTRY,	"[p] Get EEPROM last entry");
 MENU_ENTRY(EEPROM_ADD_ENTRY,		"[a] Add last entry to EEPROM");
+MENU_ENTRY(EEPROM_BACKUP_ENTRIES,	"[B] Backup EEPROM entries");
 MENU_ENTRY(SLEEP,					"[S] Sleep for 8s");
 MENU_ENTRY(SLEEP_DEEP,				"[s] Deep sleep for 10s");
 MENU_ENTRY(QUESTION,				"?");
@@ -50,6 +51,7 @@ const PROGMEM uint8_t commandIdMapping[] = {
 	'P', static_cast<uint8_t>(debug::GPSTRACKER_DEBUG_COMMAND::EEPROM_GET_ENTRIES),
 	'p', static_cast<uint8_t>(debug::GPSTRACKER_DEBUG_COMMAND::EEPROM_GET_LAST_ENTRY),
 	'a', static_cast<uint8_t>(debug::GPSTRACKER_DEBUG_COMMAND::EEPROM_ADD_ENTRY),
+	'B', static_cast<uint8_t>(debug::GPSTRACKER_DEBUG_COMMAND::EEPROM_BACKUP_ENTRIES),
 	'S', static_cast<uint8_t>(debug::GPSTRACKER_DEBUG_COMMAND::SLEEP),
 	's', static_cast<uint8_t>(debug::GPSTRACKER_DEBUG_COMMAND::SLEEP_DEEP),
 };
@@ -88,7 +90,7 @@ const char * const MENU_ENTRIES[] PROGMEM = {
 	MENU_EEPROM_GET_ENTRIES,
 	MENU_EEPROM_GET_LAST_ENTRY,
 	MENU_EEPROM_ADD_ENTRY,
-
+	MENU_EEPROM_BACKUP_ENTRIES,
 	MENU_SEPARATOR,
 
 	MENU_SLEEP,
diff --git a/GpsTracker/Debug.h b/GpsTracker/Debug.h
index 624d99f..e6dc10c 100644
--- a/GpsTracker/Debug.h
+++ b/GpsTracker/Debug.h
@@ -54,8 +54,9 @@ namespace debug {
 		EEPROM_GET_LAST_ENTRY =	17,
 		EEPROM_GET_ENTRIES =	18,
 		EEPROM_ADD_ENTRY =		19,
-		SLEEP =					20,
-		SLEEP_DEEP =			21
+		EEPROM_BACKUP_ENTRIES =	20,
+		SLEEP =					21,
+		SLEEP_DEEP =			22
 	};
 
 	void waitForSerial();
diff --git a/GpsTracker/Gps.cpp b/GpsTracker/Gps.cpp
index cbe80c8..5a62010 100644
--- a/GpsTracker/Gps.cpp
+++ b/GpsTracker/Gps.cpp
@@ -32,6 +32,7 @@ namespace gps {
 			currentStatus = hardware::sim808::device.getGpsStatus();
 			if (currentStatus > SIM808_GPS_STATUS::NO_FIX) break;
 
+			VERBOSE_FORMAT("acquireCurrentPosition", "%d", currentStatus);
 			mainunit::deepSleep(GPS_DEFAULT_INTERMEDIATE_TIMEOUT_MS / 1000);
 			timeout -= GPS_DEFAULT_INTERMEDIATE_TIMEOUT_MS;
 		} while (timeout > 1);
diff --git a/GpsTracker/GpsTracker.ino b/GpsTracker/GpsTracker.ino
index 27d7ac5..b5c711d 100644
--- a/GpsTracker/GpsTracker.ino
+++ b/GpsTracker/GpsTracker.ino
@@ -69,6 +69,8 @@ void loop() {
 			break;
 		case debug::GPSTRACKER_DEBUG_COMMAND::EEPROM_ADD_ENTRY:
 			debug::addLastPositionToEeprom();
+			break;
+		case debug::GPSTRACKER_DEBUG_COMMAND::EEPROM_BACKUP_ENTRIES:
 			positions::doBackup();
 			break;
 		case debug::GPSTRACKER_DEBUG_COMMAND::SLEEP:
diff --git a/GpsTracker/Network.cpp b/GpsTracker/Network.cpp
index 9794149..f9e5992 100644
--- a/GpsTracker/Network.cpp
+++ b/GpsTracker/Network.cpp
@@ -1,4 +1,5 @@
 #include "Config.h"
+#include "Debug.h"
 #include "Network.h"
 #include "Hardware.h"
 #include "MainUnit.h"
@@ -14,6 +15,7 @@ namespace network {
 			currentStatus = hardware::sim808::device.getNetworkRegistrationStatus();
 			if (isAvailable(currentStatus.stat)) break;
 
+			VERBOSE_FORMAT("waitForRegistered", "%d", currentStatus.stat);
 			mainunit::deepSleep(NETWORK_DEFAULT_INTERMEDIATE_TIMEOUT_MS / 1000);
 			timeout -= NETWORK_DEFAULT_INTERMEDIATE_TIMEOUT_MS;
 		} while (timeout > 1);