proto fixup

Signed-off-by: Julian Oes <julian@oes.ch>
mavlink · Apr 6, 2024 · 6592706 · 6592706
1 parent 0bdd4d8
commit 6592706
Show file tree

Hide file tree

Showing 9 changed files with 815 additions and 803 deletions.
diff --git a/examples/arm_authorizer_server/arm_authorizer_server.cpp b/examples/arm_authorizer_server/arm_authorizer_server.cpp
@@ -48,7 +48,7 @@ int main(int argc, char** argv)
             result = arm_authorizer.accept_arm_authorization(5);
         } else {
             result = arm_authorizer.reject_arm_authorization(
-                true, ArmAuthorizerServer::RejectionReason::ReasonGeneric, 10);
+                true, ArmAuthorizerServer::RejectionReason::Generic, 10);
         }
         if (result == ArmAuthorizerServer::Result::Success) {
             std::cout << "Successfully sent the response" << std::endl;

diff --git a/proto b/proto
diff --git a/src/mavsdk/plugins/arm_authorizer_server/arm_authorizer_server.cpp b/src/mavsdk/plugins/arm_authorizer_server/arm_authorizer_server.cpp
@@ -43,6 +43,8 @@ ArmAuthorizerServer::Result ArmAuthorizerServer::reject_arm_authorization(
 std::ostream& operator<<(std::ostream& str, ArmAuthorizerServer::Result const& result)
 {
     switch (result) {
+        case ArmAuthorizerServer::Result::Unknown:
+            return str << "Unknown";
         case ArmAuthorizerServer::Result::Success:
             return str << "Success";
         case ArmAuthorizerServer::Result::Failed:

diff --git a/...ugins/arm_authorizer_server/include/plugins/arm_authorizer_server/arm_authorizer_server.h b/...ugins/arm_authorizer_server/include/plugins/arm_authorizer_server/arm_authorizer_server.h
@@ -71,6 +71,7 @@ class ArmAuthorizerServer : public ServerPluginBase {
      * @brief
      */
     enum class Result {
+        Unknown, /**< @brief Unknown result. */
         Success, /**< @brief Command accepted. */
         Failed, /**< @brief Command failed. */
     };

diff --git a/src/mavsdk_server/src/generated/arm_authorizer_server/arm_authorizer_server.grpc.pb.cc b/src/mavsdk_server/src/generated/arm_authorizer_server/arm_authorizer_server.grpc.pb.cc
diff --git a/src/mavsdk_server/src/generated/arm_authorizer_server/arm_authorizer_server.grpc.pb.h b/src/mavsdk_server/src/generated/arm_authorizer_server/arm_authorizer_server.grpc.pb.h
diff --git a/src/mavsdk_server/src/generated/arm_authorizer_server/arm_authorizer_server.pb.cc b/src/mavsdk_server/src/generated/arm_authorizer_server/arm_authorizer_server.pb.cc
diff --git a/src/mavsdk_server/src/generated/arm_authorizer_server/arm_authorizer_server.pb.h b/src/mavsdk_server/src/generated/arm_authorizer_server/arm_authorizer_server.pb.h
diff --git a/src/mavsdk_server/src/plugins/arm_authorizer_server/arm_authorizer_server_service_impl.h b/src/mavsdk_server/src/plugins/arm_authorizer_server/arm_authorizer_server_service_impl.h
@@ -93,30 +93,34 @@ class ArmAuthorizerServerServiceImpl final
         }
     }
 
-    static rpc::arm_authorizer_server::ArmAutorizerServerResult::Result
+    static rpc::arm_authorizer_server::ArmAuthorizerServerResult::Result
     translateToRpcResult(const mavsdk::ArmAuthorizerServer::Result& result)
     {
         switch (result) {
             default:
                 LogErr() << "Unknown result enum value: " << static_cast<int>(result);
             // FALLTHROUGH
+            case mavsdk::ArmAuthorizerServer::Result::Unknown:
+                return rpc::arm_authorizer_server::ArmAuthorizerServerResult_Result_RESULT_UNKNOWN;
             case mavsdk::ArmAuthorizerServer::Result::Success:
-                return rpc::arm_authorizer_server::ArmAutorizerServerResult_Result_RESULT_SUCCESS;
+                return rpc::arm_authorizer_server::ArmAuthorizerServerResult_Result_RESULT_SUCCESS;
             case mavsdk::ArmAuthorizerServer::Result::Failed:
-                return rpc::arm_authorizer_server::ArmAutorizerServerResult_Result_RESULT_FAILED;
+                return rpc::arm_authorizer_server::ArmAuthorizerServerResult_Result_RESULT_FAILED;
         }
     }
 
     static mavsdk::ArmAuthorizerServer::Result translateFromRpcResult(
-        const rpc::arm_authorizer_server::ArmAutorizerServerResult::Result result)
+        const rpc::arm_authorizer_server::ArmAuthorizerServerResult::Result result)
     {
         switch (result) {
             default:
                 LogErr() << "Unknown result enum value: " << static_cast<int>(result);
             // FALLTHROUGH
-            case rpc::arm_authorizer_server::ArmAutorizerServerResult_Result_RESULT_SUCCESS:
+            case rpc::arm_authorizer_server::ArmAuthorizerServerResult_Result_RESULT_UNKNOWN:
+                return mavsdk::ArmAuthorizerServer::Result::Unknown;
+            case rpc::arm_authorizer_server::ArmAuthorizerServerResult_Result_RESULT_SUCCESS:
                 return mavsdk::ArmAuthorizerServer::Result::Success;
-            case rpc::arm_authorizer_server::ArmAutorizerServerResult_Result_RESULT_FAILED:
+            case rpc::arm_authorizer_server::ArmAuthorizerServerResult_Result_RESULT_FAILED:
                 return mavsdk::ArmAuthorizerServer::Result::Failed;
         }
     }