Quadrifoglio / Mbed OS 200_yotsuba_21

2021 rcj

Dependencies:   _sensorGen ui Robot omni_wheel PID jy901 solenoid IRsensor aqm0802 camera beep kohiMD linesSnsor lpf RCJESC

Files at this revision

API Documentation at this revision

Revision 4:b9d156177b88, committed 2021-03-05

Comitter:
THtakahiro702286
Date:
Fri Mar 05 06:31:31 2021 +0000
Parent:
3:f763ce2f35db
Child:
5:576041795232
Commit message:
nannkamawarikometa

Changed in this revision

Robot.lib Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file
sensorGen.lib Show annotated file Show diff for this revision Revisions of this file 
--- a/Robot.lib	Fri Mar 05 05:05:42 2021 +0000
+++ b/Robot.lib	Fri Mar 05 06:31:31 2021 +0000
@@ -1,1 +1,1 @@
-https://os.mbed.com/teams/Quadrifoglio/code/Robot/#19149697667d
+https://os.mbed.com/teams/Quadrifoglio/code/Robot/#d61a64c81c16

--- a/main.cpp	Fri Mar 05 05:05:42 2021 +0000
+++ b/main.cpp	Fri Mar 05 06:31:31 2021 +0000
@@ -84,8 +84,8 @@
     bool startflag;
 //    robo.pidtest();
     while(1){
-        printf("ball: x %5d,r %6d | yellow: x %5d,r %6d | blue: x %5d,r %6d  gyro %4d | \r\n"
-        , (int)(sensor.ballRange), (int)(sensor.ballAngle), (int)(sensor.yellowRange), (int)(sensor.yellowAngle), (int)(sensor.blueRange), (int)(sensor.blueAngle), (int)(sensor.tempAngle));
+//        printf("ball: x %5d,r %6d | yellow: x %5d,r %6d | blue: x %5d,r %6d  gyro %4d | \r\n"
+//        , (int)(sensor.ballRange), (int)(sensor.ballAngle), (int)(sensor.yellowRange), (int)(sensor.yellowAngle), (int)(sensor.blueRange), (int)(sensor.blueAngle), (int)(sensor.tempAngle));
 //        printf("gyro : %d\r\n",(int)sensor.angle);
         
 //        ui.returnbt(uibt);
@@ -93,7 +93,7 @@
         if(ui.mode == 0){
 //            printf("ball: x %d,r %d | yellow: x %d,r %d | blue: x %d,r %d  gyro %d | \r\n"
 //            , (int)(100*sensor.ballRange), (int)(100*sensor.ballAngle), (int)(100*sensor.yellowRange), (int)(100*sensor.yellowAngle), (int)(100*sensor.blueRange), (int)(100*sensor.blueAngle), (int)(sensor.rawAngle));
-            if(ui.flag[3]) robo.pidtest();//robo.start(ui.team, ui.algorithm);
+            if(ui.flag[3]) robo.moveTest();//robo.pidtest();//robo.start(ui.team, ui.algorithm);
             else robo.motorStop(0.0);
         } else if(ui.mode == 1){
 //                motorChecknum = (8*ui.b[3])+(4*ui.b[2])+(2*ui.b[1])+(ui.b[0]);

--- a/sensorGen.lib	Fri Mar 05 05:05:42 2021 +0000
+++ b/sensorGen.lib	Fri Mar 05 06:31:31 2021 +0000
@@ -1,1 +1,1 @@
-https://os.mbed.com/teams/Quadrifoglio/code/sensorGen_21/#41c2f80bf005
+https://os.mbed.com/users/THtakahiro702286/code/_sensorGen/#fc6e4c814d3f