Skip to content

Commit

Permalink
[FIX]: before install
Browse files Browse the repository at this point in the history
  • Loading branch information
but0n committed Dec 2, 2016
1 parent 19a62d4 commit 8e3f90d
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 189 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ osx_image: xcode
language: c
before_install:
- brew update
- brew install coreutils
- brew tap px4/px4
- brew install gcc-arm-none-eabi
script: make
2 changes: 1 addition & 1 deletion libs/include/motor.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

#define THROTTLE_MAX (unsigned short)3600 //2ms - top position of throttle
#define THROTTLE_MIN (unsigned short)1620 //0.9ms - bottom position of throttle
#define THROTTLE_MID (unsigned short)2000
#define THROTTLE_MID (unsigned short)2200

#ifdef MOTOR_NORMAL_STARTUP
#define MOTOR_SETTING() {\
Expand Down
6 changes: 3 additions & 3 deletions libs/include/pid.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@

extern float g_Yaw, g_Pitch, g_Roll; //eular

#define OUTTER_LOOP_KP 0.3f //0.257 * 0.83 0.255
#define OUTTER_LOOP_KP 0 //0.257 * 0.83 0.255
#define OUTTER_LOOP_KI 0
#define OUTTER_LOOP_KD 0

#define INNER_LOOP_KP 0.08f
#define INNER_LOOP_KP 0.018f
#define INNER_LOOP_KI 0
#define INNER_LOOP_KD 0
#define INNER_LOOP_KD 0.4f

#define SUM_ERRO_MAX 900
#define SUM_ERRO_MIN -900
Expand Down
11 changes: 0 additions & 11 deletions openjtag.cfg

This file was deleted.

92 changes: 0 additions & 92 deletions openocd.cfg

This file was deleted.

81 changes: 0 additions & 81 deletions stm32f1x.cfg

This file was deleted.

0 comments on commit 8e3f90d

Please sign in to comment.