client: Rename sends.c → press.c

[tattlekey] / client / tattlekey.c

diff --git a/client/tattlekey.c b/client/tattlekey.c
index f5306c28b8130dffceeef916951202f7d71b5b8f..e59de2fa3807c59ff37a431a3bac29570fbc8ec7 100644 (file)
--- a/client/tattlekey.c
+++ b/client/tattlekey.c
@@ -7,9 +7,9 @@
 #include "button.h"
 #include "config.h"
 #include "net.h"
-#include "sends.h"
+#include "press.h"
 
-enum event_type { BUTTONPRESS, SEND };
+enum event_type { NEW_BUTTON_PRESS, RESEND_TIME };
 typedef struct {
   enum event_type type;
   union {
@@ -42,7 +42,7 @@ static void button_pressed() {
   if (time_since_last_press >= config_minimum_seconds_between_button_presses) {
     last_button_press_time = now;
     event_t e;
-    e.type = BUTTONPRESS;
+    e.type = NEW_BUTTON_PRESS;
     e.buttonpress.timestamp = now;
     queue_try_add_ignoring_errors(&queue, &e);
   }
@@ -51,31 +51,36 @@ static void button_pressed() {
 static void time_to_send(uint _) {
   /* This runs in interrupt context; don't linger.  */
   event_t e;
-  e.type = SEND;
+  e.type = RESEND_TIME;
   queue_try_add_ignoring_errors(&queue, &e);
 }
 
-void service_sleeps(int alarm, send_t *sleeping_sends, pheap_t *sleeps_heap) {
+void set_resend_alarm(int alarm, uint32_t now, uint32_t next_act_time) {
+  uint32_t sleep_duration = next_act_time - now;
+  if (hardware_alarm_set_target(alarm,
+                                make_timeout_time_ms(sleep_duration * 1000)))
+    signal_error_by_blinking();
+  return;
+}
+
+void service_sleeps(int alarm, press_t *presses, pheap_t *sleeps_heap) {
   hardware_alarm_cancel(alarm);
 
   while (1) {
     uint32_t now = time_s();
-    int32_t act_time = next_scheduled_send(sleeping_sends, sleeps_heap);
+    int32_t act_time = next_scheduled_send(presses, sleeps_heap);
     if (act_time == -1)
       return;
     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();
+      set_resend_alarm(alarm, now, act_time);
       return;
     }
     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++;
-    if (send->send_count < config_resend_count)
+    press_t *press = &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(sleeps_heap, i);
     else
       ph_free_node(sleeps_heap, i);
@@ -88,20 +93,20 @@ void service_queue() {
     signal_error_by_blinking();
   hardware_alarm_set_callback(alarm, time_to_send);
 
-  send_t sleeping_sends[PICO_PHEAP_MAX_ENTRIES];
+  press_t presses[PICO_PHEAP_MAX_ENTRIES];
   pheap_t *sleeps_heap =
-      ph_create(PICO_PHEAP_MAX_ENTRIES, next_send_less_than, sleeping_sends);
+      ph_create(PICO_PHEAP_MAX_ENTRIES, next_send_less_than, presses);
   u16_t seq = 0;
   while (1) {
-    service_sleeps(alarm, sleeping_sends, sleeps_heap);
+    service_sleeps(alarm, presses, sleeps_heap);
 
     event_t e;
     queue_remove_blocking(&queue, &e);
     switch (e.type) {
-    case BUTTONPRESS: {
-      create_send(sleeping_sends, sleeps_heap, e.buttonpress.timestamp, seq++);
+    case NEW_BUTTON_PRESS: {
+      create_press(presses, sleeps_heap, e.buttonpress.timestamp, seq++);
     } break;
-    case SEND: {
+    case RESEND_TIME: {
       /* OK, we're awake. Cool. Thanks! (We actually do the sends in the
        * service_sleeps() call at the top of the loop.)  */
     } break;