Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-19 22:35:17 +03:00
Code Issues Wiki Activity

Implement MSP_STATUS_EX to display CPU load

Browse source
This commit is contained in:
gaelj 2016-07-17 01:07:38 +02:00
parent 8438a02781
commit 1e063c08a0
4 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
_locales/en/messages.json
View file

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

25
js/msp.js
View file

@ -88,6 +88,7 @@ var MSP_codes = {
MSP_RC_DEADBAND: 125, MSP_RC_DEADBAND: 125,
MSP_SENSOR_ALIGNMENT: 126, MSP_SENSOR_ALIGNMENT: 126,
MSP_LED_STRIP_MODECOLOR:127, MSP_LED_STRIP_MODECOLOR:127,
MSP_STATUS_EX: 150,
MSP_SET_RAW_RC: 200, MSP_SET_RAW_RC: 200,
MSP_SET_RAW_GPS: 201, MSP_SET_RAW_GPS: 201,
@ -128,10 +129,10 @@ var MSP_codes = {
// Additional private MSP for baseflight configurator (yes thats us \o/) // Additional private MSP for baseflight configurator (yes thats us \o/)
MSP_RX_MAP: 64, // get channel map (also returns number of channels total) MSP_RX_MAP: 64, // get channel map (also returns number of channels total)
MSP_SET_RX_MAP: 65, // set rc map, numchannels to set comes from MSP_RX_MAP MSP_SET_RX_MAP: 65, // set rc map, numchannels to set comes from MSP_RX_MAP
MSP_BF_CONFIG: 66, // baseflight-specific settings that aren't covered elsewhere MSP_BF_CONFIG: 66, // baseflight-specific settings that aren't covered elsewhere
MSP_SET_BF_CONFIG: 67, // baseflight-specific settings save MSP_SET_BF_CONFIG: 67, // baseflight-specific settings save
MSP_SET_REBOOT: 68, // reboot settings MSP_SET_REBOOT: 68, // reboot settings
MSP_BF_BUILD_INFO: 69 // build date as well as some space for future expansion MSP_BF_BUILD_INFO: 69 // build date as well as some space for future expansion
}; };
var MSP = { var MSP = {
@ -288,6 +289,21 @@ var MSP = {
$('span.i2c-error').text(CONFIG.i2cError); $('span.i2c-error').text(CONFIG.i2cError);
$('span.cycle-time').text(CONFIG.cycleTime); $('span.cycle-time').text(CONFIG.cycleTime);
break; 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);
$('select[name="profilechange"]').val(CONFIG.profile);
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: case MSP_codes.MSP_RAW_IMU:
// 512 for mpu6050, 256 for mma // 512 for mpu6050, 256 for mma
// currently we are unable to differentiate between the sensor types, so we are goign with 512 // currently we are unable to differentiate between the sensor types, so we are goign with 512
@ -1201,7 +1217,6 @@ var MSP = {
case MSP_codes.MSP_SET_NAME: case MSP_codes.MSP_SET_NAME:
console.log('Name set'); console.log('Name set');
break; break;
default: default:
console.log('Unknown code detected: ' + code); console.log('Unknown code detected: ' + code);
} else { } else {

4
js/serial_backend.js
View file

@ -250,7 +250,7 @@ function onConnect() {
$('#tabs ul.mode-disconnected').hide(); $('#tabs ul.mode-disconnected').hide();
$('#tabs ul.mode-connected').show(); $('#tabs ul.mode-connected').show();
MSP.send_message(MSP_codes.MSP_STATUS, false, false); MSP.send_message(MSP_codes.MSP_STATUS_EX, false, false);
MSP.send_message(MSP_codes.MSP_DATAFLASH_SUMMARY, false, false); MSP.send_message(MSP_codes.MSP_DATAFLASH_SUMMARY, false, false);
@ -432,7 +432,7 @@ function update_live_status() {
if (GUI.active_tab != 'cli') { if (GUI.active_tab != 'cli') {
MSP.send_message(MSP_codes.MSP_BOXNAMES, false, false); MSP.send_message(MSP_codes.MSP_BOXNAMES, false, false);
MSP.send_message(MSP_codes.MSP_STATUS, false, false); MSP.send_message(MSP_codes.MSP_STATUS_EX, false, false);
MSP.send_message(MSP_codes.MSP_ANALOG, false, false); MSP.send_message(MSP_codes.MSP_ANALOG, false, false);
} }

3
main.html
View file

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