From 309fff9a827b59dd241c3bc08825653c37c6e590 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Pinto?= Date: Sat, 17 Jan 2015 14:25:54 +0000 Subject: [PATCH] Changed enumerated getters / setters by adding its type. --- .../pt/lsts/imc/AcousticOperation.java | 12 ++++- src-generated/pt/lsts/imc/AlignmentState.java | 12 ++++- src-generated/pt/lsts/imc/Announce.java | 12 ++++- src-generated/pt/lsts/imc/AutopilotMode.java | 12 ++++- src-generated/pt/lsts/imc/Brake.java | 12 ++++- src-generated/pt/lsts/imc/CacheControl.java | 12 ++++- src-generated/pt/lsts/imc/CameraZoom.java | 12 ++++- src-generated/pt/lsts/imc/CcuEvent.java | 12 ++++- src-generated/pt/lsts/imc/ClockControl.java | 12 ++++- src-generated/pt/lsts/imc/CommsRelay.java | 12 ++++- .../pt/lsts/imc/CompassCalibration.java | 36 +++++++++++--- src-generated/pt/lsts/imc/ControlLoops.java | 12 ++++- src-generated/pt/lsts/imc/CoverArea.java | 24 ++++++++-- src-generated/pt/lsts/imc/DataSanity.java | 12 ++++- src-generated/pt/lsts/imc/DesiredPath.java | 36 +++++++++++--- src-generated/pt/lsts/imc/DesiredSpeed.java | 12 ++++- src-generated/pt/lsts/imc/DesiredZ.java | 12 ++++- .../pt/lsts/imc/DevCalibrationControl.java | 12 ++++- src-generated/pt/lsts/imc/Dislodge.java | 12 ++++- src-generated/pt/lsts/imc/Distance.java | 12 ++++- src-generated/pt/lsts/imc/DvlRejection.java | 12 ++++- .../pt/lsts/imc/DynamicsSimParam.java | 12 ++++- src-generated/pt/lsts/imc/Elevator.java | 36 +++++++++++--- .../pt/lsts/imc/EmergencyControl.java | 12 ++++- .../pt/lsts/imc/EmergencyControlState.java | 12 ++++- .../pt/lsts/imc/EntityActivationState.java | 12 ++++- src-generated/pt/lsts/imc/EntityList.java | 12 ++++- src-generated/pt/lsts/imc/EntityState.java | 12 ++++- src-generated/pt/lsts/imc/FollowPath.java | 24 ++++++++-- src-generated/pt/lsts/imc/FollowRefState.java | 12 ++++- src-generated/pt/lsts/imc/FollowSystem.java | 24 ++++++++-- .../pt/lsts/imc/FollowTrajectory.java | 24 ++++++++-- src-generated/pt/lsts/imc/FormCtrlParam.java | 12 ++++- src-generated/pt/lsts/imc/FormState.java | 36 +++++++++++--- .../pt/lsts/imc/FormationParameters.java | 12 ++++- src-generated/pt/lsts/imc/Goto.java | 24 ++++++++-- src-generated/pt/lsts/imc/GpsFix.java | 12 ++++- .../pt/lsts/imc/GpsFixRejection.java | 12 ++++- src-generated/pt/lsts/imc/IoEvent.java | 12 ++++- .../pt/lsts/imc/IridiumTxStatus.java | 12 ++++- src-generated/pt/lsts/imc/LblConfig.java | 12 ++++- .../pt/lsts/imc/LblRangeAcceptance.java | 12 ++++- src-generated/pt/lsts/imc/LcdControl.java | 12 ++++- src-generated/pt/lsts/imc/LeaderState.java | 12 ++++- src-generated/pt/lsts/imc/LeakSimulation.java | 12 ++++- src-generated/pt/lsts/imc/LogBookControl.java | 12 ++++- src-generated/pt/lsts/imc/LogBookEntry.java | 12 ++++- src-generated/pt/lsts/imc/LoggingControl.java | 12 ++++- src-generated/pt/lsts/imc/Loiter.java | 48 +++++++++++++++---- .../pt/lsts/imc/ManeuverControlState.java | 12 ++++- src-generated/pt/lsts/imc/MapFeature.java | 12 ++++- .../pt/lsts/imc/MonitorEntityState.java | 12 ++++- .../pt/lsts/imc/PathControlState.java | 24 ++++++++-- src-generated/pt/lsts/imc/PlanControl.java | 24 ++++++++-- .../pt/lsts/imc/PlanControlState.java | 24 ++++++++-- src-generated/pt/lsts/imc/PlanDB.java | 24 ++++++++-- src-generated/pt/lsts/imc/PlanGeneration.java | 24 ++++++++-- src-generated/pt/lsts/imc/PlanStatistics.java | 12 ++++- src-generated/pt/lsts/imc/PlanVariable.java | 24 ++++++++-- src-generated/pt/lsts/imc/PopUp.java | 24 ++++++++-- .../pt/lsts/imc/PowerChannelControl.java | 12 ++++- .../pt/lsts/imc/PowerChannelState.java | 12 ++++- src-generated/pt/lsts/imc/PowerOperation.java | 12 ++++- .../pt/lsts/imc/PulseDetectionControl.java | 12 ++++- .../pt/lsts/imc/RemoteActionsRequest.java | 12 ++++- src-generated/pt/lsts/imc/ReplayControl.java | 12 ++++- src-generated/pt/lsts/imc/ReportedState.java | 12 ++++- src-generated/pt/lsts/imc/Rows.java | 24 ++++++++-- src-generated/pt/lsts/imc/SessionStatus.java | 12 ++++- src-generated/pt/lsts/imc/SmsState.java | 12 ++++- src-generated/pt/lsts/imc/SonarData.java | 12 ++++- src-generated/pt/lsts/imc/StationKeeping.java | 24 ++++++++-- src-generated/pt/lsts/imc/SystemGroup.java | 12 ++++- src-generated/pt/lsts/imc/Target.java | 12 ++++- src-generated/pt/lsts/imc/TrexAttribute.java | 12 ++++- src-generated/pt/lsts/imc/TrexCommand.java | 12 ++++- src-generated/pt/lsts/imc/TrexOperation.java | 12 ++++- src-generated/pt/lsts/imc/UASimulation.java | 12 ++++- src-generated/pt/lsts/imc/UamTxStatus.java | 12 ++++- src-generated/pt/lsts/imc/UsblFix.java | 12 ++++- src-generated/pt/lsts/imc/VehicleCommand.java | 24 ++++++++-- .../pt/lsts/imc/VehicleFormation.java | 24 ++++++++-- src-generated/pt/lsts/imc/VehicleMedium.java | 12 ++++- .../pt/lsts/imc/VehicleOperationalLimits.java | 12 ++++- src-generated/pt/lsts/imc/VehicleState.java | 12 ++++- src-generated/pt/lsts/imc/YoYo.java | 24 ++++++++-- .../pt/lsts/imc/generator/ClassGenerator.java | 45 ++++++++++++++--- src/pt/lsts/imc/net/IMCProtocol.java | 29 ++++++++++- .../messages/listener/PeriodicCallbacks.java | 3 +- 89 files changed, 1208 insertions(+), 237 deletions(-) diff --git a/src-generated/pt/lsts/imc/AcousticOperation.java b/src-generated/pt/lsts/imc/AcousticOperation.java index bd83c4a6..7cf8587a 100644 --- a/src-generated/pt/lsts/imc/AcousticOperation.java +++ b/src-generated/pt/lsts/imc/AcousticOperation.java @@ -133,6 +133,14 @@ public OP getOp() { } } + public String getOpStr() { + return getString("op"); + } + + public short getOpVal() { + return (short) getInteger("op"); + } + /** * @param op Operation (enumerated) */ @@ -144,7 +152,7 @@ public AcousticOperation setOp(OP op) { /** * @param op Operation (as a String) */ - public AcousticOperation setOp(String op) { + public AcousticOperation setOpStr(String op) { setValue("op", op); return this; } @@ -152,7 +160,7 @@ public AcousticOperation setOp(String op) { /** * @param op Operation (integer value) */ - public AcousticOperation setOp(short op) { + public AcousticOperation setOpVal(short op) { setValue("op", op); return this; } diff --git a/src-generated/pt/lsts/imc/AlignmentState.java b/src-generated/pt/lsts/imc/AlignmentState.java index 1099d189..cc126f65 100644 --- a/src-generated/pt/lsts/imc/AlignmentState.java +++ b/src-generated/pt/lsts/imc/AlignmentState.java @@ -114,6 +114,14 @@ public STATE getState() { } } + public String getStateStr() { + return getString("state"); + } + + public short getStateVal() { + return (short) getInteger("state"); + } + /** * @param state State (enumerated) */ @@ -125,7 +133,7 @@ public AlignmentState setState(STATE state) { /** * @param state State (as a String) */ - public AlignmentState setState(String state) { + public AlignmentState setStateStr(String state) { setValue("state", state); return this; } @@ -133,7 +141,7 @@ public AlignmentState setState(String state) { /** * @param state State (integer value) */ - public AlignmentState setState(short state) { + public AlignmentState setStateVal(short state) { setValue("state", state); return this; } diff --git a/src-generated/pt/lsts/imc/Announce.java b/src-generated/pt/lsts/imc/Announce.java index 5fec6263..f444c1ea 100644 --- a/src-generated/pt/lsts/imc/Announce.java +++ b/src-generated/pt/lsts/imc/Announce.java @@ -143,6 +143,14 @@ public SYS_TYPE getSysType() { } } + public String getSysTypeStr() { + return getString("sys_type"); + } + + public short getSysTypeVal() { + return (short) getInteger("sys_type"); + } + /** * @param sys_type System Type (enumerated) */ @@ -154,7 +162,7 @@ public Announce setSysType(SYS_TYPE sys_type) { /** * @param sys_type System Type (as a String) */ - public Announce setSysType(String sys_type) { + public Announce setSysTypeStr(String sys_type) { setValue("sys_type", sys_type); return this; } @@ -162,7 +170,7 @@ public Announce setSysType(String sys_type) { /** * @param sys_type System Type (integer value) */ - public Announce setSysType(short sys_type) { + public Announce setSysTypeVal(short sys_type) { setValue("sys_type", sys_type); return this; } diff --git a/src-generated/pt/lsts/imc/AutopilotMode.java b/src-generated/pt/lsts/imc/AutopilotMode.java index 3f050ce5..e41166a2 100644 --- a/src-generated/pt/lsts/imc/AutopilotMode.java +++ b/src-generated/pt/lsts/imc/AutopilotMode.java @@ -116,6 +116,14 @@ public AUTONOMY getAutonomy() { } } + public String getAutonomyStr() { + return getString("autonomy"); + } + + public short getAutonomyVal() { + return (short) getInteger("autonomy"); + } + /** * @param autonomy Autonomy Level (enumerated) */ @@ -127,7 +135,7 @@ public AutopilotMode setAutonomy(AUTONOMY autonomy) { /** * @param autonomy Autonomy Level (as a String) */ - public AutopilotMode setAutonomy(String autonomy) { + public AutopilotMode setAutonomyStr(String autonomy) { setValue("autonomy", autonomy); return this; } @@ -135,7 +143,7 @@ public AutopilotMode setAutonomy(String autonomy) { /** * @param autonomy Autonomy Level (integer value) */ - public AutopilotMode setAutonomy(short autonomy) { + public AutopilotMode setAutonomyVal(short autonomy) { setValue("autonomy", autonomy); return this; } diff --git a/src-generated/pt/lsts/imc/Brake.java b/src-generated/pt/lsts/imc/Brake.java index 620a12e0..5c0fd214 100644 --- a/src-generated/pt/lsts/imc/Brake.java +++ b/src-generated/pt/lsts/imc/Brake.java @@ -113,6 +113,14 @@ public OP getOp() { } } + public String getOpStr() { + return getString("op"); + } + + public short getOpVal() { + return (short) getInteger("op"); + } + /** * @param op Operation (enumerated) */ @@ -124,7 +132,7 @@ public Brake setOp(OP op) { /** * @param op Operation (as a String) */ - public Brake setOp(String op) { + public Brake setOpStr(String op) { setValue("op", op); return this; } @@ -132,7 +140,7 @@ public Brake setOp(String op) { /** * @param op Operation (integer value) */ - public Brake setOp(short op) { + public Brake setOpVal(short op) { setValue("op", op); return this; } diff --git a/src-generated/pt/lsts/imc/CacheControl.java b/src-generated/pt/lsts/imc/CacheControl.java index 16e19324..3f1c11c7 100644 --- a/src-generated/pt/lsts/imc/CacheControl.java +++ b/src-generated/pt/lsts/imc/CacheControl.java @@ -120,6 +120,14 @@ public OP getOp() { } } + public String getOpStr() { + return getString("op"); + } + + public short getOpVal() { + return (short) getInteger("op"); + } + /** * @param op Control Operation (enumerated) */ @@ -131,7 +139,7 @@ public CacheControl setOp(OP op) { /** * @param op Control Operation (as a String) */ - public CacheControl setOp(String op) { + public CacheControl setOpStr(String op) { setValue("op", op); return this; } @@ -139,7 +147,7 @@ public CacheControl setOp(String op) { /** * @param op Control Operation (integer value) */ - public CacheControl setOp(short op) { + public CacheControl setOpVal(short op) { setValue("op", op); return this; } diff --git a/src-generated/pt/lsts/imc/CameraZoom.java b/src-generated/pt/lsts/imc/CameraZoom.java index 77f6bec1..448e23ad 100644 --- a/src-generated/pt/lsts/imc/CameraZoom.java +++ b/src-generated/pt/lsts/imc/CameraZoom.java @@ -147,6 +147,14 @@ public ACTION getAction() { } } + public String getActionStr() { + return getString("action"); + } + + public short getActionVal() { + return (short) getInteger("action"); + } + /** * @param action Action (enumerated) */ @@ -158,7 +166,7 @@ public CameraZoom setAction(ACTION action) { /** * @param action Action (as a String) */ - public CameraZoom setAction(String action) { + public CameraZoom setActionStr(String action) { setValue("action", action); return this; } @@ -166,7 +174,7 @@ public CameraZoom setAction(String action) { /** * @param action Action (integer value) */ - public CameraZoom setAction(short action) { + public CameraZoom setActionVal(short action) { setValue("action", action); return this; } diff --git a/src-generated/pt/lsts/imc/CcuEvent.java b/src-generated/pt/lsts/imc/CcuEvent.java index 29551f04..3019251d 100644 --- a/src-generated/pt/lsts/imc/CcuEvent.java +++ b/src-generated/pt/lsts/imc/CcuEvent.java @@ -124,6 +124,14 @@ public TYPE getType() { } } + public String getTypeStr() { + return getString("type"); + } + + public short getTypeVal() { + return (short) getInteger("type"); + } + /** * @param type Event Type (enumerated) */ @@ -135,7 +143,7 @@ public CcuEvent setType(TYPE type) { /** * @param type Event Type (as a String) */ - public CcuEvent setType(String type) { + public CcuEvent setTypeStr(String type) { setValue("type", type); return this; } @@ -143,7 +151,7 @@ public CcuEvent setType(String type) { /** * @param type Event Type (integer value) */ - public CcuEvent setType(short type) { + public CcuEvent setTypeVal(short type) { setValue("type", type); return this; } diff --git a/src-generated/pt/lsts/imc/ClockControl.java b/src-generated/pt/lsts/imc/ClockControl.java index 102b3f42..fbca849b 100644 --- a/src-generated/pt/lsts/imc/ClockControl.java +++ b/src-generated/pt/lsts/imc/ClockControl.java @@ -119,6 +119,14 @@ public OP getOp() { } } + public String getOpStr() { + return getString("op"); + } + + public short getOpVal() { + return (short) getInteger("op"); + } + /** * @param op Operation (enumerated) */ @@ -130,7 +138,7 @@ public ClockControl setOp(OP op) { /** * @param op Operation (as a String) */ - public ClockControl setOp(String op) { + public ClockControl setOpStr(String op) { setValue("op", op); return this; } @@ -138,7 +146,7 @@ public ClockControl setOp(String op) { /** * @param op Operation (integer value) */ - public ClockControl setOp(short op) { + public ClockControl setOpVal(short op) { setValue("op", op); return this; } diff --git a/src-generated/pt/lsts/imc/CommsRelay.java b/src-generated/pt/lsts/imc/CommsRelay.java index ae43ce70..d2762534 100644 --- a/src-generated/pt/lsts/imc/CommsRelay.java +++ b/src-generated/pt/lsts/imc/CommsRelay.java @@ -168,6 +168,14 @@ public SPEED_UNITS getSpeedUnits() { } } + public String getSpeedUnitsStr() { + return getString("speed_units"); + } + + public short getSpeedUnitsVal() { + return (short) getInteger("speed_units"); + } + /** * @param speed_units Speed Units (enumerated) */ @@ -179,7 +187,7 @@ public CommsRelay setSpeedUnits(SPEED_UNITS speed_units) { /** * @param speed_units Speed Units (as a String) */ - public CommsRelay setSpeedUnits(String speed_units) { + public CommsRelay setSpeedUnitsStr(String speed_units) { setValue("speed_units", speed_units); return this; } @@ -187,7 +195,7 @@ public CommsRelay setSpeedUnits(String speed_units) { /** * @param speed_units Speed Units (integer value) */ - public CommsRelay setSpeedUnits(short speed_units) { + public CommsRelay setSpeedUnitsVal(short speed_units) { setValue("speed_units", speed_units); return this; } diff --git a/src-generated/pt/lsts/imc/CompassCalibration.java b/src-generated/pt/lsts/imc/CompassCalibration.java index 6977bcd6..6f5d2f55 100644 --- a/src-generated/pt/lsts/imc/CompassCalibration.java +++ b/src-generated/pt/lsts/imc/CompassCalibration.java @@ -224,6 +224,14 @@ public Z_UNITS getZUnits() { } } + public String getZUnitsStr() { + return getString("z_units"); + } + + public short getZUnitsVal() { + return (short) getInteger("z_units"); + } + /** * @param z_units Z Units (enumerated) */ @@ -235,7 +243,7 @@ public CompassCalibration setZUnits(Z_UNITS z_units) { /** * @param z_units Z Units (as a String) */ - public CompassCalibration setZUnits(String z_units) { + public CompassCalibration setZUnitsStr(String z_units) { setValue("z_units", z_units); return this; } @@ -243,7 +251,7 @@ public CompassCalibration setZUnits(String z_units) { /** * @param z_units Z Units (integer value) */ - public CompassCalibration setZUnits(short z_units) { + public CompassCalibration setZUnitsVal(short z_units) { setValue("z_units", z_units); return this; } @@ -321,6 +329,14 @@ public SPEED_UNITS getSpeedUnits() { } } + public String getSpeedUnitsStr() { + return getString("speed_units"); + } + + public short getSpeedUnitsVal() { + return (short) getInteger("speed_units"); + } + /** * @param speed_units Speed Units (enumerated) */ @@ -332,7 +348,7 @@ public CompassCalibration setSpeedUnits(SPEED_UNITS speed_units) { /** * @param speed_units Speed Units (as a String) */ - public CompassCalibration setSpeedUnits(String speed_units) { + public CompassCalibration setSpeedUnitsStr(String speed_units) { setValue("speed_units", speed_units); return this; } @@ -340,7 +356,7 @@ public CompassCalibration setSpeedUnits(String speed_units) { /** * @param speed_units Speed Units (integer value) */ - public CompassCalibration setSpeedUnits(short speed_units) { + public CompassCalibration setSpeedUnitsVal(short speed_units) { setValue("speed_units", speed_units); return this; } @@ -373,6 +389,14 @@ public DIRECTION getDirection() { } } + public String getDirectionStr() { + return getString("direction"); + } + + public short getDirectionVal() { + return (short) getInteger("direction"); + } + /** * @param direction Direction (enumerated) */ @@ -384,7 +408,7 @@ public CompassCalibration setDirection(DIRECTION direction) { /** * @param direction Direction (as a String) */ - public CompassCalibration setDirection(String direction) { + public CompassCalibration setDirectionStr(String direction) { setValue("direction", direction); return this; } @@ -392,7 +416,7 @@ public CompassCalibration setDirection(String direction) { /** * @param direction Direction (integer value) */ - public CompassCalibration setDirection(short direction) { + public CompassCalibration setDirectionVal(short direction) { setValue("direction", direction); return this; } diff --git a/src-generated/pt/lsts/imc/ControlLoops.java b/src-generated/pt/lsts/imc/ControlLoops.java index b2a07916..ba78faba 100644 --- a/src-generated/pt/lsts/imc/ControlLoops.java +++ b/src-generated/pt/lsts/imc/ControlLoops.java @@ -132,6 +132,14 @@ public ENABLE getEnable() { } } + public String getEnableStr() { + return getString("enable"); + } + + public short getEnableVal() { + return (short) getInteger("enable"); + } + /** * @param enable Enable (enumerated) */ @@ -143,7 +151,7 @@ public ControlLoops setEnable(ENABLE enable) { /** * @param enable Enable (as a String) */ - public ControlLoops setEnable(String enable) { + public ControlLoops setEnableStr(String enable) { setValue("enable", enable); return this; } @@ -151,7 +159,7 @@ public ControlLoops setEnable(String enable) { /** * @param enable Enable (integer value) */ - public ControlLoops setEnable(short enable) { + public ControlLoops setEnableVal(short enable) { setValue("enable", enable); return this; } diff --git a/src-generated/pt/lsts/imc/CoverArea.java b/src-generated/pt/lsts/imc/CoverArea.java index 1f677a37..2772b1bd 100644 --- a/src-generated/pt/lsts/imc/CoverArea.java +++ b/src-generated/pt/lsts/imc/CoverArea.java @@ -187,6 +187,14 @@ public Z_UNITS getZUnits() { } } + public String getZUnitsStr() { + return getString("z_units"); + } + + public short getZUnitsVal() { + return (short) getInteger("z_units"); + } + /** * @param z_units Z Units (enumerated) */ @@ -198,7 +206,7 @@ public CoverArea setZUnits(Z_UNITS z_units) { /** * @param z_units Z Units (as a String) */ - public CoverArea setZUnits(String z_units) { + public CoverArea setZUnitsStr(String z_units) { setValue("z_units", z_units); return this; } @@ -206,7 +214,7 @@ public CoverArea setZUnits(String z_units) { /** * @param z_units Z Units (integer value) */ - public CoverArea setZUnits(short z_units) { + public CoverArea setZUnitsVal(short z_units) { setValue("z_units", z_units); return this; } @@ -239,6 +247,14 @@ public SPEED_UNITS getSpeedUnits() { } } + public String getSpeedUnitsStr() { + return getString("speed_units"); + } + + public short getSpeedUnitsVal() { + return (short) getInteger("speed_units"); + } + /** * @param speed_units Speed Units (enumerated) */ @@ -250,7 +266,7 @@ public CoverArea setSpeedUnits(SPEED_UNITS speed_units) { /** * @param speed_units Speed Units (as a String) */ - public CoverArea setSpeedUnits(String speed_units) { + public CoverArea setSpeedUnitsStr(String speed_units) { setValue("speed_units", speed_units); return this; } @@ -258,7 +274,7 @@ public CoverArea setSpeedUnits(String speed_units) { /** * @param speed_units Speed Units (integer value) */ - public CoverArea setSpeedUnits(short speed_units) { + public CoverArea setSpeedUnitsVal(short speed_units) { setValue("speed_units", speed_units); return this; } diff --git a/src-generated/pt/lsts/imc/DataSanity.java b/src-generated/pt/lsts/imc/DataSanity.java index 8e132fa4..5be791c8 100644 --- a/src-generated/pt/lsts/imc/DataSanity.java +++ b/src-generated/pt/lsts/imc/DataSanity.java @@ -113,6 +113,14 @@ public SANE getSane() { } } + public String getSaneStr() { + return getString("sane"); + } + + public short getSaneVal() { + return (short) getInteger("sane"); + } + /** * @param sane Sanity (enumerated) */ @@ -124,7 +132,7 @@ public DataSanity setSane(SANE sane) { /** * @param sane Sanity (as a String) */ - public DataSanity setSane(String sane) { + public DataSanity setSaneStr(String sane) { setValue("sane", sane); return this; } @@ -132,7 +140,7 @@ public DataSanity setSane(String sane) { /** * @param sane Sanity (integer value) */ - public DataSanity setSane(short sane) { + public DataSanity setSaneVal(short sane) { setValue("sane", sane); return this; } diff --git a/src-generated/pt/lsts/imc/DesiredPath.java b/src-generated/pt/lsts/imc/DesiredPath.java index 6bd9fa34..e600da67 100644 --- a/src-generated/pt/lsts/imc/DesiredPath.java +++ b/src-generated/pt/lsts/imc/DesiredPath.java @@ -250,6 +250,14 @@ public START_Z_UNITS getStartZUnits() { } } + public String getStartZUnitsStr() { + return getString("start_z_units"); + } + + public short getStartZUnitsVal() { + return (short) getInteger("start_z_units"); + } + /** * @param start_z_units Start Point -- Z Units (enumerated) */ @@ -261,7 +269,7 @@ public DesiredPath setStartZUnits(START_Z_UNITS start_z_units) { /** * @param start_z_units Start Point -- Z Units (as a String) */ - public DesiredPath setStartZUnits(String start_z_units) { + public DesiredPath setStartZUnitsStr(String start_z_units) { setValue("start_z_units", start_z_units); return this; } @@ -269,7 +277,7 @@ public DesiredPath setStartZUnits(String start_z_units) { /** * @param start_z_units Start Point -- Z Units (integer value) */ - public DesiredPath setStartZUnits(short start_z_units) { + public DesiredPath setStartZUnitsVal(short start_z_units) { setValue("start_z_units", start_z_units); return this; } @@ -332,6 +340,14 @@ public END_Z_UNITS getEndZUnits() { } } + public String getEndZUnitsStr() { + return getString("end_z_units"); + } + + public short getEndZUnitsVal() { + return (short) getInteger("end_z_units"); + } + /** * @param end_z_units End Point -- Z Units (enumerated) */ @@ -343,7 +359,7 @@ public DesiredPath setEndZUnits(END_Z_UNITS end_z_units) { /** * @param end_z_units End Point -- Z Units (as a String) */ - public DesiredPath setEndZUnits(String end_z_units) { + public DesiredPath setEndZUnitsStr(String end_z_units) { setValue("end_z_units", end_z_units); return this; } @@ -351,7 +367,7 @@ public DesiredPath setEndZUnits(String end_z_units) { /** * @param end_z_units End Point -- Z Units (integer value) */ - public DesiredPath setEndZUnits(short end_z_units) { + public DesiredPath setEndZUnitsVal(short end_z_units) { setValue("end_z_units", end_z_units); return this; } @@ -384,6 +400,14 @@ public SPEED_UNITS getSpeedUnits() { } } + public String getSpeedUnitsStr() { + return getString("speed_units"); + } + + public short getSpeedUnitsVal() { + return (short) getInteger("speed_units"); + } + /** * @param speed_units Speed Units (enumerated) */ @@ -395,7 +419,7 @@ public DesiredPath setSpeedUnits(SPEED_UNITS speed_units) { /** * @param speed_units Speed Units (as a String) */ - public DesiredPath setSpeedUnits(String speed_units) { + public DesiredPath setSpeedUnitsStr(String speed_units) { setValue("speed_units", speed_units); return this; } @@ -403,7 +427,7 @@ public DesiredPath setSpeedUnits(String speed_units) { /** * @param speed_units Speed Units (integer value) */ - public DesiredPath setSpeedUnits(short speed_units) { + public DesiredPath setSpeedUnitsVal(short speed_units) { setValue("speed_units", speed_units); return this; } diff --git a/src-generated/pt/lsts/imc/DesiredSpeed.java b/src-generated/pt/lsts/imc/DesiredSpeed.java index ccfd8063..b9d29858 100644 --- a/src-generated/pt/lsts/imc/DesiredSpeed.java +++ b/src-generated/pt/lsts/imc/DesiredSpeed.java @@ -131,6 +131,14 @@ public SPEED_UNITS getSpeedUnits() { } } + public String getSpeedUnitsStr() { + return getString("speed_units"); + } + + public short getSpeedUnitsVal() { + return (short) getInteger("speed_units"); + } + /** * @param speed_units Speed Units (enumerated) */ @@ -142,7 +150,7 @@ public DesiredSpeed setSpeedUnits(SPEED_UNITS speed_units) { /** * @param speed_units Speed Units (as a String) */ - public DesiredSpeed setSpeedUnits(String speed_units) { + public DesiredSpeed setSpeedUnitsStr(String speed_units) { setValue("speed_units", speed_units); return this; } @@ -150,7 +158,7 @@ public DesiredSpeed setSpeedUnits(String speed_units) { /** * @param speed_units Speed Units (integer value) */ - public DesiredSpeed setSpeedUnits(short speed_units) { + public DesiredSpeed setSpeedUnitsVal(short speed_units) { setValue("speed_units", speed_units); return this; } diff --git a/src-generated/pt/lsts/imc/DesiredZ.java b/src-generated/pt/lsts/imc/DesiredZ.java index dc223408..a2e8a292 100644 --- a/src-generated/pt/lsts/imc/DesiredZ.java +++ b/src-generated/pt/lsts/imc/DesiredZ.java @@ -132,6 +132,14 @@ public Z_UNITS getZUnits() { } } + public String getZUnitsStr() { + return getString("z_units"); + } + + public short getZUnitsVal() { + return (short) getInteger("z_units"); + } + /** * @param z_units Z Units (enumerated) */ @@ -143,7 +151,7 @@ public DesiredZ setZUnits(Z_UNITS z_units) { /** * @param z_units Z Units (as a String) */ - public DesiredZ setZUnits(String z_units) { + public DesiredZ setZUnitsStr(String z_units) { setValue("z_units", z_units); return this; } @@ -151,7 +159,7 @@ public DesiredZ setZUnits(String z_units) { /** * @param z_units Z Units (integer value) */ - public DesiredZ setZUnits(short z_units) { + public DesiredZ setZUnitsVal(short z_units) { setValue("z_units", z_units); return this; } diff --git a/src-generated/pt/lsts/imc/DevCalibrationControl.java b/src-generated/pt/lsts/imc/DevCalibrationControl.java index b25af856..7b27d306 100644 --- a/src-generated/pt/lsts/imc/DevCalibrationControl.java +++ b/src-generated/pt/lsts/imc/DevCalibrationControl.java @@ -117,6 +117,14 @@ public OP getOp() { } } + public String getOpStr() { + return getString("op"); + } + + public short getOpVal() { + return (short) getInteger("op"); + } + /** * @param op Operation (enumerated) */ @@ -128,7 +136,7 @@ public DevCalibrationControl setOp(OP op) { /** * @param op Operation (as a String) */ - public DevCalibrationControl setOp(String op) { + public DevCalibrationControl setOpStr(String op) { setValue("op", op); return this; } @@ -136,7 +144,7 @@ public DevCalibrationControl setOp(String op) { /** * @param op Operation (integer value) */ - public DevCalibrationControl setOp(short op) { + public DevCalibrationControl setOpVal(short op) { setValue("op", op); return this; } diff --git a/src-generated/pt/lsts/imc/Dislodge.java b/src-generated/pt/lsts/imc/Dislodge.java index 3d3f62b8..4ad3ac42 100644 --- a/src-generated/pt/lsts/imc/Dislodge.java +++ b/src-generated/pt/lsts/imc/Dislodge.java @@ -154,6 +154,14 @@ public DIRECTION getDirection() { } } + public String getDirectionStr() { + return getString("direction"); + } + + public short getDirectionVal() { + return (short) getInteger("direction"); + } + /** * @param direction Direction (enumerated) */ @@ -165,7 +173,7 @@ public Dislodge setDirection(DIRECTION direction) { /** * @param direction Direction (as a String) */ - public Dislodge setDirection(String direction) { + public Dislodge setDirectionStr(String direction) { setValue("direction", direction); return this; } @@ -173,7 +181,7 @@ public Dislodge setDirection(String direction) { /** * @param direction Direction (integer value) */ - public Dislodge setDirection(short direction) { + public Dislodge setDirectionVal(short direction) { setValue("direction", direction); return this; } diff --git a/src-generated/pt/lsts/imc/Distance.java b/src-generated/pt/lsts/imc/Distance.java index 40d4e445..dff007f0 100644 --- a/src-generated/pt/lsts/imc/Distance.java +++ b/src-generated/pt/lsts/imc/Distance.java @@ -118,6 +118,14 @@ public VALIDITY getValidity() { } } + public String getValidityStr() { + return getString("validity"); + } + + public short getValidityVal() { + return (short) getInteger("validity"); + } + /** * @param validity Validity (enumerated) */ @@ -129,7 +137,7 @@ public Distance setValidity(VALIDITY validity) { /** * @param validity Validity (as a String) */ - public Distance setValidity(String validity) { + public Distance setValidityStr(String validity) { setValue("validity", validity); return this; } @@ -137,7 +145,7 @@ public Distance setValidity(String validity) { /** * @param validity Validity (integer value) */ - public Distance setValidity(short validity) { + public Distance setValidityVal(short validity) { setValue("validity", validity); return this; } diff --git a/src-generated/pt/lsts/imc/DvlRejection.java b/src-generated/pt/lsts/imc/DvlRejection.java index d890701e..5dfe494c 100644 --- a/src-generated/pt/lsts/imc/DvlRejection.java +++ b/src-generated/pt/lsts/imc/DvlRejection.java @@ -138,6 +138,14 @@ public REASON getReason() { } } + public String getReasonStr() { + return getString("reason"); + } + + public short getReasonVal() { + return (short) getInteger("reason"); + } + /** * @param reason Reason (enumerated) */ @@ -149,7 +157,7 @@ public DvlRejection setReason(REASON reason) { /** * @param reason Reason (as a String) */ - public DvlRejection setReason(String reason) { + public DvlRejection setReasonStr(String reason) { setValue("reason", reason); return this; } @@ -157,7 +165,7 @@ public DvlRejection setReason(String reason) { /** * @param reason Reason (integer value) */ - public DvlRejection setReason(short reason) { + public DvlRejection setReasonVal(short reason) { setValue("reason", reason); return this; } diff --git a/src-generated/pt/lsts/imc/DynamicsSimParam.java b/src-generated/pt/lsts/imc/DynamicsSimParam.java index eb28edcc..1736dead 100644 --- a/src-generated/pt/lsts/imc/DynamicsSimParam.java +++ b/src-generated/pt/lsts/imc/DynamicsSimParam.java @@ -116,6 +116,14 @@ public OP getOp() { } } + public String getOpStr() { + return getString("op"); + } + + public short getOpVal() { + return (short) getInteger("op"); + } + /** * @param op Action on the Vehicle Simulation Parameters (enumerated) */ @@ -127,7 +135,7 @@ public DynamicsSimParam setOp(OP op) { /** * @param op Action on the Vehicle Simulation Parameters (as a String) */ - public DynamicsSimParam setOp(String op) { + public DynamicsSimParam setOpStr(String op) { setValue("op", op); return this; } @@ -135,7 +143,7 @@ public DynamicsSimParam setOp(String op) { /** * @param op Action on the Vehicle Simulation Parameters (integer value) */ - public DynamicsSimParam setOp(short op) { + public DynamicsSimParam setOpVal(short op) { setValue("op", op); return this; } diff --git a/src-generated/pt/lsts/imc/Elevator.java b/src-generated/pt/lsts/imc/Elevator.java index 6bfffaa8..e8f307bb 100644 --- a/src-generated/pt/lsts/imc/Elevator.java +++ b/src-generated/pt/lsts/imc/Elevator.java @@ -241,6 +241,14 @@ public START_Z_UNITS getStartZUnits() { } } + public String getStartZUnitsStr() { + return getString("start_z_units"); + } + + public short getStartZUnitsVal() { + return (short) getInteger("start_z_units"); + } + /** * @param start_z_units Start Point -- Z Units (enumerated) */ @@ -252,7 +260,7 @@ public Elevator setStartZUnits(START_Z_UNITS start_z_units) { /** * @param start_z_units Start Point -- Z Units (as a String) */ - public Elevator setStartZUnits(String start_z_units) { + public Elevator setStartZUnitsStr(String start_z_units) { setValue("start_z_units", start_z_units); return this; } @@ -260,7 +268,7 @@ public Elevator setStartZUnits(String start_z_units) { /** * @param start_z_units Start Point -- Z Units (integer value) */ - public Elevator setStartZUnits(short start_z_units) { + public Elevator setStartZUnitsVal(short start_z_units) { setValue("start_z_units", start_z_units); return this; } @@ -293,6 +301,14 @@ public END_Z_UNITS getEndZUnits() { } } + public String getEndZUnitsStr() { + return getString("end_z_units"); + } + + public short getEndZUnitsVal() { + return (short) getInteger("end_z_units"); + } + /** * @param end_z_units End Point -- Z Units (enumerated) */ @@ -304,7 +320,7 @@ public Elevator setEndZUnits(END_Z_UNITS end_z_units) { /** * @param end_z_units End Point -- Z Units (as a String) */ - public Elevator setEndZUnits(String end_z_units) { + public Elevator setEndZUnitsStr(String end_z_units) { setValue("end_z_units", end_z_units); return this; } @@ -312,7 +328,7 @@ public Elevator setEndZUnits(String end_z_units) { /** * @param end_z_units End Point -- Z Units (integer value) */ - public Elevator setEndZUnits(short end_z_units) { + public Elevator setEndZUnitsVal(short end_z_units) { setValue("end_z_units", end_z_units); return this; } @@ -360,6 +376,14 @@ public SPEED_UNITS getSpeedUnits() { } } + public String getSpeedUnitsStr() { + return getString("speed_units"); + } + + public short getSpeedUnitsVal() { + return (short) getInteger("speed_units"); + } + /** * @param speed_units Speed Units (enumerated) */ @@ -371,7 +395,7 @@ public Elevator setSpeedUnits(SPEED_UNITS speed_units) { /** * @param speed_units Speed Units (as a String) */ - public Elevator setSpeedUnits(String speed_units) { + public Elevator setSpeedUnitsStr(String speed_units) { setValue("speed_units", speed_units); return this; } @@ -379,7 +403,7 @@ public Elevator setSpeedUnits(String speed_units) { /** * @param speed_units Speed Units (integer value) */ - public Elevator setSpeedUnits(short speed_units) { + public Elevator setSpeedUnitsVal(short speed_units) { setValue("speed_units", speed_units); return this; } diff --git a/src-generated/pt/lsts/imc/EmergencyControl.java b/src-generated/pt/lsts/imc/EmergencyControl.java index 460e5958..dffba213 100644 --- a/src-generated/pt/lsts/imc/EmergencyControl.java +++ b/src-generated/pt/lsts/imc/EmergencyControl.java @@ -118,6 +118,14 @@ public COMMAND getCommand() { } } + public String getCommandStr() { + return getString("command"); + } + + public short getCommandVal() { + return (short) getInteger("command"); + } + /** * @param command Command (enumerated) */ @@ -129,7 +137,7 @@ public EmergencyControl setCommand(COMMAND command) { /** * @param command Command (as a String) */ - public EmergencyControl setCommand(String command) { + public EmergencyControl setCommandStr(String command) { setValue("command", command); return this; } @@ -137,7 +145,7 @@ public EmergencyControl setCommand(String command) { /** * @param command Command (integer value) */ - public EmergencyControl setCommand(short command) { + public EmergencyControl setCommandVal(short command) { setValue("command", command); return this; } diff --git a/src-generated/pt/lsts/imc/EmergencyControlState.java b/src-generated/pt/lsts/imc/EmergencyControlState.java index a000f656..756ba041 100644 --- a/src-generated/pt/lsts/imc/EmergencyControlState.java +++ b/src-generated/pt/lsts/imc/EmergencyControlState.java @@ -119,6 +119,14 @@ public STATE getState() { } } + public String getStateStr() { + return getString("state"); + } + + public short getStateVal() { + return (short) getInteger("state"); + } + /** * @param state State (enumerated) */ @@ -130,7 +138,7 @@ public EmergencyControlState setState(STATE state) { /** * @param state State (as a String) */ - public EmergencyControlState setState(String state) { + public EmergencyControlState setStateStr(String state) { setValue("state", state); return this; } @@ -138,7 +146,7 @@ public EmergencyControlState setState(String state) { /** * @param state State (integer value) */ - public EmergencyControlState setState(short state) { + public EmergencyControlState setStateVal(short state) { setValue("state", state); return this; } diff --git a/src-generated/pt/lsts/imc/EntityActivationState.java b/src-generated/pt/lsts/imc/EntityActivationState.java index 65fa7192..c2006dce 100644 --- a/src-generated/pt/lsts/imc/EntityActivationState.java +++ b/src-generated/pt/lsts/imc/EntityActivationState.java @@ -121,6 +121,14 @@ public STATE getState() { } } + public String getStateStr() { + return getString("state"); + } + + public short getStateVal() { + return (short) getInteger("state"); + } + /** * @param state State (enumerated) */ @@ -132,7 +140,7 @@ public EntityActivationState setState(STATE state) { /** * @param state State (as a String) */ - public EntityActivationState setState(String state) { + public EntityActivationState setStateStr(String state) { setValue("state", state); return this; } @@ -140,7 +148,7 @@ public EntityActivationState setState(String state) { /** * @param state State (integer value) */ - public EntityActivationState setState(short state) { + public EntityActivationState setStateVal(short state) { setValue("state", state); return this; } diff --git a/src-generated/pt/lsts/imc/EntityList.java b/src-generated/pt/lsts/imc/EntityList.java index 9ddd032c..4ba84dfc 100644 --- a/src-generated/pt/lsts/imc/EntityList.java +++ b/src-generated/pt/lsts/imc/EntityList.java @@ -116,6 +116,14 @@ public OP getOp() { } } + public String getOpStr() { + return getString("op"); + } + + public short getOpVal() { + return (short) getInteger("op"); + } + /** * @param op operation (enumerated) */ @@ -127,7 +135,7 @@ public EntityList setOp(OP op) { /** * @param op operation (as a String) */ - public EntityList setOp(String op) { + public EntityList setOpStr(String op) { setValue("op", op); return this; } @@ -135,7 +143,7 @@ public EntityList setOp(String op) { /** * @param op operation (integer value) */ - public EntityList setOp(short op) { + public EntityList setOpVal(short op) { setValue("op", op); return this; } diff --git a/src-generated/pt/lsts/imc/EntityState.java b/src-generated/pt/lsts/imc/EntityState.java index 17922d82..aa093c5a 100644 --- a/src-generated/pt/lsts/imc/EntityState.java +++ b/src-generated/pt/lsts/imc/EntityState.java @@ -122,6 +122,14 @@ public STATE getState() { } } + public String getStateStr() { + return getString("state"); + } + + public short getStateVal() { + return (short) getInteger("state"); + } + /** * @param state State (enumerated) */ @@ -133,7 +141,7 @@ public EntityState setState(STATE state) { /** * @param state State (as a String) */ - public EntityState setState(String state) { + public EntityState setStateStr(String state) { setValue("state", state); return this; } @@ -141,7 +149,7 @@ public EntityState setState(String state) { /** * @param state State (integer value) */ - public EntityState setState(short state) { + public EntityState setStateVal(short state) { setValue("state", state); return this; } diff --git a/src-generated/pt/lsts/imc/FollowPath.java b/src-generated/pt/lsts/imc/FollowPath.java index 99f60d34..0b3e84cd 100644 --- a/src-generated/pt/lsts/imc/FollowPath.java +++ b/src-generated/pt/lsts/imc/FollowPath.java @@ -202,6 +202,14 @@ public Z_UNITS getZUnits() { } } + public String getZUnitsStr() { + return getString("z_units"); + } + + public short getZUnitsVal() { + return (short) getInteger("z_units"); + } + /** * @param z_units Z Units (enumerated) */ @@ -213,7 +221,7 @@ public FollowPath setZUnits(Z_UNITS z_units) { /** * @param z_units Z Units (as a String) */ - public FollowPath setZUnits(String z_units) { + public FollowPath setZUnitsStr(String z_units) { setValue("z_units", z_units); return this; } @@ -221,7 +229,7 @@ public FollowPath setZUnits(String z_units) { /** * @param z_units Z Units (integer value) */ - public FollowPath setZUnits(short z_units) { + public FollowPath setZUnitsVal(short z_units) { setValue("z_units", z_units); return this; } @@ -254,6 +262,14 @@ public SPEED_UNITS getSpeedUnits() { } } + public String getSpeedUnitsStr() { + return getString("speed_units"); + } + + public short getSpeedUnitsVal() { + return (short) getInteger("speed_units"); + } + /** * @param speed_units Speed Units (enumerated) */ @@ -265,7 +281,7 @@ public FollowPath setSpeedUnits(SPEED_UNITS speed_units) { /** * @param speed_units Speed Units (as a String) */ - public FollowPath setSpeedUnits(String speed_units) { + public FollowPath setSpeedUnitsStr(String speed_units) { setValue("speed_units", speed_units); return this; } @@ -273,7 +289,7 @@ public FollowPath setSpeedUnits(String speed_units) { /** * @param speed_units Speed Units (integer value) */ - public FollowPath setSpeedUnits(short speed_units) { + public FollowPath setSpeedUnitsVal(short speed_units) { setValue("speed_units", speed_units); return this; } diff --git a/src-generated/pt/lsts/imc/FollowRefState.java b/src-generated/pt/lsts/imc/FollowRefState.java index f56db37d..bc1e332f 100644 --- a/src-generated/pt/lsts/imc/FollowRefState.java +++ b/src-generated/pt/lsts/imc/FollowRefState.java @@ -180,6 +180,14 @@ public STATE getState() { } } + public String getStateStr() { + return getString("state"); + } + + public short getStateVal() { + return (short) getInteger("state"); + } + /** * @param state State (enumerated) */ @@ -191,7 +199,7 @@ public FollowRefState setState(STATE state) { /** * @param state State (as a String) */ - public FollowRefState setState(String state) { + public FollowRefState setStateStr(String state) { setValue("state", state); return this; } @@ -199,7 +207,7 @@ public FollowRefState setState(String state) { /** * @param state State (integer value) */ - public FollowRefState setState(short state) { + public FollowRefState setStateVal(short state) { setValue("state", state); return this; } diff --git a/src-generated/pt/lsts/imc/FollowSystem.java b/src-generated/pt/lsts/imc/FollowSystem.java index 9233fead..ce48042b 100644 --- a/src-generated/pt/lsts/imc/FollowSystem.java +++ b/src-generated/pt/lsts/imc/FollowSystem.java @@ -183,6 +183,14 @@ public SPEED_UNITS getSpeedUnits() { } } + public String getSpeedUnitsStr() { + return getString("speed_units"); + } + + public short getSpeedUnitsVal() { + return (short) getInteger("speed_units"); + } + /** * @param speed_units Speed Units (enumerated) */ @@ -194,7 +202,7 @@ public FollowSystem setSpeedUnits(SPEED_UNITS speed_units) { /** * @param speed_units Speed Units (as a String) */ - public FollowSystem setSpeedUnits(String speed_units) { + public FollowSystem setSpeedUnitsStr(String speed_units) { setValue("speed_units", speed_units); return this; } @@ -202,7 +210,7 @@ public FollowSystem setSpeedUnits(String speed_units) { /** * @param speed_units Speed Units (integer value) */ - public FollowSystem setSpeedUnits(short speed_units) { + public FollowSystem setSpeedUnitsVal(short speed_units) { setValue("speed_units", speed_units); return this; } @@ -265,6 +273,14 @@ public Z_UNITS getZUnits() { } } + public String getZUnitsStr() { + return getString("z_units"); + } + + public short getZUnitsVal() { + return (short) getInteger("z_units"); + } + /** * @param z_units Z Units (enumerated) */ @@ -276,7 +292,7 @@ public FollowSystem setZUnits(Z_UNITS z_units) { /** * @param z_units Z Units (as a String) */ - public FollowSystem setZUnits(String z_units) { + public FollowSystem setZUnitsStr(String z_units) { setValue("z_units", z_units); return this; } @@ -284,7 +300,7 @@ public FollowSystem setZUnits(String z_units) { /** * @param z_units Z Units (integer value) */ - public FollowSystem setZUnits(short z_units) { + public FollowSystem setZUnitsVal(short z_units) { setValue("z_units", z_units); return this; } diff --git a/src-generated/pt/lsts/imc/FollowTrajectory.java b/src-generated/pt/lsts/imc/FollowTrajectory.java index 54bd853b..d360caa7 100644 --- a/src-generated/pt/lsts/imc/FollowTrajectory.java +++ b/src-generated/pt/lsts/imc/FollowTrajectory.java @@ -202,6 +202,14 @@ public Z_UNITS getZUnits() { } } + public String getZUnitsStr() { + return getString("z_units"); + } + + public short getZUnitsVal() { + return (short) getInteger("z_units"); + } + /** * @param z_units Z Units (enumerated) */ @@ -213,7 +221,7 @@ public FollowTrajectory setZUnits(Z_UNITS z_units) { /** * @param z_units Z Units (as a String) */ - public FollowTrajectory setZUnits(String z_units) { + public FollowTrajectory setZUnitsStr(String z_units) { setValue("z_units", z_units); return this; } @@ -221,7 +229,7 @@ public FollowTrajectory setZUnits(String z_units) { /** * @param z_units Z Units (integer value) */ - public FollowTrajectory setZUnits(short z_units) { + public FollowTrajectory setZUnitsVal(short z_units) { setValue("z_units", z_units); return this; } @@ -254,6 +262,14 @@ public SPEED_UNITS getSpeedUnits() { } } + public String getSpeedUnitsStr() { + return getString("speed_units"); + } + + public short getSpeedUnitsVal() { + return (short) getInteger("speed_units"); + } + /** * @param speed_units Speed Units (enumerated) */ @@ -265,7 +281,7 @@ public FollowTrajectory setSpeedUnits(SPEED_UNITS speed_units) { /** * @param speed_units Speed Units (as a String) */ - public FollowTrajectory setSpeedUnits(String speed_units) { + public FollowTrajectory setSpeedUnitsStr(String speed_units) { setValue("speed_units", speed_units); return this; } @@ -273,7 +289,7 @@ public FollowTrajectory setSpeedUnits(String speed_units) { /** * @param speed_units Speed Units (integer value) */ - public FollowTrajectory setSpeedUnits(short speed_units) { + public FollowTrajectory setSpeedUnitsVal(short speed_units) { setValue("speed_units", speed_units); return this; } diff --git a/src-generated/pt/lsts/imc/FormCtrlParam.java b/src-generated/pt/lsts/imc/FormCtrlParam.java index feaa5be0..e8865335 100644 --- a/src-generated/pt/lsts/imc/FormCtrlParam.java +++ b/src-generated/pt/lsts/imc/FormCtrlParam.java @@ -119,6 +119,14 @@ public ACTION getAction() { } } + public String getActionStr() { + return getString("Action"); + } + + public short getActionVal() { + return (short) getInteger("Action"); + } + /** * @param Action Action (enumerated) */ @@ -130,7 +138,7 @@ public FormCtrlParam setAction(ACTION Action) { /** * @param Action Action (as a String) */ - public FormCtrlParam setAction(String Action) { + public FormCtrlParam setActionStr(String Action) { setValue("Action", Action); return this; } @@ -138,7 +146,7 @@ public FormCtrlParam setAction(String Action) { /** * @param Action Action (integer value) */ - public FormCtrlParam setAction(short Action) { + public FormCtrlParam setActionVal(short Action) { setValue("Action", Action); return this; } diff --git a/src-generated/pt/lsts/imc/FormState.java b/src-generated/pt/lsts/imc/FormState.java index d38b8bfb..3846b259 100644 --- a/src-generated/pt/lsts/imc/FormState.java +++ b/src-generated/pt/lsts/imc/FormState.java @@ -194,6 +194,14 @@ public POSSIMMON getPosSimMon() { } } + public String getPosSimMonStr() { + return getString("PosSimMon"); + } + + public short getPosSimMonVal() { + return (short) getInteger("PosSimMon"); + } + /** * @param PosSimMon Position Mismatch Monitor (enumerated) */ @@ -205,7 +213,7 @@ public FormState setPosSimMon(POSSIMMON PosSimMon) { /** * @param PosSimMon Position Mismatch Monitor (as a String) */ - public FormState setPosSimMon(String PosSimMon) { + public FormState setPosSimMonStr(String PosSimMon) { setValue("PosSimMon", PosSimMon); return this; } @@ -213,7 +221,7 @@ public FormState setPosSimMon(String PosSimMon) { /** * @param PosSimMon Position Mismatch Monitor (integer value) */ - public FormState setPosSimMon(short PosSimMon) { + public FormState setPosSimMonVal(short PosSimMon) { setValue("PosSimMon", PosSimMon); return this; } @@ -231,6 +239,14 @@ public COMMMON getCommMon() { } } + public String getCommMonStr() { + return getString("CommMon"); + } + + public short getCommMonVal() { + return (short) getInteger("CommMon"); + } + /** * @param CommMon Communications Monitor (enumerated) */ @@ -242,7 +258,7 @@ public FormState setCommMon(COMMMON CommMon) { /** * @param CommMon Communications Monitor (as a String) */ - public FormState setCommMon(String CommMon) { + public FormState setCommMonStr(String CommMon) { setValue("CommMon", CommMon); return this; } @@ -250,7 +266,7 @@ public FormState setCommMon(String CommMon) { /** * @param CommMon Communications Monitor (integer value) */ - public FormState setCommMon(short CommMon) { + public FormState setCommMonVal(short CommMon) { setValue("CommMon", CommMon); return this; } @@ -268,6 +284,14 @@ public CONVERGMON getConvergMon() { } } + public String getConvergMonStr() { + return getString("ConvergMon"); + } + + public short getConvergMonVal() { + return (short) getInteger("ConvergMon"); + } + /** * @param ConvergMon Convergence (enumerated) */ @@ -279,7 +303,7 @@ public FormState setConvergMon(CONVERGMON ConvergMon) { /** * @param ConvergMon Convergence (as a String) */ - public FormState setConvergMon(String ConvergMon) { + public FormState setConvergMonStr(String ConvergMon) { setValue("ConvergMon", ConvergMon); return this; } @@ -287,7 +311,7 @@ public FormState setConvergMon(String ConvergMon) { /** * @param ConvergMon Convergence (integer value) */ - public FormState setConvergMon(short ConvergMon) { + public FormState setConvergMonVal(short ConvergMon) { setValue("ConvergMon", ConvergMon); return this; } diff --git a/src-generated/pt/lsts/imc/FormationParameters.java b/src-generated/pt/lsts/imc/FormationParameters.java index eb130f48..c1f6b466 100644 --- a/src-generated/pt/lsts/imc/FormationParameters.java +++ b/src-generated/pt/lsts/imc/FormationParameters.java @@ -147,6 +147,14 @@ public REFERENCE_FRAME getReferenceFrame() { } } + public String getReferenceFrameStr() { + return getString("reference_frame"); + } + + public short getReferenceFrameVal() { + return (short) getInteger("reference_frame"); + } + /** * @param reference_frame Formation Reference Frame (enumerated) */ @@ -158,7 +166,7 @@ public FormationParameters setReferenceFrame(REFERENCE_FRAME reference_frame) { /** * @param reference_frame Formation Reference Frame (as a String) */ - public FormationParameters setReferenceFrame(String reference_frame) { + public FormationParameters setReferenceFrameStr(String reference_frame) { setValue("reference_frame", reference_frame); return this; } @@ -166,7 +174,7 @@ public FormationParameters setReferenceFrame(String reference_frame) { /** * @param reference_frame Formation Reference Frame (integer value) */ - public FormationParameters setReferenceFrame(short reference_frame) { + public FormationParameters setReferenceFrameVal(short reference_frame) { setValue("reference_frame", reference_frame); return this; } diff --git a/src-generated/pt/lsts/imc/Goto.java b/src-generated/pt/lsts/imc/Goto.java index a0592986..c970a362 100644 --- a/src-generated/pt/lsts/imc/Goto.java +++ b/src-generated/pt/lsts/imc/Goto.java @@ -211,6 +211,14 @@ public Z_UNITS getZUnits() { } } + public String getZUnitsStr() { + return getString("z_units"); + } + + public short getZUnitsVal() { + return (short) getInteger("z_units"); + } + /** * @param z_units Z Units (enumerated) */ @@ -222,7 +230,7 @@ public Goto setZUnits(Z_UNITS z_units) { /** * @param z_units Z Units (as a String) */ - public Goto setZUnits(String z_units) { + public Goto setZUnitsStr(String z_units) { setValue("z_units", z_units); return this; } @@ -230,7 +238,7 @@ public Goto setZUnits(String z_units) { /** * @param z_units Z Units (integer value) */ - public Goto setZUnits(short z_units) { + public Goto setZUnitsVal(short z_units) { setValue("z_units", z_units); return this; } @@ -263,6 +271,14 @@ public SPEED_UNITS getSpeedUnits() { } } + public String getSpeedUnitsStr() { + return getString("speed_units"); + } + + public short getSpeedUnitsVal() { + return (short) getInteger("speed_units"); + } + /** * @param speed_units Speed Units (enumerated) */ @@ -274,7 +290,7 @@ public Goto setSpeedUnits(SPEED_UNITS speed_units) { /** * @param speed_units Speed Units (as a String) */ - public Goto setSpeedUnits(String speed_units) { + public Goto setSpeedUnitsStr(String speed_units) { setValue("speed_units", speed_units); return this; } @@ -282,7 +298,7 @@ public Goto setSpeedUnits(String speed_units) { /** * @param speed_units Speed Units (integer value) */ - public Goto setSpeedUnits(short speed_units) { + public Goto setSpeedUnitsVal(short speed_units) { setValue("speed_units", speed_units); return this; } diff --git a/src-generated/pt/lsts/imc/GpsFix.java b/src-generated/pt/lsts/imc/GpsFix.java index 7f14c563..84efe1a4 100644 --- a/src-generated/pt/lsts/imc/GpsFix.java +++ b/src-generated/pt/lsts/imc/GpsFix.java @@ -156,6 +156,14 @@ public TYPE getType() { } } + public String getTypeStr() { + return getString("type"); + } + + public short getTypeVal() { + return (short) getInteger("type"); + } + /** * @param type Type (enumerated) */ @@ -167,7 +175,7 @@ public GpsFix setType(TYPE type) { /** * @param type Type (as a String) */ - public GpsFix setType(String type) { + public GpsFix setTypeStr(String type) { setValue("type", type); return this; } @@ -175,7 +183,7 @@ public GpsFix setType(String type) { /** * @param type Type (integer value) */ - public GpsFix setType(short type) { + public GpsFix setTypeVal(short type) { setValue("type", type); return this; } diff --git a/src-generated/pt/lsts/imc/GpsFixRejection.java b/src-generated/pt/lsts/imc/GpsFixRejection.java index 3c0b87ee..40d18d86 100644 --- a/src-generated/pt/lsts/imc/GpsFixRejection.java +++ b/src-generated/pt/lsts/imc/GpsFixRejection.java @@ -131,6 +131,14 @@ public REASON getReason() { } } + public String getReasonStr() { + return getString("reason"); + } + + public short getReasonVal() { + return (short) getInteger("reason"); + } + /** * @param reason Reason (enumerated) */ @@ -142,7 +150,7 @@ public GpsFixRejection setReason(REASON reason) { /** * @param reason Reason (as a String) */ - public GpsFixRejection setReason(String reason) { + public GpsFixRejection setReasonStr(String reason) { setValue("reason", reason); return this; } @@ -150,7 +158,7 @@ public GpsFixRejection setReason(String reason) { /** * @param reason Reason (integer value) */ - public GpsFixRejection setReason(short reason) { + public GpsFixRejection setReasonVal(short reason) { setValue("reason", reason); return this; } diff --git a/src-generated/pt/lsts/imc/IoEvent.java b/src-generated/pt/lsts/imc/IoEvent.java index ecad7f50..82514ff2 100644 --- a/src-generated/pt/lsts/imc/IoEvent.java +++ b/src-generated/pt/lsts/imc/IoEvent.java @@ -115,6 +115,14 @@ public TYPE getType() { } } + public String getTypeStr() { + return getString("type"); + } + + public short getTypeVal() { + return (short) getInteger("type"); + } + /** * @param type Type (enumerated) */ @@ -126,7 +134,7 @@ public IoEvent setType(TYPE type) { /** * @param type Type (as a String) */ - public IoEvent setType(String type) { + public IoEvent setTypeStr(String type) { setValue("type", type); return this; } @@ -134,7 +142,7 @@ public IoEvent setType(String type) { /** * @param type Type (integer value) */ - public IoEvent setType(short type) { + public IoEvent setTypeVal(short type) { setValue("type", type); return this; } diff --git a/src-generated/pt/lsts/imc/IridiumTxStatus.java b/src-generated/pt/lsts/imc/IridiumTxStatus.java index 505045ff..551e7b0d 100644 --- a/src-generated/pt/lsts/imc/IridiumTxStatus.java +++ b/src-generated/pt/lsts/imc/IridiumTxStatus.java @@ -133,6 +133,14 @@ public STATUS getStatus() { } } + public String getStatusStr() { + return getString("status"); + } + + public short getStatusVal() { + return (short) getInteger("status"); + } + /** * @param status Status Code (enumerated) */ @@ -144,7 +152,7 @@ public IridiumTxStatus setStatus(STATUS status) { /** * @param status Status Code (as a String) */ - public IridiumTxStatus setStatus(String status) { + public IridiumTxStatus setStatusStr(String status) { setValue("status", status); return this; } @@ -152,7 +160,7 @@ public IridiumTxStatus setStatus(String status) { /** * @param status Status Code (integer value) */ - public IridiumTxStatus setStatus(short status) { + public IridiumTxStatus setStatusVal(short status) { setValue("status", status); return this; } diff --git a/src-generated/pt/lsts/imc/LblConfig.java b/src-generated/pt/lsts/imc/LblConfig.java index 58b2648c..6b803cd6 100644 --- a/src-generated/pt/lsts/imc/LblConfig.java +++ b/src-generated/pt/lsts/imc/LblConfig.java @@ -116,6 +116,14 @@ public OP getOp() { } } + public String getOpStr() { + return getString("op"); + } + + public short getOpVal() { + return (short) getInteger("op"); + } + /** * @param op Operation (enumerated) */ @@ -127,7 +135,7 @@ public LblConfig setOp(OP op) { /** * @param op Operation (as a String) */ - public LblConfig setOp(String op) { + public LblConfig setOpStr(String op) { setValue("op", op); return this; } @@ -135,7 +143,7 @@ public LblConfig setOp(String op) { /** * @param op Operation (integer value) */ - public LblConfig setOp(short op) { + public LblConfig setOpVal(short op) { setValue("op", op); return this; } diff --git a/src-generated/pt/lsts/imc/LblRangeAcceptance.java b/src-generated/pt/lsts/imc/LblRangeAcceptance.java index c7b36dce..00b6f4b9 100644 --- a/src-generated/pt/lsts/imc/LblRangeAcceptance.java +++ b/src-generated/pt/lsts/imc/LblRangeAcceptance.java @@ -153,6 +153,14 @@ public ACCEPTANCE getAcceptance() { } } + public String getAcceptanceStr() { + return getString("acceptance"); + } + + public short getAcceptanceVal() { + return (short) getInteger("acceptance"); + } + /** * @param acceptance Acceptance (enumerated) */ @@ -164,7 +172,7 @@ public LblRangeAcceptance setAcceptance(ACCEPTANCE acceptance) { /** * @param acceptance Acceptance (as a String) */ - public LblRangeAcceptance setAcceptance(String acceptance) { + public LblRangeAcceptance setAcceptanceStr(String acceptance) { setValue("acceptance", acceptance); return this; } @@ -172,7 +180,7 @@ public LblRangeAcceptance setAcceptance(String acceptance) { /** * @param acceptance Acceptance (integer value) */ - public LblRangeAcceptance setAcceptance(short acceptance) { + public LblRangeAcceptance setAcceptanceVal(short acceptance) { setValue("acceptance", acceptance); return this; } diff --git a/src-generated/pt/lsts/imc/LcdControl.java b/src-generated/pt/lsts/imc/LcdControl.java index b1e67d28..944edb91 100644 --- a/src-generated/pt/lsts/imc/LcdControl.java +++ b/src-generated/pt/lsts/imc/LcdControl.java @@ -118,6 +118,14 @@ public OP getOp() { } } + public String getOpStr() { + return getString("op"); + } + + public short getOpVal() { + return (short) getInteger("op"); + } + /** * @param op Operation (enumerated) */ @@ -129,7 +137,7 @@ public LcdControl setOp(OP op) { /** * @param op Operation (as a String) */ - public LcdControl setOp(String op) { + public LcdControl setOpStr(String op) { setValue("op", op); return this; } @@ -137,7 +145,7 @@ public LcdControl setOp(String op) { /** * @param op Operation (integer value) */ - public LcdControl setOp(short op) { + public LcdControl setOpVal(short op) { setValue("op", op); return this; } diff --git a/src-generated/pt/lsts/imc/LeaderState.java b/src-generated/pt/lsts/imc/LeaderState.java index 70ccd512..a5e352f3 100644 --- a/src-generated/pt/lsts/imc/LeaderState.java +++ b/src-generated/pt/lsts/imc/LeaderState.java @@ -161,6 +161,14 @@ public OP getOp() { } } + public String getOpStr() { + return getString("op"); + } + + public short getOpVal() { + return (short) getInteger("op"); + } + /** * @param op Action on the leader state (enumerated) */ @@ -172,7 +180,7 @@ public LeaderState setOp(OP op) { /** * @param op Action on the leader state (as a String) */ - public LeaderState setOp(String op) { + public LeaderState setOpStr(String op) { setValue("op", op); return this; } @@ -180,7 +188,7 @@ public LeaderState setOp(String op) { /** * @param op Action on the leader state (integer value) */ - public LeaderState setOp(short op) { + public LeaderState setOpVal(short op) { setValue("op", op); return this; } diff --git a/src-generated/pt/lsts/imc/LeakSimulation.java b/src-generated/pt/lsts/imc/LeakSimulation.java index cad48e57..83398448 100644 --- a/src-generated/pt/lsts/imc/LeakSimulation.java +++ b/src-generated/pt/lsts/imc/LeakSimulation.java @@ -115,6 +115,14 @@ public OP getOp() { } } + public String getOpStr() { + return getString("op"); + } + + public short getOpVal() { + return (short) getInteger("op"); + } + /** * @param op Operation (enumerated) */ @@ -126,7 +134,7 @@ public LeakSimulation setOp(OP op) { /** * @param op Operation (as a String) */ - public LeakSimulation setOp(String op) { + public LeakSimulation setOpStr(String op) { setValue("op", op); return this; } @@ -134,7 +142,7 @@ public LeakSimulation setOp(String op) { /** * @param op Operation (integer value) */ - public LeakSimulation setOp(short op) { + public LeakSimulation setOpVal(short op) { setValue("op", op); return this; } diff --git a/src-generated/pt/lsts/imc/LogBookControl.java b/src-generated/pt/lsts/imc/LogBookControl.java index a5a904de..d7e1ac66 100644 --- a/src-generated/pt/lsts/imc/LogBookControl.java +++ b/src-generated/pt/lsts/imc/LogBookControl.java @@ -118,6 +118,14 @@ public COMMAND getCommand() { } } + public String getCommandStr() { + return getString("command"); + } + + public short getCommandVal() { + return (short) getInteger("command"); + } + /** * @param command Command (enumerated) */ @@ -129,7 +137,7 @@ public LogBookControl setCommand(COMMAND command) { /** * @param command Command (as a String) */ - public LogBookControl setCommand(String command) { + public LogBookControl setCommandStr(String command) { setValue("command", command); return this; } @@ -137,7 +145,7 @@ public LogBookControl setCommand(String command) { /** * @param command Command (integer value) */ - public LogBookControl setCommand(short command) { + public LogBookControl setCommandVal(short command) { setValue("command", command); return this; } diff --git a/src-generated/pt/lsts/imc/LogBookEntry.java b/src-generated/pt/lsts/imc/LogBookEntry.java index d52da0f3..d0921392 100644 --- a/src-generated/pt/lsts/imc/LogBookEntry.java +++ b/src-generated/pt/lsts/imc/LogBookEntry.java @@ -121,6 +121,14 @@ public TYPE getType() { } } + public String getTypeStr() { + return getString("type"); + } + + public short getTypeVal() { + return (short) getInteger("type"); + } + /** * @param type Type (enumerated) */ @@ -132,7 +140,7 @@ public LogBookEntry setType(TYPE type) { /** * @param type Type (as a String) */ - public LogBookEntry setType(String type) { + public LogBookEntry setTypeStr(String type) { setValue("type", type); return this; } @@ -140,7 +148,7 @@ public LogBookEntry setType(String type) { /** * @param type Type (integer value) */ - public LogBookEntry setType(short type) { + public LogBookEntry setTypeVal(short type) { setValue("type", type); return this; } diff --git a/src-generated/pt/lsts/imc/LoggingControl.java b/src-generated/pt/lsts/imc/LoggingControl.java index 6f9ba9fe..8a526d1a 100644 --- a/src-generated/pt/lsts/imc/LoggingControl.java +++ b/src-generated/pt/lsts/imc/LoggingControl.java @@ -119,6 +119,14 @@ public OP getOp() { } } + public String getOpStr() { + return getString("op"); + } + + public short getOpVal() { + return (short) getInteger("op"); + } + /** * @param op Control Operation (enumerated) */ @@ -130,7 +138,7 @@ public LoggingControl setOp(OP op) { /** * @param op Control Operation (as a String) */ - public LoggingControl setOp(String op) { + public LoggingControl setOpStr(String op) { setValue("op", op); return this; } @@ -138,7 +146,7 @@ public LoggingControl setOp(String op) { /** * @param op Control Operation (integer value) */ - public LoggingControl setOp(short op) { + public LoggingControl setOpVal(short op) { setValue("op", op); return this; } diff --git a/src-generated/pt/lsts/imc/Loiter.java b/src-generated/pt/lsts/imc/Loiter.java index 735daa71..dd19dd6f 100644 --- a/src-generated/pt/lsts/imc/Loiter.java +++ b/src-generated/pt/lsts/imc/Loiter.java @@ -242,6 +242,14 @@ public Z_UNITS getZUnits() { } } + public String getZUnitsStr() { + return getString("z_units"); + } + + public short getZUnitsVal() { + return (short) getInteger("z_units"); + } + /** * @param z_units Z Units (enumerated) */ @@ -253,7 +261,7 @@ public Loiter setZUnits(Z_UNITS z_units) { /** * @param z_units Z Units (as a String) */ - public Loiter setZUnits(String z_units) { + public Loiter setZUnitsStr(String z_units) { setValue("z_units", z_units); return this; } @@ -261,7 +269,7 @@ public Loiter setZUnits(String z_units) { /** * @param z_units Z Units (integer value) */ - public Loiter setZUnits(short z_units) { + public Loiter setZUnitsVal(short z_units) { setValue("z_units", z_units); return this; } @@ -309,6 +317,14 @@ public SPEED_UNITS getSpeedUnits() { } } + public String getSpeedUnitsStr() { + return getString("speed_units"); + } + + public short getSpeedUnitsVal() { + return (short) getInteger("speed_units"); + } + /** * @param speed_units Speed Units (enumerated) */ @@ -320,7 +336,7 @@ public Loiter setSpeedUnits(SPEED_UNITS speed_units) { /** * @param speed_units Speed Units (as a String) */ - public Loiter setSpeedUnits(String speed_units) { + public Loiter setSpeedUnitsStr(String speed_units) { setValue("speed_units", speed_units); return this; } @@ -328,7 +344,7 @@ public Loiter setSpeedUnits(String speed_units) { /** * @param speed_units Speed Units (integer value) */ - public Loiter setSpeedUnits(short speed_units) { + public Loiter setSpeedUnitsVal(short speed_units) { setValue("speed_units", speed_units); return this; } @@ -346,6 +362,14 @@ public TYPE getType() { } } + public String getTypeStr() { + return getString("type"); + } + + public short getTypeVal() { + return (short) getInteger("type"); + } + /** * @param type Loiter Type (enumerated) */ @@ -357,7 +381,7 @@ public Loiter setType(TYPE type) { /** * @param type Loiter Type (as a String) */ - public Loiter setType(String type) { + public Loiter setTypeStr(String type) { setValue("type", type); return this; } @@ -365,7 +389,7 @@ public Loiter setType(String type) { /** * @param type Loiter Type (integer value) */ - public Loiter setType(short type) { + public Loiter setTypeVal(short type) { setValue("type", type); return this; } @@ -428,6 +452,14 @@ public DIRECTION getDirection() { } } + public String getDirectionStr() { + return getString("direction"); + } + + public short getDirectionVal() { + return (short) getInteger("direction"); + } + /** * @param direction Direction (enumerated) */ @@ -439,7 +471,7 @@ public Loiter setDirection(DIRECTION direction) { /** * @param direction Direction (as a String) */ - public Loiter setDirection(String direction) { + public Loiter setDirectionStr(String direction) { setValue("direction", direction); return this; } @@ -447,7 +479,7 @@ public Loiter setDirection(String direction) { /** * @param direction Direction (integer value) */ - public Loiter setDirection(short direction) { + public Loiter setDirectionVal(short direction) { setValue("direction", direction); return this; } diff --git a/src-generated/pt/lsts/imc/ManeuverControlState.java b/src-generated/pt/lsts/imc/ManeuverControlState.java index 7e793322..9e521341 100644 --- a/src-generated/pt/lsts/imc/ManeuverControlState.java +++ b/src-generated/pt/lsts/imc/ManeuverControlState.java @@ -118,6 +118,14 @@ public STATE getState() { } } + public String getStateStr() { + return getString("state"); + } + + public short getStateVal() { + return (short) getInteger("state"); + } + /** * @param state State (enumerated) */ @@ -129,7 +137,7 @@ public ManeuverControlState setState(STATE state) { /** * @param state State (as a String) */ - public ManeuverControlState setState(String state) { + public ManeuverControlState setStateStr(String state) { setValue("state", state); return this; } @@ -137,7 +145,7 @@ public ManeuverControlState setState(String state) { /** * @param state State (integer value) */ - public ManeuverControlState setState(short state) { + public ManeuverControlState setStateVal(short state) { setValue("state", state); return this; } diff --git a/src-generated/pt/lsts/imc/MapFeature.java b/src-generated/pt/lsts/imc/MapFeature.java index 603b5302..ce5b22b0 100644 --- a/src-generated/pt/lsts/imc/MapFeature.java +++ b/src-generated/pt/lsts/imc/MapFeature.java @@ -140,6 +140,14 @@ public FEATURE_TYPE getFeatureType() { } } + public String getFeatureTypeStr() { + return getString("feature_type"); + } + + public short getFeatureTypeVal() { + return (short) getInteger("feature_type"); + } + /** * @param feature_type FeatureType (enumerated) */ @@ -151,7 +159,7 @@ public MapFeature setFeatureType(FEATURE_TYPE feature_type) { /** * @param feature_type FeatureType (as a String) */ - public MapFeature setFeatureType(String feature_type) { + public MapFeature setFeatureTypeStr(String feature_type) { setValue("feature_type", feature_type); return this; } @@ -159,7 +167,7 @@ public MapFeature setFeatureType(String feature_type) { /** * @param feature_type FeatureType (integer value) */ - public MapFeature setFeatureType(short feature_type) { + public MapFeature setFeatureTypeVal(short feature_type) { setValue("feature_type", feature_type); return this; } diff --git a/src-generated/pt/lsts/imc/MonitorEntityState.java b/src-generated/pt/lsts/imc/MonitorEntityState.java index 012c333a..7cf3109b 100644 --- a/src-generated/pt/lsts/imc/MonitorEntityState.java +++ b/src-generated/pt/lsts/imc/MonitorEntityState.java @@ -118,6 +118,14 @@ public COMMAND getCommand() { } } + public String getCommandStr() { + return getString("command"); + } + + public short getCommandVal() { + return (short) getInteger("command"); + } + /** * @param command Command (enumerated) */ @@ -129,7 +137,7 @@ public MonitorEntityState setCommand(COMMAND command) { /** * @param command Command (as a String) */ - public MonitorEntityState setCommand(String command) { + public MonitorEntityState setCommandStr(String command) { setValue("command", command); return this; } @@ -137,7 +145,7 @@ public MonitorEntityState setCommand(String command) { /** * @param command Command (integer value) */ - public MonitorEntityState setCommand(short command) { + public MonitorEntityState setCommandVal(short command) { setValue("command", command); return this; } diff --git a/src-generated/pt/lsts/imc/PathControlState.java b/src-generated/pt/lsts/imc/PathControlState.java index 5e9968a9..fd8ca4c8 100644 --- a/src-generated/pt/lsts/imc/PathControlState.java +++ b/src-generated/pt/lsts/imc/PathControlState.java @@ -216,6 +216,14 @@ public START_Z_UNITS getStartZUnits() { } } + public String getStartZUnitsStr() { + return getString("start_z_units"); + } + + public short getStartZUnitsVal() { + return (short) getInteger("start_z_units"); + } + /** * @param start_z_units Start Point -- Z Units (enumerated) */ @@ -227,7 +235,7 @@ public PathControlState setStartZUnits(START_Z_UNITS start_z_units) { /** * @param start_z_units Start Point -- Z Units (as a String) */ - public PathControlState setStartZUnits(String start_z_units) { + public PathControlState setStartZUnitsStr(String start_z_units) { setValue("start_z_units", start_z_units); return this; } @@ -235,7 +243,7 @@ public PathControlState setStartZUnits(String start_z_units) { /** * @param start_z_units Start Point -- Z Units (integer value) */ - public PathControlState setStartZUnits(short start_z_units) { + public PathControlState setStartZUnitsVal(short start_z_units) { setValue("start_z_units", start_z_units); return this; } @@ -298,6 +306,14 @@ public END_Z_UNITS getEndZUnits() { } } + public String getEndZUnitsStr() { + return getString("end_z_units"); + } + + public short getEndZUnitsVal() { + return (short) getInteger("end_z_units"); + } + /** * @param end_z_units End Point -- Z Units (enumerated) */ @@ -309,7 +325,7 @@ public PathControlState setEndZUnits(END_Z_UNITS end_z_units) { /** * @param end_z_units End Point -- Z Units (as a String) */ - public PathControlState setEndZUnits(String end_z_units) { + public PathControlState setEndZUnitsStr(String end_z_units) { setValue("end_z_units", end_z_units); return this; } @@ -317,7 +333,7 @@ public PathControlState setEndZUnits(String end_z_units) { /** * @param end_z_units End Point -- Z Units (integer value) */ - public PathControlState setEndZUnits(short end_z_units) { + public PathControlState setEndZUnitsVal(short end_z_units) { setValue("end_z_units", end_z_units); return this; } diff --git a/src-generated/pt/lsts/imc/PlanControl.java b/src-generated/pt/lsts/imc/PlanControl.java index 2d2038de..435d7531 100644 --- a/src-generated/pt/lsts/imc/PlanControl.java +++ b/src-generated/pt/lsts/imc/PlanControl.java @@ -144,6 +144,14 @@ public TYPE getType() { } } + public String getTypeStr() { + return getString("type"); + } + + public short getTypeVal() { + return (short) getInteger("type"); + } + /** * @param type Type (enumerated) */ @@ -155,7 +163,7 @@ public PlanControl setType(TYPE type) { /** * @param type Type (as a String) */ - public PlanControl setType(String type) { + public PlanControl setTypeStr(String type) { setValue("type", type); return this; } @@ -163,7 +171,7 @@ public PlanControl setType(String type) { /** * @param type Type (integer value) */ - public PlanControl setType(short type) { + public PlanControl setTypeVal(short type) { setValue("type", type); return this; } @@ -181,6 +189,14 @@ public OP getOp() { } } + public String getOpStr() { + return getString("op"); + } + + public short getOpVal() { + return (short) getInteger("op"); + } + /** * @param op Operation (enumerated) */ @@ -192,7 +208,7 @@ public PlanControl setOp(OP op) { /** * @param op Operation (as a String) */ - public PlanControl setOp(String op) { + public PlanControl setOpStr(String op) { setValue("op", op); return this; } @@ -200,7 +216,7 @@ public PlanControl setOp(String op) { /** * @param op Operation (integer value) */ - public PlanControl setOp(short op) { + public PlanControl setOpVal(short op) { setValue("op", op); return this; } diff --git a/src-generated/pt/lsts/imc/PlanControlState.java b/src-generated/pt/lsts/imc/PlanControlState.java index 24b2ed1b..b51a98a6 100644 --- a/src-generated/pt/lsts/imc/PlanControlState.java +++ b/src-generated/pt/lsts/imc/PlanControlState.java @@ -140,6 +140,14 @@ public STATE getState() { } } + public String getStateStr() { + return getString("state"); + } + + public short getStateVal() { + return (short) getInteger("state"); + } + /** * @param state State (enumerated) */ @@ -151,7 +159,7 @@ public PlanControlState setState(STATE state) { /** * @param state State (as a String) */ - public PlanControlState setState(String state) { + public PlanControlState setStateStr(String state) { setValue("state", state); return this; } @@ -159,7 +167,7 @@ public PlanControlState setState(String state) { /** * @param state State (integer value) */ - public PlanControlState setState(short state) { + public PlanControlState setStateVal(short state) { setValue("state", state); return this; } @@ -267,6 +275,14 @@ public LAST_OUTCOME getLastOutcome() { } } + public String getLastOutcomeStr() { + return getString("last_outcome"); + } + + public short getLastOutcomeVal() { + return (short) getInteger("last_outcome"); + } + /** * @param last_outcome Last Plan Outcome (enumerated) */ @@ -278,7 +294,7 @@ public PlanControlState setLastOutcome(LAST_OUTCOME last_outcome) { /** * @param last_outcome Last Plan Outcome (as a String) */ - public PlanControlState setLastOutcome(String last_outcome) { + public PlanControlState setLastOutcomeStr(String last_outcome) { setValue("last_outcome", last_outcome); return this; } @@ -286,7 +302,7 @@ public PlanControlState setLastOutcome(String last_outcome) { /** * @param last_outcome Last Plan Outcome (integer value) */ - public PlanControlState setLastOutcome(short last_outcome) { + public PlanControlState setLastOutcomeVal(short last_outcome) { setValue("last_outcome", last_outcome); return this; } diff --git a/src-generated/pt/lsts/imc/PlanDB.java b/src-generated/pt/lsts/imc/PlanDB.java index 2845ad1a..4dafe441 100644 --- a/src-generated/pt/lsts/imc/PlanDB.java +++ b/src-generated/pt/lsts/imc/PlanDB.java @@ -144,6 +144,14 @@ public TYPE getType() { } } + public String getTypeStr() { + return getString("type"); + } + + public short getTypeVal() { + return (short) getInteger("type"); + } + /** * @param type Type (enumerated) */ @@ -155,7 +163,7 @@ public PlanDB setType(TYPE type) { /** * @param type Type (as a String) */ - public PlanDB setType(String type) { + public PlanDB setTypeStr(String type) { setValue("type", type); return this; } @@ -163,7 +171,7 @@ public PlanDB setType(String type) { /** * @param type Type (integer value) */ - public PlanDB setType(short type) { + public PlanDB setTypeVal(short type) { setValue("type", type); return this; } @@ -181,6 +189,14 @@ public OP getOp() { } } + public String getOpStr() { + return getString("op"); + } + + public short getOpVal() { + return (short) getInteger("op"); + } + /** * @param op Operation (enumerated) */ @@ -192,7 +208,7 @@ public PlanDB setOp(OP op) { /** * @param op Operation (as a String) */ - public PlanDB setOp(String op) { + public PlanDB setOpStr(String op) { setValue("op", op); return this; } @@ -200,7 +216,7 @@ public PlanDB setOp(String op) { /** * @param op Operation (integer value) */ - public PlanDB setOp(short op) { + public PlanDB setOpVal(short op) { setValue("op", op); return this; } diff --git a/src-generated/pt/lsts/imc/PlanGeneration.java b/src-generated/pt/lsts/imc/PlanGeneration.java index 402f4fcf..699b9e60 100644 --- a/src-generated/pt/lsts/imc/PlanGeneration.java +++ b/src-generated/pt/lsts/imc/PlanGeneration.java @@ -135,6 +135,14 @@ public CMD getCmd() { } } + public String getCmdStr() { + return getString("cmd"); + } + + public short getCmdVal() { + return (short) getInteger("cmd"); + } + /** * @param cmd Command (enumerated) */ @@ -146,7 +154,7 @@ public PlanGeneration setCmd(CMD cmd) { /** * @param cmd Command (as a String) */ - public PlanGeneration setCmd(String cmd) { + public PlanGeneration setCmdStr(String cmd) { setValue("cmd", cmd); return this; } @@ -154,7 +162,7 @@ public PlanGeneration setCmd(String cmd) { /** * @param cmd Command (integer value) */ - public PlanGeneration setCmd(short cmd) { + public PlanGeneration setCmdVal(short cmd) { setValue("cmd", cmd); return this; } @@ -172,6 +180,14 @@ public OP getOp() { } } + public String getOpStr() { + return getString("op"); + } + + public short getOpVal() { + return (short) getInteger("op"); + } + /** * @param op Operation (enumerated) */ @@ -183,7 +199,7 @@ public PlanGeneration setOp(OP op) { /** * @param op Operation (as a String) */ - public PlanGeneration setOp(String op) { + public PlanGeneration setOpStr(String op) { setValue("op", op); return this; } @@ -191,7 +207,7 @@ public PlanGeneration setOp(String op) { /** * @param op Operation (integer value) */ - public PlanGeneration setOp(short op) { + public PlanGeneration setOpVal(short op) { setValue("op", op); return this; } diff --git a/src-generated/pt/lsts/imc/PlanStatistics.java b/src-generated/pt/lsts/imc/PlanStatistics.java index d41279a1..58cb67f9 100644 --- a/src-generated/pt/lsts/imc/PlanStatistics.java +++ b/src-generated/pt/lsts/imc/PlanStatistics.java @@ -145,6 +145,14 @@ public TYPE getType() { } } + public String getTypeStr() { + return getString("type"); + } + + public short getTypeVal() { + return (short) getInteger("type"); + } + /** * @param type Type (enumerated) */ @@ -156,7 +164,7 @@ public PlanStatistics setType(TYPE type) { /** * @param type Type (as a String) */ - public PlanStatistics setType(String type) { + public PlanStatistics setTypeStr(String type) { setValue("type", type); return this; } @@ -164,7 +172,7 @@ public PlanStatistics setType(String type) { /** * @param type Type (integer value) */ - public PlanStatistics setType(short type) { + public PlanStatistics setTypeVal(short type) { setValue("type", type); return this; } diff --git a/src-generated/pt/lsts/imc/PlanVariable.java b/src-generated/pt/lsts/imc/PlanVariable.java index 9b25ef4c..ba027c4d 100644 --- a/src-generated/pt/lsts/imc/PlanVariable.java +++ b/src-generated/pt/lsts/imc/PlanVariable.java @@ -166,6 +166,14 @@ public TYPE getType() { } } + public String getTypeStr() { + return getString("type"); + } + + public short getTypeVal() { + return (short) getInteger("type"); + } + /** * @param type Type (enumerated) */ @@ -177,7 +185,7 @@ public PlanVariable setType(TYPE type) { /** * @param type Type (as a String) */ - public PlanVariable setType(String type) { + public PlanVariable setTypeStr(String type) { setValue("type", type); return this; } @@ -185,7 +193,7 @@ public PlanVariable setType(String type) { /** * @param type Type (integer value) */ - public PlanVariable setType(short type) { + public PlanVariable setTypeVal(short type) { setValue("type", type); return this; } @@ -203,6 +211,14 @@ public ACCESS getAccess() { } } + public String getAccessStr() { + return getString("access"); + } + + public short getAccessVal() { + return (short) getInteger("access"); + } + /** * @param access Access Type (enumerated) */ @@ -214,7 +230,7 @@ public PlanVariable setAccess(ACCESS access) { /** * @param access Access Type (as a String) */ - public PlanVariable setAccess(String access) { + public PlanVariable setAccessStr(String access) { setValue("access", access); return this; } @@ -222,7 +238,7 @@ public PlanVariable setAccess(String access) { /** * @param access Access Type (integer value) */ - public PlanVariable setAccess(short access) { + public PlanVariable setAccessVal(short access) { setValue("access", access); return this; } diff --git a/src-generated/pt/lsts/imc/PopUp.java b/src-generated/pt/lsts/imc/PopUp.java index 982d1d98..407ff42e 100644 --- a/src-generated/pt/lsts/imc/PopUp.java +++ b/src-generated/pt/lsts/imc/PopUp.java @@ -208,6 +208,14 @@ public Z_UNITS getZUnits() { } } + public String getZUnitsStr() { + return getString("z_units"); + } + + public short getZUnitsVal() { + return (short) getInteger("z_units"); + } + /** * @param z_units Z Units (enumerated) */ @@ -219,7 +227,7 @@ public PopUp setZUnits(Z_UNITS z_units) { /** * @param z_units Z Units (as a String) */ - public PopUp setZUnits(String z_units) { + public PopUp setZUnitsStr(String z_units) { setValue("z_units", z_units); return this; } @@ -227,7 +235,7 @@ public PopUp setZUnits(String z_units) { /** * @param z_units Z Units (integer value) */ - public PopUp setZUnits(short z_units) { + public PopUp setZUnitsVal(short z_units) { setValue("z_units", z_units); return this; } @@ -260,6 +268,14 @@ public SPEED_UNITS getSpeedUnits() { } } + public String getSpeedUnitsStr() { + return getString("speed_units"); + } + + public short getSpeedUnitsVal() { + return (short) getInteger("speed_units"); + } + /** * @param speed_units Speed Units (enumerated) */ @@ -271,7 +287,7 @@ public PopUp setSpeedUnits(SPEED_UNITS speed_units) { /** * @param speed_units Speed Units (as a String) */ - public PopUp setSpeedUnits(String speed_units) { + public PopUp setSpeedUnitsStr(String speed_units) { setValue("speed_units", speed_units); return this; } @@ -279,7 +295,7 @@ public PopUp setSpeedUnits(String speed_units) { /** * @param speed_units Speed Units (integer value) */ - public PopUp setSpeedUnits(short speed_units) { + public PopUp setSpeedUnitsVal(short speed_units) { setValue("speed_units", speed_units); return this; } diff --git a/src-generated/pt/lsts/imc/PowerChannelControl.java b/src-generated/pt/lsts/imc/PowerChannelControl.java index 8c2087ca..9e67e68f 100644 --- a/src-generated/pt/lsts/imc/PowerChannelControl.java +++ b/src-generated/pt/lsts/imc/PowerChannelControl.java @@ -136,6 +136,14 @@ public OP getOp() { } } + public String getOpStr() { + return getString("op"); + } + + public short getOpVal() { + return (short) getInteger("op"); + } + /** * @param op Operation (enumerated) */ @@ -147,7 +155,7 @@ public PowerChannelControl setOp(OP op) { /** * @param op Operation (as a String) */ - public PowerChannelControl setOp(String op) { + public PowerChannelControl setOpStr(String op) { setValue("op", op); return this; } @@ -155,7 +163,7 @@ public PowerChannelControl setOp(String op) { /** * @param op Operation (integer value) */ - public PowerChannelControl setOp(short op) { + public PowerChannelControl setOpVal(short op) { setValue("op", op); return this; } diff --git a/src-generated/pt/lsts/imc/PowerChannelState.java b/src-generated/pt/lsts/imc/PowerChannelState.java index 7d3c41d1..dfb68463 100644 --- a/src-generated/pt/lsts/imc/PowerChannelState.java +++ b/src-generated/pt/lsts/imc/PowerChannelState.java @@ -130,6 +130,14 @@ public STATE getState() { } } + public String getStateStr() { + return getString("state"); + } + + public short getStateVal() { + return (short) getInteger("state"); + } + /** * @param state State (enumerated) */ @@ -141,7 +149,7 @@ public PowerChannelState setState(STATE state) { /** * @param state State (as a String) */ - public PowerChannelState setState(String state) { + public PowerChannelState setStateStr(String state) { setValue("state", state); return this; } @@ -149,7 +157,7 @@ public PowerChannelState setState(String state) { /** * @param state State (integer value) */ - public PowerChannelState setState(short state) { + public PowerChannelState setStateVal(short state) { setValue("state", state); return this; } diff --git a/src-generated/pt/lsts/imc/PowerOperation.java b/src-generated/pt/lsts/imc/PowerOperation.java index 142c2fc2..265f88f5 100644 --- a/src-generated/pt/lsts/imc/PowerOperation.java +++ b/src-generated/pt/lsts/imc/PowerOperation.java @@ -120,6 +120,14 @@ public OP getOp() { } } + public String getOpStr() { + return getString("op"); + } + + public short getOpVal() { + return (short) getInteger("op"); + } + /** * @param op Operation (enumerated) */ @@ -131,7 +139,7 @@ public PowerOperation setOp(OP op) { /** * @param op Operation (as a String) */ - public PowerOperation setOp(String op) { + public PowerOperation setOpStr(String op) { setValue("op", op); return this; } @@ -139,7 +147,7 @@ public PowerOperation setOp(String op) { /** * @param op Operation (integer value) */ - public PowerOperation setOp(short op) { + public PowerOperation setOpVal(short op) { setValue("op", op); return this; } diff --git a/src-generated/pt/lsts/imc/PulseDetectionControl.java b/src-generated/pt/lsts/imc/PulseDetectionControl.java index d48618f1..b5f9a349 100644 --- a/src-generated/pt/lsts/imc/PulseDetectionControl.java +++ b/src-generated/pt/lsts/imc/PulseDetectionControl.java @@ -113,6 +113,14 @@ public OP getOp() { } } + public String getOpStr() { + return getString("op"); + } + + public short getOpVal() { + return (short) getInteger("op"); + } + /** * @param op Operation (enumerated) */ @@ -124,7 +132,7 @@ public PulseDetectionControl setOp(OP op) { /** * @param op Operation (as a String) */ - public PulseDetectionControl setOp(String op) { + public PulseDetectionControl setOpStr(String op) { setValue("op", op); return this; } @@ -132,7 +140,7 @@ public PulseDetectionControl setOp(String op) { /** * @param op Operation (integer value) */ - public PulseDetectionControl setOp(short op) { + public PulseDetectionControl setOpVal(short op) { setValue("op", op); return this; } diff --git a/src-generated/pt/lsts/imc/RemoteActionsRequest.java b/src-generated/pt/lsts/imc/RemoteActionsRequest.java index 51691b78..fd0228a7 100644 --- a/src-generated/pt/lsts/imc/RemoteActionsRequest.java +++ b/src-generated/pt/lsts/imc/RemoteActionsRequest.java @@ -120,6 +120,14 @@ public OP getOp() { } } + public String getOpStr() { + return getString("op"); + } + + public short getOpVal() { + return (short) getInteger("op"); + } + /** * @param op operation (enumerated) */ @@ -131,7 +139,7 @@ public RemoteActionsRequest setOp(OP op) { /** * @param op operation (as a String) */ - public RemoteActionsRequest setOp(String op) { + public RemoteActionsRequest setOpStr(String op) { setValue("op", op); return this; } @@ -139,7 +147,7 @@ public RemoteActionsRequest setOp(String op) { /** * @param op operation (integer value) */ - public RemoteActionsRequest setOp(short op) { + public RemoteActionsRequest setOpVal(short op) { setValue("op", op); return this; } diff --git a/src-generated/pt/lsts/imc/ReplayControl.java b/src-generated/pt/lsts/imc/ReplayControl.java index 75167199..a676fb72 100644 --- a/src-generated/pt/lsts/imc/ReplayControl.java +++ b/src-generated/pt/lsts/imc/ReplayControl.java @@ -117,6 +117,14 @@ public OP getOp() { } } + public String getOpStr() { + return getString("op"); + } + + public short getOpVal() { + return (short) getInteger("op"); + } + /** * @param op Operation (enumerated) */ @@ -128,7 +136,7 @@ public ReplayControl setOp(OP op) { /** * @param op Operation (as a String) */ - public ReplayControl setOp(String op) { + public ReplayControl setOpStr(String op) { setValue("op", op); return this; } @@ -136,7 +144,7 @@ public ReplayControl setOp(String op) { /** * @param op Operation (integer value) */ - public ReplayControl setOp(short op) { + public ReplayControl setOpVal(short op) { setValue("op", op); return this; } diff --git a/src-generated/pt/lsts/imc/ReportedState.java b/src-generated/pt/lsts/imc/ReportedState.java index c0af0152..d5031728 100644 --- a/src-generated/pt/lsts/imc/ReportedState.java +++ b/src-generated/pt/lsts/imc/ReportedState.java @@ -245,6 +245,14 @@ public S_TYPE getSType() { } } + public String getSTypeStr() { + return getString("s_type"); + } + + public short getSTypeVal() { + return (short) getInteger("s_type"); + } + /** * @param s_type Source Type (enumerated) */ @@ -256,7 +264,7 @@ public ReportedState setSType(S_TYPE s_type) { /** * @param s_type Source Type (as a String) */ - public ReportedState setSType(String s_type) { + public ReportedState setSTypeStr(String s_type) { setValue("s_type", s_type); return this; } @@ -264,7 +272,7 @@ public ReportedState setSType(String s_type) { /** * @param s_type Source Type (integer value) */ - public ReportedState setSType(short s_type) { + public ReportedState setSTypeVal(short s_type) { setValue("s_type", s_type); return this; } diff --git a/src-generated/pt/lsts/imc/Rows.java b/src-generated/pt/lsts/imc/Rows.java index 501667fa..c4867e07 100644 --- a/src-generated/pt/lsts/imc/Rows.java +++ b/src-generated/pt/lsts/imc/Rows.java @@ -211,6 +211,14 @@ public Z_UNITS getZUnits() { } } + public String getZUnitsStr() { + return getString("z_units"); + } + + public short getZUnitsVal() { + return (short) getInteger("z_units"); + } + /** * @param z_units Z Units (enumerated) */ @@ -222,7 +230,7 @@ public Rows setZUnits(Z_UNITS z_units) { /** * @param z_units Z Units (as a String) */ - public Rows setZUnits(String z_units) { + public Rows setZUnitsStr(String z_units) { setValue("z_units", z_units); return this; } @@ -230,7 +238,7 @@ public Rows setZUnits(String z_units) { /** * @param z_units Z Units (integer value) */ - public Rows setZUnits(short z_units) { + public Rows setZUnitsVal(short z_units) { setValue("z_units", z_units); return this; } @@ -263,6 +271,14 @@ public SPEED_UNITS getSpeedUnits() { } } + public String getSpeedUnitsStr() { + return getString("speed_units"); + } + + public short getSpeedUnitsVal() { + return (short) getInteger("speed_units"); + } + /** * @param speed_units Speed Units (enumerated) */ @@ -274,7 +290,7 @@ public Rows setSpeedUnits(SPEED_UNITS speed_units) { /** * @param speed_units Speed Units (as a String) */ - public Rows setSpeedUnits(String speed_units) { + public Rows setSpeedUnitsStr(String speed_units) { setValue("speed_units", speed_units); return this; } @@ -282,7 +298,7 @@ public Rows setSpeedUnits(String speed_units) { /** * @param speed_units Speed Units (integer value) */ - public Rows setSpeedUnits(short speed_units) { + public Rows setSpeedUnitsVal(short speed_units) { setValue("speed_units", speed_units); return this; } diff --git a/src-generated/pt/lsts/imc/SessionStatus.java b/src-generated/pt/lsts/imc/SessionStatus.java index 20a13eea..10412769 100644 --- a/src-generated/pt/lsts/imc/SessionStatus.java +++ b/src-generated/pt/lsts/imc/SessionStatus.java @@ -129,6 +129,14 @@ public STATUS getStatus() { } } + public String getStatusStr() { + return getString("status"); + } + + public short getStatusVal() { + return (short) getInteger("status"); + } + /** * @param status Status (enumerated) */ @@ -140,7 +148,7 @@ public SessionStatus setStatus(STATUS status) { /** * @param status Status (as a String) */ - public SessionStatus setStatus(String status) { + public SessionStatus setStatusStr(String status) { setValue("status", status); return this; } @@ -148,7 +156,7 @@ public SessionStatus setStatus(String status) { /** * @param status Status (integer value) */ - public SessionStatus setStatus(short status) { + public SessionStatus setStatusVal(short status) { setValue("status", status); return this; } diff --git a/src-generated/pt/lsts/imc/SmsState.java b/src-generated/pt/lsts/imc/SmsState.java index 843f6e3b..cdd2b3ec 100644 --- a/src-generated/pt/lsts/imc/SmsState.java +++ b/src-generated/pt/lsts/imc/SmsState.java @@ -135,6 +135,14 @@ public STATE getState() { } } + public String getStateStr() { + return getString("state"); + } + + public short getStateVal() { + return (short) getInteger("state"); + } + /** * @param state State (enumerated) */ @@ -146,7 +154,7 @@ public SmsState setState(STATE state) { /** * @param state State (as a String) */ - public SmsState setState(String state) { + public SmsState setStateStr(String state) { setValue("state", state); return this; } @@ -154,7 +162,7 @@ public SmsState setState(String state) { /** * @param state State (integer value) */ - public SmsState setState(short state) { + public SmsState setStateVal(short state) { setValue("state", state); return this; } diff --git a/src-generated/pt/lsts/imc/SonarData.java b/src-generated/pt/lsts/imc/SonarData.java index f3ae8fe9..f948f386 100644 --- a/src-generated/pt/lsts/imc/SonarData.java +++ b/src-generated/pt/lsts/imc/SonarData.java @@ -124,6 +124,14 @@ public TYPE getType() { } } + public String getTypeStr() { + return getString("type"); + } + + public short getTypeVal() { + return (short) getInteger("type"); + } + /** * @param type Type (enumerated) */ @@ -135,7 +143,7 @@ public SonarData setType(TYPE type) { /** * @param type Type (as a String) */ - public SonarData setType(String type) { + public SonarData setTypeStr(String type) { setValue("type", type); return this; } @@ -143,7 +151,7 @@ public SonarData setType(String type) { /** * @param type Type (integer value) */ - public SonarData setType(short type) { + public SonarData setTypeVal(short type) { setValue("type", type); return this; } diff --git a/src-generated/pt/lsts/imc/StationKeeping.java b/src-generated/pt/lsts/imc/StationKeeping.java index af8a99de..8b23272d 100644 --- a/src-generated/pt/lsts/imc/StationKeeping.java +++ b/src-generated/pt/lsts/imc/StationKeeping.java @@ -188,6 +188,14 @@ public Z_UNITS getZUnits() { } } + public String getZUnitsStr() { + return getString("z_units"); + } + + public short getZUnitsVal() { + return (short) getInteger("z_units"); + } + /** * @param z_units Z Units (enumerated) */ @@ -199,7 +207,7 @@ public StationKeeping setZUnits(Z_UNITS z_units) { /** * @param z_units Z Units (as a String) */ - public StationKeeping setZUnits(String z_units) { + public StationKeeping setZUnitsStr(String z_units) { setValue("z_units", z_units); return this; } @@ -207,7 +215,7 @@ public StationKeeping setZUnits(String z_units) { /** * @param z_units Z Units (integer value) */ - public StationKeeping setZUnits(short z_units) { + public StationKeeping setZUnitsVal(short z_units) { setValue("z_units", z_units); return this; } @@ -270,6 +278,14 @@ public SPEED_UNITS getSpeedUnits() { } } + public String getSpeedUnitsStr() { + return getString("speed_units"); + } + + public short getSpeedUnitsVal() { + return (short) getInteger("speed_units"); + } + /** * @param speed_units Speed Units (enumerated) */ @@ -281,7 +297,7 @@ public StationKeeping setSpeedUnits(SPEED_UNITS speed_units) { /** * @param speed_units Speed Units (as a String) */ - public StationKeeping setSpeedUnits(String speed_units) { + public StationKeeping setSpeedUnitsStr(String speed_units) { setValue("speed_units", speed_units); return this; } @@ -289,7 +305,7 @@ public StationKeeping setSpeedUnits(String speed_units) { /** * @param speed_units Speed Units (integer value) */ - public StationKeeping setSpeedUnits(short speed_units) { + public StationKeeping setSpeedUnitsVal(short speed_units) { setValue("speed_units", speed_units); return this; } diff --git a/src-generated/pt/lsts/imc/SystemGroup.java b/src-generated/pt/lsts/imc/SystemGroup.java index 794364a7..df8f0063 100644 --- a/src-generated/pt/lsts/imc/SystemGroup.java +++ b/src-generated/pt/lsts/imc/SystemGroup.java @@ -136,6 +136,14 @@ public ACTION getAction() { } } + public String getActionStr() { + return getString("Action"); + } + + public short getActionVal() { + return (short) getInteger("Action"); + } + /** * @param Action Group List Action (enumerated) */ @@ -147,7 +155,7 @@ public SystemGroup setAction(ACTION Action) { /** * @param Action Group List Action (as a String) */ - public SystemGroup setAction(String Action) { + public SystemGroup setActionStr(String Action) { setValue("Action", Action); return this; } @@ -155,7 +163,7 @@ public SystemGroup setAction(String Action) { /** * @param Action Group List Action (integer value) */ - public SystemGroup setAction(short Action) { + public SystemGroup setActionVal(short Action) { setValue("Action", Action); return this; } diff --git a/src-generated/pt/lsts/imc/Target.java b/src-generated/pt/lsts/imc/Target.java index 86ddab9c..b110b655 100644 --- a/src-generated/pt/lsts/imc/Target.java +++ b/src-generated/pt/lsts/imc/Target.java @@ -182,6 +182,14 @@ public Z_UNITS getZUnits() { } } + public String getZUnitsStr() { + return getString("z_units"); + } + + public short getZUnitsVal() { + return (short) getInteger("z_units"); + } + /** * @param z_units Z Units (enumerated) */ @@ -193,7 +201,7 @@ public Target setZUnits(Z_UNITS z_units) { /** * @param z_units Z Units (as a String) */ - public Target setZUnits(String z_units) { + public Target setZUnitsStr(String z_units) { setValue("z_units", z_units); return this; } @@ -201,7 +209,7 @@ public Target setZUnits(String z_units) { /** * @param z_units Z Units (integer value) */ - public Target setZUnits(short z_units) { + public Target setZUnitsVal(short z_units) { setValue("z_units", z_units); return this; } diff --git a/src-generated/pt/lsts/imc/TrexAttribute.java b/src-generated/pt/lsts/imc/TrexAttribute.java index 65f1dfbb..cb2bc682 100644 --- a/src-generated/pt/lsts/imc/TrexAttribute.java +++ b/src-generated/pt/lsts/imc/TrexAttribute.java @@ -136,6 +136,14 @@ public ATTR_TYPE getAttrType() { } } + public String getAttrTypeStr() { + return getString("attr_type"); + } + + public short getAttrTypeVal() { + return (short) getInteger("attr_type"); + } + /** * @param attr_type Attribute type (enumerated) */ @@ -147,7 +155,7 @@ public TrexAttribute setAttrType(ATTR_TYPE attr_type) { /** * @param attr_type Attribute type (as a String) */ - public TrexAttribute setAttrType(String attr_type) { + public TrexAttribute setAttrTypeStr(String attr_type) { setValue("attr_type", attr_type); return this; } @@ -155,7 +163,7 @@ public TrexAttribute setAttrType(String attr_type) { /** * @param attr_type Attribute type (integer value) */ - public TrexAttribute setAttrType(short attr_type) { + public TrexAttribute setAttrTypeVal(short attr_type) { setValue("attr_type", attr_type); return this; } diff --git a/src-generated/pt/lsts/imc/TrexCommand.java b/src-generated/pt/lsts/imc/TrexCommand.java index a3e78038..d2c3fdc4 100644 --- a/src-generated/pt/lsts/imc/TrexCommand.java +++ b/src-generated/pt/lsts/imc/TrexCommand.java @@ -121,6 +121,14 @@ public COMMAND getCommand() { } } + public String getCommandStr() { + return getString("command"); + } + + public short getCommandVal() { + return (short) getInteger("command"); + } + /** * @param command Command (enumerated) */ @@ -132,7 +140,7 @@ public TrexCommand setCommand(COMMAND command) { /** * @param command Command (as a String) */ - public TrexCommand setCommand(String command) { + public TrexCommand setCommandStr(String command) { setValue("command", command); return this; } @@ -140,7 +148,7 @@ public TrexCommand setCommand(String command) { /** * @param command Command (integer value) */ - public TrexCommand setCommand(short command) { + public TrexCommand setCommandVal(short command) { setValue("command", command); return this; } diff --git a/src-generated/pt/lsts/imc/TrexOperation.java b/src-generated/pt/lsts/imc/TrexOperation.java index e5152831..660cbb8d 100644 --- a/src-generated/pt/lsts/imc/TrexOperation.java +++ b/src-generated/pt/lsts/imc/TrexOperation.java @@ -120,6 +120,14 @@ public OP getOp() { } } + public String getOpStr() { + return getString("op"); + } + + public short getOpVal() { + return (short) getInteger("op"); + } + /** * @param op Operation (enumerated) */ @@ -131,7 +139,7 @@ public TrexOperation setOp(OP op) { /** * @param op Operation (as a String) */ - public TrexOperation setOp(String op) { + public TrexOperation setOpStr(String op) { setValue("op", op); return this; } @@ -139,7 +147,7 @@ public TrexOperation setOp(String op) { /** * @param op Operation (integer value) */ - public TrexOperation setOp(short op) { + public TrexOperation setOpVal(short op) { setValue("op", op); return this; } diff --git a/src-generated/pt/lsts/imc/UASimulation.java b/src-generated/pt/lsts/imc/UASimulation.java index b25cf14e..22cc9159 100644 --- a/src-generated/pt/lsts/imc/UASimulation.java +++ b/src-generated/pt/lsts/imc/UASimulation.java @@ -117,6 +117,14 @@ public TYPE getType() { } } + public String getTypeStr() { + return getString("type"); + } + + public short getTypeVal() { + return (short) getInteger("type"); + } + /** * @param type Type (enumerated) */ @@ -128,7 +136,7 @@ public UASimulation setType(TYPE type) { /** * @param type Type (as a String) */ - public UASimulation setType(String type) { + public UASimulation setTypeStr(String type) { setValue("type", type); return this; } @@ -136,7 +144,7 @@ public UASimulation setType(String type) { /** * @param type Type (integer value) */ - public UASimulation setType(short type) { + public UASimulation setTypeVal(short type) { setValue("type", type); return this; } diff --git a/src-generated/pt/lsts/imc/UamTxStatus.java b/src-generated/pt/lsts/imc/UamTxStatus.java index e8a40a3a..903ec6bd 100644 --- a/src-generated/pt/lsts/imc/UamTxStatus.java +++ b/src-generated/pt/lsts/imc/UamTxStatus.java @@ -134,6 +134,14 @@ public VALUE getValue() { } } + public String getValueStr() { + return getString("value"); + } + + public short getValueVal() { + return (short) getInteger("value"); + } + /** * @param value Value (enumerated) */ @@ -145,7 +153,7 @@ public UamTxStatus setValue(VALUE value) { /** * @param value Value (as a String) */ - public UamTxStatus setValue(String value) { + public UamTxStatus setValueStr(String value) { setValue("value", value); return this; } @@ -153,7 +161,7 @@ public UamTxStatus setValue(String value) { /** * @param value Value (integer value) */ - public UamTxStatus setValue(short value) { + public UamTxStatus setValueVal(short value) { setValue("value", value); return this; } diff --git a/src-generated/pt/lsts/imc/UsblFix.java b/src-generated/pt/lsts/imc/UsblFix.java index 8455bcc1..6a13194f 100644 --- a/src-generated/pt/lsts/imc/UsblFix.java +++ b/src-generated/pt/lsts/imc/UsblFix.java @@ -165,6 +165,14 @@ public Z_UNITS getZUnits() { } } + public String getZUnitsStr() { + return getString("z_units"); + } + + public short getZUnitsVal() { + return (short) getInteger("z_units"); + } + /** * @param z_units Z Units (enumerated) */ @@ -176,7 +184,7 @@ public UsblFix setZUnits(Z_UNITS z_units) { /** * @param z_units Z Units (as a String) */ - public UsblFix setZUnits(String z_units) { + public UsblFix setZUnitsStr(String z_units) { setValue("z_units", z_units); return this; } @@ -184,7 +192,7 @@ public UsblFix setZUnits(String z_units) { /** * @param z_units Z Units (integer value) */ - public UsblFix setZUnits(short z_units) { + public UsblFix setZUnitsVal(short z_units) { setValue("z_units", z_units); return this; } diff --git a/src-generated/pt/lsts/imc/VehicleCommand.java b/src-generated/pt/lsts/imc/VehicleCommand.java index fc77790d..23ed2944 100644 --- a/src-generated/pt/lsts/imc/VehicleCommand.java +++ b/src-generated/pt/lsts/imc/VehicleCommand.java @@ -139,6 +139,14 @@ public TYPE getType() { } } + public String getTypeStr() { + return getString("type"); + } + + public short getTypeVal() { + return (short) getInteger("type"); + } + /** * @param type Type (enumerated) */ @@ -150,7 +158,7 @@ public VehicleCommand setType(TYPE type) { /** * @param type Type (as a String) */ - public VehicleCommand setType(String type) { + public VehicleCommand setTypeStr(String type) { setValue("type", type); return this; } @@ -158,7 +166,7 @@ public VehicleCommand setType(String type) { /** * @param type Type (integer value) */ - public VehicleCommand setType(short type) { + public VehicleCommand setTypeVal(short type) { setValue("type", type); return this; } @@ -191,6 +199,14 @@ public COMMAND getCommand() { } } + public String getCommandStr() { + return getString("command"); + } + + public short getCommandVal() { + return (short) getInteger("command"); + } + /** * @param command Command (enumerated) */ @@ -202,7 +218,7 @@ public VehicleCommand setCommand(COMMAND command) { /** * @param command Command (as a String) */ - public VehicleCommand setCommand(String command) { + public VehicleCommand setCommandStr(String command) { setValue("command", command); return this; } @@ -210,7 +226,7 @@ public VehicleCommand setCommand(String command) { /** * @param command Command (integer value) */ - public VehicleCommand setCommand(short command) { + public VehicleCommand setCommandVal(short command) { setValue("command", command); return this; } diff --git a/src-generated/pt/lsts/imc/VehicleFormation.java b/src-generated/pt/lsts/imc/VehicleFormation.java index 7da2f722..737203f9 100644 --- a/src-generated/pt/lsts/imc/VehicleFormation.java +++ b/src-generated/pt/lsts/imc/VehicleFormation.java @@ -189,6 +189,14 @@ public Z_UNITS getZUnits() { } } + public String getZUnitsStr() { + return getString("z_units"); + } + + public short getZUnitsVal() { + return (short) getInteger("z_units"); + } + /** * @param z_units Z Units (enumerated) */ @@ -200,7 +208,7 @@ public VehicleFormation setZUnits(Z_UNITS z_units) { /** * @param z_units Z Units (as a String) */ - public VehicleFormation setZUnits(String z_units) { + public VehicleFormation setZUnitsStr(String z_units) { setValue("z_units", z_units); return this; } @@ -208,7 +216,7 @@ public VehicleFormation setZUnits(String z_units) { /** * @param z_units Z Units (integer value) */ - public VehicleFormation setZUnits(short z_units) { + public VehicleFormation setZUnitsVal(short z_units) { setValue("z_units", z_units); return this; } @@ -241,6 +249,14 @@ public SPEED_UNITS getSpeedUnits() { } } + public String getSpeedUnitsStr() { + return getString("speed_units"); + } + + public short getSpeedUnitsVal() { + return (short) getInteger("speed_units"); + } + /** * @param speed_units Speed Units (enumerated) */ @@ -252,7 +268,7 @@ public VehicleFormation setSpeedUnits(SPEED_UNITS speed_units) { /** * @param speed_units Speed Units (as a String) */ - public VehicleFormation setSpeedUnits(String speed_units) { + public VehicleFormation setSpeedUnitsStr(String speed_units) { setValue("speed_units", speed_units); return this; } @@ -260,7 +276,7 @@ public VehicleFormation setSpeedUnits(String speed_units) { /** * @param speed_units Speed Units (integer value) */ - public VehicleFormation setSpeedUnits(short speed_units) { + public VehicleFormation setSpeedUnitsVal(short speed_units) { setValue("speed_units", speed_units); return this; } diff --git a/src-generated/pt/lsts/imc/VehicleMedium.java b/src-generated/pt/lsts/imc/VehicleMedium.java index 89ab94a9..3da3ef8e 100644 --- a/src-generated/pt/lsts/imc/VehicleMedium.java +++ b/src-generated/pt/lsts/imc/VehicleMedium.java @@ -116,6 +116,14 @@ public MEDIUM getMedium() { } } + public String getMediumStr() { + return getString("medium"); + } + + public short getMediumVal() { + return (short) getInteger("medium"); + } + /** * @param medium Medium (enumerated) */ @@ -127,7 +135,7 @@ public VehicleMedium setMedium(MEDIUM medium) { /** * @param medium Medium (as a String) */ - public VehicleMedium setMedium(String medium) { + public VehicleMedium setMediumStr(String medium) { setValue("medium", medium); return this; } @@ -135,7 +143,7 @@ public VehicleMedium setMedium(String medium) { /** * @param medium Medium (integer value) */ - public VehicleMedium setMedium(short medium) { + public VehicleMedium setMediumVal(short medium) { setValue("medium", medium); return this; } diff --git a/src-generated/pt/lsts/imc/VehicleOperationalLimits.java b/src-generated/pt/lsts/imc/VehicleOperationalLimits.java index ce246873..3d03d042 100644 --- a/src-generated/pt/lsts/imc/VehicleOperationalLimits.java +++ b/src-generated/pt/lsts/imc/VehicleOperationalLimits.java @@ -132,6 +132,14 @@ public OP getOp() { } } + public String getOpStr() { + return getString("op"); + } + + public short getOpVal() { + return (short) getInteger("op"); + } + /** * @param op Action on the vehicle operational limits (enumerated) */ @@ -143,7 +151,7 @@ public VehicleOperationalLimits setOp(OP op) { /** * @param op Action on the vehicle operational limits (as a String) */ - public VehicleOperationalLimits setOp(String op) { + public VehicleOperationalLimits setOpStr(String op) { setValue("op", op); return this; } @@ -151,7 +159,7 @@ public VehicleOperationalLimits setOp(String op) { /** * @param op Action on the vehicle operational limits (integer value) */ - public VehicleOperationalLimits setOp(short op) { + public VehicleOperationalLimits setOpVal(short op) { setValue("op", op); return this; } diff --git a/src-generated/pt/lsts/imc/VehicleState.java b/src-generated/pt/lsts/imc/VehicleState.java index 7fa41f31..641d8c9e 100644 --- a/src-generated/pt/lsts/imc/VehicleState.java +++ b/src-generated/pt/lsts/imc/VehicleState.java @@ -152,6 +152,14 @@ public OP_MODE getOpMode() { } } + public String getOpModeStr() { + return getString("op_mode"); + } + + public short getOpModeVal() { + return (short) getInteger("op_mode"); + } + /** * @param op_mode Operation Mode (enumerated) */ @@ -163,7 +171,7 @@ public VehicleState setOpMode(OP_MODE op_mode) { /** * @param op_mode Operation Mode (as a String) */ - public VehicleState setOpMode(String op_mode) { + public VehicleState setOpModeStr(String op_mode) { setValue("op_mode", op_mode); return this; } @@ -171,7 +179,7 @@ public VehicleState setOpMode(String op_mode) { /** * @param op_mode Operation Mode (integer value) */ - public VehicleState setOpMode(short op_mode) { + public VehicleState setOpModeVal(short op_mode) { setValue("op_mode", op_mode); return this; } diff --git a/src-generated/pt/lsts/imc/YoYo.java b/src-generated/pt/lsts/imc/YoYo.java index d2d87d79..625c6aa0 100644 --- a/src-generated/pt/lsts/imc/YoYo.java +++ b/src-generated/pt/lsts/imc/YoYo.java @@ -204,6 +204,14 @@ public Z_UNITS getZUnits() { } } + public String getZUnitsStr() { + return getString("z_units"); + } + + public short getZUnitsVal() { + return (short) getInteger("z_units"); + } + /** * @param z_units Z Units (enumerated) */ @@ -215,7 +223,7 @@ public YoYo setZUnits(Z_UNITS z_units) { /** * @param z_units Z Units (as a String) */ - public YoYo setZUnits(String z_units) { + public YoYo setZUnitsStr(String z_units) { setValue("z_units", z_units); return this; } @@ -223,7 +231,7 @@ public YoYo setZUnits(String z_units) { /** * @param z_units Z Units (integer value) */ - public YoYo setZUnits(short z_units) { + public YoYo setZUnitsVal(short z_units) { setValue("z_units", z_units); return this; } @@ -286,6 +294,14 @@ public SPEED_UNITS getSpeedUnits() { } } + public String getSpeedUnitsStr() { + return getString("speed_units"); + } + + public short getSpeedUnitsVal() { + return (short) getInteger("speed_units"); + } + /** * @param speed_units Speed Units (enumerated) */ @@ -297,7 +313,7 @@ public YoYo setSpeedUnits(SPEED_UNITS speed_units) { /** * @param speed_units Speed Units (as a String) */ - public YoYo setSpeedUnits(String speed_units) { + public YoYo setSpeedUnitsStr(String speed_units) { setValue("speed_units", speed_units); return this; } @@ -305,7 +321,7 @@ public YoYo setSpeedUnits(String speed_units) { /** * @param speed_units Speed Units (integer value) */ - public YoYo setSpeedUnits(short speed_units) { + public YoYo setSpeedUnitsVal(short speed_units) { setValue("speed_units", speed_units); return this; } diff --git a/src-generator/pt/lsts/imc/generator/ClassGenerator.java b/src-generator/pt/lsts/imc/generator/ClassGenerator.java index ac9f99aa..5d80c22f 100644 --- a/src-generator/pt/lsts/imc/generator/ClassGenerator.java +++ b/src-generator/pt/lsts/imc/generator/ClassGenerator.java @@ -479,7 +479,7 @@ protected static String generateSetters(IMCMessageType type, String field, + type.getFullFieldName(field) + " (as a String)\n\t */\n"); sb.append("\tpublic " + type.getShortName() + " set" - + capitalizedField + "(String " + field + ") {\n"); + + capitalizedField + "Str(String " + field + ") {\n"); sb.append("\t\tsetValue(\"" + field + "\", " + field + ");\n"); sb.append("\t\treturn this;\n"); sb.append("\t}\n\n"); @@ -488,7 +488,7 @@ protected static String generateSetters(IMCMessageType type, String field, + type.getFullFieldName(field) + " (integer value)\n\t */\n"); sb.append("\tpublic " + type.getShortName() + " set" - + capitalizedField + "(byte " + field + ") {\n"); + + capitalizedField + "Val(byte " + field + ") {\n"); sb.append("\t\tsetValue(\"" + field + "\", " + field + ");\n"); sb.append("\t\treturn this;\n"); sb.append("\t}\n\n"); @@ -516,7 +516,7 @@ protected static String generateSetters(IMCMessageType type, String field, + type.getFullFieldName(field) + " (as a String)\n\t */\n"); sb.append("\tpublic " + type.getShortName() + " set" - + capitalizedField + "(String " + field + ") {\n"); + + capitalizedField + "Str(String " + field + ") {\n"); sb.append("\t\tsetValue(\"" + field + "\", " + field + ");\n"); sb.append("\t\treturn this;\n"); sb.append("\t}\n\n"); @@ -525,7 +525,7 @@ protected static String generateSetters(IMCMessageType type, String field, + type.getFullFieldName(field) + " (integer value)\n\t */\n"); sb.append("\tpublic " + type.getShortName() + " set" - + capitalizedField + "(short " + field + ") {\n"); + + capitalizedField + "Val(short " + field + ") {\n"); sb.append("\t\tsetValue(\"" + field + "\", " + field + ");\n"); sb.append("\t\treturn this;\n"); sb.append("\t}\n\n"); @@ -553,7 +553,7 @@ protected static String generateSetters(IMCMessageType type, String field, + type.getFullFieldName(field) + " (as a String)\n\t */\n"); sb.append("\tpublic " + type.getShortName() + " set" - + capitalizedField + "(String " + field + ") {\n"); + + capitalizedField + "Str(String " + field + ") {\n"); sb.append("\t\tsetValue(\"" + field + "\", " + field + ");\n"); sb.append("\t\treturn this;\n"); sb.append("\t}\n\n"); @@ -562,7 +562,7 @@ protected static String generateSetters(IMCMessageType type, String field, + type.getFullFieldName(field) + " (integer value)\n\t */\n"); sb.append("\tpublic " + type.getShortName() + " set" - + capitalizedField + "(int " + field + ") {\n"); + + capitalizedField + "Val(int " + field + ") {\n"); sb.append("\t\tsetValue(\"" + field + "\", " + field + ");\n"); sb.append("\t\treturn this;\n"); sb.append("\t}\n\n"); @@ -740,6 +740,17 @@ protected static String generateGetters(IMCMessageType type, String field, sb.append("\t\t\treturn null;\n"); sb.append("\t\t}\n"); sb.append("\t}\n\n"); + + sb.append("\tpublic String get" + capitalizedField + + "Str() {\n"); + sb.append("\t\treturn getString(\"" + field + "\");\n"); + sb.append("\t}\n\n"); + + sb.append("\tpublic byte get" + capitalizedField + + "Val() {\n"); + sb.append("\t\treturn (byte) getInteger(\"" + field + "\");\n"); + sb.append("\t}\n\n"); + } else { sb.append("\tpublic byte get" + capitalizedField + "() {\n"); sb.append("\t\treturn (byte) getInteger(\"" + field + "\");\n"); @@ -762,6 +773,17 @@ protected static String generateGetters(IMCMessageType type, String field, sb.append("\t\t\treturn null;\n"); sb.append("\t\t}\n"); sb.append("\t}\n\n"); + + sb.append("\tpublic String get" + capitalizedField + + "Str() {\n"); + sb.append("\t\treturn getString(\"" + field + "\");\n"); + sb.append("\t}\n\n"); + + sb.append("\tpublic short get" + capitalizedField + + "Val() {\n"); + sb.append("\t\treturn (short) getInteger(\"" + field + "\");\n"); + sb.append("\t}\n\n"); + } else { sb.append("\tpublic short get" + capitalizedField + "() {\n"); sb.append("\t\treturn (short) getInteger(\"" + field + "\");\n"); @@ -784,6 +806,17 @@ protected static String generateGetters(IMCMessageType type, String field, sb.append("\t\t\treturn null;\n"); sb.append("\t\t}\n"); sb.append("\t}\n\n"); + + sb.append("\tpublic String get" + capitalizedField + + "Str() {\n"); + sb.append("\t\treturn getString(\"" + field + "\");\n"); + sb.append("\t}\n\n"); + + sb.append("\tpublic int get" + capitalizedField + + "Val() {\n"); + sb.append("\t\treturn getInteger(\"" + field + "\");\n"); + sb.append("\t}\n\n"); + } else { sb.append("\tpublic int get" + capitalizedField + "() {\n"); sb.append("\t\treturn getInteger(\"" + field + "\");\n"); diff --git a/src/pt/lsts/imc/net/IMCProtocol.java b/src/pt/lsts/imc/net/IMCProtocol.java index e1155ec2..bbdac78f 100644 --- a/src/pt/lsts/imc/net/IMCProtocol.java +++ b/src/pt/lsts/imc/net/IMCProtocol.java @@ -87,9 +87,9 @@ private void on(Announce msg) { if (!announces.containsKey(src_id)) { System.out.println("[IMCProtocol] New node within range: " + msg.getSysName()); - + // Check if this is a peer (a name we should auto connect to) - boolean peer = Pattern.matches(autoConnect, msg.getSysName()); + boolean peer = Pattern.matches(autoConnect, msg.getSysName()); IMCNode node = new IMCNode(msg); node.setPeer(peer); announces.put(src_id, node); @@ -641,6 +641,31 @@ public void setAutoConnect(String autoConnect) { this.autoConnect = autoConnect; } + /** + * This method blocks until a system whose name matches a regular expression + * is found on the network or null if time has expired. + * + * @param systemExpr The regular expression to look for + * @param timeoutMillis The maximum amount of time to block + * @return The name of the system found + */ + public String waitFor(String systemExpr, long timeoutMillis) { + long start = System.currentTimeMillis(); + while (System.currentTimeMillis() - start < timeoutMillis) { + for (String s : systems()) { + if (s.matches(systemExpr)) + return s; + } + try { + Thread.sleep(333); + } + catch (Exception e) { + e.printStackTrace(); + } + } + return null; + } + public static void main(String[] args) throws Exception { IMCProtocol proto = new IMCProtocol(7001); diff --git a/src/pt/lsts/neptus/messages/listener/PeriodicCallbacks.java b/src/pt/lsts/neptus/messages/listener/PeriodicCallbacks.java index 2e895712..7c173e7b 100644 --- a/src/pt/lsts/neptus/messages/listener/PeriodicCallbacks.java +++ b/src/pt/lsts/neptus/messages/listener/PeriodicCallbacks.java @@ -8,7 +8,7 @@ public class PeriodicCallbacks { private static ScheduledExecutorService executor = Executors - .newScheduledThreadPool(0); + .newScheduledThreadPool(1); public static void stopAll() { executor.shutdownNow(); @@ -27,6 +27,7 @@ public static void register(Object pojo) { m.setAccessible(true); final Method method = m; final Object client = pojo; + Runnable callback = new Runnable() { @Override