orb-ui: diamond: self-serve with cone support

initial cone support

orb-ui/Cargo.toml

@@ -21,6 +21,7 @@ orb-build-info.path = "../build-info"
 orb-messages.workspace = true
 orb-sound.path = "sound"
 orb-uart.path = "uart"
+orb-cone.path = "cone"
 orb-rgb.path = "rgb"
 pid.path = "pid"
 prost = "0.12.3"

orb-ui/README.md

@@ -24,6 +24,7 @@ Test new event with the orb-ui daemon running:
 
 ```shell
 busctl --user call org.worldcoin.OrbUiState1 /org/worldcoin/OrbUiState1 org.worldcoin.OrbUiState1 OrbSignupStateEvent s "\"Bootup\""
+busctl --user call org.worldcoin.OrbUserEvent1 /org/worldcoin/OrbUserEvent1 org.worldcoin.OrbUserEvent1 UserEvent s "\"ConeButtonPressed\""
 ```
 
 ## Platform Support

orb-ui/src/dbus.rs

@@ -1,29 +1,28 @@
 //! Dbus interface definitions.
 
-use crate::engine;
-use crate::engine::Event;
+use crate::engine::RxEvent;
 use tokio::sync::mpsc;
-use zbus::interface;
+use zbus::{interface, proxy};
 
 /// Dbus interface object for OrbUiState1.
 #[derive(Debug)]
-pub struct Interface {
-    events: mpsc::UnboundedSender<Event>,
+pub struct InboundInterface {
+    events: mpsc::UnboundedSender<RxEvent>,
 }
 
-impl Interface {
-    pub fn new(events: mpsc::UnboundedSender<Event>) -> Self {
+impl InboundInterface {
+    pub fn new(events: mpsc::UnboundedSender<RxEvent>) -> Self {
         Self { events }
     }
 }
 
 #[interface(name = "org.worldcoin.OrbUiState1")]
-impl Interface {
-    /// Forward events to UI engine by sending serialized engine::Event to the event channel.
+impl InboundInterface {
+    /// Forward events to UI engine by sending serialized engine::TxEvent to the event channel.
     async fn orb_signup_state_event(&mut self, event: String) -> zbus::fdo::Result<()> {
-        // parse event to engine::Event using json_serde
+        // parse serialized event
         tracing::debug!("received JSON event: {}", event);
-        let event: engine::Event = serde_json::from_str(&event).map_err(|e| {
+        let event: RxEvent = serde_json::from_str(&event).map_err(|e| {
             zbus::fdo::Error::InvalidArgs(format!(
                 "invalid event: failed to parse {}",
                 e
@@ -35,3 +34,12 @@ impl Interface {
         Ok(())
     }
 }
+
+#[proxy(
+    default_service = "org.worldcoin.OrbUserEvent1",
+    default_path = "/org/worldcoin/OrbUserEvent1",
+    interface = "org.worldcoin.OrbUserEvent1"
+)]
+trait OutboundInterface {
+    fn user_event(&self, event: String) -> zbus::fdo::Result<()>;
+}

orb-ui/src/engine/animations/static.rs

@@ -23,6 +23,16 @@ impl<const N: usize> Static<N> {
     }
 }
 
+impl<const N: usize> Default for Static<N> {
+    fn default() -> Self {
+        Self {
+            current_color: Argb::OFF,
+            max_time: None,
+            stop: false,
+        }
+    }
+}
+
 impl<const N: usize> Animation for Static<N> {
     type Frame = [Argb; N];