Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-20 23:05:13 +03:00
Code Wiki Activity

Lot of fixes to make OSD render more similar to real layout

Browse source
This commit is contained in:
Marcin Baliniak 2017-07-13 23:37:17 +02:00
parent e113e5db94
commit 03d725cf07
2 changed files with 58 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

40
build/script.js
View file

@ -19384,7 +19384,7 @@ TABS.onboard_logging.cleanup = function (callback) {
'use strict'; 'use strict';
var SYM = SYM || {}; var SYM = SYM || {};
SYM.VOLT = 0x06; SYM.VOLT = 0x90;
SYM.RSSI = 0x01; SYM.RSSI = 0x01;
SYM.AH_RIGHT = 0x02; SYM.AH_RIGHT = 0x02;
SYM.AH_LEFT = 0x03; SYM.AH_LEFT = 0x03;
@ -19402,7 +19402,17 @@ SYM.AMP = 0x9A;
SYM.MAH = 0x07; SYM.MAH = 0x07;
SYM.METRE = 0xC; SYM.METRE = 0xC;
SYM.FEET = 0xF; SYM.FEET = 0xF;
SYM.GPS_SAT = 0x1F; SYM.GPS_SAT1 = 0x1E;
SYM.GPS_SAT2 = 0x1F;
SYM.GPS_SPEED = 0xA1;
SYM.ALT = 0xAA;
SYM.LAT = 0xA6;
SYM.LON = 0xA7;
SYM.DIR_TO_HOME = 0x60;
SYM.DIST_TO_HOME = 0xA0;
SYM.HEADING1 = 0xA9;
SYM.HEADING2 = 0xA8;
SYM.VARIO = 0x9F;
var FONT = FONT || {}; var FONT = FONT || {};
@ -19640,7 +19650,7 @@ OSD.constants = {
name: 'MAIN_BATT_VOLTAGE', name: 'MAIN_BATT_VOLTAGE',
default_position: -29, default_position: -29,
positionable: true, positionable: true,
preview: FONT.symbol(SYM.VOLT) + '16.8' preview: FONT.symbol(SYM.VOLT) + '16.8V'
}, },
RSSI_VALUE: { RSSI_VALUE: {
name: 'RSSI_VALUE', name: 'RSSI_VALUE',
@ -19728,7 +19738,7 @@ OSD.constants = {
default_position: 62, default_position: 62,
positionable: true, positionable: true,
preview: function (osd_data) { preview: function (osd_data) {
return '399.7' + FONT.symbol(osd_data.unit_mode === 0 ? SYM.FEET : SYM.METRE) return FONT.symbol(SYM.ALT) + '399.7' + FONT.symbol(osd_data.unit_mode === 0 ? SYM.FEET : SYM.METRE)
} }
}, },
ONTIME: { ONTIME: {
@ -19753,13 +19763,13 @@ OSD.constants = {
name: 'GPS_SPEED', name: 'GPS_SPEED',
default_position: -1, default_position: -1,
positionable: true, positionable: true,
preview: '40' preview: '40' + FONT.symbol(SYM.GPS_SPEED)
}, },
GPS_SATS: { GPS_SATS: {
name: 'GPS_SATS', name: 'GPS_SATS',
default_position: -1, default_position: -1,
positionable: true, positionable: true,
preview: FONT.symbol(SYM.GPS_SAT) + '14' preview: FONT.symbol(SYM.GPS_SAT1) + FONT.symbol(SYM.GPS_SAT2) + '14'
}, },
ROLL_PIDS: { ROLL_PIDS: {
name: 'ROLL_PIDS', name: 'ROLL_PIDS',
@ -19789,31 +19799,31 @@ OSD.constants = {
name: 'LONGITUDE', name: 'LONGITUDE',
default_position: -1, default_position: -1,
positionable: true, positionable: true,
preview: '14.7652' preview: FONT.symbol(SYM.LON) + '14.76521'
}, },
GPS_LAT: { GPS_LAT: {
name: 'LATITUDE', name: 'LATITUDE',
default_position: -1, default_position: -1,
positionable: true, positionable: true,
preview: '52.9872' preview: FONT.symbol(SYM.LAT) + '52.98723'
}, },
HOME_DIR: { HOME_DIR: {
name: 'DIRECTION_TO_HOME', name: 'DIRECTION_TO_HOME',
default_position: -1, default_position: -1,
positionable: true, positionable: true,
preview: '165' preview: FONT.symbol(SYM.DIR_TO_HOME)
}, },
HOME_DIST: { HOME_DIST: {
name: 'DISTANCE_TO_HOME', name: 'DISTANCE_TO_HOME',
default_position: -1, default_position: -1,
positionable: true, positionable: true,
preview: '300m' preview: FONT.symbol(SYM.DIST_TO_HOME) + '300' + FONT.symbol(SYM.METRE)
}, },
HEADING: { HEADING: {
name: 'HEADING', name: 'HEADING',
default_position: -1, default_position: -1,
positionable: true, positionable: true,
preview: '175' preview: FONT.symbol(SYM.HEADING1) + '175' + FONT.symbol(SYM.HEADING2)
}, },
VARIO: { VARIO: {
name: 'VARIO', name: 'VARIO',
@ -19825,7 +19835,7 @@ OSD.constants = {
name: 'VARIO_NUM', name: 'VARIO_NUM',
default_position: -1, default_position: -1,
positionable: true, positionable: true,
preview: '2' preview: '-0.5' + FONT.symbol(SYM.VARIO)
} }
} }
}; };
@ -19867,6 +19877,10 @@ OSD.chooseFields = function () {
OSD.constants.DISPLAY_FIELDS.push(F.VARIO_NUM); OSD.constants.DISPLAY_FIELDS.push(F.VARIO_NUM);
} }
if (semver.gte(CONFIG.flightControllerVersion, "1.7.2")) {
OSD.constants.DISPLAY_FIELDS.push(F.CRAFT_NAME);
}
}; };
OSD.updateDisplaySize = function () { OSD.updateDisplaySize = function () {
@ -20215,7 +20229,7 @@ TABS.osd.initialize = function (callback) {
} }
field.preview_img.src = canvas.toDataURL('image/png'); field.preview_img.src = canvas.toDataURL('image/png');
} }
var centerishPosition = 194; var centerishPosition = 225;
// artificial horizon // artificial horizon
if ($('input[name="ARTIFICIAL_HORIZON"]').prop('checked')) { if ($('input[name="ARTIFICIAL_HORIZON"]').prop('checked')) {

40
tabs/osd.js
View file

@ -2,7 +2,7 @@
'use strict'; 'use strict';
var SYM = SYM || {}; var SYM = SYM || {};
SYM.VOLT = 0x06; SYM.VOLT = 0x90;
SYM.RSSI = 0x01; SYM.RSSI = 0x01;
SYM.AH_RIGHT = 0x02; SYM.AH_RIGHT = 0x02;
SYM.AH_LEFT = 0x03; SYM.AH_LEFT = 0x03;
@ -20,7 +20,17 @@ SYM.AMP = 0x9A;
SYM.MAH = 0x07; SYM.MAH = 0x07;
SYM.METRE = 0xC; SYM.METRE = 0xC;
SYM.FEET = 0xF; SYM.FEET = 0xF;
SYM.GPS_SAT = 0x1F; SYM.GPS_SAT1 = 0x1E;
SYM.GPS_SAT2 = 0x1F;
SYM.GPS_SPEED = 0xA1;
SYM.ALT = 0xAA;
SYM.LAT = 0xA6;
SYM.LON = 0xA7;
SYM.DIR_TO_HOME = 0x60;
SYM.DIST_TO_HOME = 0xA0;
SYM.HEADING1 = 0xA9;
SYM.HEADING2 = 0xA8;
SYM.VARIO = 0x9F;
var FONT = FONT || {}; var FONT = FONT || {};
@ -258,7 +268,7 @@ OSD.constants = {
name: 'MAIN_BATT_VOLTAGE', name: 'MAIN_BATT_VOLTAGE',
default_position: -29, default_position: -29,
positionable: true, positionable: true,
preview: FONT.symbol(SYM.VOLT) + '16.8' preview: FONT.symbol(SYM.VOLT) + '16.8V'
}, },
RSSI_VALUE: { RSSI_VALUE: {
name: 'RSSI_VALUE', name: 'RSSI_VALUE',
@ -346,7 +356,7 @@ OSD.constants = {
default_position: 62, default_position: 62,
positionable: true, positionable: true,
preview: function (osd_data) { preview: function (osd_data) {
return '399.7' + FONT.symbol(osd_data.unit_mode === 0 ? SYM.FEET : SYM.METRE) return FONT.symbol(SYM.ALT) + '399.7' + FONT.symbol(osd_data.unit_mode === 0 ? SYM.FEET : SYM.METRE)
} }
}, },
ONTIME: { ONTIME: {
@ -371,13 +381,13 @@ OSD.constants = {
name: 'GPS_SPEED', name: 'GPS_SPEED',
default_position: -1, default_position: -1,
positionable: true, positionable: true,
preview: '40' preview: '40' + FONT.symbol(SYM.GPS_SPEED)
}, },
GPS_SATS: { GPS_SATS: {
name: 'GPS_SATS', name: 'GPS_SATS',
default_position: -1, default_position: -1,
positionable: true, positionable: true,
preview: FONT.symbol(SYM.GPS_SAT) + '14' preview: FONT.symbol(SYM.GPS_SAT1) + FONT.symbol(SYM.GPS_SAT2) + '14'
}, },
ROLL_PIDS: { ROLL_PIDS: {
name: 'ROLL_PIDS', name: 'ROLL_PIDS',
@ -407,31 +417,31 @@ OSD.constants = {
name: 'LONGITUDE', name: 'LONGITUDE',
default_position: -1, default_position: -1,
positionable: true, positionable: true,
preview: '14.7652' preview: FONT.symbol(SYM.LON) + '14.76521'
}, },
GPS_LAT: { GPS_LAT: {
name: 'LATITUDE', name: 'LATITUDE',
default_position: -1, default_position: -1,
positionable: true, positionable: true,
preview: '52.9872' preview: FONT.symbol(SYM.LAT) + '52.98723'
}, },
HOME_DIR: { HOME_DIR: {
name: 'DIRECTION_TO_HOME', name: 'DIRECTION_TO_HOME',
default_position: -1, default_position: -1,
positionable: true, positionable: true,
preview: '165' preview: FONT.symbol(SYM.DIR_TO_HOME)
}, },
HOME_DIST: { HOME_DIST: {
name: 'DISTANCE_TO_HOME', name: 'DISTANCE_TO_HOME',
default_position: -1, default_position: -1,
positionable: true, positionable: true,
preview: '300m' preview: FONT.symbol(SYM.DIST_TO_HOME) + '300' + FONT.symbol(SYM.METRE)
}, },
HEADING: { HEADING: {
name: 'HEADING', name: 'HEADING',
default_position: -1, default_position: -1,
positionable: true, positionable: true,
preview: '175' preview: FONT.symbol(SYM.HEADING1) + '175' + FONT.symbol(SYM.HEADING2)
}, },
VARIO: { VARIO: {
name: 'VARIO', name: 'VARIO',
@ -443,7 +453,7 @@ OSD.constants = {
name: 'VARIO_NUM', name: 'VARIO_NUM',
default_position: -1, default_position: -1,
positionable: true, positionable: true,
preview: '2' preview: '-0.5' + FONT.symbol(SYM.VARIO)
} }
} }
}; };
@ -485,6 +495,10 @@ OSD.chooseFields = function () {
OSD.constants.DISPLAY_FIELDS.push(F.VARIO_NUM); OSD.constants.DISPLAY_FIELDS.push(F.VARIO_NUM);
} }
if (semver.gte(CONFIG.flightControllerVersion, "1.7.2")) {
OSD.constants.DISPLAY_FIELDS.push(F.CRAFT_NAME);
}
}; };
OSD.updateDisplaySize = function () { OSD.updateDisplaySize = function () {
@ -833,7 +847,7 @@ TABS.osd.initialize = function (callback) {
} }
field.preview_img.src = canvas.toDataURL('image/png'); field.preview_img.src = canvas.toDataURL('image/png');
} }
var centerishPosition = 194; var centerishPosition = 225;
// artificial horizon // artificial horizon
if ($('input[name="ARTIFICIAL_HORIZON"]').prop('checked')) { if ($('input[name="ARTIFICIAL_HORIZON"]').prop('checked')) {