1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-23 00:05:19 +03:00

Temperature sensors support (#670)

This commit is contained in:
Michel Pastor 2019-02-08 21:08:09 +01:00 committed by GitHub
parent 9870ace818
commit 0a720f44f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 371 additions and 13 deletions

View file

@ -2383,6 +2383,9 @@
"osdGroupTimers": {
"message": "Timers"
},
"osdGroupTemperature": {
"message": "Temperature"
},
"osdGroupAttitude": {
"message": "Attitude"
},
@ -2596,11 +2599,41 @@
"osdElement_MC_POS_XYZ_P_OUTPUTS": {
"message": "MC Position XYZ P controllers outputs"
},
"osdElement_TEMPERATURE": {
"message": "Temperature"
"osdElement_IMU_TEMPERATURE": {
"message": "IMU Temperature"
},
"osdElement_TEMPERATURE_HELP": {
"message": "Temperature of the FC, obtained from the most accurate available source."
"osdElement_IMU_TEMPERATURE_HELP": {
"message": "Temperature of the IMU"
},
"osdElement_BARO_TEMPERATURE": {
"message": "Baro Temperature"
},
"osdElement_BARO_TEMPERATURE_HELP": {
"message": "Temperature of the barometer"
},
"osdElement_SENSOR1_TEMPERATURE": {
"message": "Temperature sensor 1"
},
"osdElement_SENSOR2_TEMPERATURE": {
"message": "Temperature sensor 2"
},
"osdElement_SENSOR3_TEMPERATURE": {
"message": "Temperature sensor 3"
},
"osdElement_SENSOR4_TEMPERATURE": {
"message": "Temperature sensor 4"
},
"osdElement_SENSOR5_TEMPERATURE": {
"message": "Temperature sensor 5"
},
"osdElement_SENSOR6_TEMPERATURE": {
"message": "Temperature sensor 6"
},
"osdElement_SENSOR7_TEMPERATURE": {
"message": "Temperature sensor 7"
},
"osdElement_SENSOR8_TEMPERATURE": {
"message": "Temperature sensor 8"
},
"osdSettingMainVoltageDecimals": {
"message": "Main Voltage Decimals"

View file

@ -198,6 +198,7 @@ var FC = {
sonar: 0,
air_speed: 0,
kinematics: [0.0, 0.0, 0.0],
temperature: [0, 0, 0, 0, 0, 0, 0, 0],
debug: [0, 0, 0, 0]
};

View file

@ -197,5 +197,9 @@ var MSPCodes = {
MSP2_INAV_DEBUG: 0x2019,
MSP2_BLACKBOX_CONFIG: 0x201A,
MSP2_SET_BLACKBOX_CONFIG: 0x201B
MSP2_SET_BLACKBOX_CONFIG: 0x201B,
MSP2_INAV_TEMP_SENSOR_CONFIG: 0x201C,
MSP2_INAV_SET_TEMP_SENSOR_CONFIG: 0x201D,
MSP2_INAV_TEMPERATURES: 0x201E
};

View file

@ -1462,6 +1462,13 @@ var mspHelper = (function (gui) {
console.log("Blackbox config saved");
break;
case MSPCodes.MSP2_INAV_TEMPERATURES:
for (i = 0; i < 8; ++i) {
temp_decidegrees = data.getInt16(i * 2, true);
SENSOR_DATA.temperature[i] = temp_decidegrees / 10; // °C
}
break;
default:
console.log('Unknown code detected: ' + dataHandler.code);
} else {

View file

@ -627,8 +627,13 @@ OSD.constants = {
min_version: '1.7.4',
preview: FONT.symbol(SYM.CLOCK) + '13:37'
},
]
},
{
name: 'TEMPERATURE',
name: 'osdGroupTemperature',
items: [
{
name: 'IMU_TEMPERATURE',
id: 86,
min_version: '2.1.0',
preview: function(osd_data) {
@ -640,6 +645,123 @@ OSD.constants = {
return '32' + FONT.symbol(SYM.TEMP_C);
}
},
{
name: 'BARO_TEMPERATURE',
id: 87,
min_version: '2.1.0',
preview: function(osd_data) {
if (OSD.data.preferences.units === 0) {
// Imperial
return '90' + FONT.symbol(SYM.TEMP_F);
}
// Metric, UK
return '32' + FONT.symbol(SYM.TEMP_C);
}
},
{
name: 'SENSOR1_TEMPERATURE',
id: 88,
min_version: '2.1.0',
preview: function(osd_data) {
if (OSD.data.preferences.units === 0) {
// Imperial
return '90' + FONT.symbol(SYM.TEMP_F);
}
// Metric, UK
return '32' + FONT.symbol(SYM.TEMP_C);
}
},
{
name: 'SENSOR2_TEMPERATURE',
id: 89,
min_version: '2.1.0',
preview: function(osd_data) {
if (OSD.data.preferences.units === 0) {
// Imperial
return '90' + FONT.symbol(SYM.TEMP_F);
}
// Metric, UK
return '32' + FONT.symbol(SYM.TEMP_C);
}
},
{
name: 'SENSOR3_TEMPERATURE',
id: 90,
min_version: '2.1.0',
preview: function(osd_data) {
if (OSD.data.preferences.units === 0) {
// Imperial
return '90' + FONT.symbol(SYM.TEMP_F);
}
// Metric, UK
return '32' + FONT.symbol(SYM.TEMP_C);
}
},
{
name: 'SENSOR4_TEMPERATURE',
id: 91,
min_version: '2.1.0',
preview: function(osd_data) {
if (OSD.data.preferences.units === 0) {
// Imperial
return '90' + FONT.symbol(SYM.TEMP_F);
}
// Metric, UK
return '32' + FONT.symbol(SYM.TEMP_C);
}
},
{
name: 'SENSOR5_TEMPERATURE',
id: 92,
min_version: '2.1.0',
preview: function(osd_data) {
if (OSD.data.preferences.units === 0) {
// Imperial
return '90' + FONT.symbol(SYM.TEMP_F);
}
// Metric, UK
return '32' + FONT.symbol(SYM.TEMP_C);
}
},
{
name: 'SENSOR6_TEMPERATURE',
id: 93,
min_version: '2.1.0',
preview: function(osd_data) {
if (OSD.data.preferences.units === 0) {
// Imperial
return '90' + FONT.symbol(SYM.TEMP_F);
}
// Metric, UK
return '32' + FONT.symbol(SYM.TEMP_C);
}
},
{
name: 'SENSOR7_TEMPERATURE',
id: 94,
min_version: '2.1.0',
preview: function(osd_data) {
if (OSD.data.preferences.units === 0) {
// Imperial
return '90' + FONT.symbol(SYM.TEMP_F);
}
// Metric, UK
return '32' + FONT.symbol(SYM.TEMP_C);
}
},
{
name: 'SENSOR8_TEMPERATURE',
id: 95,
min_version: '2.1.0',
preview: function(osd_data) {
if (OSD.data.preferences.units === 0) {
// Imperial
return '90' + FONT.symbol(SYM.TEMP_F);
}
// Metric, UK
return '32' + FONT.symbol(SYM.TEMP_C);
}
},
]
},
{
@ -809,7 +931,7 @@ OSD.constants = {
},
{
name: 'MSL_ALTITUDE',
id: 87,
id: 96,
preview: function(osd_data) {
if (OSD.data.preferences.units === 0) {
// Imperial
@ -850,7 +972,7 @@ OSD.constants = {
},
{
name: 'PLUS_CODE',
id: 88,
id: 97,
min_version: '2.1.0',
preview: function() {
let digits = parseInt(Settings.getInputValue('osd_plus_code_digits')) + 1;

View file

@ -18,8 +18,8 @@
<label><input type="checkbox" name="gyro_on" class="first" />Gyroscope</label> <label><input
type="checkbox" name="accel_on" />Accelerometer</label> <label><input type="checkbox"
name="mag_on" />Magnetometer</label> <label><input type="checkbox" name="baro_on" />Barometer</label> <label><input
type="checkbox" name="sonar_on" />Sonar</label> <label><input type="checkbox" name="airspeed_on" />Air speed</label> <label><input
type="checkbox" name="debug_on" />Debug</label>
type="checkbox" name="sonar_on" />Sonar</label> <label><input type="checkbox" name="airspeed_on" />Air speed</label> <label class="requires-v2_1_0"><input
type="checkbox" name="temperature_on" />Temperatures</label><label><input type="checkbox" name="debug_on" />Debug</label>
<a class="debug-trace" href="javascript:void(0);">Open Debug Trace</a>
</div>
@ -263,6 +263,131 @@
<div class="clear-both"></div>
</div>
</div>
<div class="wrapper temperature">
<div class="gui_box grey">
<div class="plot_control">
<div class="title">Temperature 0 - °C</div>
<dl>
<dt>value:</dt>
<dd class="x">0</dd>
</dl>
</div>
<svg id="temperature1">
<g class="grid x" transform="translate(40, 120)"></g>
<g class="grid y" transform="translate(40, 10)"></g>
<g class="data" transform="translate(41, 10)"></g>
<g class="axis x" transform="translate(40, 120)"></g>
<g class="axis y" transform="translate(40, 10)"></g>
</svg>
<div class="clear-both"></div>
<div class="plot_control">
<div class="title">Temperature 1 - °C</div>
<dl>
<dt>value:</dt>
<dd class="x">0</dd>
</dl>
</div>
<svg id="temperature2">
<g class="grid x" transform="translate(40, 120)"></g>
<g class="grid y" transform="translate(40, 10)"></g>
<g class="data" transform="translate(41, 10)"></g>
<g class="axis x" transform="translate(40, 120)"></g>
<g class="axis y" transform="translate(40, 10)"></g>
</svg>
<div class="clear-both"></div>
<div class="plot_control">
<div class="title">Temperature 2 - °C</div>
<dl>
<dt>value:</dt>
<dd class="x">0</dd>
</dl>
</div>
<svg id="temperature3">
<g class="grid x" transform="translate(40, 120)"></g>
<g class="grid y" transform="translate(40, 10)"></g>
<g class="data" transform="translate(41, 10)"></g>
<g class="axis x" transform="translate(40, 120)"></g>
<g class="axis y" transform="translate(40, 10)"></g>
</svg>
<div class="clear-both"></div>
<div class="plot_control">
<div class="title">Temperature 3 - °C</div>
<dl>
<dt>value:</dt>
<dd class="x">0</dd>
</dl>
</div>
<svg id="temperature4">
<g class="grid x" transform="translate(40, 120)"></g>
<g class="grid y" transform="translate(40, 10)"></g>
<g class="data" transform="translate(41, 10)"></g>
<g class="axis x" transform="translate(40, 120)"></g>
<g class="axis y" transform="translate(40, 10)"></g>
</svg>
<div class="clear-both"></div>
<div class="plot_control">
<div class="title">Temperature 4 - °C</div>
<dl>
<dt>value:</dt>
<dd class="x">0</dd>
</dl>
</div>
<svg id="temperature5">
<g class="grid x" transform="translate(40, 120)"></g>
<g class="grid y" transform="translate(40, 10)"></g>
<g class="data" transform="translate(41, 10)"></g>
<g class="axis x" transform="translate(40, 120)"></g>
<g class="axis y" transform="translate(40, 10)"></g>
</svg>
<div class="clear-both"></div>
<div class="plot_control">
<div class="title">Temperature 5 - °C</div>
<dl>
<dt>value:</dt>
<dd class="x">0</dd>
</dl>
</div>
<svg id="temperature6">
<g class="grid x" transform="translate(40, 120)"></g>
<g class="grid y" transform="translate(40, 10)"></g>
<g class="data" transform="translate(41, 10)"></g>
<g class="axis x" transform="translate(40, 120)"></g>
<g class="axis y" transform="translate(40, 10)"></g>
</svg>
<div class="clear-both"></div>
<div class="plot_control">
<div class="title">Temperature 6 - °C</div>
<dl>
<dt>value:</dt>
<dd class="x">0</dd>
</dl>
</div>
<svg id="temperature7">
<g class="grid x" transform="translate(40, 120)"></g>
<g class="grid y" transform="translate(40, 10)"></g>
<g class="data" transform="translate(41, 10)"></g>
<g class="axis x" transform="translate(40, 120)"></g>
<g class="axis y" transform="translate(40, 10)"></g>
</svg>
<div class="clear-both"></div>
<div class="plot_control">
<div class="title">Temperature 7 - °C</div>
<dl>
<dt>value:</dt>
<dd class="x">0</dd>
</dl>
</div>
<svg id="temperature8">
<g class="grid x" transform="translate(40, 120)"></g>
<g class="grid y" transform="translate(40, 10)"></g>
<g class="data" transform="translate(41, 10)"></g>
<g class="axis x" transform="translate(40, 120)"></g>
<g class="axis y" transform="translate(40, 10)"></g>
</svg>
</div>
</div>
<div class="wrapper debug">
<div class="gui_box grey">
<div class="plot_control">
@ -298,7 +423,7 @@
<div class="title">Debug 1</div>
<dl>
<dt>X:</dt>
<dd class="x">blue</dd>
<dd class="x">0</dd>
</dl>
</div>
<svg id="debug2">

View file

@ -17,6 +17,7 @@ TABS.sensors.initialize = function (callback) {
SENSOR_DATA.sonar = 0;
SENSOR_DATA.air_speed = 0;
SENSOR_DATA.altitude = 0;
SENSOR_DATA.temperature[i] = 0;
SENSOR_DATA.debug[i] = 0;
}
}
@ -181,6 +182,14 @@ TABS.sensors.initialize = function (callback) {
}
}
function plot_temperature(enable) {
if (enable) {
$('.wrapper.temperature').show();
} else {
$('.wrapper.temperature').hide();
}
}
function plot_debug(enable) {
if (enable) {
$('.wrapper.debug').show();
@ -206,6 +215,13 @@ TABS.sensors.initialize = function (callback) {
checkboxes.eq(5).prop('disabled', true);
}
if (semver.gte(CONFIG.flightControllerVersion, "2.1.0")) {
if (!bit_check(CONFIG.activeSensors, 7))
checkboxes.eq(6).prop('disabled', true);
} else {
$(".requires-v2_1_0").hide();
}
$('.tab-sensors .info .checkboxes input').change(function () {
var enable = $(this).prop('checked');
var index = $(this).parent().index();
@ -230,6 +246,9 @@ TABS.sensors.initialize = function (callback) {
plot_airspeed(enable);
break;
case 6:
plot_temperature(enable);
break;
case 7:
plot_debug(enable);
break;
}
@ -265,6 +284,7 @@ TABS.sensors.initialize = function (callback) {
samples_altitude_i = 0,
samples_sonar_i = 0,
samples_airspeed_i = 0,
samples_temperature_i = 0,
samples_debug_i = 0,
gyro_data = initDataArray(3),
accel_data = initDataArray(3),
@ -272,6 +292,16 @@ TABS.sensors.initialize = function (callback) {
altitude_data = (semver.gte(CONFIG.flightControllerVersion, "1.6.0")) ? initDataArray(2) : initDataArray(1),
sonar_data = initDataArray(1),
airspeed_data = initDataArray(1),
temperature_data = [
initDataArray(1),
initDataArray(1),
initDataArray(1),
initDataArray(1),
initDataArray(1),
initDataArray(1),
initDataArray(1),
initDataArray(1)
];
debug_data = [
initDataArray(1),
initDataArray(1),
@ -289,6 +319,16 @@ TABS.sensors.initialize = function (callback) {
var altitudeHelpers = initGraphHelpers('#altitude', samples_altitude_i);
var sonarHelpers = initGraphHelpers('#sonar', samples_sonar_i);
var airspeedHelpers = initGraphHelpers('#airspeed', samples_airspeed_i);
var temperatureHelpers = [
initGraphHelpers('#temperature1', samples_temperature_i),
initGraphHelpers('#temperature2', samples_temperature_i),
initGraphHelpers('#temperature3', samples_temperature_i),
initGraphHelpers('#temperature4', samples_temperature_i),
initGraphHelpers('#temperature5', samples_temperature_i),
initGraphHelpers('#temperature6', samples_temperature_i),
initGraphHelpers('#temperature7', samples_temperature_i),
initGraphHelpers('#temperature8', samples_temperature_i)
];
var debugHelpers = [
initGraphHelpers('#debug1', samples_debug_i),
initGraphHelpers('#debug2', samples_debug_i),
@ -446,7 +486,22 @@ TABS.sensors.initialize = function (callback) {
}, rates.airspeed, true);
}
if (checkboxes[6]) {
if (checkboxes[6] && (semver.gte(CONFIG.flightControllerVersion, "2.1.0"))) {
helper.interval.add('temperature_pull', function temperature_data_pull() {
/*
* Enable balancer
*/
if (helper.mspQueue.shouldDrop()) {
update_temperature_graphs();
return;
}
MSP.send_message(MSPCodes.MSP2_INAV_TEMPERATURES, false, false, update_temperature_graphs);
}, 1000, true);
}
if (checkboxes[7]) {
helper.interval.add('debug_pull', function debug_data_pull() {
/*
@ -527,13 +582,24 @@ TABS.sensors.initialize = function (callback) {
raw_data_text_ements.x[5].text(SENSOR_DATA.air_speed);
}
function update_temperature_graphs() {
for (var i = 0; i < 8; i++) {
updateGraphHelperSize(temperatureHelpers[i]);
addSampleToData(temperature_data[i], samples_temperature_i, [SENSOR_DATA.temperature[i]]);
drawGraph(temperatureHelpers[i], temperature_data[i], samples_temperature_i);
raw_data_text_ements.x[6 + i].text(SENSOR_DATA.temperature[i]);
}
samples_temperature_i++;
}
function update_debug_graphs() {
for (var i = 0; i < 8; i++) {
updateGraphHelperSize(debugHelpers[i]);
addSampleToData(debug_data[i], samples_debug_i, [SENSOR_DATA.debug[i]]);
drawGraph(debugHelpers[i], debug_data[i], samples_debug_i);
raw_data_text_ements.x[6 + i].text(SENSOR_DATA.debug[i]);
raw_data_text_ements.x[7 + i].text(SENSOR_DATA.debug[i]);
}
samples_debug_i++;
}