feat(orb-mcu-util): print new diamond evt version

also print 'Diamond_unknown' in case binary doesn't support any new version

Author: fouge

Cargo.lock

@@ -121,7 +121,7 @@ seek-camera.path = "seek-camera/wrapper"
 
 [workspace.dependencies.orb-messages]
 git = "https://github.com/worldcoin/orb-messages"
-rev = "3dffed6e01fa4aaca347eca52be87bfc298508eb"
+rev = "c251751145f5376087f99305fbdfba10718e3cdd"
 
 [workspace.dependencies.nusb]
 git = "https://github.com/kevinmehall/nusb"

Cargo.toml

@@ -1,28 +1,77 @@
-use std::fmt::{Display, Formatter};
-
 use orb_mcu_interface::orb_messages;
+use std::fmt::{Display, Formatter};
 
 #[derive(Clone, Debug, Default)]
 pub struct OrbRevision(pub orb_messages::Hardware);
 
+trait OrbVersionFromInt {
+    fn from_version_i32(value: i32) -> Self;
+}
+impl OrbVersionFromInt for orb_messages::hardware::OrbVersion {
+    fn from_version_i32(value: i32) -> Self {
+        match value {
+            1 => orb_messages::hardware::OrbVersion::HwVersionPearlEv1,
+            2 => orb_messages::hardware::OrbVersion::HwVersionPearlEv2,
+            3 => orb_messages::hardware::OrbVersion::HwVersionPearlEv3,
+            4 => orb_messages::hardware::OrbVersion::HwVersionPearlEv4,
+            5 => orb_messages::hardware::OrbVersion::HwVersionPearlEv5,
+            6 => orb_messages::hardware::OrbVersion::HwVersionDiamondPoc1,
+            7 => orb_messages::hardware::OrbVersion::HwVersionDiamondPoc2,
+            8 => orb_messages::hardware::OrbVersion::HwVersionDiamondB3,
+            9 => orb_messages::hardware::OrbVersion::HwVersionDiamondEvt,
+            _ => orb_messages::hardware::OrbVersion::HwVersionUnknown,
+        }
+    }
+}
+
 impl Display for OrbRevision {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        if self.0.version
-            == i32::from(orb_messages::hardware::OrbVersion::HwVersionUnknown)
-        {
-            write!(f, "unknown")
-        } else if self.0.version
-            < orb_messages::hardware::OrbVersion::HwVersionDiamondPoc1 as i32
-        {
-            write!(f, "EVT{:?}", self.0.version)
-        } else {
-            write!(
-                f,
-                "Diamond_B{:?}",
-                self.0.version
-                    - orb_messages::hardware::OrbVersion::HwVersionDiamondPoc1 as i32
-                    + 1
-            )
+        match orb_messages::hardware::OrbVersion::from_version_i32(self.0.version) {
+            orb_messages::hardware::OrbVersion::HwVersionUnknown => {
+                // from_version_i32 returned unknown but the version might not be 0
+                // meaning it's known by the firmware but not by the current binary
+                if self.0.version
+                    == orb_messages::hardware::OrbVersion::HwVersionUnknown as i32
+                {
+                    return write!(f, "unknown");
+                }
+
+                tracing::error!(
+                    "A new orb revision might not be implemented by that binary: {:?}.",
+                    self.0.version
+                );
+
+                // let's write if it's a pearl or diamond orb, guessing by the version number
+                if self.0.version
+                    < orb_messages::hardware::OrbVersion::HwVersionDiamondPoc1 as i32
+                {
+                    write!(f, "Pearl_unknown")
+                } else {
+                    write!(f, "Diamond_unknown")
+                }
+            }
+            orb_messages::hardware::OrbVersion::HwVersionPearlEv1
+            | orb_messages::hardware::OrbVersion::HwVersionPearlEv2
+            | orb_messages::hardware::OrbVersion::HwVersionPearlEv3
+            | orb_messages::hardware::OrbVersion::HwVersionPearlEv4
+            | orb_messages::hardware::OrbVersion::HwVersionPearlEv5 => {
+                write!(f, "EVT{:?}", self.0.version)
+            }
+            orb_messages::hardware::OrbVersion::HwVersionDiamondPoc1
+            | orb_messages::hardware::OrbVersion::HwVersionDiamondPoc2
+            | orb_messages::hardware::OrbVersion::HwVersionDiamondB3 => {
+                write!(
+                    f,
+                    "Diamond_B{:?}",
+                    self.0.version
+                        - orb_messages::hardware::OrbVersion::HwVersionDiamondPoc1
+                            as i32
+                        + 1
+                )
+            }
+            orb_messages::hardware::OrbVersion::HwVersionDiamondEvt => {
+                write!(f, "Diamond_EVT")
+            }
         }
     }
 }