pbio/sys/hmi: Move animations to respective HMI.

Relavant animations can be started when successfully starting a program, rather than having variant specific code in the main system loop.

Author: laurensvalk

lib/pbio/sys/hmi_lcd.c

@@ -13,10 +13,13 @@
 #include <stdint.h>
 
 #include <pbdrv/bluetooth.h>
+#include <pbdrv/display.h>
 
 #include <pbio/button.h>
 #include <pbio/os.h>
 #include <pbsys/host.h>
+#include <pbio/image.h>
+#include <pbsys/light.h>
 #include <pbsys/main.h>
 #include <pbsys/status.h>
 #include <pbsys/storage_settings.h>
@@ -116,6 +119,14 @@ static pbio_error_t run_ui(pbio_os_state_t *state, pbio_os_timer_t *timer) {
         }
         pbdrv_button_get_pressed();
     }));
+
+    // Clear UI from display to start user program.
+    pbio_image_fill(pbdrv_display_get_image(), 0);
+    pbdrv_display_update();
+
+    // Start light or display animations.
+    pbio_color_light_start_breathe_animation(pbsys_status_light_main, PBSYS_CONFIG_STATUS_LIGHT_STATE_ANIMATIONS_HUE);
+
     PBIO_OS_ASYNC_END(PBIO_SUCCESS);
 }
 

lib/pbio/sys/hmi_pup.c

@@ -17,6 +17,7 @@
 #include <pbio/button.h>
 #include <pbio/os.h>
 #include <pbsys/host.h>
+#include <pbsys/light.h>
 #include <pbsys/main.h>
 #include <pbsys/status.h>
 #include <pbsys/storage_settings.h>
@@ -208,6 +209,15 @@ static pbio_error_t run_ui(pbio_os_state_t *state, pbio_os_timer_t *timer) {
         }
         pbdrv_button_get_pressed();
     }));
+
+    // Start run animations
+    pbsys_hub_light_matrix_handle_user_program_start();
+    #if PBSYS_CONFIG_STATUS_LIGHT_STATE_ANIMATIONS
+    pbio_color_light_start_breathe_animation(pbsys_status_light_main, PBSYS_CONFIG_STATUS_LIGHT_STATE_ANIMATIONS_HUE);
+    #else
+    pbio_color_light_off(pbsys_status_light_main);
+    #endif
+
     PBIO_OS_ASYNC_END(PBIO_SUCCESS);
 }
 

lib/pbio/sys/light_matrix.c

@@ -157,12 +157,6 @@ static uint32_t pbsys_hub_light_matrix_user_program_animation_next(pbio_light_an
  */
 void pbsys_hub_light_matrix_handle_user_program_start(void) {
 
-    #if PBSYS_CONFIG_HUB_LIGHT_MATRIX_DISPLAY
-    pbio_image_fill(pbdrv_display_get_image(), 0);
-    pbdrv_display_update();
-    return;
-    #endif
-
     // 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();

lib/pbio/sys/main.c

@@ -102,15 +102,6 @@ int main(int argc, char **argv) {
         pbsys_status_set_program_id(program.id);
         pbsys_status_set(PBIO_PYBRICKS_STATUS_USER_PROGRAM_RUNNING);
         pbsys_host_stdin_set_callback(pbsys_main_stdin_event);
-        pbsys_hub_light_matrix_handle_user_program_start();
-
-        #if PBSYS_CONFIG_STATUS_LIGHT
-        #if PBSYS_CONFIG_STATUS_LIGHT_STATE_ANIMATIONS
-        pbio_color_light_start_breathe_animation(pbsys_status_light_main, PBSYS_CONFIG_STATUS_LIGHT_STATE_ANIMATIONS_HUE);
-        #else
-        pbio_color_light_off(pbsys_status_light_main);
-        #endif
-        #endif
 
         // Handle pending events triggered by the status change, such as
         // starting status light animation.