CanSat-C 2021 / Mbed 2 deprecated CanSat-C

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependencies:   mbed HMC6352 US015 TB6612FNG2 getGPS ATP3011

Files at this revision

API Documentation at this revision

Revision 13:38c5ffe5873a, committed 2021-10-27

Comitter:
user_
Date:
Wed Oct 27 06:47:49 2021 +0000
Parent:
12:0b8b980ba896
Commit message:
test;

Changed in this revision

Rotate/Rotate.cpp Show diff for this revision Revisions of this file
Rotate/Rotate.h Show annotated file Show diff for this revision Revisions of this file
catchGPS.h 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 
diff -r 0b8b980ba896 -r 38c5ffe5873a Rotate/Rotate.cpp
--- a/Rotate/Rotate.cpp	Wed Oct 27 06:44:30 2021 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-void ROttate(double angle) {
-    // double time = angle; // 試験で調整してください。
-    int time = 3;  // 試験用のため適当
-    if (angle > 0) {
-        MotorDriver('5', 1);
-        wait(time);
-        MotorDriver('1', 0);  
-    } elif (angle < 0) {
-        MotorDriver('6', 1);
-        wait(time);
-        MotorDriver('1', 0);
-    }
-}
-            
-    
\ No newline at end of file

diff -r 0b8b980ba896 -r 38c5ffe5873a Rotate/Rotate.h
--- a/Rotate/Rotate.h	Wed Oct 27 06:44:30 2021 +0000
+++ b/Rotate/Rotate.h	Wed Oct 27 06:47:49 2021 +0000
@@ -4,6 +4,18 @@
 #include "MotorDriver.h"
 #include "mbed.h"
 
-void ROttate(double angle);
+void ROttate(double angle){
+   // double time = angle; // 試験で調整してください。
+    int time = 3;  // 試験用のため適当
+    if (angle > 0) {
+        MotorDriver('5', 1);
+        wait(time);
+        MotorDriver('1', 0);  
+    } elif (angle < 0) {
+        MotorDriver('6', 1);
+        wait(time);
+        MotorDriver('1', 0);
+    }
+}
 
 #endif
\ No newline at end of file

diff -r 0b8b980ba896 -r 38c5ffe5873a catchGPS.h
--- a/catchGPS.h	Wed Oct 27 06:44:30 2021 +0000
+++ b/catchGPS.h	Wed Oct 27 06:47:49 2021 +0000
@@ -1,6 +1,6 @@
 // 現在地の座標を返す関数
 #include "mbed.h"
-#include "getGPS.h"
+// #include "getGPS.h"
 
 //Serial pc(USBTX, USBRX);
 GPS gps(D1, D0);

diff -r 0b8b980ba896 -r 38c5ffe5873a main.cpp
--- a/main.cpp	Wed Oct 27 06:44:30 2021 +0000
+++ b/main.cpp	Wed Oct 27 06:47:49 2021 +0000
@@ -6,7 +6,7 @@
 // 自作関数
 #include "AngleGet.h"
 #include "Avoid.h"  // 廃止予定 
-#include "getGPS.h"
+ #include "getGPS.h"
 #include "catchGPS.h"
 #include "FrontGet.h"
 #include "MotorDriver.h"