client: Hold presses in queues, one queue per send_count

[tattlekey] / client / tattlekey.c

diff --git a/client/tattlekey.c b/client/tattlekey.c
index cd1324145e220b097578b0b67e613ca973778bd8..9f28e455ba9993cbf7a295ddc74e7d0ed69c87ab 100644 (file)
--- a/client/tattlekey.c
+++ b/client/tattlekey.c
@@ -1,24 +1,21 @@
 #include "pico/cyw43_arch.h"
 #include "pico/stdlib.h"
 #include "pico/cyw43_arch.h"
 #include "pico/stdlib.h"

+#include "pico/util/pheap.h"

 #include "pico/util/queue.h"
 
 #include "blink.h"
 #include "button.h"
 #include "config.h"
 #include "net.h"
 #include "pico/util/queue.h"
 
 #include "blink.h"
 #include "button.h"
 #include "config.h"
 #include "net.h"

+#include "press.h"

 
 

-enum event_type { BUTTONPRESS, SEND };
+enum event_type { NEW_BUTTON_PRESS, RESEND_TIME };

 typedef struct {
   enum event_type type;
   union {
     struct {
       uint32_t timestamp;
     } buttonpress;
 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;
 
   };
 } event_t;
 


@@ -45,53 +42,92 @@ static void button_pressed() {
   if (time_since_last_press >= config_minimum_seconds_between_button_presses) {
     last_button_press_time = now;
     event_t e;
   if (time_since_last_press >= config_minimum_seconds_between_button_presses) {
     last_button_press_time = now;
     event_t e;

-    e.type = BUTTONPRESS;
+    e.type = NEW_BUTTON_PRESS;

     e.buttonpress.timestamp = now;
     queue_try_add_ignoring_errors(&queue, &e);
   }
 }
 
     e.buttonpress.timestamp = now;
     queue_try_add_ignoring_errors(&queue, &e);
   }
 }
 

-int main() {
-  stdio_init_all();
-  if (cyw43_arch_init_with_country(CYW43_COUNTRY_USA))
-    signal_error_by_blinking();
-  cyw43_arch_enable_sta_mode();
-  signal(3, 100);
-  if (cyw43_arch_wifi_connect_timeout_ms(config_wifi_ssid, config_wifi_pass,
-                                         CYW43_AUTH_WPA2_AES_PSK, 90000))
+static void time_to_send(uint _) {
+  /* This runs in interrupt context; don't linger.  */
+  event_t e;
+  e.type = RESEND_TIME;
+  queue_try_add_ignoring_errors(&queue, &e);
+}
+
+void set_resend_alarm(int alarm, uint32_t now, uint32_t next_act_time) {
+  uint32_t sleep_duration = next_act_time - now;
+  if (hardware_alarm_set_target(alarm,
+                                make_timeout_time_ms(sleep_duration * 1000)))

     signal_error_by_blinking();
     signal_error_by_blinking();

-  signal(2, 300);
+  return;
+}

 
 

-  queue_init(&queue, sizeof(event_t), 99);
+void service_sleeps(int alarm, press_pile_t *pp) {
+  hardware_alarm_cancel(alarm);

 
 

-  begin_listening_for_button_press(button_pressed);
+  while (1) {
+    uint32_t now = time_s();
+    int32_t act_time = next_scheduled_send(pp);
+    if (act_time == -1)
+      return;
+    if (act_time > now) {
+      set_resend_alarm(alarm, now, act_time);
+      return;
+    }
+    press_t press;
+    if (!get_press_due_for_resend(pp, now, &press))
+      signal_error_by_blinking();
+    uint32_t ago = now - press.timestamp;
+    send_report_packet(press.seq, ago);
+    press.send_count++;
+    if (press.send_count < config_resend_count) {
+      add_press(pp, &press);
+    }
+  }
+}
+
+void service_queue() {
+  int alarm = hardware_alarm_claim_unused(true);
+  if (alarm == -1)
+    signal_error_by_blinking();
+  hardware_alarm_set_callback(alarm, time_to_send);

 
 

+  press_pile_t *pp = create_press_pile();

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

+    service_sleeps(alarm, pp);
+

     event_t e;
     queue_remove_blocking(&queue, &e);
     switch (e.type) {
     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);
+    case NEW_BUTTON_PRESS: {
+      add_press(pp, &(press_t){e.buttonpress.timestamp, seq++, 0});

     } break;
     } 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);
+    case RESEND_TIME: {
+      /* OK, we're awake. Cool. Thanks! (We actually do the sends in the
+       * service_sleeps() call at the top of the loop.)  */

     } break;
     default:
       signal_error_by_blinking();
     }
   }
 }
     } break;
     default:
       signal_error_by_blinking();
     }
   }
 }

+
+int main() {
+  stdio_init_all();
+  if (cyw43_arch_init_with_country(CYW43_COUNTRY_USA))
+    signal_error_by_blinking();
+  cyw43_arch_enable_sta_mode();
+  signal(3, 100);
+  if (cyw43_arch_wifi_connect_timeout_ms(config_wifi_ssid, config_wifi_pass,
+                                         CYW43_AUTH_WPA2_AES_PSK, 90000))
+    signal_error_by_blinking();
+  signal(2, 300);
+
+  queue_init(&queue, sizeof(event_t), 99);
+
+  begin_listening_for_button_press(button_pressed);
+
+  service_queue();
+}