albatross
/
ControlMain2017
2017年度の製作を開始します
Fork of Control_Main_Full_20160608 by
Diff: main.cpp
- Branch:
- ?????
- Revision:
- 53:947eff37d01d
- Parent:
- 52:a9d23be503c6
- Child:
- 55:1db68795bccf
diff -r a9d23be503c6 -r 947eff37d01d main.cpp --- a/main.cpp Sat Jun 10 07:43:58 2017 +0000 +++ b/main.cpp Thu Jun 15 05:44:18 2017 +0000 @@ -70,21 +70,10 @@ *inputR = (pitch * PITCH_PER_ROLL + roll)/(PITCH_PER_ROLL + 1.0); *inputL = (pitch * PITCH_PER_ROLL - roll)/(PITCH_PER_ROLL + 1.0); } -double GetAve(double input) -{ - float sum = 0.0; - for (int i = 0; i < AVE_NUM; i++) { - sum += input; - } - return sum / AVE_NUM; -} void InputControlValues() { - char floatValues[sizeof(float)]; - double pitch =GetAve( pitchPin.read()); - double roll = GetAve(rollPin.read()); - double normedPitch = pitchIC.Processing(pitch); + double normedPitch = pitchIC.Processing(pitchPin.read()); double normedRoll = rollIC.Processing(rollPin.read()); float inputR = 0.0; @@ -93,7 +82,7 @@ SyntheRollAndPitch(normedPitch,normedRoll,&inputR,&inputL); sprintf(inputDatas_R,"%5.2f%d",inputR,(int)drug_R); sprintf(inputDatas_L,"%5.2f%d",inputL,(int)drug_L); - pc.printf("%10.3f %10.3f\n\r",inputR,inputL); + pc.printf("inputR:%10.3f inputL:%10.3f normedR:%10.3f normedL:%10.3f sMax:%5.3f sMin:%5.3f\n\r",inputR,inputL,normedPitch,normedRoll,rollIC.shiftedMax,rollIC.shiftedMin); //inputDatas_R[sizeof(float)] = (char)drug_R; //inputDatas_L[sizeof(float)] = (char)drug_L;