Diff: main.cpp

Revision:

2:fd71ffefefe5

Parent:

1:d8c40d97ce2c

Child:

5:9332620c08c6

--- a/main.cpp	Tue Jul 31 08:33:23 2018 +0000
+++ b/main.cpp	Mon Aug 27 04:49:22 2018 +0000
@@ -2,7 +2,7 @@
 #include "measuring_wheel.h"
 
 Serial pc(USBTX, USBRX,115200);
-MeasuringWheel measuring(PA_11,PA_12, PA_8,PB_4, PA_6 ,PA_7);
+MeasuringWheel measuring(PA_8,PA_9,PA_6,PA_7,PA_0,PA_1);
 
 int main()
 {
@@ -12,8 +12,8 @@
 
 
 //        pc.printf("fsjflsz\r\n");
-//        pc.printf("X = %f, Y = %f\r\n",measuring.getOutX(),measuring.getOutY());
-        pc.printf("wi = %f, w2 = %f, w3 = %f\r\n",measuring.getWheel1(),measuring.getWheel2(),measuring.getWheel3());
+//        pc.printf("%d,%d,\n",(int)measuring.getOutX(),(int)measuring.getOutY());
+//        pc.printf("w1 = %f, w2 = %f, w3 = %f\r\n",measuring.getWheel1(),measuring.getWheel2(),measuring.getWheel3());
             pc.printf("yaw = %f\r\n",measuring.getjyroAngle());
 //        wait(0.1);
     }