client: Calculate 'ago' with a clock

diff --git a/client/tattlekey.c b/client/tattlekey.c
index 842561d22e47316f81b1a1c4a8500fadbec97a89..b37773c490bfebc8409896f477531abbf285a501 100644 (file)
--- a/client/tattlekey.c
+++ b/client/tattlekey.c
@@ -18,10 +18,9 @@ static void button_pressed() {
   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;
   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;

-    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);

   }
 }
 
   }
 }
 


@@ -36,17 +35,19 @@ 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, &_);
+    uint32_t t;
+    queue_remove_blocking(&queue, &t);

     seq++;
     for (int i = 0; i < resend_count; i++) {
     seq++;
     for (int i = 0; i < resend_count; i++) {

-      send_report(seq, 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);
     }
       signal(i == 0 ? 2 : 1, 100);
       sleep_ms(resend_interval_ms);
     }