X-Git-Url: http://git.scottworley.com/tattlekey/blobdiff_plain/2dcbb2a0df003ac8a644c9111c3b7b7f2db42aaa..b512ec26593fde453ce121f30ba8d36b1e3678df:/client/tattlekey.c

diff --git a/client/tattlekey.c b/client/tattlekey.c
index 48db1b7..f5306c2 100644
--- a/client/tattlekey.c
+++ b/client/tattlekey.c
@@ -60,19 +60,18 @@ void service_sleeps(int alarm, send_t *sleeping_sends, pheap_t *sleeps_heap) {
 
   while (1) {
     uint32_t now = time_s();
-    pheap_node_id_t i = ph_peek_head(sleeps_heap);
-    if (i == 0)
+    int32_t act_time = next_scheduled_send(sleeping_sends, sleeps_heap);
+    if (act_time == -1)
       return;
-    send_t *send = &sleeping_sends[i];
-    if (next_send(send) > now) {
-      uint32_t sleep_duration = next_send(send) - now;
+    if (act_time > now) {
+      uint32_t sleep_duration = act_time - now;
       if (hardware_alarm_set_target(
               alarm, make_timeout_time_ms(sleep_duration * 1000)))
         signal_error_by_blinking();
       return;
     }
-    if (ph_remove_head(sleeps_heap, false) != i)
-      signal_error_by_blinking();
+    pheap_node_id_t i = ph_remove_head(sleeps_heap, false);
+    send_t *send = &sleeping_sends[i];
     uint32_t ago = now - send->timestamp;
     send_report(send->seq, ago);
     send->send_count++;
@@ -100,16 +99,7 @@ void service_queue() {
     queue_remove_blocking(&queue, &e);
     switch (e.type) {
     case BUTTONPRESS: {
-      pheap_node_id_t i = ph_new_node(sleeps_heap);
-      if (i == 0) {
-        /* TODO: Don't drop new presses just because sleeps_heap is full of old
-         * presses. */
-        break;
-      }
-      sleeping_sends[i].timestamp = e.buttonpress.timestamp;
-      sleeping_sends[i].seq = seq++;
-      sleeping_sends[i].send_count = 0;
-      ph_insert_node(sleeps_heap, i);
+      create_send(sleeping_sends, sleeps_heap, e.buttonpress.timestamp, seq++);
     } break;
     case SEND: {
       /* OK, we're awake. Cool. Thanks! (We actually do the sends in the