Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-31 10:26:52 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merged beta to master

Browse Source
This commit is contained in:
Lorenz Meier
2015-08-07 14:41:19 +02:00
parent 8751355e2e 08c1123c49
commit ce90c40413
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ROMFS/px4fmu_common/init.d/10015_tbs_discovery
-1
View File
@@ -11,7 +11,6 @@ sh /etc/init.d/rc.mc_defaults
if [ $AUTOCNF == yes ] if [ $AUTOCNF == yes ]
then then
# TODO review MC_YAWRATE_I
param set MC_ROLL_P 6.5 param set MC_ROLL_P 6.5
param set MC_ROLLRATE_P 0.1 param set MC_ROLLRATE_P 0.1
param set MC_ROLLRATE_I 0.05 param set MC_ROLLRATE_I 0.05
Tools/px4airframes/srcscanner.py
+3 -4
View File
@@ -16,10 +16,9 @@ class SourceScanner(object):
extensions = tuple(parser.GetSupportedExtensions()) extensions = tuple(parser.GetSupportedExtensions())
for dirname, dirnames, filenames in os.walk(srcdir): for dirname, dirnames, filenames in os.walk(srcdir):
for filename in filenames: for filename in filenames:
if filename.endswith(extensions): path = os.path.join(dirname, filename)
path = os.path.join(dirname, filename) if not self.ScanFile(path, parser):
if not self.ScanFile(path, parser): return False
return False
return True return True
def ScanFile(self, path, parser): def ScanFile(self, path, parser):
src/modules/mc_att_control/mc_att_control_params.c
+4 -2
View File
@@ -232,14 +232,16 @@ PARAM_DEFINE_FLOAT(MC_PITCHRATE_MAX, 360.0f);
/** /**
* Max yaw rate * Max yaw rate
* *
* Limit for yaw rate, has effect for large rotations in autonomous mode, to avoid large control output and mixer saturation. * Limit for yaw rate, has effect for large rotations in autonomous mode,
* to avoid large control output and mixer saturation. A value of significantly
* over 60 degrees per second can already lead to mixer saturation.
* *
* @unit deg/s * @unit deg/s
* @min 0.0 * @min 0.0
* @max 360.0 * @max 360.0
* @group Multicopter Attitude Control * @group Multicopter Attitude Control
*/ */
PARAM_DEFINE_FLOAT(MC_YAWRATE_MAX, 120.0f); PARAM_DEFINE_FLOAT(MC_YAWRATE_MAX, 60.0f);
/** /**
* Max acro roll rate * Max acro roll rate
src/modules/mc_att_control_multiplatform/mc_att_control_params.h
+1 -1
View File
@@ -56,7 +56,7 @@
#define PARAM_MP_YAWRATE_I_DEFAULT 0.0f #define PARAM_MP_YAWRATE_I_DEFAULT 0.0f
#define PARAM_MP_YAWRATE_D_DEFAULT 0.0f #define PARAM_MP_YAWRATE_D_DEFAULT 0.0f
#define PARAM_MP_YAW_FF_DEFAULT 0.5f #define PARAM_MP_YAW_FF_DEFAULT 0.5f
#define PARAM_MP_YAWRATE_MAX_DEFAULT 120.0f #define PARAM_MP_YAWRATE_MAX_DEFAULT 60.0f
#define PARAM_MP_ACRO_R_MAX_DEFAULT 35.0f #define PARAM_MP_ACRO_R_MAX_DEFAULT 35.0f
#define PARAM_MP_ACRO_P_MAX_DEFAULT 35.0f #define PARAM_MP_ACRO_P_MAX_DEFAULT 35.0f
#define PARAM_MP_ACRO_Y_MAX_DEFAULT 120.0f #define PARAM_MP_ACRO_Y_MAX_DEFAULT 120.0f