SDの設定が反映されるように修正
Dependencies: mbed MPU6050_2 HMC5883L_2 SDFileSystem3
Diff: main.cpp
- Revision:
- 13:b088f0db7158
- Parent:
- 12:083662bca47d
- Child:
- 14:90e9b44eb819
diff -r 083662bca47d -r b088f0db7158 main.cpp --- a/main.cpp Tue Feb 12 12:56:21 2019 +0000 +++ b/main.cpp Tue Feb 12 13:16:29 2019 +0000 @@ -37,20 +37,6 @@ #define MAX_FORWARD 8 //はやい_姿勢修正用 #define MAX_BACK 9 -int Servo_NEUTRAL_R; //SDcard用宣言 -int Servo_NEUTRAL_L; -int Servo_high_FORWARD_R; -int Servo_high_FORWARD_L; -int Servo_back_R; -int Servo_back_L; -int Servo_slow_FORWARD_R; -int Servo_slow_FORWARD_L; -int Turntable_NEUTRAL; -int Matchspeed; //機体角度調整 -int Focus_NEUTRAL;//カメラ焦点 -int Camera_deg_A;//カメラ角度調整 -int Camera_deg_B; - void getSF_Serial_jevois(); void getSF_Serial_pi(); @@ -70,7 +56,7 @@ //sd設定 int GetParameter(FILE *fp, const char *paramName,char parameter[]); -int SetOptions(int Servo_NEUTRAL_R,int *Servo_NEUTRAL_L, +int SetOptions(int *Servo_NEUTRAL_R,int *Servo_NEUTRAL_L, int *Servo_high_FORWARD_R,int *Servo_high_FORWARD_L, int *Servo_slow_FORWARD_R,int *Servo_slow_FORWARD_L, int *Turntable_NEUTRAL,int *Matchspeed,int *Focus_NEUTRAL, @@ -422,12 +408,12 @@ void setup(){ - /*SetOptions(&Servo_NEUTRAL_R, &Servo_NEUTRAL_L, + SetOptions(&Servo_NEUTRAL_R, &Servo_NEUTRAL_L, &Servo_high_FORWARD_R, &Servo_high_FORWARD_L, &Servo_slow_FORWARD_R,&Servo_slow_FORWARD_L, &Turntable_NEUTRAL,&Matchspeed,&Focus_NEUTRAL, &Camera_deg_A, &Camera_deg_B - );*/ + ); Init_sensors(); //switch2.rise(ResetTrim); @@ -684,11 +670,11 @@ else if(SDerrorcount > 0) pc.printf("ERROR 2. reading parameter is failed[%d]\r\n",SDerrorcount); pc.printf("Servo_NEUTRAL_R = %d, Servo_NEUTRAL_L = %d\r\n", *Servo_NEUTRAL_R, *Servo_NEUTRAL_L); - pc.printf("Servo_high_FORWARD_R = %d, Servo_high_FORWARD_L = %d, kdRUD = %f\r\n", *Servo_high_FORWARD_R, *Servo_high_FORWARD_L); - pc.printf("Servo_slow_FORWARD_R = %f, Servo_slow_FORWARD_L = %f\r\n", *Servo_slow_FORWARD_R, *Servo_slow_FORWARD_L); - pc.printf("Turntable_NEUTRAL = %f, Matchspeed = %f\r\n", *Turntable_NEUTRAL, *Matchspeed); - pc.printf("Focus_NEUTRAL = %fr\n", *Focus_NEUTRAL); - pc.printf("Camera_deg_A = %f, Camera_deg_B = %f\r\n", *Camera_deg_A, *Camera_deg_B); + pc.printf("Servo_high_FORWARD_R = %d, Servo_high_FORWARD_L = %d\r\n", *Servo_high_FORWARD_R, *Servo_high_FORWARD_L); + pc.printf("Servo_slow_FORWARD_R = %d, Servo_slow_FORWARD_L = %d\r\n", *Servo_slow_FORWARD_R, *Servo_slow_FORWARD_L); + pc.printf("Turntable_NEUTRAL = %d, Matchspeed = %d\r\n", *Turntable_NEUTRAL, *Matchspeed); + pc.printf("Focus_NEUTRAL = %d\r\n", *Focus_NEUTRAL); + pc.printf("Camera_deg_A = %d, Camera_deg_B = %d\r\n", *Camera_deg_A, *Camera_deg_B); return SDerrorcount; }