From 149db28841909556bb3ea0e9f478ac6d2932c108 Mon Sep 17 00:00:00 2001
From: Bertrand Lemasle <blemasle@gmail.com>
Date: Wed, 5 Dec 2018 18:17:54 +1300
Subject: [PATCH] Added force parameter to prepareBackup, as for backup

---
 src/NetworkPositionsBackup.cpp |  4 ++--
 src/NetworkPositionsBackup.h   |  2 +-
 src/Positions.cpp              |  6 +++---
 src/Positions.h                |  2 +-
 src/PositionsBackup.h          | 30 +++++++++++++++---------------
 src/SdPositionsBackup.cpp      |  2 +-
 src/SdPositionsBackup.h        | 34 +++++++++++++++++-----------------
 7 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/src/NetworkPositionsBackup.cpp b/src/NetworkPositionsBackup.cpp
index fd79f18..8284e86 100644
--- a/src/NetworkPositionsBackup.cpp
+++ b/src/NetworkPositionsBackup.cpp
@@ -99,11 +99,11 @@ namespace positions {
 
 			void NetworkPositionsBackup::setup() {}
 
-			void NetworkPositionsBackup::prepare() {
+			void NetworkPositionsBackup::prepare(bool force) {
 				#define CURRENT_LOGGER_FUNCTION "prepare"
 				VERBOSE;
 
-				if (!isBackupNeeded(true)) return;
+				if (force || !isBackupNeeded(true)) return;
 				network::powerOn();
 			}
 
diff --git a/src/NetworkPositionsBackup.h b/src/NetworkPositionsBackup.h
index 7247fe8..dd2912e 100644
--- a/src/NetworkPositionsBackup.h
+++ b/src/NetworkPositionsBackup.h
@@ -16,7 +16,7 @@ namespace positions {
 			public:
 				void setup();
 
-				void prepare();
+				void prepare(bool force);
 				void backup(bool force);
 			};
 
diff --git a/src/Positions.cpp b/src/Positions.cpp
index 90db23b..8221475 100644
--- a/src/Positions.cpp
+++ b/src/Positions.cpp
@@ -163,13 +163,13 @@ namespace positions {
 		return lastEntry - fromIndex;
 	}
 
-	void prepareBackup() {
+	void prepareBackup(bool force) {
 #if BACKUPS_ENABLED > 1
 		for (int i = 0; i < BACKUPS_ENABLED; i++) {
-			_backups[i]->prepare();
+			_backups[i]->prepare(force);
 		}
 #elif BACKUPS_ENABLED == 1
-		_backup->prepare();
+		_backup->prepare(force);
 #endif
 	}
 
diff --git a/src/Positions.h b/src/Positions.h
index 6f3b6a0..a6313e3 100644
--- a/src/Positions.h
+++ b/src/Positions.h
@@ -28,7 +28,7 @@ namespace positions {
 	bool moveNext(uint16_t &index);
 	uint16_t count(uint16_t fromIndex);
 
-	void prepareBackup();
+	void prepareBackup(bool force);
 	void doBackup(bool force);
 
 	void print(uint16_t index, PositionEntry &entry);
diff --git a/src/PositionsBackup.h b/src/PositionsBackup.h
index 340ec4b..f837f52 100644
--- a/src/PositionsBackup.h
+++ b/src/PositionsBackup.h
@@ -1,16 +1,16 @@
-#pragma once
-
-namespace positions {
-	namespace backup {
-
-		class PositionsBackup {
-		public:
-			~PositionsBackup();
-			virtual void setup() = 0;
-
-			virtual void prepare() = 0;
-			virtual void backup(bool force) = 0;
-		};
-
-	}
+#pragma once
+
+namespace positions {
+	namespace backup {
+
+		class PositionsBackup {
+		public:
+			~PositionsBackup();
+			virtual void setup() = 0;
+
+			virtual void prepare(bool force) = 0;
+			virtual void backup(bool force) = 0;
+		};
+
+	}
 }
\ No newline at end of file
diff --git a/src/SdPositionsBackup.cpp b/src/SdPositionsBackup.cpp
index d2d40cb..8dea093 100644
--- a/src/SdPositionsBackup.cpp
+++ b/src/SdPositionsBackup.cpp
@@ -97,7 +97,7 @@ namespace positions {
 				}
 			}
 
-			void SdPositionsBackup::setup() {
+			void SdPositionsBackup::setup(bool force) {
 				hardware::sdcard::setup();
 			}
 
diff --git a/src/SdPositionsBackup.h b/src/SdPositionsBackup.h
index 87aa92b..9eb071e 100644
--- a/src/SdPositionsBackup.h
+++ b/src/SdPositionsBackup.h
@@ -1,18 +1,18 @@
-#pragma once
-
-#include "PositionsBackup.h"
-
-namespace positions {
-	namespace backup {
-		namespace sd {
-
-			class SdPositionsBackup : public PositionsBackup {
-			private:
-			public:
-				void setup();
-				void backup(bool force);
-			};
-
-		}
-	}
+#pragma once
+
+#include "PositionsBackup.h"
+
+namespace positions {
+	namespace backup {
+		namespace sd {
+
+			class SdPositionsBackup : public PositionsBackup {
+			private:
+			public:
+				void setup(bool force);
+				void backup(bool force);
+			};
+
+		}
+	}
 }
\ No newline at end of file