From: Scott Worley Date: Mon, 9 Oct 2023 18:56:40 +0000 (-0700) Subject: client: Set up for multiple types of events to go into the queue X-Git-Tag: v0.1.0~50 X-Git-Url: http://git.scottworley.com/tattlekey/commitdiff_plain/e8d047a087aa273dfe5cf0ecd8cc0f879110ae1e?ds=sidebyside client: Set up for multiple types of events to go into the queue --- diff --git a/client/tattlekey.c b/client/tattlekey.c index 6313424..aadf49d 100644 --- a/client/tattlekey.c +++ b/client/tattlekey.c @@ -7,6 +7,16 @@ #include "config.h" #include "net.h" +enum event_type { BUTTONPRESS }; +typedef struct { + enum event_type type; + union { + struct { + uint32_t timestamp; + } buttonpress; + }; +} event_t; + queue_t queue; uint32_t time_s() { return time_us_64() / 1000000ul; } @@ -18,9 +28,12 @@ static void button_pressed() { 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; + event_t e; + e.type = BUTTONPRESS; + e.buttonpress.timestamp = 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); + queue_try_add(&queue, &e); } } @@ -35,21 +48,27 @@ int main() { signal_error_by_blinking(); signal(2, 300); - queue_init(&queue, sizeof(uint32_t), 99); + queue_init(&queue, sizeof(event_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); + event_t e; + queue_remove_blocking(&queue, &e); + switch (e.type) { + case BUTTONPRESS: + seq++; + for (int i = 0; i < config_resend_count; i++) { + uint32_t now = time_s(); + uint32_t ago = now - e.buttonpress.timestamp; + send_report(seq, ago); + signal(i == 0 ? 2 : 1, 100); + sleep_ms(config_resend_interval_ms); + } + break; + default: + signal_error_by_blinking(); } } }