CanSat-C 2021 / Mbed 2 deprecated CanSat-C

Dependencies:   mbed HMC6352 US015 TB6612FNG2 getGPS ATP3011

Files at this revision

API Documentation at this revision

Comitter:
user_
Date:
Tue Oct 26 08:21:08 2021 +0000
Parent:
8:5fe1b4bbd108
Child:
10:0433f48faf74
Commit message:
mikansei;

Changed in this revision

AngleGet.h Show annotated file Show diff for this revision Revisions of this file
Avoid.h Show annotated file Show diff for this revision Revisions of this file
MotorDriver.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
--- a/AngleGet.h	Tue Oct 26 08:04:13 2021 +0000
+++ b/AngleGet.h	Tue Oct 26 08:21:08 2021 +0000
@@ -1,8 +1,11 @@
 #include "HMC6352.h"
 #include "math.h"
 #include "getGPS.h"
-#include "Math.h"
+//#include <math.h>
 
+#define M_PI 3.14  // とりあえず円周率を定義
+
+Serial pc(USBTX, USBRX);
 HMC6352 compass(D4, D5);
 GPS gps(D1, D0);
 
--- a/Avoid.h	Tue Oct 26 08:04:13 2021 +0000
+++ b/Avoid.h	Tue Oct 26 08:21:08 2021 +0000
@@ -1,7 +1,7 @@
 // 回避行動を行う関数
 // 廃止予定
 #include "mbed.h"
-#include "Move.h"
+#include "MotorDriver.h"
 
 int Avoid() 
 {
--- a/MotorDriver.h	Tue Oct 26 08:04:13 2021 +0000
+++ b/MotorDriver.h	Tue Oct 26 08:21:08 2021 +0000
@@ -3,7 +3,7 @@
 
 TB6612 motor_a(D10,D6,D7);  //モータA制御用(pwma,ain1,ain2)
 TB6612 motor_b(D11,D8,D9);  //モータB制御用(pwmb,bin1,bin2)
-Serial pc(USBTX, USBRX);
+//Serial pc(USBTX, USBRX);
 
 void MotorDriver(char input_data, float motor_speed) {
     switch (input_data) {
--- a/catchGPS.h	Tue Oct 26 08:04:13 2021 +0000
+++ b/catchGPS.h	Tue Oct 26 08:21:08 2021 +0000
@@ -2,7 +2,7 @@
 #include "mbed.h"
 #include "getGPS.h"
 
-Serial pc(USBTX, USBRX);
+//Serial pc(USBTX, USBRX);
 GPS gps(D1, D0);
 
 int catchGPS(double *GPS_x, double *GPS_y)
--- a/main.cpp	Tue Oct 26 08:04:13 2021 +0000
+++ b/main.cpp	Tue Oct 26 08:21:08 2021 +0000
@@ -11,6 +11,7 @@
 #include "FrontGet.h"
 #include "MotorDriver.h"
 
+Serial pc(USBTX, USBRX);
 // フライトピン・ニクロム線関係
 Serial pc(SERIAL_TX, SERIAL_RX);
 DigitalIn flight_pin(A0);