Skip to content

Commit

Permalink
Merge pull request #155 from mavlink/update-proto
Browse files Browse the repository at this point in the history
Update protos and mavsdk_server to v0.20.0
  • Loading branch information
unipheas authored Oct 21, 2019
2 parents d4438b1 + 444d6e2 commit d4eaf83
Show file tree
Hide file tree
Showing 19 changed files with 2,867 additions and 144 deletions.
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "jonasvautherin/grpc-swift" "master"
github "ReactiveX/RxSwift" == 5.0.1
binary "https://s3.eu-central-1.amazonaws.com/dronecode-sdk/backend.json" == 0.18.3
binary "https://s3.eu-central-1.amazonaws.com/dronecode-sdk/backend.json" == 0.20.0
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
binary "https://s3.eu-central-1.amazonaws.com/dronecode-sdk/backend.json" "0.18.3"
binary "https://s3.eu-central-1.amazonaws.com/dronecode-sdk/backend.json" "0.20.0"
github "ReactiveX/RxSwift" "5.0.1"
github "jonasvautherin/grpc-swift" "820730e24b9cf035b2889b30d2fe87411e041720"
13 changes: 2 additions & 11 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,6 @@
"version": "1.0.0"
}
},
{
"package": "swift-nio-ssl-support",
"repositoryURL": "https://github.com/apple/swift-nio-ssl-support.git",
"state": {
"branch": null,
"revision": "c02eec4e0e6d351cd092938cf44195a8e669f555",
"version": "1.0.0"
}
},
{
"package": "swift-nio-zlib-support",
"repositoryURL": "https://github.com/apple/swift-nio-zlib-support.git",
Expand All @@ -87,8 +78,8 @@
"repositoryURL": "https://github.com/apple/swift-protobuf.git",
"state": {
"branch": null,
"revision": "7bf52ab1f5ee87aeb89f2a6b9bfc6369408476f7",
"version": "1.5.0"
"revision": "da75a93ac017534e0028e83c0e4fc4610d2acf48",
"version": "1.7.0"
}
}
]
Expand Down
10 changes: 5 additions & 5 deletions Sources/MAVSDK-Swift/Generated/Gimbal.swift
Original file line number Diff line number Diff line change
Expand Up @@ -71,37 +71,37 @@ public class Gimbal {


public enum Result: Equatable {
case unknown
case success
case error
case timeout
case unknown
case UNRECOGNIZED(Int)

internal var rpcResult: Mavsdk_Rpc_Gimbal_GimbalResult.Result {
switch self {
case .unknown:
return .unknown
case .success:
return .success
case .error:
return .error
case .timeout:
return .timeout
case .unknown:
return .unknown
case .UNRECOGNIZED(let i):
return .UNRECOGNIZED(i)
}
}

internal static func translateFromRpc(_ rpcResult: Mavsdk_Rpc_Gimbal_GimbalResult.Result) -> Result {
switch rpcResult {
case .unknown:
return .unknown
case .success:
return .success
case .error:
return .error
case .timeout:
return .timeout
case .unknown:
return .unknown
case .UNRECOGNIZED(let i):
return .UNRECOGNIZED(i)
}
Expand Down
Loading

0 comments on commit d4eaf83

Please sign in to comment.