Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-25 09:15:49 +03:00
Code Issues Wiki Activity

Merge branch 'new_stuff' of

Browse source 
https://github.com/skaman82/cleanflight-configurator into
skaman82-new_stuff

Fix up messages.json formatting.

Conflicts:
	_locales/en/messages.json
This commit is contained in:
Dominic Clifton 2015-12-15 00:29:11 +01:00
commit bd98aca67f
22 changed files with 724 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

2
js/msp.js
View file

@ -233,6 +233,7 @@ var MSP = {
CONFIG.activeSensors = data.getUint16(4, 1);
CONFIG.mode = data.getUint32(6, 1);
CONFIG.profile = data.getUint8(10);
$('select[name="profilechange"]').val(CONFIG.profile);
sensor_status(CONFIG.activeSensors);
$('span.i2c-error').text(CONFIG.i2cError);
@ -879,6 +880,7 @@ var MSP = {
DATAFLASH.totalSize = 0;
DATAFLASH.usedSize = 0;
}
update_dataflash_global();
break;
case MSP_codes.MSP_DATAFLASH_READ:
// No-op, let callback handle it