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

Merge pull request #2449 from haslinghuis/fix_motor_MSP

Browse source 
Fix MSP motortab
This commit is contained in:
Michael Keller 2021-03-28 18:29:41 +13:00 • committed by GitHub
commit 1395841f1c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/js/tabs/motors.js
View file

@ -59,21 +59,17 @@ TABS.motors.initialize = function (callback) {
GUI.active_tab = 'motors'; GUI.active_tab = 'motors';
} }
Promise MSP.promise(MSPCodes.MSP_STATUS)
.resolve(true) .then(() => MSP.promise(MSPCodes.MSP_FEATURE_CONFIG))
.then(() => { return MSP.promise(MSPCodes.MSP_STATUS); }) .then(() => MSP.promise(MSPCodes.MSP_MIXER_CONFIG))
.then(() => { return MSP.promise(MSPCodes.MSP_FEATURE_CONFIG); }) .then(() => FC.MOTOR_CONFIG.use_dshot_telemetry || FC.MOTOR_CONFIG.use_esc_sensor ? MSP.promise(MSPCodes.MSP_MOTOR_TELEMETRY) : true)
.then(() => { return MSP.promise(MSPCodes.MSP_MIXER_CONFIG); }) .then(() => MSP.promise(MSPCodes.MSP_MOTOR_CONFIG))
.then(() => { return (FC.MOTOR_CONFIG.use_dshot_telemetry || FC.MOTOR_CONFIG.use_esc_sensor) ? MSP.promise(MSPCodes.MSP_MOTOR_TELEMETRY) : true; }) .then(() => MSP.promise(MSPCodes.MSP_MOTOR_3D_CONFIG))
.then(() => { return MSP.promise(MSPCodes.MSP_MOTOR_CONFIG); }) .then(() => MSP.promise(MSPCodes.MSP2_MOTOR_OUTPUT_REORDERING))
.then(() => { return MSP.promise(MSPCodes.MSP_MOTOR_3D_CONFIG); }) .then(() => MSP.promise(MSPCodes.MSP_ADVANCED_CONFIG))
.then(() => { return MSP.promise(MSPCodes.MSP2_MOTOR_OUTPUT_REORDERING); }) .then(() => semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_42) ? MSP.promise(MSPCodes.MSP_FILTER_CONFIG) : true)
.then(() => { return MSP.promise(MSPCodes.MSP_ADVANCED_CONFIG); }) .then(() => semver.gte(FC.CONFIG.apiVersion, "1.8.0") ? MSP.promise(MSPCodes.MSP_ARMING_CONFIG) : true)
.then(() => { return MSP.promise(MSPCodes.MSP_ARMING_CONFIG); }) .then(() => load_html());
.then(() => { return (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_42)) ? MSP.promise(MSPCodes.MSP_FILTER_CONFIG) : true; })
.then(() => { return MSP.promise(MSPCodes.MSP_MIXER_CONFIG); })
.then(() => { return (semver.gte(FC.CONFIG.apiVersion, "1.8.0")) ? MSP.promise(MSPCodes.MSP_ARMING_CONFIG) : true; })
.then(() => { load_html(); });
function load_html() { function load_html() {
$('#content').load("./tabs/motors.html", process_html); $('#content').load("./tabs/motors.html", process_html);