From 7dd52304b5cb833f58ec0ed05bab53d96aec0aac Mon Sep 17 00:00:00 2001 From: Miguel Angel Mulero Martinez Date: Mon, 20 May 2019 12:57:11 +0200 Subject: [PATCH] Reorder OSD elements priority --- src/js/tabs/osd.js | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/js/tabs/osd.js b/src/js/tabs/osd.js index 30253261..2dd5d587 100644 --- a/src/js/tabs/osd.js +++ b/src/js/tabs/osd.js @@ -625,7 +625,7 @@ OSD.constants = { name: 'GPS_SPEED', desc: 'osdDescElementGPSSpeed', default_position: -1, - draw_order: 430, + draw_order: 810, positionable: true, preview: function (osd_data) { return ' 40' + (osd_data.unit_mode === 0 ? FONT.symbol(SYM.MPH) : FONT.symbol(SYM.KPH)); @@ -635,7 +635,7 @@ OSD.constants = { name: 'GPS_SATS', desc: 'osdDescElementGPSSats', default_position: -1, - draw_order: 420, + draw_order: 800, positionable: true, preview: FONT.symbol(SYM.GPS_SAT_L) + FONT.symbol(SYM.GPS_SAT_R) + '14' }, @@ -643,7 +643,7 @@ OSD.constants = { name: 'GPS_LON', desc: 'osdDescElementGPSLon', default_position: -1, - draw_order: 450, + draw_order: 830, positionable: true, preview: FONT.symbol(SYM.GPS_LON) + '-000.0000000' }, @@ -651,7 +651,7 @@ OSD.constants = { name: 'GPS_LAT', desc: 'osdDescElementGPSLat', default_position: -1, - draw_order: 440, + draw_order: 820, positionable: true, preview: FONT.symbol(SYM.GPS_LAT) + '-00.0000000 ' }, @@ -755,7 +755,7 @@ OSD.constants = { name: 'HOME_DIRECTION', desc: 'osdDescElementHomeDirection', default_position: -1, - draw_order: 470, + draw_order: 850, positionable: true, preview: FONT.symbol(SYM.ARROW_SOUTH + 2) }, @@ -763,7 +763,7 @@ OSD.constants = { name: 'HOME_DISTANCE', desc: 'osdDescElementHomeDistance', default_position: -1, - draw_order: 460, + draw_order: 840, positionable: true, preview: function (osd_data) { return FONT.symbol(SYM.HOMEFLAG) + '43' + FONT.symbol(osd_data.unit_mode === 0 ? SYM.FEET : SYM.METRE) + (semver.gte(CONFIG.apiVersion, "1.37.0") ? ' ' : ''); @@ -809,7 +809,7 @@ OSD.constants = { name: 'ESC_TEMPERATURE', desc: 'osdDescElementEscTemperature', default_position: -1, - draw_order: 480, + draw_order: 900, positionable: true, preview: function (osd_data) { return "E" + OSD.generateTemperaturePreview(osd_data, 45); @@ -819,7 +819,7 @@ OSD.constants = { name: 'ESC_RPM', desc: 'osdDescElementEscRpm', default_position: -1, - draw_order: 490, + draw_order: 1000, positionable: true, preview: [ "22600", "22600", "22600", "22600"] }, @@ -835,7 +835,7 @@ OSD.constants = { name: 'RTC_DATE_TIME', desc: 'osdDescElementRtcDateTime', default_position: -1, - draw_order: 500, + draw_order: 360, positionable: true, preview: '2017-11-11 16:20:00' }, @@ -843,7 +843,7 @@ OSD.constants = { name: 'ADJUSTMENT_RANGE', desc: 'osdDescElementAdjustmentRange', default_position: -1, - draw_order: 510, + draw_order: 370, positionable: true, preview: 'PITCH/ROLL P: 42' }, @@ -871,7 +871,7 @@ OSD.constants = { name: 'CORE_TEMPERATURE', desc: 'osdDescElementCoreTemperature', default_position: -1, - draw_order: 520, + draw_order: 380, positionable: true, preview: function (osd_data) { return "C" + OSD.generateTemperaturePreview(osd_data, 33); @@ -897,7 +897,7 @@ OSD.constants = { name: 'MOTOR_DIAGNOSTICS', desc: 'osdDescElementMotorDiag', default_position: -1, - draw_order: 325, + draw_order: 335, positionable: true, preview: FONT.symbol(0x84) + FONT.symbol(0x85) @@ -924,7 +924,7 @@ OSD.constants = { name: 'LINK_QUALITY', desc: 'osdDescElementLinkQuality', default_position: -1, - draw_order: 350, + draw_order: 390, positionable: true, preview: '8' }, @@ -932,7 +932,7 @@ OSD.constants = { name: 'FLIGHT_DISTANCE', desc: 'osdDescElementFlightDist', default_position: -1, - draw_order: 360, + draw_order: 860, positionable: true, preview: function (osd_data) { return '653' + FONT.symbol(osd_data.unit_mode === 0 ? SYM.FEET : SYM.METRE); @@ -942,7 +942,7 @@ OSD.constants = { name: 'STICK_OVERLAY_LEFT', desc: 'osdDescElementStickOverlayLeft', default_position: -1, - draw_order: 370, + draw_order: 400, positionable: true, preview: OSD.drawStickOverlayPreview }, @@ -950,7 +950,7 @@ OSD.constants = { name: 'STICK_OVERLAY_RIGHT', desc: 'osdDescElementStickOverlayRight', default_position: -1, - draw_order: 370, + draw_order: 410, positionable: true, preview: OSD.drawStickOverlayPreview }, @@ -958,7 +958,7 @@ OSD.constants = { name: 'DISPLAY_NAME', desc: 'osdDescElementDisplayName', default_position: -77, - draw_order: 380, + draw_order: 350, positionable: true, preview: function(osd_data) { return OSD.generateDisplayName(osd_data, 1); @@ -968,7 +968,7 @@ OSD.constants = { name: 'ESC_RPM_FREQ', desc: 'osdDescElementEscRpmFreq', default_position: -1, - draw_order: 390, + draw_order: 1010, positionable: true, preview: [ "22600", "22600", "22600", "22600"] },