X-Git-Url: http://git.scottworley.com/tattlekey/blobdiff_plain/07b39467ab6efc8ad5d9510bf5ebf06c9679ed4e..ff999046a743cadb712418918b50bc5bb1074448:/client/tattlekey.c

diff --git a/client/tattlekey.c b/client/tattlekey.c
index 352b84c..a11e6c1 100644
--- a/client/tattlekey.c
+++ b/client/tattlekey.c
@@ -7,13 +7,18 @@
 #include "config.h"
 #include "net.h"
 
-enum event_type { BUTTONPRESS };
+enum event_type { BUTTONPRESS, SEND };
 typedef struct {
   enum event_type type;
   union {
     struct {
       uint32_t timestamp;
     } buttonpress;
+    struct {
+      uint32_t timestamp;
+      u16_t seq;
+      u8_t send_count;
+    } send;
   };
 } event_t;
 
@@ -46,6 +51,37 @@ static void button_pressed() {
   }
 }
 
+void service_queue() {
+  u16_t seq = 0;
+  while (1) {
+    event_t e;
+    queue_remove_blocking(&queue, &e);
+    switch (e.type) {
+    case BUTTONPRESS: {
+      event_t send_e;
+      send_e.type = SEND;
+      send_e.send.timestamp = e.buttonpress.timestamp;
+      send_e.send.seq = seq++;
+      send_e.send.send_count = 0;
+      queue_try_add_ignoring_errors(&queue, &send_e);
+    } break;
+    case SEND: {
+      uint32_t now = time_s();
+      uint32_t ago = now - e.send.timestamp;
+      send_report(e.send.seq, ago);
+      e.send.send_count++;
+      if (e.send.send_count < config_resend_count)
+        queue_try_add_ignoring_errors(&queue, &e);
+      /* TODO: Sleep elsewhere. */
+      signal(e.send.send_count == 1 ? 2 : 1, 100);
+      sleep_ms(config_resend_interval_ms);
+    } break;
+    default:
+      signal_error_by_blinking();
+    }
+  }
+}
+
 int main() {
   stdio_init_all();
   if (cyw43_arch_init_with_country(CYW43_COUNTRY_USA))
@@ -61,23 +97,5 @@ int main() {
 
   begin_listening_for_button_press(button_pressed);
 
-  u16_t seq = 0;
-  while (1) {
-    event_t e;
-    queue_remove_blocking(&queue, &e);
-    switch (e.type) {
-    case BUTTONPRESS:
-      seq++;
-      for (int i = 0; i < config_resend_count; i++) {
-        uint32_t now = time_s();
-        uint32_t ago = now - e.buttonpress.timestamp;
-        send_report(seq, ago);
-        signal(i == 0 ? 2 : 1, 100);
-        sleep_ms(config_resend_interval_ms);
-      }
-      break;
-    default:
-      signal_error_by_blinking();
-    }
-  }
+  service_queue();
 }