diff options
-rwxr-xr-x | _locales/en/messages.json | 38 | ||||
-rw-r--r-- | resources/osd/bold.mcm | 152 | ||||
-rw-r--r-- | resources/osd/bold/034.png (renamed from resources/osd/bold/34.png) | bin | 248 -> 248 bytes | |||
-rw-r--r-- | resources/osd/bold/036.png (renamed from resources/osd/bold/36.png) | bin | 151 -> 151 bytes | |||
-rw-r--r-- | resources/osd/bold/063.png | bin | 0 -> 240 bytes | |||
-rw-r--r-- | resources/osd/clarity.mcm | 152 | ||||
-rw-r--r-- | resources/osd/clarity/063.png | bin | 0 -> 240 bytes | |||
-rw-r--r-- | resources/osd/default.mcm | 152 | ||||
-rw-r--r-- | resources/osd/default/034.png (renamed from resources/osd/default/34.png) | bin | 248 -> 248 bytes | |||
-rw-r--r-- | resources/osd/default/036.png (renamed from resources/osd/default/36.png) | bin | 151 -> 151 bytes | |||
-rw-r--r-- | resources/osd/default/063.png | bin | 0 -> 240 bytes | |||
-rw-r--r-- | resources/osd/large.mcm | 152 | ||||
-rw-r--r-- | resources/osd/large/034.png (renamed from resources/osd/large/34.png) | bin | 248 -> 248 bytes | |||
-rw-r--r-- | resources/osd/large/036.png (renamed from resources/osd/large/36.png) | bin | 151 -> 151 bytes | |||
-rw-r--r-- | resources/osd/large/063.png | bin | 0 -> 240 bytes | |||
-rw-r--r-- | tabs/osd.js | 209 |
16 files changed, 542 insertions, 313 deletions
diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 7095e8da..e47ff905 100755 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -2381,7 +2381,10 @@ "message": "GPS" }, "osdGroupPIDs": { - "message": "PIDs" + "message": "RC Adjustable Values" + }, + "osdGroupPIDOutputs": { + "message": "PID controllers outputs" }, "osdGroupVTX": { "message": "VTX" @@ -2530,6 +2533,39 @@ "osdElement_WIND_SPEED_VERTICAL_HELP": { "message": "Shows estimated vertical wind speed and direction (up or down)." }, + "osdElement_LEVEL_PIDS": { + "message": "Level PIDs" + }, + "osdElement_POS_XY_PIDS": { + "message": "Position XY PIDs" + }, + "osdElement_POS_Z_PIDS": { + "message": "Position Z PIDs" + }, + "osdElement_VEL_XY_PIDS": { + "message": "Velocity XY PIDs" + }, + "osdElement_VEL_Z_PIDS": { + "message": "Velocity Z PIDs" + }, + "osdElement_FW_ALT_PID_OUTPUTS": { + "message": "FW Altitude PID controller outputs" + }, + "osdElement_FW_POS_PID_OUTPUTS": { + "message": "FW Position PID controller outputs" + }, + "osdElement_MC_VEL_X_PID_OUTPUTS": { + "message": "MC Velocity X PID controller outputs" + }, + "osdElement_MC_VEL_Y_PID_OUTPUTS": { + "message": "MC Velocity Y PID controller outputs" + }, + "osdElement_MC_VEL_Z_PID_OUTPUTS": { + "message": "MC Velocity Z PID controller outputs" + }, + "osdElement_MC_POS_XYZ_P_OUTPUTS": { + "message": "MC Position XYZ P controllers outputs" + }, "portColumnSensors": { "message": "Sensors" }, diff --git a/resources/osd/bold.mcm b/resources/osd/bold.mcm index c1e30de5..82ddb484 100644 --- a/resources/osd/bold.mcm +++ b/resources/osd/bold.mcm @@ -3,53 +3,53 @@ MAX7456 01010101
01010101
01010101
-00010001
01010101
-01010100
-10001000
01010101
-01010010
-00100010
-00010101
-01010010
-00100010
-00010101
-01010010
-00000010
-00010101
-01010010
-00010010
-00010101
-01010100
-01010100
01010101
01010101
01010101
01010101
01010101
-00000001
01010101
-01010100
-10101000
01010101
-01010010
-00000010
-00010101
-01010010
-00010010
-00010101
-00000010
-00010010
-00000001
-00100000
-10001000
-00100001
-00101010
-10101010
-10100001
-00000000
-00000000
-00000001
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
01010101
01010101
01010101
@@ -4035,53 +4035,53 @@ MAX7456 01010101
01010101
01010101
+00010001
01010101
+01010100
+10001000
01010101
+01010010
+00100010
+00010101
+01010010
+00100010
+00010101
+01010010
+00000010
+00010101
+01010010
+00010010
+00010101
+01010100
+01010100
01010101
01010101
01010101
01010101
01010101
+00000001
01010101
+01010100
+10101000
01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
+01010010
+00000010
+00010101
+01010010
+00010010
+00010101
+00000010
+00010010
+00000001
+00100000
+10001000
+00100001
+00101010
+10101010
+10100001
+00000000
+00000000
+00000001
01010101
01010101
01010101
diff --git a/resources/osd/bold/34.png b/resources/osd/bold/034.png Binary files differindex a146a468..a146a468 100644 --- a/resources/osd/bold/34.png +++ b/resources/osd/bold/034.png diff --git a/resources/osd/bold/36.png b/resources/osd/bold/036.png Binary files differindex 857d7be8..857d7be8 100644 --- a/resources/osd/bold/36.png +++ b/resources/osd/bold/036.png diff --git a/resources/osd/bold/063.png b/resources/osd/bold/063.png Binary files differnew file mode 100644 index 00000000..5fb046e2 --- /dev/null +++ b/resources/osd/bold/063.png diff --git a/resources/osd/clarity.mcm b/resources/osd/clarity.mcm index 9761a779..074f3ae1 100644 --- a/resources/osd/clarity.mcm +++ b/resources/osd/clarity.mcm @@ -3,53 +3,53 @@ MAX7456 01010101
01010101
01010101
-00010001
01010101
-01010100
-10001000
01010101
-01010010
-00100010
-00010101
-01010010
-00100010
-00010101
-01010010
-00000010
-00010101
-01010010
-00010010
-00010101
-01010100
-01010100
01010101
01010101
01010101
01010101
01010101
-00000001
01010101
-01010100
-10101000
01010101
-01010010
-00000010
-00010101
-01010010
-00010010
-00010101
-00000010
-00010010
-00000001
-00100000
-10001000
-00100001
-00101010
-10101010
-10100001
-00000000
-00000000
-00000001
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
01010101
01010101
01010101
@@ -4035,53 +4035,53 @@ MAX7456 01010101
01010101
01010101
+00010001
01010101
+01010100
+10001000
01010101
+01010010
+00100010
+00010101
+01010010
+00100010
+00010101
+01010010
+00000010
+00010101
+01010010
+00010010
+00010101
+01010100
+01010100
01010101
01010101
01010101
01010101
01010101
+00000001
01010101
+01010100
+10101000
01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
+01010010
+00000010
+00010101
+01010010
+00010010
+00010101
+00000010
+00010010
+00000001
+00100000
+10001000
+00100001
+00101010
+10101010
+10100001
+00000000
+00000000
+00000001
01010101
01010101
01010101
diff --git a/resources/osd/clarity/063.png b/resources/osd/clarity/063.png Binary files differnew file mode 100644 index 00000000..5fb046e2 --- /dev/null +++ b/resources/osd/clarity/063.png diff --git a/resources/osd/default.mcm b/resources/osd/default.mcm index f469055b..abee92cc 100644 --- a/resources/osd/default.mcm +++ b/resources/osd/default.mcm @@ -3,53 +3,53 @@ MAX7456 01010101
01010101
01010101
-00010001
01010101
-01010100
-10001000
01010101
-01010010
-00100010
-00010101
-01010010
-00100010
-00010101
-01010010
-00000010
-00010101
-01010010
-00010010
-00010101
-01010100
-01010100
01010101
01010101
01010101
01010101
01010101
-00000001
01010101
-01010100
-10101000
01010101
-01010010
-00000010
-00010101
-01010010
-00010010
-00010101
-00000010
-00010010
-00000001
-00100000
-10001000
-00100001
-00101010
-10101010
-10100001
-00000000
-00000000
-00000001
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
01010101
01010101
01010101
@@ -4035,53 +4035,53 @@ MAX7456 01010101
01010101
01010101
+00010001
01010101
+01010100
+10001000
01010101
+01010010
+00100010
+00010101
+01010010
+00100010
+00010101
+01010010
+00000010
+00010101
+01010010
+00010010
+00010101
+01010100
+01010100
01010101
01010101
01010101
01010101
01010101
+00000001
01010101
+01010100
+10101000
01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
+01010010
+00000010
+00010101
+01010010
+00010010
+00010101
+00000010
+00010010
+00000001
+00100000
+10001000
+00100001
+00101010
+10101010
+10100001
+00000000
+00000000
+00000001
01010101
01010101
01010101
diff --git a/resources/osd/default/34.png b/resources/osd/default/034.png Binary files differindex a146a468..a146a468 100644 --- a/resources/osd/default/34.png +++ b/resources/osd/default/034.png diff --git a/resources/osd/default/36.png b/resources/osd/default/036.png Binary files differindex 857d7be8..857d7be8 100644 --- a/resources/osd/default/36.png +++ b/resources/osd/default/036.png diff --git a/resources/osd/default/063.png b/resources/osd/default/063.png Binary files differnew file mode 100644 index 00000000..5fb046e2 --- /dev/null +++ b/resources/osd/default/063.png diff --git a/resources/osd/large.mcm b/resources/osd/large.mcm index 83d35e65..f04a2ee7 100644 --- a/resources/osd/large.mcm +++ b/resources/osd/large.mcm @@ -2051,53 +2051,53 @@ MAX7456 01010101
01010101
01010101
-00010001
01010101
-01010100
-10001000
01010101
-01010010
-00100010
-00010101
-01010010
-00100010
-00010101
-01010010
-00000010
-00010101
-01010010
-00010010
-00010101
-01010100
-01010100
01010101
01010101
01010101
01010101
01010101
-00000001
01010101
-01010100
-10101000
01010101
-01010010
-00000010
-00010101
-01010010
-00010010
-00010101
-00000010
-00010010
-00000001
-00100000
-10001000
-00100001
-00101010
-10101010
-10100001
-00000000
-00000000
-00000001
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
01010101
01010101
01010101
@@ -4035,53 +4035,53 @@ MAX7456 01010101
01010101
01010101
+00010001
01010101
+01010100
+10001000
01010101
+01010010
+00100010
+00010101
+01010010
+00100010
+00010101
+01010010
+00000010
+00010101
+01010010
+00010010
+00010101
+01010100
+01010100
01010101
01010101
01010101
01010101
01010101
+00000001
01010101
+01010100
+10101000
01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
+01010010
+00000010
+00010101
+01010010
+00010010
+00010101
+00000010
+00010010
+00000001
+00100000
+10001000
+00100001
+00101010
+10101010
+10100001
+00000000
+00000000
+00000001
01010101
01010101
01010101
diff --git a/resources/osd/large/34.png b/resources/osd/large/034.png Binary files differindex a146a468..a146a468 100644 --- a/resources/osd/large/34.png +++ b/resources/osd/large/034.png diff --git a/resources/osd/large/36.png b/resources/osd/large/036.png Binary files differindex 857d7be8..857d7be8 100644 --- a/resources/osd/large/36.png +++ b/resources/osd/large/036.png diff --git a/resources/osd/large/063.png b/resources/osd/large/063.png Binary files differnew file mode 100644 index 00000000..5fb046e2 --- /dev/null +++ b/resources/osd/large/063.png diff --git a/tabs/osd.js b/tabs/osd.js index 4c5f2a95..a2a1cbcc 100644 --- a/tabs/osd.js +++ b/tabs/osd.js @@ -2,6 +2,7 @@ 'use strict'; var SYM = SYM || {}; +SYM.MILLIOHM = 0x00; SYM.VOLT = 0x90; SYM.RSSI = 0x01; SYM.AH_RIGHT = 0x02; @@ -46,7 +47,7 @@ SYM.MI = 187; SYM.HOME = 191; SYM.TRIP_DIST = 0x22; SYM.HEADING1 = 0xA9; -SYM.HEADING2 = 0xA8; +SYM.DEGREES = 0xA8; SYM.HEADING_N = 24; SYM.HEADING_E = 26; SYM.HEADING_W = 27; @@ -443,7 +444,7 @@ OSD.constants = { }, { name: 'SAG_COMP_MAIN_BATT_VOLTAGE', - id: 49, + id: 76, min_version: '2.0.0', preview: FONT.symbol(SYM.VOLT) + FONT.embed_dot('16.8V') }, @@ -455,11 +456,17 @@ OSD.constants = { }, { name: 'SAG_COMP_MAIN_BATT_CELL_VOLTAGE', - id: 50, + id: 77, min_version: '2.0.0', preview: FONT.symbol(SYM.VOLT) + FONT.embed_dot('4.18V') }, { + name: 'POWER_SUPPLY_IMPEDANCE', + id: 78, + min_version: '2.0.0', + preview: ' 23' + FONT.symbol(SYM.MILLIOHM) + }, + { name: 'MAIN_BATT_REMAINING_PERCENTAGE', id: 38, min_version: '1.8.1', @@ -467,13 +474,13 @@ OSD.constants = { }, { name: 'REMAINING_FLIGHT_TIME', - id: 51, + id: 48, min_version: '2.0.0', preview: FONT.symbol(SYM.FLY_M) + '10:35' }, { name: 'REMAINING_FLIGHT_DISTANCE', - id: 52, + id: 49, min_version: '2.0.0', preview: function(osd_data) { if (OSD.data.preferences.units === 0) { @@ -514,7 +521,7 @@ OSD.constants = { name: 'HEADING', id: 24, min_version: '1.6.0', - preview: FONT.symbol(SYM.HEADING1) + '175' + FONT.symbol(SYM.HEADING2) + preview: FONT.symbol(SYM.HEADING1) + '175' + FONT.symbol(SYM.DEGREES) }, { name: 'HEADING_GRAPH', @@ -741,6 +748,12 @@ OSD.constants = { preview: FONT.symbol(SYM.DIR_TO_HOME) }, { + name: 'HOME_HEADING_ERROR', + id: 50, + min_version: '2.0.0', + preview: FONT.symbol(SYM.HOME) + FONT.symbol(SYM.HEADING) + ' -10' + FONT.symbol(SYM.DEGREES) + }, + { name: 'DISTANCE_TO_HOME', id: 23, min_version: '1.6.0', @@ -772,7 +785,7 @@ OSD.constants = { }, { name: 'WIND_SPEED_HORIZONTAL', - id: 47, + id: 46, min_version: '2.0.0', preview: function(osd_data) { // 6 chars @@ -788,7 +801,7 @@ OSD.constants = { }, { name: 'WIND_SPEED_VERTICAL', - id: 48, + id: 47, min_version: '2.0.0', preview: function(osd_data) { // 6 chars @@ -802,6 +815,18 @@ OSD.constants = { return p; } }, + { + name: 'CRUISE_HEADING_ERROR', + id: 51, + min_version: '2.0.0', + preview: FONT.symbol(SYM.HEADING) + ' 5' + FONT.symbol(SYM.DEGREES) + }, + { + name: 'CRUISE_HEADING_ADJUSTMENT', + id: 52, + min_version: '2.0.0', + preview: FONT.symbol(SYM.HEADING) + ' -90' + FONT.symbol(SYM.DEGREES) + }, ] }, { @@ -863,6 +888,174 @@ OSD.constants = { id: 18, preview: 'YAW 85 45 0' }, + { + name: 'LEVEL_PIDS', + id: 56, + min_version: '2.0.0', + preview: 'LEV 20 15 80' + }, + { + name: 'POS_XY_PIDS', + id: 57, + min_version: '2.0.0', + preview: 'PXY 20 15 80' + }, + { + name: 'POS_Z_PIDS', + id: 58, + min_version: '2.0.0', + preview: 'PZ 20 15 80' + }, + { + name: 'VEL_XY_PIDS', + id: 59, + min_version: '2.0.0', + preview: 'VXY 20 15 80' + }, + { + name: 'VEL_Z_PIDS', + id: 60, + min_version: '2.0.0', + preview: 'VZ 20 15 80' + }, + { + name: 'HEADING_P', + id: 61, + min_version: '2.0.0', + preview: 'HP 20' + }, + { + name: 'BOARD_ALIGNMENT_ROLL', + id: 62, + min_version: '2.0.0', + preview: 'AR 0' + }, + { + name: 'BOARD_ALIGNMENT_PITCH', + id: 63, + min_version: '2.0.0', + preview: 'AP ' + FONT.embed_dot('1.0') + }, + { + name: 'THROTTLE_EXPO', + id: 66, + min_version: '2.0.0', + preview: 'TEX 0' + }, + { + name: 'STABILIZED_RC_EXPO', + id: 64, + min_version: '2.0.0', + preview: 'EXP 20' + }, + { + name: 'STABILIZED_RC_YAW_EXPO', + id: 65, + min_version: '2.0.0', + preview: 'YEX 20' + }, + { + name: 'STABILIZED_PITCH_RATE', + id: 67, + min_version: '2.0.0', + preview: 'SPR 20' + }, + { + name: 'STABILIZED_ROLL_RATE', + id: 68, + min_version: '2.0.0', + preview: 'SRR 20' + }, + { + name: 'STABILIZED_YAW_RATE', + id: 69, + min_version: '2.0.0', + preview: 'SYR 20' + }, + { + name: 'MANUAL_RC_EXPO', + id: 70, + min_version: '2.0.0', + preview: 'MEX 20' + }, + { + name: 'MANUAL_RC_YAW_EXPO', + id: 71, + min_version: '2.0.0', + preview: 'MYX 20' + }, + { + name: 'MANUAL_PITCH_RATE', + id: 72, + min_version: '2.0.0', + preview: 'MPR 20' + }, + { + name: 'MANUAL_ROLL_RATE', + id: 73, + min_version: '2.0.0', + preview: 'MRR 20' + }, + { + name: 'MANUAL_YAW_RATE', + id: 74, + min_version: '2.0.0', + preview: 'MYR 20' + }, + { + name: 'NAV_FW_CRUISE_THROTTLE', + id: 75, + min_version: '2.0.0', + preview: 'CRS 1500' + }, + { + name: 'NAV_FW_PITCH_TO_THROTTLE', + id: 76, + min_version: '2.0.0', + preview: 'P2T 10' + }, + { + name: 'FW_MIN_THROTTLE_DOWN_PITCH_ANGLE', + id: 77, + min_version: '2.0.0', + preview: '0TP ' + FONT.embed_dot('4.5') + }, + ] + }, + { + name: 'osdGroupPIDOutputs', + min_version: '2.0.0', + items: [ + { + name: 'FW_ALT_PID_OUTPUTS', + id: 79, + preview: 'PZO ' + FONT.embed_dot(' 1.2') + ' ' + FONT.embed_dot(' 0.1') + ' ' + FONT.embed_dot(' 0.0') + ' ' + FONT.embed_dot(' 1.3') + }, + { + name: 'FW_POS_PID_OUTPUTS', + id: 80, + preview: 'PXYO ' + FONT.embed_dot(' 1.2') + ' ' + FONT.embed_dot(' 0.1') + ' ' + FONT.embed_dot(' 0.0') + ' ' + FONT.embed_dot(' 1.3') + }, + { + name: 'MC_VEL_X_PID_OUTPUTS', + id: 81, + preview: 'VXO ' + FONT.embed_dot(' 1.2') + ' ' + FONT.embed_dot(' 0.1') + ' ' + FONT.embed_dot(' 0.0') + ' ' + FONT.embed_dot(' 1.3') + }, + { + name: 'MC_VEL_Y_PID_OUTPUTS', + id: 82, + preview: 'VYO ' + FONT.embed_dot(' 1.2') + ' ' + FONT.embed_dot(' 0.1') + ' ' + FONT.embed_dot(' 0.0') + ' ' + FONT.embed_dot(' 1.3') + }, + { + name: 'MC_VEL_Z_PID_OUTPUTS', + id: 83, + preview: 'VZO ' + FONT.embed_dot(' 1.2') + ' ' + FONT.embed_dot(' 0.1') + ' ' + FONT.embed_dot(' 0.0') + ' ' + FONT.embed_dot(' 1.3') + }, + { + name: 'MC_POS_XYZ_P_OUTPUTS', + id: 84, + preview: 'POSO ' + FONT.embed_dot(' 1.2') + ' ' + FONT.embed_dot(' 0.1') + ' ' + FONT.embed_dot(' 0.0') + }, ] } ] |