tasks: ui: use embassy-futures instead of futures crate

src/tasks/safetyui.rs

@@ -4,7 +4,6 @@ use figments::prelude::*;
 use figments_render::output::Brightness;
 use rgb::Rgba;
 use core::fmt::Debug;
-use futures::join;
 use log::*;
 
 use crate::{animation::{AnimDisplay, AnimatedSurface, Animation}, events::{Personality, Prediction}, graphics::{display::{DisplayControls, SegmentSpace, Uniforms}, shaders::*}, tasks::ui::UiSurfacePool};
@@ -84,10 +83,10 @@ impl<S: Debug + Surface<Uniforms = Uniforms, CoordinateSpace = SegmentSpace, Pix
         self.headlight.set_visible(true);
         self.brakelight.set_opacity(0);
         self.brakelight.set_visible(true);
-        join!(
+        embassy_futures::join::join(
             fade_in.apply(&mut self.headlight),
             fade_in.apply(&mut self.brakelight)
-        );
+        ).await;
 
         info!("Fade out overlay");
         TURN_OFF.apply(&mut self.overlay).await;
@@ -100,17 +99,17 @@ impl<S: Debug + Surface<Uniforms = Uniforms, CoordinateSpace = SegmentSpace, Pix
             Personality::Active => {
                 // FIXME: These should be a Off/Low/High enum, so the stopping brake looks different from the dayrunning brake.
                 warn!("Active personality: Turning on safety lights");
-                join!(
+                embassy_futures::join::join(
                     TURN_ON.apply(&mut self.brakelight),
                     TURN_ON.apply(&mut self.headlight)
-                );
+                ).await;
             },
             Personality::Parked => {
                 warn!("Idle personality: Turning off safety lights");
-                join!(
+                embassy_futures::join::join(
                     TURN_OFF.apply(&mut self.brakelight),
                     TURN_OFF.apply(&mut self.headlight)
-                );
+                ).await;
             },
             Personality::Sleeping => {
                 warn!("Sleeping personality: Safety UI is going to sleep");