client: Prefix all the config settings with "config_"

[tattlekey] / client / tattlekey.c

diff --git a/client/tattlekey.c b/client/tattlekey.c
index 30f92a4d4e3cb804a86af133a4c058a3908acfd7..6313424dc34d11143f87a107d765ba765ef02075 100644 (file)
--- a/client/tattlekey.c
+++ b/client/tattlekey.c
@@ -1,32 +1,26 @@
 #include "pico/cyw43_arch.h"
 #include "pico/stdlib.h"
+#include "pico/util/queue.h"
 
 #include "blink.h"
 #include "button.h"
 #include "config.h"
 #include "net.h"
 
-static u16_t seq = 0;
+queue_t queue;
 
-static void button_pressed() {
-  /* TODO: This is interrupt context.  We need to get out of interrupt context
-   * quickly; we should not be doing significant work here, & definitely
-   * shouldn't be sleeping here.  We signal errors with blinking the LED, which
-   * involves sleeping, so this all has to move. */
-  send_report(seq++, 0);
-  signal(4, 200);
-}
+uint32_t time_s() { return time_us_64() / 1000000ul; }
 
-static void wait_forever() {
-  /* pico-examples/gpio/hello_gpio_irq/hello_gpio_irq.c implements wait-forever
-   * as "while (1);", but
-   * https://www.raspberrypi.com/documentation/pico-sdk/high_level.html#gaf469c6d691230e9d1008
-   * says sleeping uses less power, so we sleep.  */
-  while (1) {
-    /* https://www.raspberrypi.com/documentation/pico-sdk/hardware.html#rpip7ce2cdc1662dce59296b
-     * says the maximum sleep is 2^32 - 1 microseconds (~71.58 minutes), so we
-     * sleep in chunks. */
-    sleep_ms(1 << 31); /* 35.79 minutes */
+static void button_pressed() {
+  /* This runs in interrupt context; don't linger.  */
+  static uint64_t last_button_press_time = 0;
+  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;
+    /* We don't check for failure (full queue) here because there's not much to
+     * be done about it. */
+    queue_try_add(&queue, &now);
   }
 }
 
@@ -34,14 +28,28 @@ int main() {
   stdio_init_all();
   if (cyw43_arch_init_with_country(CYW43_COUNTRY_USA))
     signal_error_by_blinking();
-  signal(1, 200);
   cyw43_arch_enable_sta_mode();
-  signal(2, 200);
-  if (cyw43_arch_wifi_connect_timeout_ms(wifi_ssid, wifi_pass,
-                                         CYW43_AUTH_WPA2_AES_PSK, 10000))
+  signal(3, 100);
+  if (cyw43_arch_wifi_connect_timeout_ms(config_wifi_ssid, config_wifi_pass,
+                                         CYW43_AUTH_WPA2_AES_PSK, 90000))
     signal_error_by_blinking();
-  signal(3, 200);
+  signal(2, 300);
+
+  queue_init(&queue, sizeof(uint32_t), 99);
+
   begin_listening_for_button_press(button_pressed);
 
-  wait_forever();
+  u16_t seq = 0;
+  while (1) {
+    uint32_t t;
+    queue_remove_blocking(&queue, &t);
+    seq++;
+    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(config_resend_interval_ms);
+    }
+  }
 }