client: lint nits

[tattlekey] / client / tattlekey.c

diff --git a/client/tattlekey.c b/client/tattlekey.c
index b433b4435b4950de5b561abb48a69aadc89aaa98..c4e745fdccbd91d076be8b11c97b6e2c1659f1d7 100644 (file)
--- a/client/tattlekey.c
+++ b/client/tattlekey.c
@@ -7,9 +7,9 @@
 #include "button.h"
 #include "config.h"
 #include "net.h"
 #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 {
 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;
   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);
   }
     e.buttonpress.timestamp = now;
     queue_try_add_ignoring_errors(&queue, &e);
   }


@@ -51,35 +51,38 @@ static void button_pressed() {
 static void time_to_send(uint _) {
   /* This runs in interrupt context; don't linger.  */
   event_t e;
 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);
 }
 
   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();
+}
+
+void service_sleeps(int alarm, press_pile_t *pp) {

   hardware_alarm_cancel(alarm);
 
   while (1) {
     uint32_t now = time_s();
   hardware_alarm_cancel(alarm);
 
   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(pp);
+    if (act_time == -1)

       return;
       return;

-    send_t *send = &sleeping_sends[i];
-    if (next_send(send) > now) {
-      uint32_t sleep_duration = next_send(send) - now;
-      if (hardware_alarm_set_target(
-              alarm, make_timeout_time_ms(sleep_duration * 1000)))
-        signal_error_by_blinking();
+    if (act_time > now) {
+      set_resend_alarm(alarm, now, act_time);

       return;
     }
       return;
     }

-    if (ph_remove_head(sleeps_heap, false) != i)
+    press_t press;
+    if (!get_press_due_for_resend(pp, now, &press))

       signal_error_by_blinking();
       signal_error_by_blinking();

-    uint32_t ago = now - send->timestamp;
-    send_report(send->seq, ago);
-    send->send_count++;
-    if (send->send_count < config_resend_count)
-      ph_insert_node(sleeps_heap, i);
-    else
-      ph_free_node(sleeps_heap, i);
+    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);
+    }

   }
 }
 
   }
 }
 


@@ -89,20 +92,18 @@ void service_queue() {
     signal_error_by_blinking();
   hardware_alarm_set_callback(alarm, time_to_send);
 
     signal_error_by_blinking();
   hardware_alarm_set_callback(alarm, time_to_send);
 

-  send_t sleeping_sends[PICO_PHEAP_MAX_ENTRIES];
-  pheap_t *sleeps_heap =
-      ph_create(PICO_PHEAP_MAX_ENTRIES, next_send_less_than, sleeping_sends);
+  press_pile_t *pp = create_press_pile();

   u16_t seq = 0;
   while (1) {
   u16_t seq = 0;
   while (1) {

-    service_sleeps(alarm, sleeping_sends, sleeps_heap);
+    service_sleeps(alarm, pp);

 
     event_t e;
     queue_remove_blocking(&queue, &e);
     switch (e.type) {
 
     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: {
+      add_press(pp, &(press_t){e.buttonpress.timestamp, seq++, 0});

     } break;
     } 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;
       /* OK, we're awake. Cool. Thanks! (We actually do the sends in the
        * service_sleeps() call at the top of the loop.)  */
     } break;