Andriy Makukha / Mbed 2 deprecated football_project_wo_output

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

Fork of football_project by MZJ

Diff: TA.cpp

Revision:
31:a6110950f385
Parent:
30:c60b0d52b067
Child:
32:64e5d7340d82
diff -r c60b0d52b067 -r a6110950f385 TA.cpp
--- a/TA.cpp	Mon Jan 04 16:33:39 2016 +0000
+++ b/TA.cpp	Tue Jan 05 13:05:48 2016 +0000
@@ -132,7 +132,7 @@
 
 #if 1
 // inputs
-DigitalIn TA::touch_1( p0, PullNone );  //  Top touch sensor.
+EdgeDigIn TA::touch_1( p0, PullNone );  //  Top touch sensor.
 DigitalIn TA::touch_2( p12,PullDown );  //  Test  button (p6 [was] RSVD for lower button--p6 is last analog-in though.)
 DigitalIn TA::touch_3( p3, PullNone );  // /Power button (even though not a touch button.)
 #endif
@@ -270,6 +270,18 @@
   return false;
 }
 
+void TA::resetTouchIfStuck()
+{
+  if(tripped())
+  {
+    cap_enable = 1;
+    wait_ms(100);
+    cap_enable = 0;
+    writeToPhone("toggled cap sense power\r\n");
+    //Serial.println(F("toggled cap sense power"));
+  }
+}
+
 void TA::spin(void)
 {
   static byte payload [6];
@@ -292,15 +304,8 @@
         last_touch = millis();  
   }
 ***/
-  if(tripped())
-  {
-    cap_enable = 1;
-    wait_ms(100);
-    cap_enable = 0;
-    //activated_start = millis();
-    writeToPhone("toggled cap sense power");
-    //Serial.println(F("toggled cap sense power"));
-    }
+  resetTouchIfStuck();
+
   if(powering_up2)
   {
     unsigned long t = millis() - powerup_start;