Move timer to main

diff --git a/vis/device.py b/vis/device.py
index 093f380c3c9e43419abc7003b62604d58380acf8..7d47d77c0b006019fe44ec9775edbfbab201d379 100644 (file)
--- a/vis/device.py
+++ b/vis/device.py
@@ -87,6 +87,7 @@ class Frame:
        bits_typ = 0   # data type
        binary   = ""  # binary read-in
        values   = []  # converted numeric data
+       total    = 0   # total states read so far
 
        # Constructor
        def __init__(self):
@@ -153,8 +154,12 @@ class Frame:
                fmt = Frame.fmtMap[self.bits_typ] * self.count
                sns = Frame.snsMap[self.bits_sns]
                self.values = unpack('<'+fmt, self.binary)
-               print('convert: %3s = \'%3s\'%%[%s] -> [%s]' %
-                       (sns, fmt, hexDump(self.binary), fltDump(self.values)))
+               #print('convert: %3s = \'%3s\'%%[%s] -> [%s]' %
+               #       (sns, fmt, hexDump(self.binary), fltDump(self.values)))
+
+               if self.total % 100 == 0:
+                       print('read %d samples' % self.total);
+               self.total += 1;
 
                # Create state
                state = State()

diff --git a/yue/main.cpp b/yue/main.cpp
index e580188dcce225a1caf375fed709594a5b036c5b..ce909d4eeff3eb9d95e69f8d6825b7c1f76209ea 100644 (file)
--- a/yue/main.cpp
+++ b/yue/main.cpp
@@ -146,7 +146,7 @@ void printBin(uint8_t *frame, int len);
 int main(void) {\r
     // Initialization\r
     // Interruption Declarations\r
-    clock1.attach(&clock1_interrupt, TIME_ACCURACY);    // maximun accuracy be 0.1s\r
+    //clock1.attach(&clock1_interrupt, TIME_ACCURACY);    // maximun accuracy be 0.1s\r
     serial.attach(&serialRx_interrupt, Serial::RxIrq);  // receive interrupt for serialS\r
     serial.baud(115200);\r
     magSensor.begin();\r
@@ -155,8 +155,13 @@ int main(void) {
 \r
     printStr("\r\n============= Start of the program ============\r\n");\r
 \r
+    int ticks = 0, tocks = 0;\r
     while(1){\r
-        wait(3);\r
+       ticks = us_ticker_read() * TIME_ACCURACY;\r
+       if (tocks < ticks) {\r
+               clock1_interrupt();\r
+               tocks++;\r
+       }\r
     }\r
 }\r
 \r