Skip to content

Commit

Permalink
updated default PID, update 1.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Amir Hirsch committed Dec 22, 2016
1 parent d4de8c8 commit 447194c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions control.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@

Control::PIDParameters::PIDParameters()
: thrust_master{1.0, 0.0, 0.0, 0.0, 0.005, 0.005, 1.0},
pitch_master{5.0, 1.0, 0.0, 10.0, 0.005, 0.005, 10.0},
roll_master{5.0, 1.0, 0.0, 10.0, 0.005, 0.005, 10.0},
pitch_master{10.0, 1.0, 0.0, 10.0, 0.005, 0.005, 10.0},
roll_master{10.0, 1.0, 0.0, 10.0, 0.005, 0.005, 10.0},
yaw_master{5.0, 1.0, 0.0, 10.0, 0.005, 0.005, 180.0},
thrust_slave{1.0, 0.0, 0.0, 10.0, 0.001, 0.001, 0.3},
pitch_slave{20.0, 8.0, 0.0, 30.0, 0.001, 0.001, 30.0},
roll_slave{20.0, 8.0, 0.0, 30.0, 0.001, 0.001, 30.0},
pitch_slave{10.0, 4.0, 0.0, 30.0, 0.001, 0.001, 30.0},
roll_slave{10.0, 4.0, 0.0, 30.0, 0.001, 0.001, 30.0},
yaw_slave{30.0, 5.0, 0.0, 20.0, 0.001, 0.001, 240.0},
pid_bypass{BYPASS_THRUST_MASTER | BYPASS_THRUST_SLAVE | BYPASS_YAW_MASTER} // AHRS/Horizon mode
{
Expand Down
2 changes: 1 addition & 1 deletion version.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "debug.h"

#define FIRMWARE_VERSION_A 1
#define FIRMWARE_VERSION_B 3
#define FIRMWARE_VERSION_B 4
#define FIRMWARE_VERSION_C 0

struct __attribute__((packed)) Version {
Expand Down

0 comments on commit 447194c

Please sign in to comment.