client: Start moving pending-sends logic out to sends.c

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 7714c1e43dedaf618e6066c4d15cecec4b60ad33..74a41895c9a4a639f0753b24b7a4f0aceb82a41e 100644 (file)
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -12,6 +12,7 @@ add_executable(tattlekey
   button.c
   config.c
   net.c
   button.c
   config.c
   net.c

+  sends.c

   tattlekey.c
   )
 
   tattlekey.c
   )
 

diff --git a/client/sends.c b/client/sends.c
new file mode 100644 (file)
index 0000000..c060792
--- /dev/null
+++ b/client/sends.c
@@ -0,0 +1,11 @@
+#include "sends.h"
+
+uint32_t next_send(send_t *s) {
+  return s->timestamp + (1 << s->send_count) - 1;
+}
+
+bool next_send_less_than(void *user_data, pheap_node_id_t a,
+                         pheap_node_id_t b) {
+  send_t *sends = (send_t *)user_data;
+  return next_send(&sends[a]) < next_send(&sends[b]);
+}

diff --git a/client/sends.h b/client/sends.h
new file mode 100644 (file)
index 0000000..02d49db
--- /dev/null
+++ b/client/sends.h
@@ -0,0 +1,17 @@
+#ifndef SENDS_H
+#define SENDS_H
+
+#include "pico/cyw43_arch.h"
+#include "pico/util/pheap.h"
+
+typedef struct {
+  uint32_t timestamp;
+  u16_t seq;
+  u8_t send_count;
+} send_t;
+
+uint32_t next_send(send_t *s);
+
+bool next_send_less_than(void *user_data, pheap_node_id_t a, pheap_node_id_t b);
+
+#endif

diff --git a/client/tattlekey.c b/client/tattlekey.c
index c38de126d50245cd3a9ba08d128e170b6c23d75c..48db1b7f0bfa430961a1b62410e6d94875ff8a02 100644 (file)
--- a/client/tattlekey.c
+++ b/client/tattlekey.c
@@ -7,22 +7,7 @@
 #include "button.h"
 #include "config.h"
 #include "net.h"
 #include "button.h"
 #include "config.h"
 #include "net.h"

-
-typedef struct {
-  uint32_t timestamp;
-  u16_t seq;
-  u8_t send_count;
-} send_t;
-
-uint32_t next_send(send_t *s) {
-  return s->timestamp + (1 << s->send_count) - 1;
-}
-
-bool next_send_less_than(void *user_data, pheap_node_id_t a,
-                         pheap_node_id_t b) {
-  send_t *sends = (send_t *)user_data;
-  return next_send(&sends[a]) < next_send(&sends[b]);
-}
+#include "sends.h"

 
 enum event_type { BUTTONPRESS, SEND };
 typedef struct {
 
 enum event_type { BUTTONPRESS, SEND };
 typedef struct {