Skip to content

Commit bfe734f

Browse files
Merge pull request #208 from Esri/main
Updated to 1.3.0.
2 parents 54e4eb5 + 7707333 commit bfe734f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+3725
-5
lines changed

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ let package = Package(
4747
]
4848
),
4949
.binaryTarget(name: "mavsdk_server",
50-
url: "https://github.com/mavlink/MAVSDK/releases/download/v1.0.8/mavsdk_server.xcframework.zip",
51-
checksum: "ac1cad61e9101f15725cbecb995a7be18ff87ee80d5aa67c91a70e9d0b43816f"),
50+
url: "https://github.com/mavlink/MAVSDK/releases/download/v1.4.0/mavsdk_server.xcframework.zip",
51+
checksum: "a38385a38d426a0d6b9700e142b4de978eddff5d6d33666c108fb35922f5c276"),
5252
.testTarget(name: "MavsdkTests",
5353
dependencies: [
5454
"Mavsdk",

Sources/Mavsdk/Generated/Action.swift

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ public class Action {
142142
case noVtolTransitionSupport
143143
/// Error getting or setting parameter.
144144
case parameterError
145+
/// Action not supported.
146+
case unsupported
145147
case UNRECOGNIZED(Int)
146148

147149
internal var rpcResult: Mavsdk_Rpc_Action_ActionResult.Result {
@@ -170,6 +172,8 @@ public class Action {
170172
return .noVtolTransitionSupport
171173
case .parameterError:
172174
return .parameterError
175+
case .unsupported:
176+
return .unsupported
173177
case .UNRECOGNIZED(let i):
174178
return .UNRECOGNIZED(i)
175179
}
@@ -201,6 +205,8 @@ public class Action {
201205
return .noVtolTransitionSupport
202206
case .parameterError:
203207
return .parameterError
208+
case .unsupported:
209+
return .unsupported
204210
case .UNRECOGNIZED(let i):
205211
return .UNRECOGNIZED(i)
206212
}
@@ -1020,4 +1026,42 @@ public class Action {
10201026
return Disposables.create()
10211027
}
10221028
}
1029+
1030+
/**
1031+
Set current speed.
1032+
1033+
This will set the speed during a mission, reposition, and similar.
1034+
It is ephemeral, so not stored on the drone and does not survive a reboot.
1035+
1036+
- Parameter speedMS: Speed in meters/second
1037+
1038+
*/
1039+
public func setCurrentSpeed(speedMS: Float) -> Completable {
1040+
return Completable.create { completable in
1041+
var request = Mavsdk_Rpc_Action_SetCurrentSpeedRequest()
1042+
1043+
1044+
1045+
request.speedMS = speedMS
1046+
1047+
1048+
1049+
do {
1050+
1051+
let response = self.service.setCurrentSpeed(request)
1052+
1053+
let result = try response.response.wait().actionResult
1054+
if (result.result == Mavsdk_Rpc_Action_ActionResult.Result.success) {
1055+
completable(.completed)
1056+
} else {
1057+
completable(.error(ActionError(code: ActionResult.Result.translateFromRpc(result.result), description: result.resultStr)))
1058+
}
1059+
1060+
} catch {
1061+
completable(.error(error))
1062+
}
1063+
1064+
return Disposables.create()
1065+
}
1066+
}
10231067
}

Sources/Mavsdk/Generated/Calibration.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ public class Calibration {
8989
case cancelled
9090
/// Calibration process failed since the vehicle is armed.
9191
case failedArmed
92+
/// Functionality not supported.
93+
case unsupported
9294
case UNRECOGNIZED(Int)
9395

9496
internal var rpcResult: Mavsdk_Rpc_Calibration_CalibrationResult.Result {
@@ -115,6 +117,8 @@ public class Calibration {
115117
return .cancelled
116118
case .failedArmed:
117119
return .failedArmed
120+
case .unsupported:
121+
return .unsupported
118122
case .UNRECOGNIZED(let i):
119123
return .UNRECOGNIZED(i)
120124
}
@@ -144,6 +148,8 @@ public class Calibration {
144148
return .cancelled
145149
case .failedArmed:
146150
return .failedArmed
151+
case .unsupported:
152+
return .unsupported
147153
case .UNRECOGNIZED(let i):
148154
return .UNRECOGNIZED(i)
149155
}

Sources/Mavsdk/Generated/Camera.swift

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2037,4 +2037,41 @@ public class Camera {
20372037
return Disposables.create()
20382038
}
20392039
}
2040+
2041+
/**
2042+
Select current camera .
2043+
2044+
Bind the plugin instance to a specific camera_id
2045+
2046+
- Parameter cameraID: Id of camera to be selected
2047+
2048+
*/
2049+
public func selectCamera(cameraID: Int32) -> Completable {
2050+
return Completable.create { completable in
2051+
var request = Mavsdk_Rpc_Camera_SelectCameraRequest()
2052+
2053+
2054+
2055+
request.cameraID = cameraID
2056+
2057+
2058+
2059+
do {
2060+
2061+
let response = self.service.selectCamera(request)
2062+
2063+
let result = try response.response.wait().cameraResult
2064+
if (result.result == Mavsdk_Rpc_Camera_CameraResult.Result.success) {
2065+
completable(.completed)
2066+
} else {
2067+
completable(.error(CameraError(code: CameraResult.Result.translateFromRpc(result.result), description: result.resultStr)))
2068+
}
2069+
2070+
} catch {
2071+
completable(.error(error))
2072+
}
2073+
2074+
return Disposables.create()
2075+
}
2076+
}
20402077
}

0 commit comments

Comments
 (0)