Diff: config/falfalla.h

Revision:

13:b088f0db7158

Parent:

12:083662bca47d

--- a/config/falfalla.h	Tue Feb 12 12:56:21 2019 +0000
+++ b/config/falfalla.h	Tue Feb 12 13:16:29 2019 +0000
@@ -4,50 +4,19 @@
 #define SWITCH_CHECK 1400
 #define NUMBER_FALFALLA 2 //何号機かを入れるとそれに応じて#if以下が変わって設定が変わる
 
-static float g_kpELE=2.0;
-static float g_kiELE=0.0;
-static float g_kdELE=0.0;
-static float g_kpRUD=3.0;
-static float g_kiRUD=0.0;
-static float g_kdRUD=0.0;
-static float g_kpAIL=3.0;
-static float g_kiAIL=0.0;
-static float g_kdAIL=0.0;
-
-static float g_rightloopROLL=-17.0;
-static float g_rightloopROLL_approach=-17.0;
-static float g_rightloopPITCH=-6.3;
-static float g_rightloopPITCH_approach = -15.0;
-static float g_leftloopROLL=16.0;
-static float g_leftloopROLL_approach=16.0;
-static float g_leftloopPITCH=-6.0;
-static float g_leftloopPITCH_approach=-13.0;
-static float g_gostraightROLL=2.0;
-static float g_gostraightPITCH=-3.0;
-static float g_takeoffTHR=1.0;
-static float g_loopTHR=0.58;
-
-static float g_rightloopROLLshort=-20.0;
-static float g_rightloopPITCHshort=-7.0;
-static float g_leftloopROLLshort=22.0;
-static float g_leftloopPITCHshort=-6.0;
-
-static float g_glideloopROLL = -5.0;      //rewrite
-static float g_glideloopPITCH = 0.0;
-static float g_autoonPITCH = -3.0;
-
-static int g_rightloopRUD = 1500;
-static int g_rightloopRUD_approach=1500;
-static int g_rightloopshortRUD = 1500;
-static int g_leftloopRUD = 1500;
-static int g_leftloopRUD_approach = 1710;
-static int g_leftloopshortRUD = 1500;
-static int g_glideloopRUD = 1500;
-
-static int g_AIL_L_correctionrightloop = 0;
-static int g_AIL_L_correctionrightloopshort = 0;
-static int g_AIL_L_correctionleftloop = 0;
-static int g_AIL_L_correctionleftloopshort = 0;
+static int Servo_NEUTRAL_R;               //SDcard用宣言
+static int Servo_NEUTRAL_L;
+static int Servo_high_FORWARD_R;
+static int Servo_high_FORWARD_L;
+static int Servo_back_R;
+static int Servo_back_L;
+static int Servo_slow_FORWARD_R;
+static int Servo_slow_FORWARD_L;
+static int Turntable_NEUTRAL;
+static int Matchspeed; //機体角度調整
+static int Focus_NEUTRAL;//カメラ焦点
+static int Camera_deg_A;//カメラ角度調整
+static int Camera_deg_B;
 
 
 #if NUMBER_FALFALLA == 1    //1号機