Changes to OSD preview (#768)

Changes to match https://github.com/iNavFlight/inav/pull/4652

1 files changed, 107 insertions, 32 deletions

diff --git a/tabs/osd.js b/tabs/osd.js
index 6e6d56ff..17acc6ce 100644
--- a/tabs/osd.js
+++ b/tabs/osd.js
@@ -3,11 +3,12 @@
 
 var SYM = SYM || {};
 SYM.MILLIOHM = 0x00;
-SYM.VOLT = 0x90;
+SYM.BATT = 0x90;
 SYM.RSSI = 0x01;
 SYM.AH_RIGHT = 0x02;
 SYM.AH_LEFT = 0x03;
 SYM.THR = 0x04;
+SYM.VOLT = 0x06;
 SYM.AH_DECORATION_UP = 5;
 SYM.WIND_SPEED_HORIZONTAL = 22;
 SYM.WIND_SPEED_VERTICAL = 23;
@@ -358,8 +359,12 @@ function osdMainBatteryPreview() {
     if (Settings.getInputValue('osd_main_voltage_decimals') == 2) {
         s += '3';
     }
-    s += 'V';
-    return FONT.symbol(SYM.VOLT) + FONT.embed_dot(s);
+    if (semver.lt(CONFIG.flightControllerVersion, '2.2.0')) {
+        s += 'V';
+    } else {
+        s += FONT.symbol(SYM.VOLT);
+    }
+    return FONT.symbol(SYM.BATT) + FONT.embed_dot(s);
 }
 
 function osdCoordinatePreview(symbol, coordinate) {
@@ -557,13 +562,13 @@ OSD.constants = {
                 {
                     name: 'MAIN_BATT_CELL_VOLTAGE',
                     id: 32,
-                    preview: FONT.symbol(SYM.VOLT) + FONT.embed_dot('3.90V')
+                    preview: FONT.symbol(SYM.BATT) + FONT.embed_dot('3.90') + FONT.symbol(SYM.VOLT)
                 },
                 {
                     name: 'SAG_COMP_MAIN_BATT_CELL_VOLTAGE',
                     id: 54,
                     min_version: '2.0.0',
-                    preview: FONT.symbol(SYM.VOLT) + FONT.embed_dot('4.18V')
+                    preview: FONT.symbol(SYM.BATT) + FONT.embed_dot('4.18') + FONT.symbol(SYM.VOLT)
                 },
                 {
                     name: 'POWER_SUPPLY_IMPEDANCE',
@@ -587,11 +592,19 @@ OSD.constants = {
                     id: 49,
                     min_version: '2.0.0',
                     preview: function(osd_data) {
-                        if (OSD.data.preferences.units === 0) {
-                            // Imperial
-                            return FONT.symbol(SYM.TRIP_DIST) + FONT.symbol(SYM.DIST_MI) + FONT.embed_dot('0.98');
+                        if (semver.lt(CONFIG.flightControllerVersion, '2.2.0')) {
+                            if (OSD.data.preferences.units === 0) {
+                                // Imperial
+                                return FONT.symbol(SYM.TRIP_DIST) + FONT.symbol(SYM.DIST_MI) + FONT.embed_dot('0.98');
+                            }
+                            return FONT.symbol(SYM.TRIP_DIST) + FONT.symbol(SYM.DIST_KM) + FONT.embed_dot('1.73');
+                        } else {
+                            if (OSD.data.preferences.units === 0) {
+                                // Imperial
+                                return FONT.symbol(SYM.TRIP_DIST) + FONT.embed_dot('0.98') + FONT.symbol(SYM.DIST_MI);
+                            }
+                            return FONT.symbol(SYM.TRIP_DIST) + FONT.embed_dot('1.73') + FONT.symbol(SYM.DIST_KM);
                         }
-                        return FONT.symbol(SYM.TRIP_DIST) + FONT.symbol(SYM.DIST_KM) + FONT.embed_dot('1.73');
                     }
                 },
                 {
@@ -807,11 +820,19 @@ OSD.constants = {
                     name: 'ALTITUDE',
                     id: 15,
                     preview: function () {
-                        if (OSD.data.preferences.units === 0) {
-                            // metric
+                        if (semver.lt(CONFIG.flightControllerVersion, '2.2.0')) {
+                            if (OSD.data.preferences.units === 0) {
+                                // imperial
+                                return FONT.symbol(SYM.ALT_FT) + '118';
+                            }
                             return FONT.symbol(SYM.ALT_M) + '399'
+                        } else {
+                            if (OSD.data.preferences.units === 0) {
+                                // imperial
+                                return '118' + FONT.symbol(SYM.ALT_FT);
+                            }
+                            return '399' + FONT.symbol(SYM.ALT_M);
                         }
-                        return FONT.symbol(SYM.ALT_FT) + '118';
                     }
                 },
                 {
@@ -828,10 +849,10 @@ OSD.constants = {
                     id: 26,
                     preview: function(osd_data) {
                         if (OSD.data.preferences.units === 0) {
-                            // Metric
-                            return FONT.embed_dot('-0.5') + FONT.symbol(SYM.M_S);
+                            // imperial
+                            return FONT.embed_dot('-1.6') + FONT.symbol(SYM.FT_S);
                         }
-                        return FONT.embed_dot('-1.6') + FONT.symbol(SYM.FT_S);
+                        return FONT.embed_dot('-0.5') + FONT.symbol(SYM.M_S);
                     }
                 }
             ]
@@ -930,27 +951,57 @@ OSD.constants = {
                 {
                     name: 'CURRENT_DRAW',
                     id: 11,
-                    preview: FONT.symbol(SYM.AMP) + FONT.embed_dot('42.1')
+                    preview: function() {
+                        if (semver.lt(CONFIG.flightControllerVersion, '2.2.0')) {
+                            return FONT.symbol(SYM.AMP) + FONT.embed_dot('42.1');
+                        } else {
+                            return FONT.embed_dot('42.1') + FONT.symbol(SYM.AMP);
+                        }
+                    }
                 },
                 {
                     name: 'MAH_DRAWN',
                     id: 12,
-                    preview: FONT.symbol(SYM.MAH) + '690 ' // 4 chars
+                    preview: function() {
+                        if (semver.lt(CONFIG.flightControllerVersion, '2.2.0')) {
+                            return FONT.symbol(SYM.MAH) + '690 '; // 4 chars
+                        } else {
+                            return ' 690' + FONT.symbol(SYM.MAH); // 4 chars
+                        }
+                    }
                 },
                 {
                     name: 'WH_DRAWN',
                     id: 36,
-                    preview: FONT.symbol(SYM.WH) + FONT.embed_dot('1.25')
+                    preview: function() {
+                        if (semver.lt(CONFIG.flightControllerVersion, '2.2.0')) {
+                            return FONT.symbol(SYM.WH) + FONT.embed_dot('1.25');
+                        } else {
+                            return FONT.embed_dot('1.25') + FONT.symbol(SYM.WH);
+                        }
+                    }
                 },
                 {
                     name: 'POWER',
                     id: 19,
-                    preview: FONT.symbol(SYM.WATT) + '50 ' // 3 chars
+                    preview: function() {
+                        if (semver.lt(CONFIG.flightControllerVersion, '2.2.0')) {
+                            return FONT.symbol(SYM.WATT) + '50 '; // 3 chars
+                        } else {
+                            return ' 50' + FONT.symbol(SYM.WATT); // 3 chars
+                        }
+                    }
                 },
                 {
                     name: 'MAIN_BATT_REMAINING_CAPACITY',
                     id: 37,
-                    preview: FONT.symbol(SYM.MAH) + '690 ' // 4 chars
+                    preview: function() {
+                        if (semver.lt(CONFIG.flightControllerVersion, '2.2.0')) {
+                            return FONT.symbol(SYM.MAH) + '690 '; // 4 chars
+                        } else {
+                            return ' 690' + FONT.symbol(SYM.MAH); // 4 chars
+                        }
+                    }
                 },
                 {
                     name: 'EFFICIENCY_MAH',
@@ -986,11 +1037,19 @@ OSD.constants = {
                     name: 'MSL_ALTITUDE',
                     id: 96,
                     preview: function(osd_data) {
-                        if (OSD.data.preferences.units === 0) {
-                            // Imperial
-                            return FONT.symbol(SYM.ALT_FT) + '275';
+                        if (semver.lt(CONFIG.flightControllerVersion, '2.2.0')) {
+                            if (OSD.data.preferences.units === 0) {
+                                // Imperial
+                                return FONT.symbol(SYM.ALT_FT) + '275';
+                            }
+                            return FONT.symbol(SYM.ALT_M) + '477';
+                        } else {
+                            if (OSD.data.preferences.units === 0) {
+                                // Imperial
+                                return '275' + FONT.symbol(SYM.ALT_FT);
+                            }
+                            return '477' + FONT.symbol(SYM.ALT_M);
                         }
-                        return FONT.symbol(SYM.ALT_M) + '477';
                     },
                 },
                 {
@@ -1046,11 +1105,19 @@ OSD.constants = {
                     name: 'DISTANCE_TO_HOME',
                     id: 23,
                     preview: function(osd_data) {
-                        if (OSD.data.preferences.units === 0) {
-                            // Imperial
-                            return FONT.symbol(SYM.HOME) + FONT.symbol(SYM.DIST_MI) + FONT.embed_dot('0.98');
+                        if (semver.lt(CONFIG.flightControllerVersion, '2.2.0')) {
+                            if (OSD.data.preferences.units === 0) {
+                                // Imperial
+                                return FONT.symbol(SYM.HOME) + FONT.symbol(SYM.DIST_MI) + FONT.embed_dot('0.98');
+                            }
+                            return FONT.symbol(SYM.HOME) + FONT.symbol(SYM.DIST_KM) + FONT.embed_dot('1.73');
+                        } else {
+                            if (OSD.data.preferences.units === 0) {
+                                // Imperial
+                                return FONT.symbol(SYM.HOME) + FONT.embed_dot('0.98') + FONT.symbol(SYM.DIST_MI);
+                            }
+                            return FONT.symbol(SYM.HOME) + FONT.embed_dot('1.73') + FONT.symbol(SYM.DIST_KM);
                         }
-                        return FONT.symbol(SYM.HOME) + FONT.symbol(SYM.DIST_KM) + FONT.embed_dot('1.73');
                     }
                 },
                 {
@@ -1058,11 +1125,19 @@ OSD.constants = {
                     id: 40,
                     min_version: '1.9.1',
                     preview: function(osd_data) {
-                        if (OSD.data.preferences.units === 0) {
-                            // Imperial
-                            return FONT.symbol(SYM.TRIP_DIST) + FONT.symbol(SYM.DIST_MI) + FONT.embed_dot('0.98');
+                        if (semver.lt(CONFIG.flightControllerVersion, '2.2.0')) {
+                            if (OSD.data.preferences.units === 0) {
+                                // Imperial
+                                return FONT.symbol(SYM.TRIP_DIST) + FONT.symbol(SYM.DIST_MI) + FONT.embed_dot('0.98');
+                            }
+                            return FONT.symbol(SYM.TRIP_DIST) + FONT.symbol(SYM.DIST_KM) + FONT.embed_dot('1.73');
+                        } else {
+                            if (OSD.data.preferences.units === 0) {
+                                // Imperial
+                                return FONT.symbol(SYM.TRIP_DIST) + FONT.embed_dot('0.98') + FONT.symbol(SYM.DIST_MI);
+                            }
+                            return FONT.symbol(SYM.TRIP_DIST) + FONT.embed_dot('1.73') + FONT.symbol(SYM.DIST_KM);
                         }
-                        return FONT.symbol(SYM.TRIP_DIST) + FONT.symbol(SYM.DIST_KM) + FONT.embed_dot('1.73');
                     }
                 },
                 {