bump tonic dependencies (#67)

* bump tonic dependencies

.github/workflows/CI.yml

@@ -33,6 +33,7 @@ jobs:
             os: windows-latest
             rust: stable
     steps:
+      - uses: arduino/setup-protoc@v2
       - uses: actions/checkout@v4
         with:
           submodules: true
@@ -58,6 +59,7 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
+      - uses: arduino/setup-protoc@v2
       - uses: actions/checkout@v4
         with:
           submodules: true
@@ -73,6 +75,7 @@ jobs:
     name: docs
     runs-on: ubuntu-latest
     steps:
+      - uses: arduino/setup-protoc@v2
       - uses: actions/checkout@v4
         with:
           submodules: true

Cargo.toml

@@ -6,8 +6,8 @@ edition = "2021"
 rust-version = "1.65.0"
 
 [dependencies]
-tonic = "0.6.0"
-prost = "0.9.0"
+tonic = "0.10.2"
+prost = "0.12.1"
 
 thiserror = "1.0.30"
 futures-util = { version = "0.3.17", default-features = false }
@@ -16,4 +16,4 @@ futures-util = { version = "0.3.17", default-features = false }
 tokio = { version = "1.12.0", features = ["rt-multi-thread", "macros", "time"] }
 
 [build-dependencies]
-tonic-build = "0.6.0"
+tonic-build = "0.10.2"

README.md

@@ -12,6 +12,8 @@ $ rustup update
 
 # Build
 
+*note that building mavsdk-rust requires the [protoc](https://grpc.io/docs/protoc-installation/) compiler to be installed.*
+
 ```bash
 $ cargo build
 ```

src/info.rs

@@ -68,8 +68,8 @@ impl FromRpcResponse<pb::GetVersionResponse> for GetVersionResult {
             .info_result
             .ok_or_else(|| Error::Unknown("InfoResult does not received".into()))?;
 
-        let info_result = pb::info_result::Result::from_i32(rpc_info_result.result)
-            .ok_or_else(|| Error::Unknown("Unsupported InfoResult.result value".into()))?;
+        let info_result = pb::info_result::Result::try_from(rpc_info_result.result)
+            .map_err(|_| Error::Unknown("Unsupported InfoResult.result value".into()))?;
 
         match info_result {
             pb::info_result::Result::Success => match &get_version_response.version {

src/mocap.rs

@@ -258,8 +258,8 @@ impl FromRpcResponse<pb::SetVisionPositionEstimateResponse> for SetVisionPositio
             .mocap_result
             .ok_or_else(|| Error::Unknown("MocapResult does not received".into()))?;
 
-        let mocap_result = pb::mocap_result::Result::from_i32(rpc_mocap_result.result)
-            .ok_or_else(|| Error::Unknown("Unsupported MocapResult.result value".into()))?;
+        let mocap_result = pb::mocap_result::Result::try_from(rpc_mocap_result.result)
+            .map_err(|_| Error::Unknown("Unsupported MocapResult.result value".into()))?;
 
         match mocap_result {
             pb::mocap_result::Result::Success => Ok(()),

src/telemetry.rs

@@ -139,8 +139,8 @@ impl From<pb::Odometry> for Odometry {
     fn from(rpc_odometry: pb::Odometry) -> Self {
         Self {
             time_usec: 0,
-            frame_id: MavFrame::from_i32(rpc_odometry.frame_id).unwrap(),
-            child_frame_id: MavFrame::from_i32(rpc_odometry.child_frame_id).unwrap(),
+            frame_id: MavFrame::try_from(rpc_odometry.frame_id).unwrap(),
+            child_frame_id: MavFrame::try_from(rpc_odometry.child_frame_id).unwrap(),
             position_body: PositionBody::from(&rpc_odometry.position_body.unwrap()),
             q: Quaternion::from(&rpc_odometry.q.unwrap()),
             velocity_body: VelocityBody::from(&rpc_odometry.velocity_body.unwrap_or_default()),