diff --git a/js/msp/MSPHelper.js b/js/msp/MSPHelper.js index 3e7d0f93..0bb72c45 100644 --- a/js/msp/MSPHelper.js +++ b/js/msp/MSPHelper.js @@ -800,28 +800,6 @@ var mspHelper = (function (gui) { console.log('Channel forwarding saved'); break; - case MSPCodes.MSP_CF_SERIAL_CONFIG: - SERIAL_CONFIG.ports = []; - var bytesPerPort = 1 + 2 + 4; - var serialPortCount = data.byteLength / bytesPerPort; - - for (i = 0; i < serialPortCount; i++) { - var BAUD_RATES = mspHelper.BAUD_RATES_post1_6_3; - - var serialPort = { - identifier: data.getUint8(offset), - functions: mspHelper.serialPortFunctionMaskToFunctions(data.getUint16(offset + 1, true)), - msp_baudrate: BAUD_RATES[data.getUint8(offset + 3)], - sensors_baudrate: BAUD_RATES[data.getUint8(offset + 4)], - telemetry_baudrate: BAUD_RATES[data.getUint8(offset + 5)], - blackbox_baudrate: BAUD_RATES[data.getUint8(offset + 6)] - }; - - offset += bytesPerPort; - SERIAL_CONFIG.ports.push(serialPort); - } - break; - case MSPCodes.MSP2_CF_SERIAL_CONFIG: SERIAL_CONFIG.ports = []; var bytesPerPort = 1 + 4 + 4; @@ -844,7 +822,6 @@ var mspHelper = (function (gui) { } break; - case MSPCodes.MSP_SET_CF_SERIAL_CONFIG: case MSPCodes.MSP2_SET_CF_SERIAL_CONFIG: console.log('Serial config saved'); break; @@ -1812,24 +1789,6 @@ var mspHelper = (function (gui) { } break; - case MSPCodes.MSP_SET_CF_SERIAL_CONFIG: - for (i = 0; i < SERIAL_CONFIG.ports.length; i++) { - var serialPort = SERIAL_CONFIG.ports[i]; - - buffer.push(serialPort.identifier); - - var functionMask = mspHelper.SERIAL_PORT_FUNCTIONSToMask(serialPort.functions); - buffer.push(specificByte(functionMask, 0)); - buffer.push(specificByte(functionMask, 1)); - - var BAUD_RATES = mspHelper.BAUD_RATES_post1_6_3; - buffer.push(BAUD_RATES.indexOf(serialPort.msp_baudrate)); - buffer.push(BAUD_RATES.indexOf(serialPort.sensors_baudrate)); - buffer.push(BAUD_RATES.indexOf(serialPort.telemetry_baudrate)); - buffer.push(BAUD_RATES.indexOf(serialPort.blackbox_baudrate)); - } - break; - case MSPCodes.MSP2_SET_CF_SERIAL_CONFIG: for (i = 0; i < SERIAL_CONFIG.ports.length; i++) { var serialPort = SERIAL_CONFIG.ports[i]; diff --git a/tabs/auxiliary.js b/tabs/auxiliary.js index 593912f2..55dbe25f 100644 --- a/tabs/auxiliary.js +++ b/tabs/auxiliary.js @@ -18,15 +18,7 @@ TABS.auxiliary.initialize = function (callback) { } function get_rc_data() { - if (SERIAL_CONFIG.ports.length == 0) { - MSP.send_message(MSPCodes.MSP_RC, false, false, get_serial_config); - } else { - MSP.send_message(MSPCodes.MSP_RC, false, false, load_html); - } - } - - function get_serial_config() { - MSP.send_message(MSPCodes.MSP_CF_SERIAL_CONFIG, false, false, load_html); + MSP.send_message(MSPCodes.MSP_RC, false, false, load_html); } function load_html() {