Revision 19:96a462583af9, committed 2019-07-16

Comitter:

M_souta

Date:

Tue Jul 16 06:48:51 2019 +0000

Parent:

18:c694bae76e51

Commit message:

test

Changed in this revision

diff -r c694bae76e51 -r 96a462583af9 Input/ExternalInt/ExternalInt.cpp
--- a/Input/ExternalInt/ExternalInt.cpp	Mon Jul 08 01:55:34 2019 +0000
+++ b/Input/ExternalInt/ExternalInt.cpp	Tue Jul 16 06:48:51 2019 +0000
@@ -9,7 +9,7 @@
     InterruptIn(INT2_PIN),
     InterruptIn(INT3_PIN),
     InterruptIn(INT4_PIN),
-    InterruptIn(INT5_PIN),
+//    InterruptIn(INT5_PIN),
 };
 
 namespace EXTERNALINT {
@@ -19,13 +19,13 @@
         BoardInt[2].mode(PullUp);
         BoardInt[3].mode(PullUp);
         BoardInt[4].mode(PullUp);
-        BoardInt[5].mode(PullUp);
+//        BoardInt[5].mode(PullUp);
         
         BoardInt[0].fall(int0);
         BoardInt[1].fall(int1);
         BoardInt[2].fall(int1);
         BoardInt[3].fall(int1);
         BoardInt[4].fall(int1);
-        BoardInt[5].fall(int1);
+//        BoardInt[5].fall(int1);
     }
 }

diff -r c694bae76e51 -r 96a462583af9 Input/ExternalInt/ExternalInt.h
--- a/Input/ExternalInt/ExternalInt.h	Mon Jul 08 01:55:34 2019 +0000
+++ b/Input/ExternalInt/ExternalInt.h	Tue Jul 16 06:48:51 2019 +0000
@@ -2,12 +2,11 @@
 #define EXTERNALINT_H_
 
 namespace EXTERNALINT {
-    #define INT0_PIN    PB_8
-    #define INT1_PIN    PC_9
-    #define INT2_PIN    PC_8
-    #define INT3_PIN    PC_6
-    #define INT4_PIN    PC_5
-    #define INT5_PIN    PA_12
+    #define INT0_PIN    PC_9
+    #define INT1_PIN    PC_8
+    #define INT2_PIN    PC_6
+    #define INT3_PIN    PC_5
+    #define INT4_PIN    PA_12
     
     class Int {
         public:

diff -r c694bae76e51 -r 96a462583af9 Input/Switch/Switch.cpp
--- a/Input/Switch/Switch.cpp	Mon Jul 08 01:55:34 2019 +0000
+++ b/Input/Switch/Switch.cpp	Tue Jul 16 06:48:51 2019 +0000
@@ -58,40 +58,40 @@
             ch.all = 11;
             break;
             case 4:
-            ch.all = 12;
+            ch.all = 6;
             break;
             case 5:
-            ch.all = 13;
+            ch.all = 4;
             break;
             case 6:
-            ch.all = 14;
+            ch.all = 2;
             break;
             case 7:
-            ch.all = 15;
+            ch.all = 0;
             break;
             case 8:
             ch.all = 7;
             break;
             case 9:
-            ch.all = 6;
+            ch.all = 5;
             break;
             case 10:
-            ch.all = 4;
+            ch.all = 3;
             break;
             case 11:
-            ch.all = 5;
+            ch.all = 1;
             break;
             case 12:
-            ch.all = 2;
+            ch.all = 12;
             break;
             case 13:
-            ch.all = 3;
+            ch.all = 13;
             break;
             case 14:
-            ch.all = 0;
+            ch.all = 14;
             break;
             case 15:
-            ch.all = 1;
+            ch.all = 15;
             break;
         }
         

diff -r c694bae76e51 -r 96a462583af9 System/Process/Process.cpp
--- a/System/Process/Process.cpp	Mon Jul 08 01:55:34 2019 +0000
+++ b/System/Process/Process.cpp	Tue Jul 16 06:48:51 2019 +0000
@@ -64,6 +64,7 @@
 
 float tireProRPM[4];
 float tireTarRPM[4];
+float tirePWM[4];
 
 #pragma endregion USER-DEFINED_VARIABLES_AND_PROTOTYPE
 
@@ -186,8 +187,11 @@
 
 	while(1)
 	{
-		//LED_DEBUG0 = !LED_DEBUG0;
-		//LED_DEBUG1 = !LED_DEBUG1;
+		if(LimitSw::IsPressed(10)) {
+			LED_DEBUG0 = LED_ON;
+		} else {
+			LED_DEBUG0 = LED_OFF;
+		}
 		//printf("%d\r\n",ECD_0.getPulses());
 		buzzer.period(1.0/800);
 		
@@ -201,11 +205,6 @@
 			CONTROLLER::Controller::DataReset();
 			AllActuatorReset();
 			lock = true;
-			//buzzer = 1;
-			//BuzzerTimer.attach(BuzzerTimer_func, 0.5);
-			//buzzer = 1;
-			//BuzzerTimer.attach(&BuzzerTimer_func, 1.2);
-			//BuzzerTimer.attach(BuzzerTimer_func, 1);
 		}
 		else
 		#endif

diff -r c694bae76e51 -r 96a462583af9 TrapezoidControl.lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/TrapezoidControl.lib	Tue Jul 16 06:48:51 2019 +0000
@@ -0,0 +1,1 @@
+https://os.mbed.com/users/M_souta/code/TrapezoidControl/#2e7bf7fce378