Skip to content

Allow motor test mode when reversible motors (3D) enabled #2595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sensei-hacker wants to merge 1 commit into
base: maintenance-9.x
Choose a base branch
from
Open

Allow motor test mode when reversible motors (3D) enabled #2595

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions tabs/outputs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,12 @@ import interval from './../js/intervals';

TABS.outputs = {
allowTestMode: false,
feature3DEnabled: false,
feature3DSupported: false
feature3DEnabled: false
};
TABS.outputs.initialize = function (callback) {
var self = this;

self.armed = false;
self.feature3DSupported = false;
self.allowTestMode = true;

var $motorsEnableTestMode;
Expand Down Expand Up @@ -402,10 +400,6 @@ TABS.outputs.initialize = function (callback) {
function process_motors() {
$motorsEnableTestMode = $('#motorsEnableTestMode');

if (self.feature3DEnabled && !self.feature3DSupported) {
self.allowTestMode = false;
}

$motorsEnableTestMode.prop('checked', false);
$motorsEnableTestMode.prop('disabled', true);

Expand Down Expand Up @@ -526,10 +520,9 @@ TABS.outputs.initialize = function (callback) {
$slidersInput.prop('max', FC.MISC.maxthrottle);
$('div.values li:not(:last)').text(FC.MISC.mincommand);

if (self.feature3DEnabled && self.feature3DSupported) {
//Arbitrary sanity checks
//Note: values may need to be revisited
if (FC.REVERSIBLE_MOTORS.neutral > 1575 || FC.EVERSIBLE_MOTORS.neutral < 1425)
if (self.feature3DEnabled) {
// Clamp neutral to safe range around midpoint (1500us); values outside indicate corrupt config
if (FC.REVERSIBLE_MOTORS.neutral > 1575 || FC.REVERSIBLE_MOTORS.neutral < 1425)
FC.REVERSIBLE_MOTORS.neutral = 1500;

$slidersInput.val(FC.REVERSIBLE_MOTORS.neutral);
Expand Down Expand Up @@ -590,7 +583,7 @@ TABS.outputs.initialize = function (callback) {
$slidersInput.prop('disabled', true);

// change all values to default
if (self.feature3DEnabled && self.feature3DSupported) {
if (self.feature3DEnabled) {
$slidersInput.val(FC.REVERSIBLE_MOTORS.neutral);
} else {
$slidersInput.val(FC.MISC.mincommand);
Expand Down
Loading