client: Initial wifi connection time: 10s → 90s

[tattlekey] / client / tattlekey.c

diff --git a/client/tattlekey.c b/client/tattlekey.c
index 17a41f9651660fece5d92cfebe18f4f85e57e47e..45059f6ed2e832b8457c64f4696640d0a6c44e1a 100644 (file)
--- a/client/tattlekey.c
+++ b/client/tattlekey.c
@@ -1,34 +1,43 @@
 #include "pico/cyw43_arch.h"
 #include "pico/stdlib.h"
+#include "pico/util/queue.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);
-}
+#include "blink.h"
+#include "button.h"
+#include "config.h"
+#include "net.h"
 
-void signal(int count, int duration) {
-  for (int i = 0; i < count; i++)
-    one_blink(duration);
-  sleep_ms(1000);
-}
+queue_t queue;
 
-void blink_forever(int duration) {
-  while (true) {
-    one_blink(duration);
-  }
+static void button_pressed() {
+  /* This runs in interrupt context; don't linger.  */
+  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);
 }
 
-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())
+  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, 90000))
+    signal_error_by_blinking();
   signal(3, 200);
-  signal_success_by_blinking();
+
+  queue_init(&queue, 1, 99);
+
+  begin_listening_for_button_press(button_pressed);
+
+  u16_t seq = 0;
+  while (1) {
+    char _;
+    queue_remove_blocking(&queue, &_);
+    send_report(seq++, 0);
+    signal(4, 200);
+  }
 }