Revision 1:e8c3c7f14070, committed 2021-03-04

Comitter:

THtakahiro702286

Date:

Thu Mar 04 14:25:52 2021 +0000

Parent:

0:304a5472ddd8

Child:

2:540f68b1a40e

Commit message:

sukosi sukkiri

Changed in this revision

--- a/Robot.lib	Thu Mar 04 12:03:30 2021 +0000
+++ b/Robot.lib	Thu Mar 04 14:25:52 2021 +0000
@@ -1,1 +1,1 @@
-https://os.mbed.com/teams/Quadrifoglio/code/Robot/#904dac75a729
+https://os.mbed.com/teams/Quadrifoglio/code/Robot/#104dfa57a0e7

--- a/lib/camera.lib	Thu Mar 04 12:03:30 2021 +0000
+++ b/lib/camera.lib	Thu Mar 04 14:25:52 2021 +0000
@@ -1,1 +1,1 @@
-https://os.mbed.com/teams/Quadrifoglio/code/camera/#12ef615ee47f
+https://os.mbed.com/teams/Quadrifoglio/code/camera/#91c45dda6be1

--- a/lib/kohiMD.lib	Thu Mar 04 12:03:30 2021 +0000
+++ b/lib/kohiMD.lib	Thu Mar 04 14:25:52 2021 +0000
@@ -1,1 +1,1 @@
-https://os.mbed.com/teams/Quadrifoglio/code/kohiMD/#d4d97efd8881
+https://os.mbed.com/teams/Quadrifoglio/code/kohiMD/#d7e8402e6869

--- a/main.cpp	Thu Mar 04 12:03:30 2021 +0000
+++ b/main.cpp	Thu Mar 04 14:25:52 2021 +0000
@@ -13,7 +13,7 @@
 void main2ui()
 {
     char lcdname1[4] = {}, lcdname2[4] = {};
-    int  lcdvalue[2] = {};
+    int  lcdvalue[4] = {};
     double temp[2] = {};
     while(1){
 //        printf("test\r\n");

--- a/main.h	Thu Mar 04 12:03:30 2021 +0000
+++ b/main.h	Thu Mar 04 14:25:52 2021 +0000
@@ -6,43 +6,43 @@
 #define PI 3.1415926535897932
 
 
-static PinName const US1trig = PC_8;
-static PinName const US1echo = PC_6;
-static PinName const US2trig = PC_5;
-static PinName const US2echo = PA_12;
-static PinName const US3trig = PA_11;
-static PinName const US3echo = PB_12;
-static PinName const US4trig = PB_2;
-static PinName const US4echo = PB_1;
-static PinName const jyscl   = PA_8;
-static PinName const jysda   = PB_4;
-static PinName const IR      = PC_2;
+#define US1trig  PC_8
+#define US1echo  PC_6
+#define US2trig  PC_5
+#define US2echo  PA_12
+#define US3trig  PA_11
+#define US3echo  PB_12
+#define US4trig  PB_2
+#define US4echo  PB_1
+#define jyscl    PA_8
+#define jysda    PB_4
+#define IR       PC_2
 
-static PinName const motor0  = PA_15;
-static PinName const motor1  = PA_6;
-static PinName const motor2  = PA_7;
-static PinName const motor3  = PB_6;
-static PinName const kicker  = PA_10;
-static PinName const ESCpin  = PC_9;
+#define motor0   PA_15
+#define motor1   PA_6
+#define motor2   PA_7
+#define motor3   PB_6
+#define kicker   PA_10
+#define ESCpin   PC_9
 
-static PinName const buzz    = PC_7;
-static PinName const lcdscl  = PB_8;
-static PinName const lcdsda  = PB_9;
-static PinName const button  = PC_3;
-static PinName const toggle1 = PA_9;
-static PinName const toggle2 = PB_10;
-static PinName const toggle3 = PB_5;
+#define buzz     PC_7
+#define lcdscl   PB_8
+#define lcdsda   PB_9
+#define button   PC_3
+#define toggle1  PA_9
+#define toggle2  PB_10
+#define toggle3  PB_5
 
-static PinName const line1   = A0;
-static PinName const line2   = A1;
-static PinName const line3   = A2;
-static PinName const line4   = A3;
-static PinName const line5   = A4;
-static PinName const line6   = A5;
+#define line1    A0
+#define line2    A1
+#define line3    A2
+#define line4    A3
+#define line5    A4
+#define line6    A5
 
-static PinName const pixysclk = PB_13;
-static PinName const pixymiso = PB_14;
-static PinName const pixymosi = PB_15;
+#define pixysclk  PB_13
+#define pixymiso  PB_14
+#define pixymosi  PB_15
 
 
 #endif
\ No newline at end of file

--- a/sensorGen.lib	Thu Mar 04 12:03:30 2021 +0000
+++ b/sensorGen.lib	Thu Mar 04 14:25:52 2021 +0000
@@ -1,1 +1,1 @@
-https://os.mbed.com/users/piroro4560/code/sensorGen_0202/#f651e59a9805
+https://os.mbed.com/users/THtakahiro702286/code/_sensorGen/#8ed76df0196b