diff options
author | Mark Haslinghuis <mark@numloq.nl> | 2022-07-09 01:28:05 +0300 |
---|---|---|
committer | Mark Haslinghuis <mark@numloq.nl> | 2022-07-24 01:26:08 +0300 |
commit | f57255920aab8ceece9c1d2b94d6eaa6cfcc80a7 (patch) | |
tree | 740eff69aa923ec659879645a8d067517a29a080 | |
parent | 8054aa7fa904006cea80570fdf92d3e244f5ffef (diff) |
Fix motor stop
-rw-r--r-- | src/js/msp/MSPHelper.js | 6 | ||||
-rw-r--r-- | src/js/tabs/motors.js | 18 |
2 files changed, 9 insertions, 15 deletions
diff --git a/src/js/msp/MSPHelper.js b/src/js/msp/MSPHelper.js index 3dfcbb91..8ad9294c 100644 --- a/src/js/msp/MSPHelper.js +++ b/src/js/msp/MSPHelper.js @@ -1741,10 +1741,10 @@ MspHelper.prototype.process_data = function(dataHandler) { console.log(`Unknown code detected: ${code}`); } else { console.log(`FC reports unsupported message error: ${code}`); - } - if (code === MSPCodes.MSP_SET_REBOOT) { - TABS.onboard_logging.mscRebootFailedCallback(); + if (code === MSPCodes.MSP_SET_REBOOT) { + TABS.onboard_logging.mscRebootFailedCallback(); + } } } else { diff --git a/src/js/tabs/motors.js b/src/js/tabs/motors.js index 75a686d3..767bef69 100644 --- a/src/js/tabs/motors.js +++ b/src/js/tabs/motors.js @@ -55,9 +55,7 @@ motors.initialize = async function (callback) { // Update filtering defaults based on API version const FILTER_DEFAULT = FC.getFilterDefaults(); - if (GUI.active_tab != 'motors') { - GUI.active_tab = 'motors'; - } + GUI.active_tab = 'motors'; await MSP.promise(MSPCodes.MSP_STATUS); await MSP.promise(MSPCodes.MSP_PID_ADVANCED); @@ -884,7 +882,7 @@ motors.initialize = async function (callback) { ]; motorsEnableTestModeElement.on('change', function () { - let enabled = $(this).is(':checked'); + let enabled = motorsEnableTestModeElement.is(':checked'); // prevent or disable testing if configHasChanged flag is set. if (self.configHasChanged) { if (enabled) { @@ -900,17 +898,13 @@ motors.initialize = async function (callback) { if (motorsEnableTestModeElement.is(':checked')) { if (!ignoreKeys.includes(e.code)) { motorsEnableTestModeElement.prop('checked', false).trigger('change'); + document.removeEventListener('keydown', evt => disableMotorTest(evt)); } } } if (enabled) { document.addEventListener('keydown', e => disableMotorTest(e)); - // enable Status and Motor data pulling - GUI.interval_add('motor_and_status_pull', get_status, 50, true); - } else { - document.removeEventListener('keydown', e => disableMotorTest(e)); - GUI.interval_remove("motor_and_status_pull"); } setContentButtons(enabled); @@ -1002,7 +996,7 @@ motors.initialize = async function (callback) { // data pulling functions used inside interval timer - function get_status() { + function getStatus() { // status needed for arming flag MSP.send_message(MSPCodes.MSP_STATUS, false, false, get_motor_data); } @@ -1143,8 +1137,8 @@ motors.initialize = async function (callback) { $('a.stop').on('click', () => motorsEnableTestModeElement.prop('checked', false).trigger('change')); - // get initial motor status values - get_status(); + // enable Status and Motor data pulling + GUI.interval_add('motor_and_status_pull', getStatus, 50, true); setup_motor_output_reordering_dialog(SetupEscDshotDirectionDialogCallback, zeroThrottleValue); |