X-Git-Url: http://git.scottworley.com/tattlekey/blobdiff_plain/ff379463e38b1cebd43d5c2ab8a0a0ae8e7a9b53..d7789e5bc00881da0f9e0e96b867309f5289dc8f:/client/tattlekey.c

diff --git a/client/tattlekey.c b/client/tattlekey.c
index 9e7b4b5..6313424 100644
--- a/client/tattlekey.c
+++ b/client/tattlekey.c
@@ -9,17 +9,18 @@
 
 queue_t queue;
 
+uint32_t time_s() { return time_us_64() / 1000000ul; }
+
 static void button_pressed() {
   /* This runs in interrupt context; don't linger.  */
   static uint64_t last_button_press_time = 0;
-  uint64_t now = time_us_64();
-  uint64_t time_since_last_press = now - last_button_press_time;
-  if (time_since_last_press > minimum_microseconds_between_button_presses) {
+  uint32_t now = time_s();
+  uint32_t time_since_last_press = now - last_button_press_time;
+  if (time_since_last_press >= config_minimum_seconds_between_button_presses) {
     last_button_press_time = now;
-    char zero = '\0';
     /* We don't check for failure (full queue) here because there's not much to
      * be done about it. */
-    queue_try_add(&queue, &zero);
+    queue_try_add(&queue, &now);
   }
 }
 
@@ -29,24 +30,26 @@ int main() {
     signal_error_by_blinking();
   cyw43_arch_enable_sta_mode();
   signal(3, 100);
-  if (cyw43_arch_wifi_connect_timeout_ms(wifi_ssid, wifi_pass,
+  if (cyw43_arch_wifi_connect_timeout_ms(config_wifi_ssid, config_wifi_pass,
                                          CYW43_AUTH_WPA2_AES_PSK, 90000))
     signal_error_by_blinking();
   signal(2, 300);
 
-  queue_init(&queue, 1, 99);
+  queue_init(&queue, sizeof(uint32_t), 99);
 
   begin_listening_for_button_press(button_pressed);
 
   u16_t seq = 0;
   while (1) {
-    char _;
-    queue_remove_blocking(&queue, &_);
+    uint32_t t;
+    queue_remove_blocking(&queue, &t);
     seq++;
-    for (int i = 0; i < resend_count; i++) {
-      send_report(seq, i);
+    for (int i = 0; i < config_resend_count; i++) {
+      uint32_t now = time_s();
+      uint32_t ago = now - t;
+      send_report(seq, ago);
       signal(i == 0 ? 2 : 1, 100);
-      sleep_ms(resend_interval_ms);
+      sleep_ms(config_resend_interval_ms);
     }
   }
 }