pbio/sys/light_matrix: Handle animation synchronously with program.

The status event handler would only change this on program start and stop events, so we could just as well do it exactly there.

Author: laurensvalk

lib/pbio/sys/hmi.c

@@ -175,7 +175,6 @@ void pbsys_hmi_init(void) {
 
 void pbsys_hmi_handle_status_change(pbsys_status_change_t event, pbio_pybricks_status_t data) {
     pbsys_status_light_handle_status_change(event, data);
-    pbsys_hub_light_matrix_handle_status_change(event, data);
 }
 
 /**

lib/pbio/sys/light_matrix.c

@@ -143,22 +143,19 @@ static uint32_t pbsys_hub_light_matrix_user_program_animation_next(pbio_light_an
     return 40;
 }
 
-void pbsys_hub_light_matrix_handle_status_change(pbsys_status_change_t event, pbio_pybricks_status_t data) {
-
-    pbio_pybricks_status_t status = (intptr_t)data;
-
-    // Only need to handle changing program running state.
-    if (status != PBIO_PYBRICKS_STATUS_USER_PROGRAM_RUNNING) {
-        return;
-    }
-
-    if (event == PBSYS_STATUS_CHANGE_SET) {
+/**
+ * Updates light matrix behavior when program is started or stopped.
+ * 
+ * @param start   @c true for start or @c false for stop.
+ */
+void pbsys_hub_light_matrix_handle_user_program_start(bool start) {
+    if (start) {
         // The user animation updates only a subset of pixels to save time,
         // so the rest must be cleared before it starts.
         pbsys_hub_light_matrix_user_program_animation_clear();
         pbio_light_animation_init(&pbsys_hub_light_matrix->animation, pbsys_hub_light_matrix_user_program_animation_next);
         pbio_light_animation_start(&pbsys_hub_light_matrix->animation);
-    } else if (event == PBSYS_STATUS_CHANGE_CLEARED) {
+    } else {
         // If the user program has ended, show stop sign and selected slot.
         pbsys_hub_light_matrix_show_idle_ui(100);
     }

lib/pbio/sys/light_matrix.h

@@ -11,12 +11,12 @@
 #if PBSYS_CONFIG_HUB_LIGHT_MATRIX
 void pbsys_hub_light_matrix_init(void);
 void pbsys_hub_light_matrix_deinit(void);
-void pbsys_hub_light_matrix_handle_status_change(pbsys_status_change_t event, pbio_pybricks_status_t data);
+void pbsys_hub_light_matrix_handle_user_program_start(bool start);
 void pbsys_hub_light_matrix_update_program_slot(void);
 #else
 #define pbsys_hub_light_matrix_init()
 #define pbsys_hub_light_matrix_deinit()
-#define pbsys_hub_light_matrix_handle_status_change(event, data)
+#define pbsys_hub_light_matrix_handle_user_program_start(start)
 #define pbsys_hub_light_matrix_update_program_slot()
 #endif
 

lib/pbio/sys/main.c

@@ -17,6 +17,7 @@
 #include <pbsys/main.h>
 #include <pbsys/status.h>
 
+#include "light_matrix.h"
 #include "program_stop.h"
 #include "storage.h"
 #include <pbsys/program_stop.h>
@@ -105,6 +106,7 @@ int main(int argc, char **argv) {
         pbsys_status_set_program_id(program.id);
         pbsys_status_set(PBIO_PYBRICKS_STATUS_USER_PROGRAM_RUNNING);
         pbsys_host_rx_set_callback(pbsys_main_stdin_event);
+        pbsys_hub_light_matrix_handle_user_program_start(true);
 
         // Handle pending events triggered by the status change, such as
         // starting status light animation.
@@ -118,6 +120,7 @@ int main(int argc, char **argv) {
         pbsys_status_clear(PBIO_PYBRICKS_STATUS_USER_PROGRAM_RUNNING);
         pbsys_host_rx_set_callback(NULL);
         pbsys_program_stop_set_buttons(PBIO_BUTTON_CENTER);
+        pbsys_hub_light_matrix_handle_user_program_start(false);
         pbio_stop_all(true);
         program.start_request_type = PBSYS_MAIN_PROGRAM_START_REQUEST_TYPE_NONE;