Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-16 21:05:30 +03:00
Code Issues Wiki Activity

Fix minor issues

Browse source
This commit is contained in:
Mark Haslinghuis 2020-11-22 02:29:59 +01:00
parent dcfe3d3108
commit 06f4c8b976
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/js/msp.js
View file

@ -208,7 +208,6 @@ var MSP = {
// message received, store dataview // message received, store dataview
this.dataView = new DataView(this.message_buffer, 0, this.message_length_expected); this.dataView = new DataView(this.message_buffer, 0, this.message_length_expected);
} else { } else {
console.log(`code: ${this.code} - crc failed`);
this.packet_error++; this.packet_error++;
this.crcError = true; this.crcError = true;
this.dataView = new DataView(new ArrayBuffer(0)); this.dataView = new DataView(new ArrayBuffer(0));

14
src/js/msp/MSPHelper.js
View file

@ -277,7 +277,6 @@ MspHelper.prototype.process_data = function(dataHandler) {
FC.BF_CONFIG.currentmetertype = data.readU8(); FC.BF_CONFIG.currentmetertype = data.readU8();
FC.BF_CONFIG.batterycapacity = data.readU16(); FC.BF_CONFIG.batterycapacity = data.readU16();
} else { } else {
var offset = 0;
FC.CURRENT_METER_CONFIGS = []; FC.CURRENT_METER_CONFIGS = [];
var current_meter_count = data.readU8(); var current_meter_count = data.readU8();
for (let i = 0; i < current_meter_count; i++) { for (let i = 0; i < current_meter_count; i++) {
@ -1618,13 +1617,16 @@ MspHelper.prototype.process_data = function(dataHandler) {
break; break;
} }
} }
} else {
console.log(`code: ${code} - crc failed`);
} }
// trigger callbacks, cleanup/remove callback after trigger // trigger callbacks, cleanup/remove callback after trigger
for (let i = dataHandler.callbacks.length - 1; i >= 0; i--) { // itterating in reverse because we use .splice which modifies array length for (let i = dataHandler.callbacks.length - 1; i >= 0; i--) { // iterating in reverse because we use .splice which modifies array length
if (dataHandler.callbacks[i].code == code) { if (dataHandler.callbacks[i]?.code === code) {
// save callback reference // save callback reference
var callback = dataHandler.callbacks[i].callback; const callback = dataHandler.callbacks[i].callback;
var callbackOnError = dataHandler.callbacks[i].callbackOnError; const callbackOnError = dataHandler.callbacks[i].callbackOnError;
// remove timeout // remove timeout
clearInterval(dataHandler.callbacks[i].timer); clearInterval(dataHandler.callbacks[i].timer);
@ -1634,6 +1636,8 @@ MspHelper.prototype.process_data = function(dataHandler) {
if (!crcError || callbackOnError) { if (!crcError || callbackOnError) {
// fire callback // fire callback
if (callback) callback({'command': code, 'data': data, 'length': data.byteLength, 'crcError': crcError}); if (callback) callback({'command': code, 'data': data, 'length': data.byteLength, 'crcError': crcError});
} else {
console.log(`code: ${code} - crc failed. No callback`);
} }
} }
} }

4
src/js/serial_backend.js
View file

@ -60,7 +60,7 @@ function initializeSerialBackend() {
$('select#baud').hide(); $('select#baud').hide();
} else if (portName !== '0') { } else if (portName !== '0') {
if (!clicks) { if (!clicks) {
console.log(`${serial.connectionType}: connecting to: ${portName}`); console.log(`Connecting to: ${portName}`);
GUI.connecting_to = portName; GUI.connecting_to = portName;
// lock port select & baud while we are connecting / connected // lock port select & baud while we are connecting / connected
@ -803,7 +803,7 @@ function reinitialiseConnection(originatorTab, callback) {
if (callback) { if (callback) {
callback(); callback();
} }
}, 100); }, 200);
//TODO: Need to work out how to do a proper reconnect here. //TODO: Need to work out how to do a proper reconnect here.
// caveat: Timeouts set with `GUI.timeout_add()` are removed on disconnect. // caveat: Timeouts set with `GUI.timeout_add()` are removed on disconnect.
} else { } else {