client: get_press_due_for_resend()

[tattlekey] / client / tattlekey.c

diff --git a/client/tattlekey.c b/client/tattlekey.c
index 88bdd9159f7c958649bef438920bb7dbe2ed6b80..9f28e455ba9993cbf7a295ddc74e7d0ed69c87ab 100644 (file)
--- a/client/tattlekey.c
+++ b/client/tattlekey.c
@@ -75,15 +75,15 @@ void service_sleeps(int alarm, press_pile_t *pp) {
       set_resend_alarm(alarm, now, act_time);
       return;
     }
-    pheap_node_id_t i = ph_remove_head(pp->sleeps_heap, false);
-    press_t *press = &pp->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(pp->sleeps_heap, i);
-    else
-      ph_free_node(pp->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);
+    }
   }
 }