client: Don't sleep in interrupt context

[tattlekey] / client / tattlekey.c

diff --git a/client/tattlekey.c b/client/tattlekey.c
index 76e9168df08da2640a8ce3ff8a94a2eaa329ca5b..05488eaa7c3a1e02d17170bd6aaa4116afcfad6d 100644 (file)
--- a/client/tattlekey.c
+++ b/client/tattlekey.c
@@ -1,31 +1,22 @@
 #include "pico/cyw43_arch.h"
 #include "pico/stdlib.h"
 #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);
+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 blink_forever(int duration) {
-  while (true) {
-    one_blink(duration);
-  }
-}
-
-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))
 int main() {
   stdio_init_all();
   if (cyw43_arch_init_with_country(CYW43_COUNTRY_USA))


@@ -33,9 +24,20 @@ int main() {
   signal(1, 200);
   cyw43_arch_enable_sta_mode();
   signal(2, 200);
   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))
+  if (cyw43_arch_wifi_connect_timeout_ms(wifi_ssid, wifi_pass,
+                                         CYW43_AUTH_WPA2_AES_PSK, 10000))

     signal_error_by_blinking();
   signal(3, 200);
     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);
+  }

 }
 }