football_project_wo_output

Dependencies:   mbed

Fork of football_project by MZJ

Files at this revision

API Documentation at this revision

Comitter:
andriym
Date:
Thu Jun 16 06:52:07 2016 +0000
Parent:
97:2894fbc2d4f8
Commit message:
Removed timer.;

Changed in this revision

main.cpp Show annotated file Show diff for this revision Revisions of this file
diff -r 2894fbc2d4f8 -r 9241041ec253 main.cpp
--- a/main.cpp	Thu Jun 16 06:19:49 2016 +0000
+++ b/main.cpp	Thu Jun 16 06:52:07 2016 +0000
@@ -4,9 +4,6 @@
 
 using namespace std;
 
-Timer tmr;
-//Output out;
-
 ///////////////////////////////////  PINS   ///////////////////////////////////
 
 DebounceIn buttonTeam(BUT_TEAM);
@@ -136,7 +133,7 @@
         team = _team;
         Contact c;
         c.rssi = rssi;
-        c.time_ms = (time!=NULL) ? time : tmr.read_ms();
+        c.time_ms = (time!=NULL) ? time : 0; //tmr.read_ms();
         contacts.push_front(c);
         
         // Cleanup
@@ -145,7 +142,7 @@
     }
     int16_t get_distance(int &cnt) {
         // Find max RSSI
-        uint32_t cur_time = tmr.read_ms();
+        uint32_t cur_time = 0; //tmr.read_ms();
         int16_t max_rssi=-128;
         cnt=0;
         for (list<Contact>::iterator it=contacts.begin(); it != contacts.end(); ++it) {
@@ -279,12 +276,12 @@
     out.sleep(2.0);
     */
         
-    tmr.start();
+    //tmr.start();
     
     Players players;
     
-    uint32_t last_send = tmr.read_ms();
-    uint32_t last_shown = tmr.read_ms();
+    uint32_t last_send = 0; //tmr.read_ms();
+    uint32_t last_shown = 0; // tmr.read_ms();
     //uint32_t min_wait = SEND_RATE_MS - 0.5*SEND_RATE_MS*SEND_DESYNC;
     //uint32_t send_wait = min_wait;
 
@@ -343,7 +340,7 @@
         bVLOld = bVLNew;
 
         // Output
-        unsigned long current_time = tmr.read_ms();
+        unsigned long current_time = 0; //tmr.read_ms();
         
         if (current_time - last_shown > CYCLE_MS)
         {