mirror of
https://github.com/iNavFlight/inav-configurator.git
synced 2025-07-15 12:25:13 +03:00
Extend baudrates; Allow telemetry baud rates down to 1200 bps
This commit is contained in:
parent
86f2a8aa0b
commit
12492267b7
3 changed files with 80 additions and 20 deletions
|
@ -7552,7 +7552,22 @@ var MSPCodes = {
|
||||||
var mspHelper = (function (gui) {
|
var mspHelper = (function (gui) {
|
||||||
var self = {};
|
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',
|
'AUTO',
|
||||||
'9600',
|
'9600',
|
||||||
'19200',
|
'19200',
|
||||||
|
@ -8032,13 +8047,15 @@ var mspHelper = (function (gui) {
|
||||||
var serialPortCount = data.byteLength / bytesPerPort;
|
var serialPortCount = data.byteLength / bytesPerPort;
|
||||||
|
|
||||||
for (i = 0; i < serialPortCount; i++) {
|
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 = {
|
var serialPort = {
|
||||||
identifier: data.getUint8(offset),
|
identifier: data.getUint8(offset),
|
||||||
functions: mspHelper.serialPortFunctionMaskToFunctions(data.getUint16(offset + 1, true)),
|
functions: mspHelper.serialPortFunctionMaskToFunctions(data.getUint16(offset + 1, true)),
|
||||||
msp_baudrate: mspHelper.BAUD_RATES[data.getUint8(offset + 3)],
|
msp_baudrate: BAUD_RATES[data.getUint8(offset + 3)],
|
||||||
gps_baudrate: mspHelper.BAUD_RATES[data.getUint8(offset + 4)],
|
gps_baudrate: BAUD_RATES[data.getUint8(offset + 4)],
|
||||||
telemetry_baudrate: mspHelper.BAUD_RATES[data.getUint8(offset + 5)],
|
telemetry_baudrate: BAUD_RATES[data.getUint8(offset + 5)],
|
||||||
blackbox_baudrate: mspHelper.BAUD_RATES[data.getUint8(offset + 6)]
|
blackbox_baudrate: BAUD_RATES[data.getUint8(offset + 6)]
|
||||||
};
|
};
|
||||||
|
|
||||||
offset += bytesPerPort;
|
offset += bytesPerPort;
|
||||||
|
@ -8703,10 +8720,11 @@ var mspHelper = (function (gui) {
|
||||||
buffer.push(specificByte(functionMask, 0));
|
buffer.push(specificByte(functionMask, 0));
|
||||||
buffer.push(specificByte(functionMask, 1));
|
buffer.push(specificByte(functionMask, 1));
|
||||||
|
|
||||||
buffer.push(mspHelper.BAUD_RATES.indexOf(serialPort.msp_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(mspHelper.BAUD_RATES.indexOf(serialPort.gps_baudrate));
|
buffer.push(BAUD_RATES.indexOf(serialPort.msp_baudrate));
|
||||||
buffer.push(mspHelper.BAUD_RATES.indexOf(serialPort.telemetry_baudrate));
|
buffer.push(BAUD_RATES.indexOf(serialPort.gps_baudrate));
|
||||||
buffer.push(mspHelper.BAUD_RATES.indexOf(serialPort.blackbox_baudrate));
|
buffer.push(BAUD_RATES.indexOf(serialPort.telemetry_baudrate));
|
||||||
|
buffer.push(BAUD_RATES.indexOf(serialPort.blackbox_baudrate));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -20497,7 +20515,7 @@ TABS.ports.initialize = function (callback, scrollPosition) {
|
||||||
'115200'
|
'115200'
|
||||||
];
|
];
|
||||||
|
|
||||||
var telemetryBaudRates = [
|
var telemetryBaudRates_pre1_6_3 = [
|
||||||
'AUTO',
|
'AUTO',
|
||||||
'9600',
|
'9600',
|
||||||
'19200',
|
'19200',
|
||||||
|
@ -20506,6 +20524,17 @@ TABS.ports.initialize = function (callback, scrollPosition) {
|
||||||
'115200'
|
'115200'
|
||||||
];
|
];
|
||||||
|
|
||||||
|
var telemetryBaudRates_post1_6_3 = [
|
||||||
|
'AUTO',
|
||||||
|
'1200',
|
||||||
|
'2400',
|
||||||
|
'9600',
|
||||||
|
'19200',
|
||||||
|
'38400',
|
||||||
|
'57600',
|
||||||
|
'115200'
|
||||||
|
];
|
||||||
|
|
||||||
var blackboxBaudRates = [
|
var blackboxBaudRates = [
|
||||||
'19200',
|
'19200',
|
||||||
'38400',
|
'38400',
|
||||||
|
@ -20563,6 +20592,7 @@ TABS.ports.initialize = function (callback, scrollPosition) {
|
||||||
}
|
}
|
||||||
|
|
||||||
var telemetry_baudrate_e = $('select.telemetry_baudrate');
|
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++) {
|
for (var i = 0; i < telemetryBaudRates.length; i++) {
|
||||||
telemetry_baudrate_e.append('<option value="' + telemetryBaudRates[i] + '">' + telemetryBaudRates[i] + '</option>');
|
telemetry_baudrate_e.append('<option value="' + telemetryBaudRates[i] + '">' + telemetryBaudRates[i] + '</option>');
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,22 @@
|
||||||
var mspHelper = (function (gui) {
|
var mspHelper = (function (gui) {
|
||||||
var self = {};
|
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',
|
'AUTO',
|
||||||
'9600',
|
'9600',
|
||||||
'19200',
|
'19200',
|
||||||
|
@ -484,13 +499,15 @@ var mspHelper = (function (gui) {
|
||||||
var serialPortCount = data.byteLength / bytesPerPort;
|
var serialPortCount = data.byteLength / bytesPerPort;
|
||||||
|
|
||||||
for (i = 0; i < serialPortCount; i++) {
|
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 = {
|
var serialPort = {
|
||||||
identifier: data.getUint8(offset),
|
identifier: data.getUint8(offset),
|
||||||
functions: mspHelper.serialPortFunctionMaskToFunctions(data.getUint16(offset + 1, true)),
|
functions: mspHelper.serialPortFunctionMaskToFunctions(data.getUint16(offset + 1, true)),
|
||||||
msp_baudrate: mspHelper.BAUD_RATES[data.getUint8(offset + 3)],
|
msp_baudrate: BAUD_RATES[data.getUint8(offset + 3)],
|
||||||
gps_baudrate: mspHelper.BAUD_RATES[data.getUint8(offset + 4)],
|
gps_baudrate: BAUD_RATES[data.getUint8(offset + 4)],
|
||||||
telemetry_baudrate: mspHelper.BAUD_RATES[data.getUint8(offset + 5)],
|
telemetry_baudrate: BAUD_RATES[data.getUint8(offset + 5)],
|
||||||
blackbox_baudrate: mspHelper.BAUD_RATES[data.getUint8(offset + 6)]
|
blackbox_baudrate: BAUD_RATES[data.getUint8(offset + 6)]
|
||||||
};
|
};
|
||||||
|
|
||||||
offset += bytesPerPort;
|
offset += bytesPerPort;
|
||||||
|
@ -1155,10 +1172,11 @@ var mspHelper = (function (gui) {
|
||||||
buffer.push(specificByte(functionMask, 0));
|
buffer.push(specificByte(functionMask, 0));
|
||||||
buffer.push(specificByte(functionMask, 1));
|
buffer.push(specificByte(functionMask, 1));
|
||||||
|
|
||||||
buffer.push(mspHelper.BAUD_RATES.indexOf(serialPort.msp_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(mspHelper.BAUD_RATES.indexOf(serialPort.gps_baudrate));
|
buffer.push(BAUD_RATES.indexOf(serialPort.msp_baudrate));
|
||||||
buffer.push(mspHelper.BAUD_RATES.indexOf(serialPort.telemetry_baudrate));
|
buffer.push(BAUD_RATES.indexOf(serialPort.gps_baudrate));
|
||||||
buffer.push(mspHelper.BAUD_RATES.indexOf(serialPort.blackbox_baudrate));
|
buffer.push(BAUD_RATES.indexOf(serialPort.telemetry_baudrate));
|
||||||
|
buffer.push(BAUD_RATES.indexOf(serialPort.blackbox_baudrate));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
|
@ -54,7 +54,7 @@ TABS.ports.initialize = function (callback, scrollPosition) {
|
||||||
'115200'
|
'115200'
|
||||||
];
|
];
|
||||||
|
|
||||||
var telemetryBaudRates = [
|
var telemetryBaudRates_pre1_6_3 = [
|
||||||
'AUTO',
|
'AUTO',
|
||||||
'9600',
|
'9600',
|
||||||
'19200',
|
'19200',
|
||||||
|
@ -63,6 +63,17 @@ TABS.ports.initialize = function (callback, scrollPosition) {
|
||||||
'115200'
|
'115200'
|
||||||
];
|
];
|
||||||
|
|
||||||
|
var telemetryBaudRates_post1_6_3 = [
|
||||||
|
'AUTO',
|
||||||
|
'1200',
|
||||||
|
'2400',
|
||||||
|
'9600',
|
||||||
|
'19200',
|
||||||
|
'38400',
|
||||||
|
'57600',
|
||||||
|
'115200'
|
||||||
|
];
|
||||||
|
|
||||||
var blackboxBaudRates = [
|
var blackboxBaudRates = [
|
||||||
'19200',
|
'19200',
|
||||||
'38400',
|
'38400',
|
||||||
|
@ -120,6 +131,7 @@ TABS.ports.initialize = function (callback, scrollPosition) {
|
||||||
}
|
}
|
||||||
|
|
||||||
var telemetry_baudrate_e = $('select.telemetry_baudrate');
|
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++) {
|
for (var i = 0; i < telemetryBaudRates.length; i++) {
|
||||||
telemetry_baudrate_e.append('<option value="' + telemetryBaudRates[i] + '">' + telemetryBaudRates[i] + '</option>');
|
telemetry_baudrate_e.append('<option value="' + telemetryBaudRates[i] + '">' + telemetryBaudRates[i] + '</option>');
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue