Bring the configurator up to dat with firmware OSD features

Add:
- blackbox numer stat
- ESC temperature element
- ESC RPM element
- missing tooltip descriptions
10.3.x-maintenance
Dan Nixon 2017-06-25 10:07:44 +01:00
parent 25a0db0f6c
commit 157e6bb68c
2 changed files with 69 additions and 14 deletions

View File

@ -2281,6 +2281,30 @@
"osdDescElementArmedTime": {
"message": "Time since the craft was last armed"
},
"osdDescElementWarnings": {
"message": "Alerts (e.g. low battery) and warnings for potential problems (e.g. critically low battery), and visual beeper."
},
"osdDescElementEscTemperature": {
"message": "Temperature reported by ESC telemetry"
},
"osdDescElementEscRpm": {
"message": "RPM reported by ESC telemetry"
},
"osdDescElementHomeDirection": {
"message": "Arrow showing direction to home position"
},
"osdDescElementHomeDistance": {
"message": "Distance to home position (in either feet or metre based on unit system setting)"
},
"osdDescElementNumericalHeading": {
"message": "Numerical readout of current heading in degrees"
},
"osdDescElementNumericalVario": {
"message": "Numerical readout of vertical speed (in either feet or metre based on unit system setting)"
},
"osdDescElementCompassBar": {
"message": "Graphical compass bar showing current heading"
},
"osdDescStatMaxSpeed": {
"message": "Maximum recorded speed"
@ -2312,8 +2336,11 @@
"osdDescStatArmedTime": {
"message": "Time since craft was last armed"
},
"osdDescElementWarnings": {
"message": "Alerts (e.g. low battery) and warnings for potential problems (e.g. critically low battery), and visual beeper."
"osdDescStatMaxDistance": {
"message": "Maximum distance from home location"
},
"osdDescStatBlackboxLogNumber": {
"message": "Log number for this flights Blackbox log"
},
"mainHelpArmed": {

View File

@ -35,6 +35,7 @@ SYM.HEADING_N=0x18;
SYM.HEADING_S=0x19;
SYM.HEADING_E=0x1A;
SYM.HEADING_W=0x1B;
SYM.TEMP_C = 0x0E;
var FONT = FONT || {};
@ -496,12 +497,14 @@ OSD.constants = {
},
HOME_DIR: {
name: 'HOME_DIRECTION',
desc: 'osdDescElementHomeDirection',
default_position: -1,
positionable: true,
preview: FONT.symbol(SYM.ARROW_SOUTH + 2)
},
HOME_DIST: {
name: 'HOME_DISTANCE',
desc: 'osdDescElementHomeDistance',
default_position: -1,
positionable: true,
preview: function(osd_data) {
@ -510,25 +513,28 @@ OSD.constants = {
},
NUMERICAL_HEADING: {
name: 'NUMERICAL_HEADING',
desc: 'osdDescElementNumericalHeading',
default_position: -1,
positionable: true,
preview: FONT.symbol(SYM.ARROW_EAST) + '90'
},
NUMERICAL_VARIO: {
name: 'NUMERICAL_VARIO',
desc: 'osdDescElementNumericalVario',
default_position: -1,
positionable: true,
preview: FONT.symbol(SYM.ARROW_NORTH) + '8.7'
},
COMPASS_BAR: {
name: 'COMPASS_BAR',
default_position: -1,
positionable: true,
preview: function(osd_data) {
return FONT.symbol(SYM.HEADING_W) + FONT.symbol(SYM.HEADING_LINE) + FONT.symbol(SYM.HEADING_DIVIDED_LINE) +
FONT.symbol(SYM.HEADING_LINE) + FONT.symbol(SYM.HEADING_N) + FONT.symbol(SYM.HEADING_LINE) +
FONT.symbol(SYM.HEADING_DIVIDED_LINE) + FONT.symbol(SYM.HEADING_LINE) + FONT.symbol(SYM.HEADING_E)
}
name: 'COMPASS_BAR',
desc: 'osdDescElementCompassBar',
default_position: -1,
positionable: true,
preview: function(osd_data) {
return FONT.symbol(SYM.HEADING_W) + FONT.symbol(SYM.HEADING_LINE) + FONT.symbol(SYM.HEADING_DIVIDED_LINE) +
FONT.symbol(SYM.HEADING_LINE) + FONT.symbol(SYM.HEADING_N) + FONT.symbol(SYM.HEADING_LINE) +
FONT.symbol(SYM.HEADING_DIVIDED_LINE) + FONT.symbol(SYM.HEADING_LINE) + FONT.symbol(SYM.HEADING_E)
}
},
WARNINGS: {
name: 'WARNINGS',
@ -536,7 +542,21 @@ OSD.constants = {
default_position: -1,
positionable: true,
preview: 'LOW VOLTAGE'
}
},
ESC_TEMPERATURE: {
name: 'ESC_TEMPERATURE',
desc: 'osdDescElementEscTemperature',
default_position: -1,
positionable: true,
preview: FONT.symbol(SYM.TEMP_C) + '45'
},
ESC_RPM: {
name: 'ESC_RPM',
desc: 'osdDescElementEscRpm',
default_position: -1,
positionable: true,
preview: '226000'
}
},
ALL_STATISTIC_FIELDS: {
MAX_SPEED: {
@ -580,7 +600,12 @@ OSD.constants = {
desc: 'osdDescStatArmedTime'
},
MAX_DISTANCE: {
name: 'MAX_DISTANCE'
name: 'MAX_DISTANCE',
desc: 'osdDescStatMaxDistance'
},
BLACKBOX_LOG_NUMBER: {
name: 'BLACKBOX_LOG_NUMBER',
desc: 'osdDescStatBlackboxLogNumber'
}
}
};
@ -641,7 +666,9 @@ OSD.chooseFields = function () {
F.HOME_DIST,
F.NUMERICAL_HEADING,
F.NUMERICAL_VARIO,
F.COMPASS_BAR
F.COMPASS_BAR,
F.ESC_TEMPERATURE,
F.ESC_RPM
]);
}
}
@ -684,7 +711,8 @@ OSD.chooseFields = function () {
F.END_BATTERY,
F.FLYTIME,
F.ARMEDTIME,
F.MAX_DISTANCE
F.MAX_DISTANCE,
F.BLACKBOX_LOG_NUMBER
];
};