Skip to content

Commit ddde159

Browse files
authored
Merge pull request #728 from JyeSmith/OSD_REMAINING_TIME_ESTIMATE
Added OSD_REMAINING_TIME_ESTIMATE to OSD
2 parents a791255 + e796838 commit ddde159

File tree

2 files changed

+25
-14
lines changed

2 files changed

+25
-14
lines changed

_locales/en/messages.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2520,6 +2520,9 @@
25202520
"osdDescElementTimer2" : {
25212521
"message": "Shows the value of timer 2"
25222522
},
2523+
"osdDescElementRemaningTimeEstimate" : {
2524+
"message": "Estimate of flight time remaning"
2525+
},
25232526
"osdDescElementUnknown" : {
25242527
"message": "Unknown element (details to be added in a future release)"
25252528
},

tabs/osd.js

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -606,20 +606,27 @@ OSD.constants = {
606606
positionable: true,
607607
preview: '226000'
608608
},
609-
RTC_DATE_TIME: {
610-
name: 'RTC_DATE_TIME',
611-
desc: 'osdDescElementRtcDateTime',
612-
default_position: -1,
613-
positionable: true,
614-
preview: '2017-11-11 16:20:00'
615-
},
616-
ADJUSTMENT_RANGE: {
617-
name: 'ADJUSTMENT_RANGE',
618-
desc: 'osdDescElementAdjustmentRange',
619-
default_position: -1,
620-
positionable: true,
621-
preview: 'PITCH/ROLL P: 42'
622-
},
609+
REMAINING_TIME_ESTIMATE: {
610+
name: 'REMAINING_TIME_ESTIMATE',
611+
desc: 'osdDescElementRemaningTimeEstimate',
612+
default_position: -1,
613+
positionable: true,
614+
preview: '01:13'
615+
},
616+
RTC_DATE_TIME: {
617+
name: 'RTC_DATE_TIME',
618+
desc: 'osdDescElementRtcDateTime',
619+
default_position: -1,
620+
positionable: true,
621+
preview: '2017-11-11 16:20:00'
622+
},
623+
ADJUSTMENT_RANGE: {
624+
name: 'ADJUSTMENT_RANGE',
625+
desc: 'osdDescElementAdjustmentRange',
626+
default_position: -1,
627+
positionable: true,
628+
preview: 'PITCH/ROLL P: 42'
629+
},
623630
TIMER_1: {
624631
name: 'TIMER_1',
625632
desc: 'osdDescElementTimer1',
@@ -819,6 +826,7 @@ OSD.chooseFields = function () {
819826
]);
820827
if (semver.gte(CONFIG.apiVersion, "1.37.0")) {
821828
OSD.constants.DISPLAY_FIELDS = OSD.constants.DISPLAY_FIELDS.concat([
829+
F.REMAINING_TIME_ESTIMATE,
822830
F.RTC_DATE_TIME,
823831
F.ADJUSTMENT_RANGE
824832
]);

0 commit comments

Comments
 (0)