diff --git a/gulpfile.js b/gulpfile.js index 91a16809..d3257b5d 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -89,6 +89,7 @@ sources.js = [ './js/msp/MSPCodes.js', './js/msp/MSPHelper.js', './js/msp/MSPchainer.js', + './js/ublox/UBLOX.js', './js/port_handler.js', './js/connection/connection.js', './js/connection/connectionBle.js', diff --git a/js/configurator_main.js b/js/configurator_main.js index 4ca94c2d..8bcf3f73 100644 --- a/js/configurator_main.js +++ b/js/configurator_main.js @@ -81,6 +81,7 @@ $(function() { globalSettings.unitType = store.get('unit_type', UnitType.none); globalSettings.mapProviderType = store.get('map_provider_type', 'osm'); globalSettings.mapApiKey = store.get('map_api_key', ''); + globalSettings.assistnowApiKey = store.get('assistnow_api_key', ''); globalSettings.proxyURL = store.get('proxyurl', 'http://192.168.1.222/mapproxy/service?'); globalSettings.proxyLayer = store.get('proxylayer', 'your_proxy_layer_name'); globalSettings.showProfileParameters = store.get('show_profile_parameters', 1); @@ -340,6 +341,7 @@ $(function() { $('#proxylayer').val(globalSettings.proxyLayer); $('#showProfileParameters').prop('checked', globalSettings.showProfileParameters); $('#cliAutocomplete').prop('checked', globalSettings.cliAutocomplete); + $('#assistnow-api-key').val(globalSettings.assistnowApiKey); i18n.getLanguages().forEach(lng => { $('#languageOption').append("".format(lng, i18n.getMessage("language_" + lng))); @@ -383,6 +385,11 @@ $(function() { store.set('proxylayer', $(this).val()); globalSettings.proxyLayer = $(this).val(); }); + $('#assistnow-api-key').on('change', function () { + store.set('assistnow_api_key', $(this).val()); + globalSettings.assistnowApiKey = $(this).val(); + }); + $('#demoModeReset').on('click', function () { SITLProcess.deleteEepromFile('demo.bin'); }); diff --git a/js/globalSettings.js b/js/globalSettings.js index 1a58268c..96b078fb 100644 --- a/js/globalSettings.js +++ b/js/globalSettings.js @@ -21,6 +21,7 @@ var globalSettings = { // tree target for documents docsTreeLocation: 'master', cliAutocomplete: true, + assistnowApiKey: null, }; module.exports = { globalSettings, UnitType }; \ No newline at end of file diff --git a/js/msp/MSPHelper.js b/js/msp/MSPHelper.js index 383b99bb..c8d64572 100644 --- a/js/msp/MSPHelper.js +++ b/js/msp/MSPHelper.js @@ -3383,6 +3383,10 @@ var mspHelper = (function () { MSP.send_message(MSPCodes.MSP2_SET_CF_SERIAL_CONFIG, mspHelper.crunch(MSPCodes.MSP2_SET_CF_SERIAL_CONFIG), false, callback); }; + self.sendUbloxCommand = function (ubloxData, callback) { + MSP.send_message(MSPCodes.MSP2_INAV_GPS_UBLOX_COMMAND, ubloxData, false, callback); + }; + return self; })(); diff --git a/locale/en/messages.json b/locale/en/messages.json index 88d11147..928351d5 100644 --- a/locale/en/messages.json +++ b/locale/en/messages.json @@ -5911,5 +5911,11 @@ }, "maintenanceFlushSettingsCache": { "message": "Flush settings cache" + }, + "gpsOptions": { + "message": "GPS Options" + }, + "gpsOptionsAssistnowToken": { + "message": "AssitNow Token" } } diff --git a/tabs/options.html b/tabs/options.html index 7c21b29d..d7e6c2f9 100644 --- a/tabs/options.html +++ b/tabs/options.html @@ -97,5 +97,17 @@ +
+
+
+
+ +
+
+ + +
+
+
\ No newline at end of file