Merge pull request #722 from mikeller/added_new_osd_elements

Added new OSD elements for RTC time and adjustment range.
10.3.x-maintenance
Michael Keller 2017-11-12 11:32:27 +13:00 committed by GitHub
commit bf6b51ca83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 6 deletions

View File

@ -2493,6 +2493,12 @@
"osdDescElementEscRpm": {
"message": "RPM reported by ESC telemetry"
},
"osdDescElementRtcDateTime": {
"message": "Real time clock date / time"
},
"osdDescElementAdjustmentRange": {
"message": "Currently active adjustment range setting and value"
},
"osdDescElementHomeDirection": {
"message": "Arrow showing direction to home position"
},

View File

@ -600,12 +600,26 @@ OSD.constants = {
preview: FONT.symbol(SYM.TEMP_C) + '45'
},
ESC_RPM: {
name: 'ESC_RPM',
desc: 'osdDescElementEscRpm',
default_position: -1,
positionable: true,
preview: '226000'
},
name: 'ESC_RPM',
desc: 'osdDescElementEscRpm',
default_position: -1,
positionable: true,
preview: '226000'
},
RTC_DATE_TIME: {
name: 'RTC_DATE_TIME',
desc: 'osdDescElementRtcDateTime',
default_position: -1,
positionable: true,
preview: '2017-11-11 16:20:00'
},
ADJUSTMENT_RANGE: {
name: 'ADJUSTMENT_RANGE',
desc: 'osdDescElementAdjustmentRange',
default_position: -1,
positionable: true,
preview: 'PITCH/ROLL P: 42'
},
TIMER_1: {
name: 'TIMER_1',
desc: 'osdDescElementTimer1',
@ -792,6 +806,12 @@ OSD.chooseFields = function () {
F.ESC_TEMPERATURE,
F.ESC_RPM
]);
if (semver.gte(CONFIG.apiVersion, "1.37.0")) {
OSD.constants.DISPLAY_FIELDS = OSD.constants.DISPLAY_FIELDS.concat([
F.RTC_DATE_TIME,
F.ADJUSTMENT_RANGE
]);
}
}
}
}