client: Rename the event enum values

[tattlekey] / client / tattlekey.c

diff --git a/client/tattlekey.c b/client/tattlekey.c
index f5306c28b8130dffceeef916951202f7d71b5b8f..c5e500ed4518e2d5fc377c7226d56f24ff911b93 100644 (file)
--- a/client/tattlekey.c
+++ b/client/tattlekey.c
@@ -9,7 +9,7 @@
 #include "net.h"
 #include "sends.h"
 
 #include "net.h"
 #include "sends.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,10 +51,18 @@ 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 set_send_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, send_t *sleeping_sends, pheap_t *sleeps_heap) {
   hardware_alarm_cancel(alarm);
 
 void service_sleeps(int alarm, send_t *sleeping_sends, pheap_t *sleeps_heap) {
   hardware_alarm_cancel(alarm);
 


@@ -64,16 +72,13 @@ void service_sleeps(int alarm, send_t *sleeping_sends, pheap_t *sleeps_heap) {
     if (act_time == -1)
       return;
     if (act_time > now) {
     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_send_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;
       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_report_packet(send->seq, ago);

     send->send_count++;
     if (send->send_count < config_resend_count)
       ph_insert_node(sleeps_heap, i);
     send->send_count++;
     if (send->send_count < config_resend_count)
       ph_insert_node(sleeps_heap, i);


@@ -98,10 +103,10 @@ void service_queue() {
     event_t e;
     queue_remove_blocking(&queue, &e);
     switch (e.type) {
     event_t e;
     queue_remove_blocking(&queue, &e);
     switch (e.type) {

-    case BUTTONPRESS: {
+    case NEW_BUTTON_PRESS: {

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