From bd70d431c01810f9f06a47aeacbba862a8509a8f Mon Sep 17 00:00:00 2001
From: Darren Lines <darren@darrenlines.uk>
Date: Fri, 29 Jul 2022 14:18:30 +0100
Subject: [PATCH 1/2] Add version number to CLI save

This PR adds the version number to the CLI filename. It also adds a secondary way to get the data from the FC if it is out of range. If it fails, it appears as the previous save filename looked.
---
 js/helpers.js | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/js/helpers.js b/js/helpers.js
index 8b611898..cf8930c4 100644
--- a/js/helpers.js
+++ b/js/helpers.js
@@ -42,13 +42,28 @@ function generateFilename(prefix, suffix) {
 
     if (CONFIG) {
         if (CONFIG.flightControllerIdentifier) {
-            filename = CONFIG.flightControllerIdentifier + '_' + filename;
-        }
+            filename = CONFIG.flightControllerIdentifier + '_' + CONFIG.flightControllerVersion + "_" + filename;
+        } 
         if (CONFIG.name && CONFIG.name.trim() !== '') {
             filename = filename + '_' + CONFIG.name.trim().replace(' ', '_');
         }
+    } else {
+        // Attempt to get the version number and 
+        MSPHelper.getSetting("version").then(function (data) {
+            if (data.value) {
+                let version = data.value.split('/')[0] + "_" + data.value.split(' ')[1];
+                filename = "" + version + "_" + filename;
+            }
+        });
+
+        MSPHelper.getSetting("name").then(function (data) {
+            if (data.value && data.value.trim() !== '') {
+                filename += "_" + data.value.trim().replace(' ', '_');
+            }
+        });
     }
 
+
     filename = filename + '_' + date.getFullYear()
         + zeroPad(date.getMonth() + 1, 2)
         + zeroPad(date.getDate(), 2)

From dac6ff3616b250778747482a047a449f27ed0c32 Mon Sep 17 00:00:00 2001
From: Darren Lines <darren@darrenlines.uk>
Date: Mon, 15 Aug 2022 18:02:07 +0100
Subject: [PATCH 2/2] Removed MSP parts

---
 js/helpers.js | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/js/helpers.js b/js/helpers.js
index cf8930c4..914fbbaa 100644
--- a/js/helpers.js
+++ b/js/helpers.js
@@ -43,27 +43,13 @@ function generateFilename(prefix, suffix) {
     if (CONFIG) {
         if (CONFIG.flightControllerIdentifier) {
             filename = CONFIG.flightControllerIdentifier + '_' + CONFIG.flightControllerVersion + "_" + filename;
-        } 
+        }
+         
         if (CONFIG.name && CONFIG.name.trim() !== '') {
             filename = filename + '_' + CONFIG.name.trim().replace(' ', '_');
         }
-    } else {
-        // Attempt to get the version number and 
-        MSPHelper.getSetting("version").then(function (data) {
-            if (data.value) {
-                let version = data.value.split('/')[0] + "_" + data.value.split(' ')[1];
-                filename = "" + version + "_" + filename;
-            }
-        });
-
-        MSPHelper.getSetting("name").then(function (data) {
-            if (data.value && data.value.trim() !== '') {
-                filename += "_" + data.value.trim().replace(' ', '_');
-            }
-        });
     }
 
-
     filename = filename + '_' + date.getFullYear()
         + zeroPad(date.getMonth() + 1, 2)
         + zeroPad(date.getDate(), 2)