diff --git a/src/js/data_storage.js b/src/js/data_storage.js index c3fdfcd1de..c18424ce1a 100644 --- a/src/js/data_storage.js +++ b/src/js/data_storage.js @@ -6,6 +6,7 @@ export const API_VERSION_1_42 = '1.42.0'; export const API_VERSION_1_43 = '1.43.0'; export const API_VERSION_1_44 = '1.44.0'; export const API_VERSION_1_45 = '1.45.0'; +export const API_VERSION_1_46 = '1.46.0'; const CONFIGURATOR = { // all versions are specified and compared using semantic versioning http://semver.org/ diff --git a/src/js/serial_backend.js b/src/js/serial_backend.js index 49053baab9..c07d2c5472 100644 --- a/src/js/serial_backend.js +++ b/src/js/serial_backend.js @@ -10,7 +10,7 @@ import MSP from "./msp"; import MSPCodes from "./msp/MSPCodes"; import PortUsage from "./port_usage"; import PortHandler from "./port_handler"; -import CONFIGURATOR, { API_VERSION_1_45 } from "./data_storage"; +import CONFIGURATOR, { API_VERSION_1_45, API_VERSION_1_46 } from "./data_storage"; import serial from "./serial"; import MdnsDiscovery from "./mdns_discovery"; import UI_PHONES from "./phones_ui"; @@ -186,8 +186,11 @@ function finishClose(finishedCallback) { const connectedTime = Date.now() - connectionTimestamp; tracking.sendTiming(tracking.EVENT_CATEGORIES.FLIGHT_CONTROLLER, 'Connected', connectedTime); } - // close reset to custom defaults dialog - $('#dialogResetToCustomDefaults')[0].close(); + + if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_46)) { + // close reset to custom defaults dialog + $('#dialogResetToCustomDefaults')[0].close(); + } tracking.resetFlightControllerData(); @@ -200,6 +203,7 @@ function finishClose(finishedCallback) { GUI.connected_to = false; GUI.allowedTabs = GUI.defaultAllowedTabsWhenDisconnected.slice(); + // close problems dialog $('#dialogReportProblems-closebtn').click(); @@ -362,15 +366,7 @@ function abortConnect() { clicks = false; } -function processBoardInfo() { - tracking.setFlightControllerData(tracking.DATA.BOARD_TYPE, FC.CONFIG.boardIdentifier); - tracking.setFlightControllerData(tracking.DATA.TARGET_NAME, FC.CONFIG.targetName); - tracking.setFlightControllerData(tracking.DATA.BOARD_NAME, FC.CONFIG.boardName); - tracking.setFlightControllerData(tracking.DATA.MANUFACTURER_ID, FC.CONFIG.manufacturerId); - tracking.setFlightControllerData(tracking.DATA.MCU_TYPE, FC.getMcuType()); - - gui_log(i18n.getMessage('boardInfoReceived', [FC.getHardwareName(), FC.CONFIG.boardVersion])); - +function processCustomDefaults() { if (bit_check(FC.CONFIG.targetCapabilities, FC.TARGET_CAPABILITIES_FLAGS.SUPPORTS_CUSTOM_DEFAULTS) && bit_check(FC.CONFIG.targetCapabilities, FC.TARGET_CAPABILITIES_FLAGS.HAS_CUSTOM_DEFAULTS) && FC.CONFIG.configurationState === FC.CONFIGURATION_STATES.DEFAULTS_BARE) { const dialog = $('#dialogResetToCustomDefaults')[0]; @@ -406,6 +402,22 @@ function processBoardInfo() { } } +function processBoardInfo() { + tracking.setFlightControllerData(tracking.DATA.BOARD_TYPE, FC.CONFIG.boardIdentifier); + tracking.setFlightControllerData(tracking.DATA.TARGET_NAME, FC.CONFIG.targetName); + tracking.setFlightControllerData(tracking.DATA.BOARD_NAME, FC.CONFIG.boardName); + tracking.setFlightControllerData(tracking.DATA.MANUFACTURER_ID, FC.CONFIG.manufacturerId); + tracking.setFlightControllerData(tracking.DATA.MCU_TYPE, FC.getMcuType()); + + gui_log(i18n.getMessage('boardInfoReceived', [FC.getHardwareName(), FC.CONFIG.boardVersion])); + + if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_46)) { + checkReportProblems(); + } else { + processCustomDefaults(); + } +} + function checkReportProblems() { const PROBLEM_ANALYTICS_EVENT = 'ProblemFound'; const problemItemTemplate = $('#dialogReportProblems-listItemTemplate');