client: Prefix all the config settings with "config_"

[tattlekey] / client / tattlekey.c

diff --git a/client/tattlekey.c b/client/tattlekey.c
index 76e9168df08da2640a8ce3ff8a94a2eaa329ca5b..6313424dc34d11143f87a107d765ba765ef02075 100644 (file)
--- a/client/tattlekey.c
+++ b/client/tattlekey.c
@@ -1,41 +1,55 @@
 #include "pico/cyw43_arch.h"
 #include "pico/stdlib.h"
+#include "pico/util/queue.h"
 
-char ssid[] = "THEWIFISSID";
-char pass[] = "THEWIFIPASSWORD";
+#include "blink.h"
+#include "button.h"
+#include "config.h"
+#include "net.h"
 
-void one_blink(int duration) {
-  cyw43_arch_gpio_put(CYW43_WL_GPIO_LED_PIN, 1);
-  sleep_ms(duration);
-  cyw43_arch_gpio_put(CYW43_WL_GPIO_LED_PIN, 0);
-  sleep_ms(duration);
-}
+queue_t queue;
 
-void signal(int count, int duration) {
-  for (int i = 0; i < count; i++)
-    one_blink(duration);
-  sleep_ms(1000);
-}
+uint32_t time_s() { return time_us_64() / 1000000ul; }
 
-void blink_forever(int duration) {
-  while (true) {
-    one_blink(duration);
+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);
   }
 }
 
-void signal_error_by_blinking() { blink_forever(100); }
-void signal_success_by_blinking() { blink_forever(400); }
-
 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(ssid, 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_success_by_blinking();
+  signal(2, 300);
+
+  queue_init(&queue, sizeof(uint32_t), 99);
+
+  begin_listening_for_button_press(button_pressed);
+
+  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);
+    }
+  }
 }