From cb7522513953b2273086d9d6ea3accfb6d79e63a Mon Sep 17 00:00:00 2001
From: Bertrand Lemasle <blemasle@gmail.com>
Date: Wed, 21 Mar 2018 15:15:13 +1300
Subject: [PATCH] Cleaned up code of freeRam debugs. Cleaned commented code

---
 GpsTracker/Config.cpp                 | 12 ++++++++++--
 GpsTracker/Config.h                   |  2 +-
 GpsTracker/NetworkPositionsBackup.cpp |  9 ---------
 GpsTracker/Positions.cpp              | 11 +++++------
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/GpsTracker/Config.cpp b/GpsTracker/Config.cpp
index cc3a236..6f0f7d5 100644
--- a/GpsTracker/Config.cpp
+++ b/GpsTracker/Config.cpp
@@ -20,14 +20,21 @@ namespace config {
 
 				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);
+				NOTICE_FORMAT("read", "%d, %d, %s, %s", value.network.saveThreshold, value.network.lastSavedEntry, value.network.apn, value.network.url);
+				//networkConfig_t c = {
+				//	POSITIONS_CONFIG_NET_DEFAULT_SAVE_THRESHOLD,
+				//	0xFFFF,
+				//	POSITIONS_CONFIG_NET_DEFAULT_APN,
+				//	POSITIONS_CONFIG_NET_DEFAULT_URL,
+				//};
+				//value.network = c;
 #endif
 			}
 
 			void write() {
 				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);
+				NOTICE_FORMAT("write", "%d, %d, %s, %s", value.network.saveThreshold, value.network.lastSavedEntry, value.network.apn, value.network.url);
 #endif
 				hardware::i2c::powerOn();
 				int written = hardware::i2c::eeprom.writeBlock(CONFIG_ADDR, value);
@@ -37,6 +44,7 @@ namespace config {
 
 		void setup() {
 			details::read();
+			//details::write();
 		}
 
 		void save() {
diff --git a/GpsTracker/Config.h b/GpsTracker/Config.h
index b31a0a4..604c6b7 100644
--- a/GpsTracker/Config.h
+++ b/GpsTracker/Config.h
@@ -3,7 +3,7 @@
 #include <Arduino.h>
 
 #define BACKUP_ENABLE_SDCARD 0
-#define BACKUP_ENABLE_NETWORK 0
+#define BACKUP_ENABLE_NETWORK 1
 
 #if BACKUP_ENABLE_NETWORK
 #include "NetworkPositionsConfig.h"
diff --git a/GpsTracker/NetworkPositionsBackup.cpp b/GpsTracker/NetworkPositionsBackup.cpp
index c2bf8fd..6e0f499 100644
--- a/GpsTracker/NetworkPositionsBackup.cpp
+++ b/GpsTracker/NetworkPositionsBackup.cpp
@@ -26,7 +26,6 @@ namespace positions {
 
 				bool appendPosition(PositionEntry &entry) {
 					VERBOSE("appendPosition");
-					debug::displayFreeRam();
 
 					char buffer[BUFFER_SIZE];
 					snprintf(buffer, BUFFER_SIZE, "%d,%d,%d,%d,",
@@ -36,7 +35,6 @@ namespace positions {
 						static_cast<uint8_t>(entry.metadata.status));
 
 					strcat(buffer, entry.position);
-					debug::displayFreeRam();
 
 					return hardware::sim808::device.httpPost(
 						config::main::value.network.url,
@@ -49,7 +47,6 @@ namespace positions {
 
 				void appendPositions() {
 					VERBOSE("appendPositions");
-					debug::displayFreeRam();
 
 					uint16_t currentEntryIndex = config::main::value.network.lastSavedEntry + 1;
 					PositionEntry currentEntry;
@@ -64,7 +61,6 @@ namespace positions {
 						hardware::i2c::powerOn();
 						do {
 							if (!positions::get(currentEntryIndex, currentEntry)) break;
-							debug::displayFreeRam();
 
 							if (!appendPosition(currentEntry)) break;
 
@@ -72,12 +68,10 @@ namespace positions {
 							config::main::save();
 
 						} while (positions::moveNext(currentEntryIndex));
-						debug::displayFreeRam();
 						hardware::i2c::powerOff();
 					}
 
 					network::powerOff();
-					debug::displayFreeRam();
 				}
 
 			}
@@ -88,11 +82,8 @@ namespace positions {
 
 			void NetworkPositionsBackup::backup() {
 				VERBOSE("backup");
-				debug::displayFreeRam();
 
 				if (!details::isBackupNeeded()) return;
-				debug::displayFreeRam();
-
 				details::appendPositions();
 			}
 		}
diff --git a/GpsTracker/Positions.cpp b/GpsTracker/Positions.cpp
index 91d1015..63f4999 100644
--- a/GpsTracker/Positions.cpp
+++ b/GpsTracker/Positions.cpp
@@ -113,6 +113,8 @@ namespace positions {
 	}
 
 	bool get(uint16_t index, PositionEntry &entry) {
+		VERBOSE("get");
+
 		uint16_t entryAddress = details::getEntryAddress(index);
 		if (entryAddress == -1) return false;
 
@@ -144,15 +146,12 @@ namespace positions {
 
 	void doBackup() {
 #ifdef BACKUPS_ENABLED
-		debug::displayFreeRam();
 		VERBOSE_FORMAT("doBackup", "%d backups enabled", BACKUPS_ENABLED);
-		//_backups[0]->backup(); //disabled for first real running test
-		debug::displayFreeRam();
-		/*for (int i = 0; i < BACKUPS_ENABLED; i++) {
+
+		for (int i = 0; i < BACKUPS_ENABLED; i++) {
 			VERBOSE_FORMAT("doBackup", "calling backup %d", i);
-			delay(1000);
 			_backups[i]->backup();
-		}*/
+		}
 #endif
 	}
 }
\ No newline at end of file