X-Git-Url: http://git.scottworley.com/tattlekey/blobdiff_plain/e3ff9e0d326c0dfce08c7b9fb7aaa2b11245a6a5..f9625e91cfed21a65b720609ed1d8a7e7c0f36bd:/client/tattlekey.c?ds=inline

diff --git a/client/tattlekey.c b/client/tattlekey.c
index 2f64323..5e829d1 100644
--- a/client/tattlekey.c
+++ b/client/tattlekey.c
@@ -1,3 +1,20 @@
+/* tattlekey: A one-key UDP keyboard
+ * Copyright (C) 2023  Scott Worley <scottworley@scottworley.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 #include "pico/cyw43_arch.h"
 #include "pico/stdlib.h"
 #include "pico/util/pheap.h"
@@ -60,7 +77,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 +91,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();
+    u32_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);
+    }
   }
 }
 
@@ -102,7 +118,9 @@ void service_queue() {
     queue_remove_blocking(&queue, &e);
     switch (e.type) {
     case NEW_BUTTON_PRESS: {
-      create_press(pp, e.buttonpress.timestamp, seq++);
+      add_press(pp, &(press_t){e.buttonpress.timestamp, seq++, 0});
+      if (seq == 0)
+        new_epoch();
     } break;
     case RESEND_TIME: {
       /* OK, we're awake. Cool. Thanks! (We actually do the sends in the