Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-21 15:25:22 +03:00
Code Issues Wiki Activity

Added loading of craft name on startup.

Browse source
This commit is contained in:
mikeller 2017-05-16 23:48:31 +12:00
parent e2faf9fe26
commit eff295292b
2 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
_locales/en/messages.json
View file

@ -190,10 +190,13 @@
"message": "Firmware Version: <strong>$1</strong>" "message": "Firmware Version: <strong>$1</strong>"
}, },
"apiVersionReceived": { "apiVersionReceived": {
"message": "MultiWii API version <span style=\"color: #ffbb00\">received</span> - <strong>$1</strong>" "message": "MultiWii API version: <strong>$1</strong>"
}, },
"uniqueDeviceIdReceived": { "uniqueDeviceIdReceived": {
"message": "Unique device ID <span style=\"color: #ffbb00\">received</span> - <strong>0x$1</strong>" "message": "Unique device ID: <strong>0x$1</strong>"
},
"craftNameReceived": {
"message": "Craft name: <strong>$1</strong>"
}, },
"boardInfoReceived": { "boardInfoReceived": {
"message": "Board: <strong>$1</strong>, version: <strong>$2</strong>" "message": "Board: <strong>$1</strong>, version: <strong>$2</strong>"

29
js/serial_backend.js
View file

@ -208,16 +208,15 @@ function onOpen(openInfo) {
MSP.send_message(MSPCodes.MSP_UID, false, false, function () { MSP.send_message(MSPCodes.MSP_UID, false, false, function () {
GUI.log(chrome.i18n.getMessage('uniqueDeviceIdReceived', [CONFIG.uid[0].toString(16) + CONFIG.uid[1].toString(16) + CONFIG.uid[2].toString(16)])); GUI.log(chrome.i18n.getMessage('uniqueDeviceIdReceived', [CONFIG.uid[0].toString(16) + CONFIG.uid[1].toString(16) + CONFIG.uid[2].toString(16)]));
// continue as usually if (semver.gte(CONFIG.apiVersion, "1.20.0")) {
CONFIGURATOR.connectionValid = true; MSP.send_message(MSPCodes.MSP_NAME, false, false, function () {
GUI.allowedTabs = GUI.defaultAllowedFCTabsWhenConnected.slice(); GUI.log(chrome.i18n.getMessage('craftNameReceived', [CONFIG.name]));
if (semver.lt(CONFIG.apiVersion, "1.4.0")) {
GUI.allowedTabs.splice(GUI.allowedTabs.indexOf('led_strip'), 1); finishOpen();
});
} else {
finishOpen();
} }
onConnect();
$('#tabs ul.mode-connected .tab_setup a').click();
}); });
}); });
}); });
@ -251,6 +250,18 @@ function onOpen(openInfo) {
} }
} }
function finishOpen() {
CONFIGURATOR.connectionValid = true;
GUI.allowedTabs = GUI.defaultAllowedFCTabsWhenConnected.slice();
if (semver.lt(CONFIG.apiVersion, "1.4.0")) {
GUI.allowedTabs.splice(GUI.allowedTabs.indexOf('led_strip'), 1);
}
onConnect();
$('#tabs ul.mode-connected .tab_setup a').click();
}
function connectCli() { function connectCli() {
CONFIGURATOR.connectionValid = true; // making it possible to open the CLI tab CONFIGURATOR.connectionValid = true; // making it possible to open the CLI tab
GUI.allowedTabs = ['cli']; GUI.allowedTabs = ['cli'];