From 646d7ef8356083a8baaccdd861aaf43c182da2cb Mon Sep 17 00:00:00 2001
From: Alexander van Saase <avsaase@gmail.com>
Date: Sun, 3 Jan 2021 12:56:03 +0100
Subject: [PATCH 1/5] plus code type selection

---
 tabs/osd.html | 3 +++
 tabs/osd.js   | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/tabs/osd.html b/tabs/osd.html
index 0321e129..3b16a0be 100644
--- a/tabs/osd.html
+++ b/tabs/osd.html
@@ -71,6 +71,9 @@
                                 <label>
                                     <select class="update_preview" data-setting="osd_plus_code_digits" data-live="true"></select> Plus Code Digits
                                 </label>
+                                <label>
+                                    <select class="update_preview" data-setting="osd_plus_code_type" data-live="true"></select> Plus Code Type
+                                </label>
                                 <label>
                                     <select class="update_preview" data-setting="osd_crosshairs_style" data-live="true"></select> Crosshairs Style
                                 </label>
diff --git a/tabs/osd.js b/tabs/osd.js
index 72916f93..8bb88790 100644
--- a/tabs/osd.js
+++ b/tabs/osd.js
@@ -1190,9 +1190,15 @@ OSD.constants = {
                     name: 'PLUS_CODE',
                     id: 97,
                     preview: function() {
+                        var pluscodeformat;
                         let digits = parseInt(Settings.getInputValue('osd_plus_code_digits')) + 1;
                         console.log("DITIS", digits);
-                        return '9547X6PM+VWCCC'.substr(0, digits);
+                        if (Settings.getInputValue('osd_plus_code_type') == 0) {
+                            pluscodeformat = '9547X6PM+VWCCC'.substr(0, digits);
+                        } else {
+                            pluscodeformat = 'X6PM+VWCCC'.substr(0, digits-4);
+                        }
+                        return pluscodeformat;
                     }
                 },
                 {

From bcf5af7a5709d40fc41196ea10221645eda597bc Mon Sep 17 00:00:00 2001
From: Alexander van Saase <avsaase@gmail.com>
Date: Mon, 4 Jan 2021 20:54:50 +0100
Subject: [PATCH 2/5] Added options for COUNTRY (2 digits trimmed) and FIELD (6
 digits trimmed)

---
 tabs/osd.js | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/tabs/osd.js b/tabs/osd.js
index 8bb88790..4664bf36 100644
--- a/tabs/osd.js
+++ b/tabs/osd.js
@@ -1190,15 +1190,10 @@ OSD.constants = {
                     name: 'PLUS_CODE',
                     id: 97,
                     preview: function() {
-                        var pluscodeformat;
                         let digits = parseInt(Settings.getInputValue('osd_plus_code_digits')) + 1;
+                        let digitsRemoved = parseInt(Settings.getInputValue('osd_plus_code_type')) * 2;
                         console.log("DITIS", digits);
-                        if (Settings.getInputValue('osd_plus_code_type') == 0) {
-                            pluscodeformat = '9547X6PM+VWCCC'.substr(0, digits);
-                        } else {
-                            pluscodeformat = 'X6PM+VWCCC'.substr(0, digits-4);
-                        }
-                        return pluscodeformat;
+                        return '9547X6PM+VWCCC'.substr(digitsRemoved, digits-digitsRemoved);
                     }
                 },
                 {

From a6859fee9bf61b35d9e589b543c4482227d51c04 Mon Sep 17 00:00:00 2001
From: Alexander van Saase <avsaase@gmail.com>
Date: Mon, 4 Jan 2021 21:22:39 +0100
Subject: [PATCH 3/5] Rename type to format

---
 _locales/en/messages.json | 3 +++
 tabs/osd.html             | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index fb410f5b..5f39ac5c 100755
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -3064,6 +3064,9 @@
     "osdSettingMainVoltageDecimals": {
         "message": "Main voltage decimals"
     },
+    "osdSettingPLUS_CODE_FORMAT_HELP": {
+        "message": "COUNTRY, LOCAL and FIELD require a reference location within respectively ~800km, ~40km and ~2km to recover the original coordinates."
+    },
     "osdSettingCRSF_LQ_FORMAT_HELP": {
         "message": "TYPE1 shows LQ% as used by TBS hardware. TYPE2 shows RF Profile Modes (2=150Hz, 1=50Hz, 0=4Hz update rates) and LQ % [0..100%]. Tracer shows RFMode 1 (1=250Hz) and LQ % [0..100%]."
     },
diff --git a/tabs/osd.html b/tabs/osd.html
index 3b16a0be..5a29c3cc 100644
--- a/tabs/osd.html
+++ b/tabs/osd.html
@@ -71,8 +71,9 @@
                                 <label>
                                     <select class="update_preview" data-setting="osd_plus_code_digits" data-live="true"></select> Plus Code Digits
                                 </label>
+                                <div class="helpicon cf_tip" data-i18n_title="osdSettingPLUS_CODE_FORMAT_HELP"></div>
                                 <label>
-                                    <select class="update_preview" data-setting="osd_plus_code_type" data-live="true"></select> Plus Code Type
+                                    <select class="update_preview" data-setting="osd_plus_code_format" data-live="true"></select> Plus Code Format
                                 </label>
                                 <label>
                                     <select class="update_preview" data-setting="osd_crosshairs_style" data-live="true"></select> Crosshairs Style

From 67eb5cfce598baf174bc684b3c3bda19d7e446b4 Mon Sep 17 00:00:00 2001
From: Alexander van Saase <avsaase@gmail.com>
Date: Mon, 4 Jan 2021 21:48:10 +0100
Subject: [PATCH 4/5] Fix bug

---
 tabs/osd.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tabs/osd.js b/tabs/osd.js
index 4664bf36..210f58e0 100644
--- a/tabs/osd.js
+++ b/tabs/osd.js
@@ -1191,7 +1191,7 @@ OSD.constants = {
                     id: 97,
                     preview: function() {
                         let digits = parseInt(Settings.getInputValue('osd_plus_code_digits')) + 1;
-                        let digitsRemoved = parseInt(Settings.getInputValue('osd_plus_code_type')) * 2;
+                        let digitsRemoved = parseInt(Settings.getInputValue('osd_plus_code_format')) * 2;
                         console.log("DITIS", digits);
                         return '9547X6PM+VWCCC'.substr(digitsRemoved, digits-digitsRemoved);
                     }

From 8bf8ed2c5ddfb6838ba9af179216da77e532d7b5 Mon Sep 17 00:00:00 2001
From: Alexander van Saase <avsaase@gmail.com>
Date: Wed, 6 Jan 2021 12:02:22 +0100
Subject: [PATCH 5/5] update for fw compatibility

---
 _locales/en/messages.json | 7 +++++--
 tabs/osd.html             | 5 +++--
 tabs/osd.js               | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 5f39ac5c..8c87dfec 100755
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -3064,8 +3064,11 @@
     "osdSettingMainVoltageDecimals": {
         "message": "Main voltage decimals"
     },
-    "osdSettingPLUS_CODE_FORMAT_HELP": {
-        "message": "COUNTRY, LOCAL and FIELD require a reference location within respectively ~800km, ~40km and ~2km to recover the original coordinates."
+    "osdSettingPLUS_CODE_DIGITS_HELP": {
+        "message": "Precision at the equator: 10=13.9x13.9m; 11=2.8x3.5m; 12=56x87cm; 13=11x22cm."
+    }, 
+    "osdSettingPLUS_CODE_SHORT_HELP": {
+        "message": "Removing 2, 4 and 6 leading digits requires a reference location within, respectively, ~800km, ~40km and ~2km to recover the original coordinates."
     },
     "osdSettingCRSF_LQ_FORMAT_HELP": {
         "message": "TYPE1 shows LQ% as used by TBS hardware. TYPE2 shows RF Profile Modes (2=150Hz, 1=50Hz, 0=4Hz update rates) and LQ % [0..100%]. Tracer shows RFMode 1 (1=250Hz) and LQ % [0..100%]."
diff --git a/tabs/osd.html b/tabs/osd.html
index 5a29c3cc..371fbdc9 100644
--- a/tabs/osd.html
+++ b/tabs/osd.html
@@ -68,12 +68,13 @@
                                 <label>
                                     <select class="update_preview" data-setting="osd_coordinate_digits" data-live="true"></select> Coordinate Digits
                                 </label>
+                                <div class="helpicon cf_tip" data-i18n_title="osdSettingPLUS_CODE_DIGITS_HELP"></div>
                                 <label>
                                     <select class="update_preview" data-setting="osd_plus_code_digits" data-live="true"></select> Plus Code Digits
                                 </label>
-                                <div class="helpicon cf_tip" data-i18n_title="osdSettingPLUS_CODE_FORMAT_HELP"></div>
+                                <div class="helpicon cf_tip" data-i18n_title="osdSettingPLUS_CODE_SHORT_HELP"></div>
                                 <label>
-                                    <select class="update_preview" data-setting="osd_plus_code_format" data-live="true"></select> Plus Code Format
+                                    <select class="update_preview" data-setting="osd_plus_code_short" data-live="true"></select> Plus Code Remove Leading Digits 
                                 </label>
                                 <label>
                                     <select class="update_preview" data-setting="osd_crosshairs_style" data-live="true"></select> Crosshairs Style
diff --git a/tabs/osd.js b/tabs/osd.js
index 210f58e0..a1146c1d 100644
--- a/tabs/osd.js
+++ b/tabs/osd.js
@@ -1191,7 +1191,7 @@ OSD.constants = {
                     id: 97,
                     preview: function() {
                         let digits = parseInt(Settings.getInputValue('osd_plus_code_digits')) + 1;
-                        let digitsRemoved = parseInt(Settings.getInputValue('osd_plus_code_format')) * 2;
+                        let digitsRemoved = parseInt(Settings.getInputValue('osd_plus_code_short')) * 2;
                         console.log("DITIS", digits);
                         return '9547X6PM+VWCCC'.substr(digitsRemoved, digits-digitsRemoved);
                     }