]> git.scottworley.com Git - tattlekey/blobdiff - client/tattlekey.c
client: lint nits
[tattlekey] / client / tattlekey.c
index 88bdd9159f7c958649bef438920bb7dbe2ed6b80..c4e745fdccbd91d076be8b11c97b6e2c1659f1d7 100644 (file)
@@ -60,7 +60,6 @@ void set_resend_alarm(int alarm, uint32_t now, uint32_t next_act_time) {
   if (hardware_alarm_set_target(alarm,
                                 make_timeout_time_ms(sleep_duration * 1000)))
     signal_error_by_blinking();
-  return;
 }
 
 void service_sleeps(int alarm, press_pile_t *pp) {
@@ -75,15 +74,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);
+    }
   }
 }