From 12492267b7bbf1642a1c49b895d51458af619923 Mon Sep 17 00:00:00 2001 From: "Konstantin Sharlaimov (DigitalEntity)" Date: Mon, 27 Mar 2017 17:41:21 +1000 Subject: [PATCH 1/2] Extend baudrates; Allow telemetry baud rates down to 1200 bps --- build/script.js | 50 ++++++++++++++++++++++++++++++++++++--------- js/msp/MSPHelper.js | 36 ++++++++++++++++++++++++-------- tabs/ports.js | 14 ++++++++++++- 3 files changed, 80 insertions(+), 20 deletions(-) diff --git a/build/script.js b/build/script.js index e4e20f51..043524df 100644 --- a/build/script.js +++ b/build/script.js @@ -7552,7 +7552,22 @@ var MSPCodes = { var mspHelper = (function (gui) { var self = {}; - self.BAUD_RATES = [ + self.BAUD_RATES_post1_6_3 = [ + 'AUTO', + '1200', + '2400', + '9600', + '19200', + '38400', + '57600', + '115200', + '230400', + '250000', + '460800', + '921600' + ]; + + self.BAUD_RATES_pre1_6_3 = [ 'AUTO', '9600', '19200', @@ -8032,13 +8047,15 @@ var mspHelper = (function (gui) { var serialPortCount = data.byteLength / bytesPerPort; for (i = 0; i < serialPortCount; i++) { + var BAUD_RATES = (semver.gte(CONFIG.flightControllerVersion, "1.6.3")) ? mspHelper.BAUD_RATES_post1_6_3 : mspHelper.BAUD_RATES_pre1_6_3; + var serialPort = { identifier: data.getUint8(offset), functions: mspHelper.serialPortFunctionMaskToFunctions(data.getUint16(offset + 1, true)), - msp_baudrate: mspHelper.BAUD_RATES[data.getUint8(offset + 3)], - gps_baudrate: mspHelper.BAUD_RATES[data.getUint8(offset + 4)], - telemetry_baudrate: mspHelper.BAUD_RATES[data.getUint8(offset + 5)], - blackbox_baudrate: mspHelper.BAUD_RATES[data.getUint8(offset + 6)] + msp_baudrate: BAUD_RATES[data.getUint8(offset + 3)], + gps_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; @@ -8703,10 +8720,11 @@ var mspHelper = (function (gui) { buffer.push(specificByte(functionMask, 0)); buffer.push(specificByte(functionMask, 1)); - buffer.push(mspHelper.BAUD_RATES.indexOf(serialPort.msp_baudrate)); - buffer.push(mspHelper.BAUD_RATES.indexOf(serialPort.gps_baudrate)); - buffer.push(mspHelper.BAUD_RATES.indexOf(serialPort.telemetry_baudrate)); - buffer.push(mspHelper.BAUD_RATES.indexOf(serialPort.blackbox_baudrate)); + var BAUD_RATES = (semver.gte(CONFIG.flightControllerVersion, "1.6.3")) ? mspHelper.BAUD_RATES_post1_6_3 : mspHelper.BAUD_RATES_pre1_6_3; + buffer.push(BAUD_RATES.indexOf(serialPort.msp_baudrate)); + buffer.push(BAUD_RATES.indexOf(serialPort.gps_baudrate)); + buffer.push(BAUD_RATES.indexOf(serialPort.telemetry_baudrate)); + buffer.push(BAUD_RATES.indexOf(serialPort.blackbox_baudrate)); } break; @@ -20497,8 +20515,19 @@ TABS.ports.initialize = function (callback, scrollPosition) { '115200' ]; - var telemetryBaudRates = [ + var telemetryBaudRates_pre1_6_3 = [ + 'AUTO', + '9600', + '19200', + '38400', + '57600', + '115200' + ]; + + var telemetryBaudRates_post1_6_3 = [ 'AUTO', + '1200', + '2400', '9600', '19200', '38400', @@ -20563,6 +20592,7 @@ TABS.ports.initialize = function (callback, scrollPosition) { } var telemetry_baudrate_e = $('select.telemetry_baudrate'); + var telemetryBaudRates = semver.gte(CONFIG.flightControllerVersion, "1.6.3") ? telemetryBaudRates_post1_6_3 : telemetryBaudRates_pre1_6_3; for (var i = 0; i < telemetryBaudRates.length; i++) { telemetry_baudrate_e.append(''); } diff --git a/js/msp/MSPHelper.js b/js/msp/MSPHelper.js index 8eebd136..c6d16108 100644 --- a/js/msp/MSPHelper.js +++ b/js/msp/MSPHelper.js @@ -4,7 +4,22 @@ var mspHelper = (function (gui) { var self = {}; - self.BAUD_RATES = [ + self.BAUD_RATES_post1_6_3 = [ + 'AUTO', + '1200', + '2400', + '9600', + '19200', + '38400', + '57600', + '115200', + '230400', + '250000', + '460800', + '921600' + ]; + + self.BAUD_RATES_pre1_6_3 = [ 'AUTO', '9600', '19200', @@ -484,13 +499,15 @@ var mspHelper = (function (gui) { var serialPortCount = data.byteLength / bytesPerPort; for (i = 0; i < serialPortCount; i++) { + var BAUD_RATES = (semver.gte(CONFIG.flightControllerVersion, "1.6.3")) ? mspHelper.BAUD_RATES_post1_6_3 : mspHelper.BAUD_RATES_pre1_6_3; + var serialPort = { identifier: data.getUint8(offset), functions: mspHelper.serialPortFunctionMaskToFunctions(data.getUint16(offset + 1, true)), - msp_baudrate: mspHelper.BAUD_RATES[data.getUint8(offset + 3)], - gps_baudrate: mspHelper.BAUD_RATES[data.getUint8(offset + 4)], - telemetry_baudrate: mspHelper.BAUD_RATES[data.getUint8(offset + 5)], - blackbox_baudrate: mspHelper.BAUD_RATES[data.getUint8(offset + 6)] + msp_baudrate: BAUD_RATES[data.getUint8(offset + 3)], + gps_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; @@ -1155,10 +1172,11 @@ var mspHelper = (function (gui) { buffer.push(specificByte(functionMask, 0)); buffer.push(specificByte(functionMask, 1)); - buffer.push(mspHelper.BAUD_RATES.indexOf(serialPort.msp_baudrate)); - buffer.push(mspHelper.BAUD_RATES.indexOf(serialPort.gps_baudrate)); - buffer.push(mspHelper.BAUD_RATES.indexOf(serialPort.telemetry_baudrate)); - buffer.push(mspHelper.BAUD_RATES.indexOf(serialPort.blackbox_baudrate)); + var BAUD_RATES = (semver.gte(CONFIG.flightControllerVersion, "1.6.3")) ? mspHelper.BAUD_RATES_post1_6_3 : mspHelper.BAUD_RATES_pre1_6_3; + buffer.push(BAUD_RATES.indexOf(serialPort.msp_baudrate)); + buffer.push(BAUD_RATES.indexOf(serialPort.gps_baudrate)); + buffer.push(BAUD_RATES.indexOf(serialPort.telemetry_baudrate)); + buffer.push(BAUD_RATES.indexOf(serialPort.blackbox_baudrate)); } break; diff --git a/tabs/ports.js b/tabs/ports.js index 0c878e22..e4e13336 100644 --- a/tabs/ports.js +++ b/tabs/ports.js @@ -54,7 +54,7 @@ TABS.ports.initialize = function (callback, scrollPosition) { '115200' ]; - var telemetryBaudRates = [ + var telemetryBaudRates_pre1_6_3 = [ 'AUTO', '9600', '19200', @@ -63,6 +63,17 @@ TABS.ports.initialize = function (callback, scrollPosition) { '115200' ]; + var telemetryBaudRates_post1_6_3 = [ + 'AUTO', + '1200', + '2400', + '9600', + '19200', + '38400', + '57600', + '115200' + ]; + var blackboxBaudRates = [ '19200', '38400', @@ -120,6 +131,7 @@ TABS.ports.initialize = function (callback, scrollPosition) { } var telemetry_baudrate_e = $('select.telemetry_baudrate'); + var telemetryBaudRates = semver.gte(CONFIG.flightControllerVersion, "1.6.3") ? telemetryBaudRates_post1_6_3 : telemetryBaudRates_pre1_6_3; for (var i = 0; i < telemetryBaudRates.length; i++) { telemetry_baudrate_e.append(''); } From 0dcbf6109ca0fd913e2b0157d82d3a525fced871 Mon Sep 17 00:00:00 2001 From: "Konstantin Sharlaimov (DigitalEntity)" Date: Mon, 27 Mar 2017 17:45:52 +1000 Subject: [PATCH 2/2] Add 4800 baud --- build/script.js | 2 ++ js/msp/MSPHelper.js | 1 + tabs/ports.js | 1 + 3 files changed, 4 insertions(+) diff --git a/build/script.js b/build/script.js index 043524df..c5b38d00 100644 --- a/build/script.js +++ b/build/script.js @@ -7556,6 +7556,7 @@ var mspHelper = (function (gui) { 'AUTO', '1200', '2400', + '4800', '9600', '19200', '38400', @@ -20528,6 +20529,7 @@ TABS.ports.initialize = function (callback, scrollPosition) { 'AUTO', '1200', '2400', + '4800', '9600', '19200', '38400', diff --git a/js/msp/MSPHelper.js b/js/msp/MSPHelper.js index c6d16108..23b0f3c5 100644 --- a/js/msp/MSPHelper.js +++ b/js/msp/MSPHelper.js @@ -8,6 +8,7 @@ var mspHelper = (function (gui) { 'AUTO', '1200', '2400', + '4800', '9600', '19200', '38400', diff --git a/tabs/ports.js b/tabs/ports.js index e4e13336..c34c81e5 100644 --- a/tabs/ports.js +++ b/tabs/ports.js @@ -67,6 +67,7 @@ TABS.ports.initialize = function (callback, scrollPosition) { 'AUTO', '1200', '2400', + '4800', '9600', '19200', '38400',