time sync working

Circuitsoft · Apr 13, 2017 · 45ec026 · 45ec026
1 parent d01252a
commit 45ec026
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 17 deletions.
diff --git a/pyaci/interactive_console.py b/pyaci/interactive_console.py
@@ -74,7 +74,6 @@ def MinIntervalGet(self):
 
     # Experimental: to be removed
     def runCommand(self, command):
-        print("Running + {data}".format(data=command.serialize()))
         self.AppCommand(command.serialize())
 
     def setTime(self):

diff --git a/src/epoch.c b/src/epoch.c
@@ -5,35 +5,51 @@
 #include "app_timer.h"
 
 //  Timer settings
-#define APP_TIMER_PRESCALER             63 // Wraparound value -1
-#define APP_TIMER_MAX_TIMERS            1
-#define APP_TIMER_OP_QUEUE_SIZE         1
-
+#define APP_TIMER_PRESCALER             31   // divisor value - 1
+#define TICKS_PER_SECOND                1024 // f / (APP_TIMER_PRESCALER+1)
+#define APP_TIMER_MAX_TIMERS            2
+#define APP_TIMER_OP_QUEUE_SIZE         3
 
 static int32_t epoch_offset;
 static bool started_timer = false;
-static app_timer_id_t         timer_ID;
-
+static app_timer_id_t alignment_timer_ID;
+static app_timer_id_t measurement_timer_ID;
 
-static void timeout_cb(void * p_context)
+static void measurement_timer_cb(void * p_context)
 {
+  epoch_offset += 1;
   sensor_update();
-  toggle_led(LED_RED);
+  if (epoch_offset % 10 == 0) {
+    toggle_led(LED_GREEN);
+  }
+}
+
+static void start_measurement_timer() {
+  app_timer_create(&measurement_timer_ID, APP_TIMER_MODE_REPEATED, measurement_timer_cb);
+  app_timer_start(measurement_timer_ID, TICKS_PER_SECOND, NULL);
+  epoch_offset += 1;  // Timer will kick off 1 second from now; account for this
+}
+
+static void timer_aligned_cb(void * p_context) {
+  start_measurement_timer();
 }
 
-static void start_timer() {
-  started_timer = true;
+static void start_timer(uint16_t start_delay) {
   APP_TIMER_INIT(APP_TIMER_PRESCALER, APP_TIMER_MAX_TIMERS, APP_TIMER_OP_QUEUE_SIZE, false);
-  app_timer_create(&timer_ID, APP_TIMER_MODE_REPEATED, timeout_cb);
-  app_timer_start(timer_ID, 512, NULL);
+  int32_t start_delay_ticks = (start_delay * (TICKS_PER_SECOND/1000.0));
+  if (start_delay_ticks > 5) {
+    app_timer_create(&alignment_timer_ID, APP_TIMER_MODE_SINGLE_SHOT, timer_aligned_cb);
+    app_timer_start(alignment_timer_ID, start_delay_ticks, NULL);
+  } else {
+    start_measurement_timer();
+  }
 }
 
 void set_epoch_time(int32_t epoch, uint16_t ms) {
   epoch_offset = epoch;
-  //uint16_t sleep_time = 1000 - ms;
-  // Need to wake in sleep time ms
-  // then start 1s timer
   if (!started_timer) {
-    start_timer();
+    started_timer = true;
+    uint16_t start_delay = 1000 - ms;
+    start_timer(start_delay);
   }
 }