[software] white led task / blink on error and communication

endsummercamp · Sep 6, 2024 · 340101f · 340101f
1 parent 2ddc522
commit 340101f
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 1 deletion.
diff --git a/antani_sw/src/main.rs b/antani_sw/src/main.rs
@@ -207,6 +207,8 @@ enum TaskCommand {
     IncreaseBrightness,
     DecreaseBrightness,
     ResetTime,
+    UsbActivity,
+    Error,
     None,
 }
 
@@ -315,7 +317,12 @@ async fn main(spawner: Spawner) {
     )));
 
     // white led
-    let _white_led = Output::new(p.PIN_20, embassy_rp::gpio::Level::Low);
+    let white_led = Output::new(p.PIN_20, embassy_rp::gpio::Level::Low);
+
+    unwrap!(spawner.spawn(white_led_task(
+        white_led,
+        MEGA_CHANNEL.subscriber().unwrap()
+    )));
 
     // infrared stuff
     let _ir_sens_0 = Input::new(p.PIN_9, Pull::None);
@@ -494,6 +501,8 @@ async fn main(spawner: Spawner) {
                     timer_offset = Instant::now().as_micros() as f64 / 1_000_000.0;
                 }
 
+                TaskCommand::UsbActivity | TaskCommand::Error => {}
+
                 TaskCommand::None => {}
             }
         }
@@ -625,6 +634,7 @@ async fn ir_blaster_tsk(
                     Status::Error => {
                         log::error!("Error in IR blaster");
                         enable_pwm(&mut ir_blaster, &mut pwm_cfg, false);
+                        publisher.publish(crate::TaskCommand::Error).await;
                         break;
                     }
                 };
@@ -638,6 +648,35 @@ async fn ir_blaster_tsk(
     }
 }
 
+#[embassy_executor::task]
+async fn white_led_task(mut white_led: Output<'static>, mut subscriber: MegaSubscriber) {
+    loop {
+        match subscriber.next_message_pure().await {
+            TaskCommand::ReceivedIrNec(_, _, _)
+            | TaskCommand::MidiSetPixel(_, _, _, _)
+            | TaskCommand::UsbActivity => {
+                // communication state
+                white_led.set_high();
+                Timer::after(Duration::from_millis(200)).await;
+                white_led.set_low();
+                Timer::after(Duration::from_millis(200)).await;
+            }
+
+            TaskCommand::Error => {
+                // error state
+                for _ in 0..4 {
+                    white_led.set_high();
+                    Timer::after(Duration::from_millis(50)).await;
+                    white_led.set_low();
+                    Timer::after(Duration::from_millis(50)).await;
+                }
+            }
+
+            _ => {}
+        }
+    }
+}
+
 #[embassy_executor::task]
 async fn temperature(
     mut adc: adc::Adc<'static, adc::Async>,

diff --git a/antani_sw/src/usb.rs b/antani_sw/src/usb.rs
@@ -203,6 +203,7 @@ async fn usb_control<'d, T: Instance + 'd>(
                 mega_deserialization_buf.x.clear();
 
                 publisher.publish(command).await;
+                publisher.publish(crate::TaskCommand::UsbActivity).await;
             }
             Err(e) => match e.kind {
                 capnp::ErrorKind::MessageEndsPrematurely(_, _) => {
@@ -212,6 +213,8 @@ async fn usb_control<'d, T: Instance + 'd>(
                 e => {
                     error!("Error deserializing message: {:?}", e);
 
+                    publisher.publish(crate::TaskCommand::Error).await;
+
                     mega_deserialization_buf.x.clear();
                 }
             },