Skip to content

Commit 1afabe3

Browse files
authored
Merge pull request #850 from DanNixon/osd_temperatures
Add support for OSD core temerature readout
2 parents 0ddacfa + 3b3f37c commit 1afabe3

File tree

2 files changed

+29
-1
lines changed

2 files changed

+29
-1
lines changed

_locales/en/messages.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2837,6 +2837,9 @@
28372837
"osdDescElementUnknown" : {
28382838
"message": "Unknown element (details to be added in a future release)"
28392839
},
2840+
"osdDescElementCoreTemperature": {
2841+
"message": "Temperature of the STM32 MCU core"
2842+
},
28402843

28412844
"osdDescStatMaxSpeed": {
28422845
"message": "Maximum recorded speed"

tabs/osd.js

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,21 @@ OSD.generateTimerPreview = function(osd_data, timer_index) {
256256
return preview;
257257
};
258258

259+
OSD.generateTemperaturePreview = function(osd_data, temperature) {
260+
var preview = '';
261+
switch (osd_data.unit_mode) {
262+
case 0:
263+
temperature *= (9.0 / 5.0);
264+
temperature += 32.0;
265+
preview += Math.floor(temperature) + 'F'
266+
break;
267+
case 1:
268+
preview += temperature + 'C'
269+
break;
270+
}
271+
return preview;
272+
}
273+
259274
OSD.generateCraftName = function(osd_data) {
260275
var preview = 'CRAFT_NAME';
261276
if (CONFIG.name != '')
@@ -645,6 +660,15 @@ OSD.constants = {
645660
return OSD.generateTimerPreview(osd_data, 1);
646661
}
647662
},
663+
CORE_TEMPERATURE: {
664+
name: 'CORE_TEMPERATURE',
665+
desc: 'osdDescElementCoreTemperature',
666+
default_position: -1,
667+
positionable: true,
668+
preview: function(osd_data) {
669+
return OSD.generateTemperaturePreview(osd_data, 33);
670+
}
671+
}
648672
},
649673
UNKNOWN_DISPLAY_FIELD: {
650674
name: 'UNKNOWN_',
@@ -828,7 +852,8 @@ OSD.chooseFields = function () {
828852
OSD.constants.DISPLAY_FIELDS = OSD.constants.DISPLAY_FIELDS.concat([
829853
F.REMAINING_TIME_ESTIMATE,
830854
F.RTC_DATE_TIME,
831-
F.ADJUSTMENT_RANGE
855+
F.ADJUSTMENT_RANGE,
856+
F.CORE_TEMPERATURE
832857
]);
833858
}
834859
}

0 commit comments

Comments
 (0)