CSE477 / swimate_v2

Dependencies:   Adafruit_GFX_128x64 DS3231 PinDetect SDFileSystem USBDevice mbed RealtimeMath MODSERIAL

Revision:
18:06b718f8e6fd
Parent:
13:227a6cfd2097
Child:
19:4f4f7bc4a3fb
diff -r 006d9087d76c -r 06b718f8e6fd main.cpp
--- a/main.cpp	Wed May 28 23:15:05 2014 +0000
+++ b/main.cpp	Thu Jun 05 19:09:07 2014 +0000
@@ -13,7 +13,6 @@
 #include "pins.h"
 #include "DS3231.h"
 
-
 // Capture button stuff
 #define PIN_DETECT_SAMPLE_PERIOD_uS 20000   // 20 ms sample period
 #define SYNC_HELD_SAMPLES   (SYNC_HOLD_TIME_MS * 1000 / PIN_DETECT_SAMPLE_PERIOD_uS)
@@ -58,7 +57,6 @@
         State = IDLE;
 }
 
-DigitalOut led(LED1);
 int main(void)
 {
     SystemTime::start();
@@ -94,12 +92,12 @@
             while (State == CAPTURE) {
                 data = receive_data();
                 log_data(data);
-                int split = process_data(data->x);
-                if (split != UINT16_MAX) {
-                    PC_PRINTLNF("Split time: %d", split);
-                    OLED_PRINTPF("Split: %d", split, 0, 40);
-                    log_data(split);
-                }
+//                int split = process_data(data->x);
+//                if (split != UINT16_MAX) {
+//                    PC_PRINTLNF("Split time: %d", split);
+//                    OLED_PRINTPF("Split: %d", split, 0, 40);
+//                    log_data(split);
+//                }
             }
             
             receive_close();
@@ -107,9 +105,8 @@
             log_close();
         } else if (State == SYNC) {
             OLED_PRINTP("Ready to sync...", 0, 0);
-//            sync_init();
-//            while (State == SYNC)
-//                sync();
+            sync_init();
+            sync();
         }
     }
 }