Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-23 16:25:19 +03:00
Code Wiki Activity

Port GPS renamed to Sensors and moved to separate column

Browse source
This commit is contained in:
Pawel Spychalski (DzikuVx) 2017-09-19 21:33:26 +02:00
parent e8997dceb7
commit 8dfa070624
5 changed files with 26 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
_locales/en/messages.json
View file

@ -756,8 +756,8 @@
"portsFunction_MSP": { "portsFunction_MSP": {
"message": "MSP" "message": "MSP"
}, },
"portsFunction_GSP": { "portsFunction_GPS": {
"message": "GSP" "message": "GPS"
}, },
"portsFunction_TELEMETRY_FRSKY": { "portsFunction_TELEMETRY_FRSKY": {
"message": "FrSky" "message": "FrSky"
@ -2181,5 +2181,8 @@
}, },
"osdElement_RTC_TIME_HELP": { "osdElement_RTC_TIME_HELP": {
"message": "Shows the current time, as retrieved from the GPS or set via the radio." "message": "Shows the current time, as retrieved from the GPS or set via the radio."
},
"portColumnSensors": {
"message": "Sensors"
} }
} }

2
js/fc.js
View file

@ -218,7 +218,7 @@ var FC = {
mincommand: 0, mincommand: 0,
failsafe_throttle: 0, failsafe_throttle: 0,
gps_type: 0, gps_type: 0,
gps_baudrate: 0, sensors_baudrate: 0,
gps_ubx_sbas: 0, gps_ubx_sbas: 0,
multiwiicurrentoutput: 0, multiwiicurrentoutput: 0,
rssi_channel: 0, rssi_channel: 0,

8
js/msp/MSPHelper.js
View file

@ -261,7 +261,7 @@ var mspHelper = (function (gui) {
MISC.failsafe_throttle = data.getUint16(offset, true); // 1000-2000 MISC.failsafe_throttle = data.getUint16(offset, true); // 1000-2000
offset += 2; offset += 2;
MISC.gps_type = data.getUint8(offset++); MISC.gps_type = data.getUint8(offset++);
MISC.gps_baudrate = data.getUint8(offset++); MISC.sensors_baudrate = data.getUint8(offset++);
MISC.gps_ubx_sbas = data.getInt8(offset++); MISC.gps_ubx_sbas = data.getInt8(offset++);
MISC.multiwiicurrentoutput = data.getUint8(offset++); MISC.multiwiicurrentoutput = data.getUint8(offset++);
MISC.rssi_channel = data.getUint8(offset++); MISC.rssi_channel = data.getUint8(offset++);
@ -507,7 +507,7 @@ var mspHelper = (function (gui) {
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: BAUD_RATES[data.getUint8(offset + 3)], msp_baudrate: BAUD_RATES[data.getUint8(offset + 3)],
gps_baudrate: BAUD_RATES[data.getUint8(offset + 4)], sensors_baudrate: BAUD_RATES[data.getUint8(offset + 4)],
telemetry_baudrate: BAUD_RATES[data.getUint8(offset + 5)], telemetry_baudrate: BAUD_RATES[data.getUint8(offset + 5)],
blackbox_baudrate: BAUD_RATES[data.getUint8(offset + 6)] blackbox_baudrate: BAUD_RATES[data.getUint8(offset + 6)]
}; };
@ -1133,7 +1133,7 @@ var mspHelper = (function (gui) {
buffer.push(lowByte(MISC.failsafe_throttle)); buffer.push(lowByte(MISC.failsafe_throttle));
buffer.push(highByte(MISC.failsafe_throttle)); buffer.push(highByte(MISC.failsafe_throttle));
buffer.push(MISC.gps_type); buffer.push(MISC.gps_type);
buffer.push(MISC.gps_baudrate); buffer.push(MISC.sensors_baudrate);
buffer.push(MISC.gps_ubx_sbas); buffer.push(MISC.gps_ubx_sbas);
buffer.push(MISC.multiwiicurrentoutput); buffer.push(MISC.multiwiicurrentoutput);
buffer.push(MISC.rssi_channel); buffer.push(MISC.rssi_channel);
@ -1210,7 +1210,7 @@ var mspHelper = (function (gui) {
var BAUD_RATES = (semver.gte(CONFIG.flightControllerVersion, "1.6.3")) ? mspHelper.BAUD_RATES_post1_6_3 : mspHelper.BAUD_RATES_pre1_6_3; 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.msp_baudrate));
buffer.push(BAUD_RATES.indexOf(serialPort.gps_baudrate)); buffer.push(BAUD_RATES.indexOf(serialPort.sensors_baudrate));
buffer.push(BAUD_RATES.indexOf(serialPort.telemetry_baudrate)); buffer.push(BAUD_RATES.indexOf(serialPort.telemetry_baudrate));
buffer.push(BAUD_RATES.indexOf(serialPort.blackbox_baudrate)); buffer.push(BAUD_RATES.indexOf(serialPort.blackbox_baudrate));
} }

4
tabs/ports.html
View file

@ -19,7 +19,7 @@
<td>Data</td> <td>Data</td>
<td>Telemetry</td> <td>Telemetry</td>
<td>RX</td> <td>RX</td>
<td>GPS</td> <td data-i18n="portColumnSensors"></td>
<td class='peripherls-column'>Peripherals</td> <td class='peripherls-column'>Peripherals</td>
</tr> </tr>
</thead> </thead>
@ -56,7 +56,7 @@
<!-- list generated here --> <!-- list generated here -->
</select></td> </select></td>
<td class="functionsCell-rx"></td> <td class="functionsCell-rx"></td>
<td class="functionsCell-gps"><select class="gps_baudrate"> <td class="functionsCell-sensors"><select class="sensors_baudrate">
<!-- list generated here --> <!-- list generated here -->
</select></td> </select></td>
<td class="functionsCell-peripherals"><select class="blackbox_baudrate"> <td class="functionsCell-peripherals"><select class="blackbox_baudrate">

22
tabs/ports.js
View file

@ -2,12 +2,13 @@
TABS.ports = {}; TABS.ports = {};
TABS.ports.initialize = function (callback, scrollPosition) { TABS.ports.initialize = function (callback) {
var board_definition = {}; var board_definition = {};
var functionRules = [ var functionRules = [
{name: 'MSP', groups: ['data', 'msp'], maxPorts: 2}, {name: 'MSP', groups: ['data', 'msp'], maxPorts: 2},
{name: 'GPS', groups: ['gps'], maxPorts: 1}, {name: 'GPS', groups: ['sensors'], maxPorts: 1},
{name: 'TELEMETRY_FRSKY', groups: ['telemetry'], sharableWith: ['msp'], notSharableWith: ['blackbox'], maxPorts: 1}, {name: 'TELEMETRY_FRSKY', groups: ['telemetry'], sharableWith: ['msp'], notSharableWith: ['blackbox'], maxPorts: 1},
{name: 'TELEMETRY_HOTT', groups: ['telemetry'], sharableWith: ['msp'], notSharableWith: ['blackbox'], maxPorts: 1}, {name: 'TELEMETRY_HOTT', groups: ['telemetry'], sharableWith: ['msp'], notSharableWith: ['blackbox'], maxPorts: 1},
{name: 'TELEMETRY_SMARTPORT', groups: ['telemetry'], maxPorts: 1}, {name: 'TELEMETRY_SMARTPORT', groups: ['telemetry'], maxPorts: 1},
@ -111,7 +112,7 @@ TABS.ports.initialize = function (callback, scrollPosition) {
'250000' '250000'
]; ];
var columns = ['data', 'logging', 'gps', 'telemetry', 'rx', 'peripherals']; var columns = ['data', 'logging', 'sensors', 'telemetry', 'rx', 'peripherals'];
if (GUI.active_tab != 'ports') { if (GUI.active_tab != 'ports') {
GUI.active_tab = 'ports'; GUI.active_tab = 'ports';
@ -151,7 +152,7 @@ TABS.ports.initialize = function (callback, scrollPosition) {
var i, var i,
$elements; $elements;
$elements = $('select.gps_baudrate'); $elements = $('select.sensors_baudrate');
for (i = 0; i < gpsBaudRates.length; i++) { for (i = 0; i < gpsBaudRates.length; i++) {
$elements.append('<option value="' + gpsBaudRates[i] + '">' + gpsBaudRates[i] + '</option>'); $elements.append('<option value="' + gpsBaudRates[i] + '">' + gpsBaudRates[i] + '</option>');
} }
@ -183,10 +184,10 @@ TABS.ports.initialize = function (callback, scrollPosition) {
port_configuration_e.find('select.msp_baudrate').val(serialPort.msp_baudrate); port_configuration_e.find('select.msp_baudrate').val(serialPort.msp_baudrate);
port_configuration_e.find('select.telemetry_baudrate').val(serialPort.telemetry_baudrate); port_configuration_e.find('select.telemetry_baudrate').val(serialPort.telemetry_baudrate);
port_configuration_e.find('select.gps_baudrate').val(serialPort.gps_baudrate); port_configuration_e.find('select.sensors_baudrate').val(serialPort.sensors_baudrate);
port_configuration_e.find('select.blackbox_baudrate').val(serialPort.blackbox_baudrate); port_configuration_e.find('select.blackbox_baudrate').val(serialPort.blackbox_baudrate);
port_configuration_e.find('.identifier').text(portIdentifierToNameMapping[serialPort.identifier]) port_configuration_e.find('.identifier').text(portIdentifierToNameMapping[serialPort.identifier]);
port_configuration_e.data('index', portIndex); port_configuration_e.data('index', portIndex);
port_configuration_e.data('port', serialPort); port_configuration_e.data('port', serialPort);
@ -206,7 +207,7 @@ TABS.ports.initialize = function (callback, scrollPosition) {
} }
var select_e; var select_e;
if (column !== 'telemetry' && column !== 'peripherals') { if (column !== 'telemetry' && column !== 'peripherals' && column !== 'sensors') {
var checkboxId = 'functionCheckbox-' + portIndex + '-' + columnIndex + '-' + i; var checkboxId = 'functionCheckbox-' + portIndex + '-' + columnIndex + '-' + i;
functions_e.prepend('<span class="function"><input type="checkbox" class="togglemedium" id="' + checkboxId + '" value="' + functionName + '" /><label for="' + checkboxId + '"> ' + functionRule.displayName + '</label></span>'); functions_e.prepend('<span class="function"><input type="checkbox" class="togglemedium" id="' + checkboxId + '" value="' + functionName + '" /><label for="' + checkboxId + '"> ' + functionRule.displayName + '</label></span>');
@ -276,6 +277,11 @@ TABS.ports.initialize = function (callback, scrollPosition) {
functions.push(peripheralFunction); functions.push(peripheralFunction);
} }
var sensorsFunction = $(portConfiguration_e).find('select[name=function-sensors]').val();
if (sensorsFunction) {
functions.push(sensorsFunction);
}
if (telemetryFunction.length > 0) { if (telemetryFunction.length > 0) {
googleAnalytics.sendEvent('Setting', 'Telemetry Protocol', telemetryFunction); googleAnalytics.sendEvent('Setting', 'Telemetry Protocol', telemetryFunction);
} }
@ -284,7 +290,7 @@ TABS.ports.initialize = function (callback, scrollPosition) {
functions: functions, functions: functions,
msp_baudrate: $(portConfiguration_e).find('.msp_baudrate').val(), msp_baudrate: $(portConfiguration_e).find('.msp_baudrate').val(),
telemetry_baudrate: $(portConfiguration_e).find('.telemetry_baudrate').val(), telemetry_baudrate: $(portConfiguration_e).find('.telemetry_baudrate').val(),
gps_baudrate: $(portConfiguration_e).find('.gps_baudrate').val(), sensors_baudrate: $(portConfiguration_e).find('.sensors_baudrate').val(),
blackbox_baudrate: $(portConfiguration_e).find('.blackbox_baudrate').val(), blackbox_baudrate: $(portConfiguration_e).find('.blackbox_baudrate').val(),
identifier: oldSerialPort.identifier identifier: oldSerialPort.identifier
}; };