Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-13 19:40:22 +03:00
Code Wiki Activity

Use MSP_STATUS_EX to display CPU load in status bar, from INAV 1.2.0

Browse source
This commit is contained in:
gaelj 2016-07-21 19:19:30 +02:00
parent a2d8647b19
commit c40f0cf2e6
4 changed files with 36 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
_locales/en/messages.json
View file

@ -213,6 +213,9 @@
"statusbar_cycle_time": {
"message": "Cycle Time:"
},
"statusbar_cpu_load": {
"message": "CPU Load: $1%"
},
"dfu_connect_message": {
"message": "Please use the Firmware Flasher to access DFU devices"

15
js/msp.js
View file

@ -66,6 +66,7 @@ var MSP_codes = {
MSP_3D: 124,
MSP_RC_DEADBAND: 125,
MSP_SENSOR_ALIGNMENT: 126,
MSP_STATUS_EX: 150,
MSP_SET_RAW_RC: 200,
MSP_SET_RAW_GPS: 201,
@ -263,6 +264,20 @@ var MSP = {
$('span.i2c-error').text(CONFIG.i2cError);
$('span.cycle-time').text(CONFIG.cycleTime);
break;
case MSP_codes.MSP_STATUS_EX:
CONFIG.cycleTime = data.getUint16(0, 1);
CONFIG.i2cError = data.getUint16(2, 1);
CONFIG.activeSensors = data.getUint16(4, 1);
CONFIG.mode = data.getUint32(6, 1);
CONFIG.profile = data.getUint8(10);
CONFIG.cpuload = data.getUint16(11, 1);
sensor_status(CONFIG.activeSensors);
$('span.i2c-error').text(CONFIG.i2cError);
$('span.cycle-time').text(CONFIG.cycleTime);
$('span.cpu-load').text(chrome.i18n.getMessage('statusbar_cpu_load', [CONFIG.cpuload]));
break;
case MSP_codes.MSP_RAW_IMU:
// 512 for mpu6050, 256 for mma
// currently we are unable to differentiate between the sensor types, so we are goign with 512

10
js/serial_backend.js
View file

@ -73,6 +73,8 @@ $(document).ready(function () {
// Reset various UI elements
$('span.i2c-error').text(0);
$('span.cycle-time').text(0);
if (semver.gte(CONFIG.flightControllerVersion, "1.2.0"))
$('span.cpu-load').text('');
// unlock port select & baud
$('div#port-picker #port').prop('disabled', false);
@ -260,7 +262,11 @@ function onConnect() {
$('#tabs ul.mode-disconnected').hide();
$('#tabs ul.mode-connected').show();
if (semver.gte(CONFIG.flightControllerVersion, "1.2.0")) {
MSP.send_message(MSP_codes.MSP_STATUS_EX, false, false);
} else {
MSP.send_message(MSP_codes.MSP_STATUS, false, false);
}
MSP.send_message(MSP_codes.MSP_DATAFLASH_SUMMARY, false, false);
@ -443,6 +449,9 @@ function update_live_status() {
if (GUI.active_tab != 'cli') {
MSP.send_message(MSP_codes.MSP_BOXNAMES, false, false);
if (semver.gte(CONFIG.flightControllerVersion, "1.2.0"))
MSP.send_message(MSP_codes.MSP_STATUS_EX, false, false);
else
MSP.send_message(MSP_codes.MSP_STATUS, false, false);
MSP.send_message(MSP_codes.MSP_ANALOG, false, false);
}
@ -509,7 +518,6 @@ function update_live_status() {
startLiveDataRefreshTimer();
}
function specificByte(num, pos) {
return 0x000000FF & (num >> (8 * pos));
}

3
main.html
View file

@ -247,6 +247,9 @@
<div>
<span i18n="statusbar_cycle_time"></span> <span class="cycle-time">0</span>
</div>
<div>
<span class="cpu-load"> </span>
</div>
<div class="version">
<!-- configuration version generated here -->
</div>