knut kristensen / Mbed 2 deprecated prosjektoppgave_alarm

Dependencies:   mbed

Fork of prosjektoppgave_alarm by PnM_spring17

Files at this revision

API Documentation at this revision

Comitter:
knutak
Date:
Tue Feb 07 07:41:58 2017 +0000
Parent:
15:549d573fcad7
Commit message:
lagt inn terminalfunskjon

Changed in this revision

main.cpp Show annotated file Show diff for this revision Revisions of this file
--- a/main.cpp	Tue Jan 31 08:46:30 2017 +0000
+++ b/main.cpp	Tue Feb 07 07:41:58 2017 +0000
@@ -10,6 +10,7 @@
 
 Ticker tick;
 Timer systemTid;
+Timer passord;
 
 struct alarmKretser { //1 = aktivert
     int A;
@@ -148,6 +149,7 @@
 
 void resetSystem()
 {
+    
 
 }
 
@@ -190,11 +192,14 @@
                  }
              else{
                  pc.printf("For mange forsok\n");
-                 wait(20);
+                 passord.start();
+                 while(passord.read() < 20)
+                 {}
+                 passord.stop();
+                 passord.reset();
                  i = 0;
                  }
              }
-    return 1;
-        
+    return 1; 
     }
     
\ No newline at end of file