diff --git a/src/js/msp.js b/src/js/msp.js index a339c214ec..ac4edea8b0 100644 --- a/src/js/msp.js +++ b/src/js/msp.js @@ -208,7 +208,6 @@ var MSP = { // message received, store dataview this.dataView = new DataView(this.message_buffer, 0, this.message_length_expected); } else { - console.log(`code: ${this.code} - crc failed`); this.packet_error++; this.crcError = true; this.dataView = new DataView(new ArrayBuffer(0)); diff --git a/src/js/msp/MSPHelper.js b/src/js/msp/MSPHelper.js index d7395f4795..e74540bed4 100644 --- a/src/js/msp/MSPHelper.js +++ b/src/js/msp/MSPHelper.js @@ -277,7 +277,6 @@ MspHelper.prototype.process_data = function(dataHandler) { FC.BF_CONFIG.currentmetertype = data.readU8(); FC.BF_CONFIG.batterycapacity = data.readU16(); } else { - var offset = 0; FC.CURRENT_METER_CONFIGS = []; var current_meter_count = data.readU8(); for (let i = 0; i < current_meter_count; i++) { @@ -1618,13 +1617,16 @@ MspHelper.prototype.process_data = function(dataHandler) { break; } } + } else { + console.log(`code: ${code} - crc failed`); } + // 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 - if (dataHandler.callbacks[i].code == code) { + 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) { // save callback reference - var callback = dataHandler.callbacks[i].callback; - var callbackOnError = dataHandler.callbacks[i].callbackOnError; + const callback = dataHandler.callbacks[i].callback; + const callbackOnError = dataHandler.callbacks[i].callbackOnError; // remove timeout clearInterval(dataHandler.callbacks[i].timer); @@ -1634,6 +1636,8 @@ MspHelper.prototype.process_data = function(dataHandler) { if (!crcError || callbackOnError) { // fire callback if (callback) callback({'command': code, 'data': data, 'length': data.byteLength, 'crcError': crcError}); + } else { + console.log(`code: ${code} - crc failed. No callback`); } } } diff --git a/src/js/serial_backend.js b/src/js/serial_backend.js index 0fe0c726f5..c675f50658 100644 --- a/src/js/serial_backend.js +++ b/src/js/serial_backend.js @@ -60,7 +60,7 @@ function initializeSerialBackend() { $('select#baud').hide(); } else if (portName !== '0') { if (!clicks) { - console.log(`${serial.connectionType}: connecting to: ${portName}`); + console.log(`Connecting to: ${portName}`); GUI.connecting_to = portName; // lock port select & baud while we are connecting / connected @@ -803,7 +803,7 @@ function reinitialiseConnection(originatorTab, callback) { if (callback) { callback(); } - }, 100); + }, 200); //TODO: Need to work out how to do a proper reconnect here. // caveat: Timeouts set with `GUI.timeout_add()` are removed on disconnect. } else {