diff --git a/js/serialPortHelper.js b/js/serialPortHelper.js index 7fc48fc7..5059dc06 100644 --- a/js/serialPortHelper.js +++ b/js/serialPortHelper.js @@ -133,6 +133,20 @@ helper.serialPortHelper = (function () { 'MSP_DISPLAYPORT': 25, }; + privateScope.identifierToName = { + 0: 'UART1', + 1: 'UART2', + 2: 'UART3', + 3: 'UART4', + 4: 'UART5', + 5: 'UART6', + 6: 'UART7', + 7: 'UART8', + 20: 'USB VCP', + 30: 'SOFTSERIAL1', + 31: 'SOFTSERIAL2' + }; + privateScope.generateNames = function () { if (privateScope.namesGenerated) { return; @@ -187,5 +201,9 @@ helper.serialPortHelper = (function () { return functions; }; + publicScope.getPortName = function (identifier) { + return privateScope.identifierToName[identifier]; + }; + return publicScope; })(); \ No newline at end of file diff --git a/tabs/gps.js b/tabs/gps.js index e0d9a65c..59cb2e36 100644 --- a/tabs/gps.js +++ b/tabs/gps.js @@ -33,12 +33,11 @@ TABS.gps.initialize = function (callback) { 19: 'adsb_12.png', // ADSB_EMITTER_TYPE_POINT_OBSTACLE }; - - var loadChainer = new MSPChainerClass(); var loadChain = [ mspHelper.loadFeatures, + mspHelper.loadSerialPorts, mspHelper.loadMiscV2 ]; @@ -50,6 +49,7 @@ TABS.gps.initialize = function (callback) { var saveChain = [ mspHelper.saveMiscV2, + mspHelper.saveSerialPorts, saveSettings, mspHelper.saveToEeprom ]; diff --git a/tabs/ports.js b/tabs/ports.js index 9e337786..4888d17e 100644 --- a/tabs/ports.js +++ b/tabs/ports.js @@ -57,20 +57,6 @@ TABS.ports.initialize = function (callback) { $(".tab-ports").addClass("supported"); - var portIdentifierToNameMapping = { - 0: 'UART1', - 1: 'UART2', - 2: 'UART3', - 3: 'UART4', - 4: 'UART5', - 5: 'UART6', - 6: 'UART7', - 7: 'UART8', - 20: 'USB VCP', - 30: 'SOFTSERIAL1', - 31: 'SOFTSERIAL2' - }; - var i, $elements; @@ -111,7 +97,7 @@ TABS.ports.initialize = function (callback) { port_configuration_e.find('select.sensors_baudrate').val(serialPort.sensors_baudrate); port_configuration_e.find('select.peripherals_baudrate').val(serialPort.peripherals_baudrate); - port_configuration_e.find('.identifier').text(portIdentifierToNameMapping[serialPort.identifier]); + port_configuration_e.find('.identifier').text(helper.serialPortHelper.getPortName(serialPort.identifier)); if (serialPort.identifier >= 30) { port_configuration_e.find('.softSerialWarning').css("display", "inline") } else {