Merge remote-tracking branch 'upstream/master' into crsf-LQ-scaled

_locales/en/messages.json

@@ -1793,16 +1793,16 @@
     },
 
     "controlAxisRoll": {
-        "message": "Roll"
+        "message": "Roll [A]"
     },
     "controlAxisPitch": {
-        "message": "Pitch"
+        "message": "Pitch [E]"
     },
     "controlAxisYaw": {
-        "message": "Yaw"
+        "message": "Yaw [R]"
     },
     "controlAxisThrottle": {
-        "message": "Throttle"
+        "message": "Throttle [T]"
     },
     "radioChannelShort": {
         "message": "CH "
@@ -2558,7 +2558,7 @@
         "message": "VTX"
     },
     "osdGroupCRSF": {
-    "message": "CRSF RX Statistics"
+        "message": "CRSF RX Statistics"
     },
     "osdGroupMapsAndRadars": {
         "message": "Maps and Radars"
@@ -2848,6 +2848,21 @@
     "osdElement_ESC_TEMPERATURE_HELP": {
         "message": "Temperature of the ESC read from DSHOT telemetry"
     },
+    "osdGroupGVars": {
+        "message": "Global Variables"
+    },
+    "osdElement_GVAR_0": {
+        "message": "Global Variable 0"
+    },
+    "osdElement_GVAR_1": {
+        "message": "Global Variable 1"
+    },
+    "osdElement_GVAR_2": {
+        "message": "Global Variable 2"
+    },
+    "osdElement_GVAR_3": {
+        "message": "Global Variable 3"
+    },
     "osdElement_SENSOR1_TEMPERATURE": {
         "message": "Temperature sensor 1"
     },

src/css/tabs/receiver.css

@@ -38,12 +38,12 @@
 
 .tab-receiver .bars .name {
     padding: 0 10px 0 0;
-    width: 50px;
+    width: 62px;
     text-align: right;
 }
 
 .tab-receiver .bars .meter {
-    width: calc(100% - 60px);
+    width: calc(97% - 60px);
 }
 
 .tab-receiver .bars .meter-bar {
@@ -58,7 +58,7 @@
 
 .tab-receiver .bars .meter-bar .label {
     position: absolute;
-    width: 50px;
+    width: 72px;
     height: 15px;
     line-height: 15px;
     text-align: center;

tabs/osd.js

@@ -90,6 +90,10 @@ SYM.DB = 0xEB;
 SYM.DBM = 0xEC;
 SYM.MW = 0xED;
 SYM.SNR = 0xEE;
+SYM.GVAR_1 = 0xEF;
+SYM.GVAR_2 = 0xF0;
+SYM.GVAR_3 = 0xF1;
+SYM.GVAR_4 = 0xF2;
 
 var FONT = FONT || {};
 
@@ -1380,6 +1384,35 @@ OSD.constants = {
                 },
             ]
         },
+        {
+            name: 'osdGroupGVars',
+            items: [
+                {
+                    name: 'GVAR_0',
+                    id: 113,
+                    positionable: true,
+                    preview: 'G0:01337'
+                },
+                {
+                    name: 'GVAR_1',
+                    id: 114,
+                    positionable: true,
+                    preview: 'G1:31415'
+                },
+                {
+                    name: 'GVAR_2',
+                    id: 115,
+                    positionable: true,
+                    preview: 'G2:01611'
+                },
+                {
+                    name: 'GVAR_3',
+                    id: 116,
+                    positionable: true,
+                    preview: 'G3:30126'
+                }
+            ]
+        },
         {
             name: 'osdGroupPIDs',
             items: [