client: get_press_due_for_resend()

[tattlekey] / client / tattlekey.c

diff --git a/client/tattlekey.c b/client/tattlekey.c
index 14eb7b92c909494563e5475d3bb5cfc5aa95906b..9f28e455ba9993cbf7a295ddc74e7d0ed69c87ab 100644 (file)
--- a/client/tattlekey.c
+++ b/client/tattlekey.c
@@ -7,7 +7,7 @@
 #include "button.h"
 #include "config.h"
 #include "net.h"
 #include "button.h"
 #include "config.h"
 #include "net.h"

-#include "sends.h"
+#include "press.h"

 
 enum event_type { NEW_BUTTON_PRESS, RESEND_TIME };
 typedef struct {
 
 enum event_type { NEW_BUTTON_PRESS, RESEND_TIME };
 typedef struct {


@@ -63,27 +63,27 @@ void set_resend_alarm(int alarm, uint32_t now, uint32_t next_act_time) {
   return;
 }
 
   return;
 }
 

-void service_sleeps(int alarm, press_t *presses, pheap_t *sleeps_heap) {
+void service_sleeps(int alarm, press_pile_t *pp) {

   hardware_alarm_cancel(alarm);
 
   while (1) {
     uint32_t now = time_s();
   hardware_alarm_cancel(alarm);
 
   while (1) {
     uint32_t now = time_s();

-    int32_t act_time = next_scheduled_send(presses, sleeps_heap);
+    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;
     }
     if (act_time == -1)
       return;
     if (act_time > now) {
       set_resend_alarm(alarm, now, act_time);
       return;
     }

-    pheap_node_id_t i = ph_remove_head(sleeps_heap, false);
-    press_t *press = &presses[i];
-    uint32_t ago = now - press->timestamp;
-    send_report_packet(press->seq, ago);
-    press->send_count++;
-    if (press->send_count < config_resend_count)
-      ph_insert_node(sleeps_heap, i);
-    else
-      ph_free_node(sleeps_heap, i);
+    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);
+    }

   }
 }
 
   }
 }
 


@@ -93,18 +93,16 @@ void service_queue() {
     signal_error_by_blinking();
   hardware_alarm_set_callback(alarm, time_to_send);
 
     signal_error_by_blinking();
   hardware_alarm_set_callback(alarm, time_to_send);
 

-  press_t presses[PICO_PHEAP_MAX_ENTRIES];
-  pheap_t *sleeps_heap =
-      ph_create(PICO_PHEAP_MAX_ENTRIES, next_send_less_than, presses);
+  press_pile_t *pp = create_press_pile();

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

-    service_sleeps(alarm, presses, sleeps_heap);
+    service_sleeps(alarm, pp);

 
     event_t e;
     queue_remove_blocking(&queue, &e);
     switch (e.type) {
     case NEW_BUTTON_PRESS: {
 
     event_t e;
     queue_remove_blocking(&queue, &e);
     switch (e.type) {
     case NEW_BUTTON_PRESS: {

-      create_press(presses, sleeps_heap, e.buttonpress.timestamp, seq++);
+      add_press(pp, &(press_t){e.buttonpress.timestamp, seq++, 0});

     } break;
     case RESEND_TIME: {
       /* OK, we're awake. Cool. Thanks! (We actually do the sends in the
     } break;
     case RESEND_TIME: {
       /* OK, we're awake. Cool. Thanks! (We actually do the sends in the