Loop for the right msg_type

Signed-off-by: Albert Esteve <[email protected]>
aesteve-rh · Jan 23, 2024 · e403d28 · e403d28
1 parent 80d3f65
commit e403d28
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -329,8 +329,10 @@ impl Vhal {
 
     pub fn get_gear_selection(&self) -> Result<c::VehicleGear> {
         self.get_property(VehicleProperty::GEAR_SELECTION, 0)?;
-        let resp = self.recv_cmd()?;
-        resp.is_valid(VehicleHalProto::MsgType::GET_PROPERTY_RESP)?;
+        let mut resp = self.recv_cmd()?;
+        while resp.is_valid(VehicleHalProto::MsgType::GET_PROPERTY_RESP).is_err() {
+            resp = self.recv_cmd()?;
+        }
 
         Ok(c::VehicleGear::try_from(resp.expect_i32()?)
             .map_err(|_| VhalError::ReceiveMessageValueError)?)
@@ -343,8 +345,10 @@ impl Vhal {
 
     pub fn get_vehicle_speed(&self) -> Result<f32> {
         self.get_property(VehicleProperty::PERF_VEHICLE_SPEED, 0)?;
-        let resp = self.recv_cmd()?;
-        resp.is_valid(VehicleHalProto::MsgType::GET_PROPERTY_RESP)?;
+        let mut resp = self.recv_cmd()?;
+        while resp.is_valid(VehicleHalProto::MsgType::GET_PROPERTY_RESP).is_err() {
+            resp = self.recv_cmd()?;
+        }
         resp.expect_f32()
     }
 
@@ -355,8 +359,10 @@ impl Vhal {
 
     pub fn get_vehicle_display_speed(&self) -> Result<f32> {
         self.get_property(VehicleProperty::PERF_VEHICLE_SPEED_DISPLAY, 0)?;
-        let resp = self.recv_cmd()?;
-        resp.is_valid(VehicleHalProto::MsgType::GET_PROPERTY_RESP)?;
+        let mut resp = self.recv_cmd()?;
+        while resp.is_valid(VehicleHalProto::MsgType::GET_PROPERTY_RESP).is_err() {
+            resp = self.recv_cmd()?;
+        }
         resp.expect_f32()
     }