Skip to content
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

Jump to bottom

GCS: Output - Stop max resetting neutral #2254

Closed
wants to merge 16 commits into from
Closed

GCS: Output - Stop max resetting neutral #2254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
dcbfc04
Update inputchannelform.cpp
fxbisto Mar 21, 2019
59bc793
Update manualcontrolsettings.xml
fxbisto Mar 21, 2019
eadc7b8
Update transmitter_control.c
fxbisto Mar 21, 2019
9734acd
Update inputchannelform.cpp
fxbisto Mar 22, 2019
295b84b
gcs, inputchannelform: Fix whitespaces.
glowtape Apr 3, 2019
5c50160
Merge pull request #1 from d-ronin/next
fxbisto Apr 4, 2019
f8a9f96
Flight: Add target for Matek405Ctr and Matek405Std boards
jihlein Apr 2, 2019
8c9aa8d
Revert "Flight: Add target for Matek405Ctr and Matek405Std boards"
fxbisto Apr 4, 2019
7197ea6
Flight: Add target for Matek405Ctr and Matek405Std boards
jihlein Apr 2, 2019
274837f
Flight: Matek405 function cleanup
jihlein Apr 2, 2019
5c3835b
Flight: Fix typo in Matek405 pios_board.c
jihlein Apr 2, 2019
e6a8873
Flight: Remove gyro config objects for LPF, gyro range, accel range
jihlein Apr 3, 2019
9f54efb
Flight: Matek405 BMP280 none/enable selection, gyro range 2000 DPS
jihlein Apr 4, 2019
853ef56
Begin removal of features unused on miniquads: CameraStab and Storm32…
fxbisto Apr 5, 2019
8f8097a
Flight: Cleanup Matek405 I2C sensor handling
jihlein Apr 5, 2019
c3f04ec
GCS: Output - Stop max resetting neutral
fxbisto Apr 12, 2019
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
11 changes: 0 additions & 11 deletions flight/Libraries/sanitycheck.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,17 +262,6 @@ static int32_t check_stabilization_settings(int index, bool multirotor)
}
}

// POI mode is only valid for YAW in the case it is enabled and camera stab is running
if (modes[MANUALCONTROLSETTINGS_STABILIZATION1SETTINGS_ROLL] == MANUALCONTROLSETTINGS_STABILIZATION1SETTINGS_POI ||
modes[MANUALCONTROLSETTINGS_STABILIZATION1SETTINGS_PITCH] == MANUALCONTROLSETTINGS_STABILIZATION1SETTINGS_POI)
return SYSTEMALARMS_CONFIGERROR_STABILIZATION;
if (modes[MANUALCONTROLSETTINGS_STABILIZATION1SETTINGS_YAW] == MANUALCONTROLSETTINGS_STABILIZATION1SETTINGS_POI) {
#if !defined(CAMERASTAB_POI_MODE)
return SYSTEMALARMS_CONFIGERROR_STABILIZATION;
#endif
// TODO: Need to check camera stab is actually running
}


// Warning: This assumes that certain conditions in the XML file are met. That
// MANUALCONTROLSETTINGS_STABILIZATION1SETTINGS_DISABLED has the same numeric value for each channel
Expand Down
27 changes: 1 addition & 26 deletions flight/Modules/Actuator/actuator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
#include "actuatorcommand.h"
#include "flightstatus.h"
#include "mixersettings.h"
#include "cameradesired.h"
#include "manualcontrolcommand.h"
#include "pios_thread.h"
#include "pios_queue.h"
Expand Down Expand Up @@ -514,30 +513,6 @@ static void post_process_scale_and_commit(float *motor_vect,

num_motors++;
break;
case MIXERSETTINGS_MIXER1TYPE_CAMERAPITCH:
if (CameraDesiredHandle()) {
CameraDesiredPitchGet(
&motor_vect[ct]);
} else {
motor_vect[ct] = -1;
}
break;
case MIXERSETTINGS_MIXER1TYPE_CAMERAROLL:
if (CameraDesiredHandle()) {
CameraDesiredRollGet(
&motor_vect[ct]);
} else {
motor_vect[ct] = -1;
}
break;
case MIXERSETTINGS_MIXER1TYPE_CAMERAYAW:
if (CameraDesiredHandle()) {
CameraDesiredRollGet(
&motor_vect[ct]);
} else {
motor_vect[ct] = -1;
}
break;
default:
set_failsafe();
PIOS_Assert(0);
Expand Down Expand Up @@ -1090,7 +1065,7 @@ static float channel_failsafe_value(int idx)
case MIXERSETTINGS_MIXER1TYPE_DISABLED:
return -1;
default:
/* Other channel types-- camera. Center them. */
/* Centre other chanel types. */
return 0;
}
}
Expand Down
Loading