client: Calculate 'ago' with a clock

[tattlekey] / client / tattlekey.c

diff --git a/client/tattlekey.c b/client/tattlekey.c
index 3a1f7b7b67212de7437b593f1b4f8c1512ad305a..b37773c490bfebc8409896f477531abbf285a501 100644 (file)
--- a/client/tattlekey.c
+++ b/client/tattlekey.c
@@ -9,17 +9,18 @@
 
 queue_t queue;
 
 
 queue_t queue;
 

+uint32_t time_s() { return time_us_64() / 1000000ul; }
+

 static void button_pressed() {
   /* This runs in interrupt context; don't linger.  */
   static uint64_t last_button_press_time = 0;
 static void button_pressed() {
   /* This runs in interrupt context; don't linger.  */
   static uint64_t last_button_press_time = 0;

-  uint64_t now = time_us_64();
-  uint64_t time_since_last_press = now - last_button_press_time;
-  if (time_since_last_press > minimum_microseconds_between_button_presses) {
+  uint32_t now = time_s();
+  uint32_t time_since_last_press = now - last_button_press_time;
+  if (time_since_last_press >= minimum_seconds_between_button_presses) {

     last_button_press_time = now;
     last_button_press_time = now;

-    char zero = '\0';

     /* We don't check for failure (full queue) here because there's not much to
      * be done about it. */
     /* We don't check for failure (full queue) here because there's not much to
      * be done about it. */

-    queue_try_add(&queue, &zero);
+    queue_try_add(&queue, &now);

   }
 }
 
   }
 }
 


@@ -34,15 +35,21 @@ int main() {
     signal_error_by_blinking();
   signal(2, 300);
 
     signal_error_by_blinking();
   signal(2, 300);
 

-  queue_init(&queue, 1, 99);
+  queue_init(&queue, sizeof(uint32_t), 99);

 
   begin_listening_for_button_press(button_pressed);
 
   u16_t seq = 0;
   while (1) {
 
   begin_listening_for_button_press(button_pressed);
 
   u16_t seq = 0;
   while (1) {

-    char _;
-    queue_remove_blocking(&queue, &_);
-    send_report(seq++, 0);
-    signal(2, 100);
+    uint32_t t;
+    queue_remove_blocking(&queue, &t);
+    seq++;
+    for (int i = 0; i < resend_count; i++) {
+      uint32_t now = time_s();
+      uint32_t ago = now - t;
+      send_report(seq, ago);
+      signal(i == 0 ? 2 : 1, 100);
+      sleep_ms(resend_interval_ms);
+    }

   }
 }
   }
 }