Commit 762ebec3 by gdj

增加无人机控制参数 commander_flight_height,commander_flight_mode,commander_mode_lost_action。

parent eaf790bc
package com.dji.sdk.cloudapi.device;
import com.dji.sdk.annotations.CloudSDKVersion;
import com.dji.sdk.cloudapi.control.CommanderFlightModeEnum;
import com.dji.sdk.cloudapi.control.CommanderModeLostActionEnum;
import com.dji.sdk.config.version.CloudSDKVersionEnum;
import com.fasterxml.jackson.annotation.JsonProperty;
......@@ -91,6 +93,16 @@ public class OsdDockDrone {
private String trackId;
/**
* 指点飞行失控动作
*/
private CommanderModeLostActionEnum commanderModeLostAction;
/**
* 指点飞行模式
*/
private CommanderFlightModeEnum commanderFlightMode;
public OsdDockDrone() {
}
......@@ -134,6 +146,8 @@ public class OsdDockDrone {
", nearHeightLimit=" + nearHeightLimit +
", maintainStatus=" + maintainStatus +
", trackId='" + trackId + '\'' +
", commanderModeLostAction='" + commanderModeLostAction + '\'' +
", commanderFlightMode='" + commanderFlightMode + '\'' +
'}';
}
......@@ -469,4 +483,23 @@ public class OsdDockDrone {
this.trackId = trackId;
return this;
}
public CommanderModeLostActionEnum getCommanderModeLostAction() {
return commanderModeLostAction;
}
public OsdDockDrone setCommanderModeLostAction(CommanderModeLostActionEnum commanderModeLostAction) {
this.commanderModeLostAction = commanderModeLostAction;
return this;
}
public CommanderFlightModeEnum getCommanderFlightMode() {
return commanderFlightMode;
}
public OsdDockDrone setCommanderFlightMode(CommanderFlightModeEnum commanderFlightMode) {
this.commanderFlightMode = commanderFlightMode;
return this;
}
}
\ No newline at end of file
package com.dji.sdk.cloudapi.property;
import com.dji.sdk.cloudapi.control.CommanderFlightModeEnum;
import com.dji.sdk.common.BaseModel;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
* @author sean
* @version 1.7
* @date 2023/10/20
*/
public class DockDroneCommanderFlightMode extends BaseModel {
@JsonProperty("commander_flight_mode")
private CommanderFlightModeEnum commanderFlightMode;
public DockDroneCommanderFlightMode() {
}
@Override
public String toString() {
return "DockDroneCommanderFlightMode{" +
"commanderFlightMode=" + commanderFlightMode +
'}';
}
public CommanderFlightModeEnum getCommanderFlightMode() {
return commanderFlightMode;
}
public DockDroneCommanderFlightMode setCommanderFlightMode(CommanderFlightModeEnum commanderFlightMode) {
this.commanderFlightMode = commanderFlightMode;
return this;
}
}
......@@ -48,6 +48,8 @@ public enum PropertySetEnum {
COMMANDER_FLIGHT_HEIGHT("commander_flight_height", DockDroneCommanderFlightHeight.class, CloudSDKVersionEnum.V1_0_0, Set.of(GatewayTypeEnum.DOCK, GatewayTypeEnum.DOCK2, GatewayTypeEnum.DOCK3)),
COMMANDER_FLIGHT_MODE("commander_flight_mode", DockDroneCommanderFlightMode.class, CloudSDKVersionEnum.V1_0_0, Set.of(GatewayTypeEnum.DOCK, GatewayTypeEnum.DOCK2, GatewayTypeEnum.DOCK3)),
OFFLINE_MAP_ENABLE("offline_map_enable", DockDroneOfflineMapEnable.class, CloudSDKVersionEnum.V1_0_1, Set.of(GatewayTypeEnum.DOCK2, GatewayTypeEnum.DOCK3)),
SILENT_MODE("silent_mode", DockSilentMode.class, CloudSDKVersionEnum.V1_0_2, Set.of(GatewayTypeEnum.DOCK, GatewayTypeEnum.DOCK2, GatewayTypeEnum.DOCK3)),
......
......@@ -25,6 +25,12 @@ public enum PropertySetFieldEnum {
OUT_OF_CONTROL_ACTION(PropertySetEnum.OUT_OF_CONTROL_ACTION, OutOfControlActionReceiver.class),
COMMANDER_FLIGHT_HEIGHT(PropertySetEnum.COMMANDER_FLIGHT_HEIGHT, CommanderFlightHeightReceiver.class),
COMMANDER_FLIGHT_MODE(PropertySetEnum.COMMANDER_FLIGHT_MODE, CommanderFlightModeReceiver.class),
COMMANDER_MODE_LOST_ACTION(PropertySetEnum.COMMANDER_MODE_LOST_ACTION, CommanderModeLostActionReceiver.class),
// EXIT_WAYLINE_WHEN_RC_LOST(PropertySetEnum.EXIT_WAYLINE_WHEN_RC_LOST, .class),
//
// THERMAL_CURRENT_PALETTE_STYLE(PropertySetEnum.THERMAL_CURRENT_PALETTE_STYLE, .class),
......
package com.dji.sample.manage.model.receiver;
import com.dji.sdk.cloudapi.device.OsdDockDrone;
import com.dji.sdk.cloudapi.device.RcLostActionEnum;
import com.fasterxml.jackson.annotation.JsonCreator;
import java.util.Objects;
/**
* @author sean
* @version 1.4
* @date 2023/3/3
*/
public class CommanderFlightHeightReceiver extends BasicDeviceProperty {
private static final int HEIGHT_LIMIT_MAX = 1500;
private static final int HEIGHT_LIMIT_MIN = 20;
private Integer commanderFlightHeight;
@Override
public boolean valid() {
return Objects.nonNull(this.commanderFlightHeight) && this.commanderFlightHeight >= HEIGHT_LIMIT_MIN && this.commanderFlightHeight <= HEIGHT_LIMIT_MAX;
}
@Override
public boolean canPublish(OsdDockDrone osd) {
return commanderFlightHeight.intValue() != osd.getHeightLimit();
}
}
\ No newline at end of file
package com.dji.sample.manage.model.receiver;
import com.dji.sdk.cloudapi.control.CommanderFlightModeEnum;
import com.dji.sdk.cloudapi.control.CommanderModeLostActionEnum;
import com.dji.sdk.cloudapi.device.OsdDockDrone;
import com.fasterxml.jackson.annotation.JsonCreator;
import java.util.Objects;
/**
* @author sean
* @version 1.4
* @date 2023/3/3
*/
public class CommanderFlightModeReceiver extends BasicDeviceProperty {
private CommanderFlightModeEnum commanderFlightMode;
@JsonCreator
public CommanderFlightModeReceiver(Integer commanderFlightMode) {
this.commanderFlightMode = CommanderFlightModeEnum.find(commanderFlightMode);
}
@Override
public boolean valid() {
return Objects.nonNull(commanderFlightMode);
}
@Override
public boolean canPublish(OsdDockDrone osd) {
return commanderFlightMode != osd.getCommanderFlightMode();
}
}
package com.dji.sample.manage.model.receiver;
import com.dji.sdk.cloudapi.control.CommanderModeLostActionEnum;
import com.dji.sdk.cloudapi.device.OsdDockDrone;
import com.dji.sdk.cloudapi.device.RcLostActionEnum;
import com.fasterxml.jackson.annotation.JsonCreator;
import java.util.Objects;
/**
* @author sean
* @version 1.4
* @date 2023/3/3
*/
public class CommanderModeLostActionReceiver extends BasicDeviceProperty {
private CommanderModeLostActionEnum commanderModeLostAction;
@JsonCreator
public CommanderModeLostActionReceiver(Integer commanderModeLostAction) {
this.commanderModeLostAction = CommanderModeLostActionEnum.find(commanderModeLostAction);
}
@Override
public boolean valid() {
return Objects.nonNull(commanderModeLostAction);
}
@Override
public boolean canPublish(OsdDockDrone osd) {
return commanderModeLostAction != osd.getCommanderModeLostAction();
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment