VSAG/vision_sjtu_19
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	main.cpp
This commit is contained in:
xinyang
2019-08-06 11:55:43 +08:00
parent 9392c201db 72d6a15d44
commit 6cdb6b4832
5 changed files with 56 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
others/include/config/setconfig.h
View File

@@ -35,35 +35,40 @@
#ifndef ENERGY_CAMERA_GAIN
#define ENERGY_CAMERA_GAIN (20)
#endif
#ifndef ROBOT_ID
#define ROBOT_ID (0)
#endif
#ifndef SMALL_YAW_AIM_KD
#define SMALL_YAW_AIM_KD (0)
#define SMALL_YAW_AIM_KD (0.35)
#endif
#ifndef SMALL_YAW_AIM_KP
#define SMALL_YAW_AIM_KP (4)
#define SMALL_YAW_AIM_KP (0.85)
#endif
#ifndef SMALL_PITCH_AIM_KD
#define SMALL_PITCH_AIM_KD (0)
#define SMALL_PITCH_AIM_KD (0.35)
#endif
#ifndef SMALL_PITCH_AIM_KP
#define SMALL_PITCH_AIM_KP (3.7)
#define SMALL_PITCH_AIM_KP (0.85)
#endif
#ifndef BIG_YAW_AIM_KD
#define BIG_YAW_AIM_KD (0)
#define BIG_YAW_AIM_KD (0.35)
#endif
#ifndef BIG_YAW_AIM_KP
#define BIG_YAW_AIM_KP (6.5)
#define BIG_YAW_AIM_KP (0.85)
#endif
#ifndef BIG_YAW_AIM_KI
#define BIG_YAW_AIM_KI (0.1)
#define BIG_YAW_AIM_KI (0)
#endif
#ifndef BIG_PITCH_AIM_KD
#define BIG_PITCH_AIM_KD (0)
#define BIG_PITCH_AIM_KD (0.35)
#endif
#ifndef BIG_PITCH_AIM_KP
#define BIG_PITCH_AIM_KP (6.5)
#define BIG_PITCH_AIM_KP (0.85)
#endif
#ifndef BIG_PITCH_AIM_KI
#define BIG_PITCH_AIM_KI (0.1)
#define BIG_PITCH_AIM_KI (0)
#endif
#ifndef COMPENSATE_YAW
#define COMPENSATE_YAW (5)
@@ -72,7 +77,7 @@
#define COMPENSATE_PITCH (74)
#endif
#ifndef EXTRA_DELTA_X
#define EXTRA_DELTA_X (10)
#define EXTRA_DELTA_X (0)
#endif
#ifndef EXTRA_DELTA_Y
#define EXTRA_DELTA_Y (10)