X-Git-Url: http://git.scottworley.com/tattlekey/blobdiff_plain/f68e05b24686490605df455a66704909c84ea606..6e43b84fc4f233c4f72e1b82920cacd925411fa9:/client/tattlekey.c diff --git a/client/tattlekey.c b/client/tattlekey.c index 88bdd91..9f28e45 100644 --- 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); + } } }