Ability to force backup. Forcing backup when "stopping"

GpsTracker/Core.cpp

@@ -7,38 +7,42 @@
 using namespace utils;
 
 namespace core {
-	uint16_t sleepTime = SLEEP_DEFAULT_TIME_SECONDS;;
+	uint16_t sleepTime = SLEEP_DEFAULT_TIME_SECONDS;
 	uint8_t stoppedInARow = 0;
 
 	void main() {
-
+		bool forceBackup = false;
 		positions::prepareBackup();
 		PositionEntryMetadata metadata;
 		if (positions::acquire(metadata)) {
 			positions::appendLast(metadata);
-			updateSleepTime(gps::getVelocity());
+			forceBackup = updateSleepTime(gps::getVelocity());
 		}
 
-		positions::doBackup();
+		positions::doBackup(forceBackup);
 		mainunit::deepSleep(sleepTime);
 	}
 
-	void updateSleepTime(uint8_t velocity) {
-		uint16_t result = computeSleepTime(velocity);
+	bool updateSleepTime(uint8_t velocity) {
+		uint16_t result = mapSleepTime(velocity);
+		bool goingLongSleep = false;
 
 		if (velocity < SLEEP_TIMING_MIN_MOVING_VELOCITY) {
 			stoppedInARow++;
 			if (stoppedInARow < SLEEP_DEFAULT_STOPPED_THRESHOLD) {
 				result = SLEEP_DEFAULT_PAUSING_TIME_SECONDS;
 			}
+			else goingLongSleep = true;
 		}
 		else stoppedInARow = 0;
 
 		sleepTime = result;
 		NOTICE_FORMAT("updateSleepTime", "%dkmh => %d seconds", velocity, sleepTime);
+
+		return goingLongSleep;
 	}
 
-	uint16_t computeSleepTime(uint8_t velocity) {
+	uint16_t mapSleepTime(uint8_t velocity) {
 		uint16_t result;
 		uint16_t currentTime = 0xFFFF;
 		

GpsTracker/Core.h

@@ -14,6 +14,6 @@ namespace core {
 	extern uint16_t sleepTime;
 
 	void main();
-	void updateSleepTime(uint8_t velocity);
-	uint16_t computeSleepTime(uint8_t velocity);
+	bool updateSleepTime(uint8_t velocity);
+	uint16_t mapSleepTime(uint8_t velocity);
 }

GpsTracker/Debug.cpp

@@ -168,7 +168,7 @@ namespace debug {
 
 		NOTICE_FORMAT("setFakeGpsPosition", "Last position set to : %s", gps::lastPosition);
 		NOTICE_FORMAT("setFakeGpsPosition", "Speed : %d", gps::getVelocity());
-		NOTICE_FORMAT("setFakeGpsPosition", "Sleep time : %d", core::computeSleepTime(gps::getVelocity()));
+		NOTICE_FORMAT("setFakeGpsPosition", "Sleep time : %d", core::mapSleepTime(gps::getVelocity()));
 	}
 
 	void getAndDisplayBattery() {
@@ -198,7 +198,7 @@ namespace debug {
 		utils::flash::read(&config::defaultSleepTimings[arraySize - 1], maxSpeedTiming);
 
 		for (int i = 0; i <= maxSpeedTiming.speed; i++) {
-			core::computeSleepTime(i);
+			core::mapSleepTime(i);
 		}
 
 		NOTICE_MSG("getAndDisplaySleepTimes", "Done");

GpsTracker/GpsTracker.ino

@@ -78,7 +78,7 @@ void loop() {
 			debug::addLastPositionToEeprom();
 			break;
 		case debug::GPSTRACKER_DEBUG_COMMAND::EEPROM_BACKUP_ENTRIES:
-			positions::doBackup();
+			positions::doBackup(false);
 			break;
 		case debug::GPSTRACKER_DEBUG_COMMAND::SLEEP:
 			mainunit::sleep(period_t::SLEEP_8S);

GpsTracker/NetworkPositionsBackup.cpp

@@ -106,10 +106,10 @@ namespace positions {
 				_prepareTime = rtc::getTime();
 			}
 
-			void NetworkPositionsBackup::backup() {
+			void NetworkPositionsBackup::backup(bool force) {
 				NOTICE("backup");
 
-				if (!isBackupNeeded(false)) return;
+				if (!force || !isBackupNeeded(false)) return;
 				appendPositions();
 			}
 		}

GpsTracker/NetworkPositionsBackup.h

@@ -20,7 +20,7 @@ namespace positions {
 				void setup();
 
 				void prepare();
-				void backup();
+				void backup(bool force);
 			};
 
 		}

GpsTracker/Positions.cpp

@@ -154,10 +154,10 @@ namespace positions {
 #endif
 	}
 
-	void doBackup() {
+	void doBackup(bool force) {
 #ifdef BACKUPS_ENABLED
 		for (int i = 0; i < BACKUPS_ENABLED; i++) {
-			_backups[i]->backup();
+			_backups[i]->backup(force);
 		}
 #endif
 	}

GpsTracker/Positions.h

@@ -28,5 +28,5 @@ namespace positions {
 	uint16_t count(uint16_t fromIndex);
 
 	void prepareBackup();
-	void doBackup();
+	void doBackup(bool force);
 }

GpsTracker/PositionsBackup.h

@@ -9,7 +9,7 @@ namespace positions {
 			virtual void setup() = 0;
 
 			virtual void prepare() = 0;
-			virtual void backup() = 0;
+			virtual void backup(bool force) = 0;
 		};
 
 	}

GpsTracker/SdPositionsBackup.cpp

@@ -99,7 +99,7 @@ namespace positions {
 				hardware::sdcard::setup();
 			}
 
-			void SdPositionsBackup::backup() {
+			void SdPositionsBackup::backup(bool force) {
 				VERBOSE("backup");
 
 				if (!hardware::sdcard::available) {

GpsTracker/SdPositionsBackup.h

@@ -10,7 +10,7 @@ namespace positions {
 			private:
 			public:
 				void setup();
-				void backup();
+				void backup(bool force);
 			};
 
 		}