From 3ec9258fbf929d1e780a32d88920b52815cf883e Mon Sep 17 00:00:00 2001
From: Mike Bailey <jmbailey@nps.edu>
Date: Mon, 19 Aug 2019 14:14:32 -0700
Subject: [PATCH] Use longer enum names, bug in marshalling Bitsets
---
.../edu/nps/moves/dis7/AcknowledgeRPdu.java | 2 +-
.../edu/nps/moves/dis7/ActionRequestRPdu.java | 2 +-
.../nps/moves/dis7/ActionResponseRPdu.java | 2 +-
.../nps/moves/dis7/ArealObjectStatePdu.java | 1 +
.../edu/nps/moves/dis7/CommentRPdu.java | 2 +-
.../edu/nps/moves/dis7/CreateEntityRPdu.java | 2 +-
.../edu/nps/moves/dis7/DataQueryRPdu.java | 2 +-
.../edu/nps/moves/dis7/DataRPdu.java | 2 +-
.../nps/moves/dis7/DirectedEnergyDamage.java | 1 +
.../nps/moves/dis7/DirectedEnergyFirePdu.java | 1 +
.../edu/nps/moves/dis7/EntityStatePdu.java | 1 +
.../moves/dis7/EnvironmentalProcessPdu.java | 1 +
.../edu/nps/moves/dis7/EventReportRPdu.java | 2 +-
src-generated/edu/nps/moves/dis7/IFFPdu.java | 2 +-
.../edu/nps/moves/dis7/LEDetonationPdu.java | 2 +-
.../edu/nps/moves/dis7/LEFirePdu.java | 2 +-
.../moves/dis7/LinearSegmentParameter.java | 2 +
.../edu/nps/moves/dis7/MinefieldStatePdu.java | 1 +
.../nps/moves/dis7/PointObjectStatePdu.java | 2 +
.../edu/nps/moves/dis7/RecordQueryRPdu.java | 2 +-
.../edu/nps/moves/dis7/RecordRPdu.java | 2 +-
.../edu/nps/moves/dis7/RemoveEntityRPdu.java | 2 +-
.../edu/nps/moves/dis7/SetDataRPdu.java | 2 +-
.../edu/nps/moves/dis7/SetRecordRPdu.java | 2 +-
.../edu/nps/moves/dis7/StartResumeRPdu.java | 2 +-
.../edu/nps/moves/dis7/StopFreezePdu.java | 1 +
.../edu/nps/moves/dis7/StopFreezeRPdu.java | 3 +-
src-generated/edu/nps/moves/dis7/TSPIPdu.java | 2 +-
.../moves/dis7/enumerations/DISPDUType.java | 40 -------------------
29 files changed, 31 insertions(+), 59 deletions(-)
diff --git a/src-generated/edu/nps/moves/dis7/AcknowledgeRPdu.java b/src-generated/edu/nps/moves/dis7/AcknowledgeRPdu.java
index 8734775add..728ac82a0c 100644
--- a/src-generated/edu/nps/moves/dis7/AcknowledgeRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/AcknowledgeRPdu.java
@@ -28,7 +28,7 @@ public class AcknowledgeRPdu extends SimulationManagementWithReliabilityFamilyPd
/** Constructor */
public AcknowledgeRPdu()
{
- setPduType( DISPDUType.ACKNOWLEDGE_R );
+ setPduType( DISPDUType.ACKNOWLEDGE_RELIABLE );
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/ActionRequestRPdu.java b/src-generated/edu/nps/moves/dis7/ActionRequestRPdu.java
index a2e746de25..bacc8df1fc 100644
--- a/src-generated/edu/nps/moves/dis7/ActionRequestRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ActionRequestRPdu.java
@@ -46,7 +46,7 @@ public class ActionRequestRPdu extends SimulationManagementWithReliabilityFamily
/** Constructor */
public ActionRequestRPdu()
{
- setPduType( DISPDUType.ACTION_REQUEST_R );
+ setPduType( DISPDUType.ACTION_REQUEST_RELIABLE );
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/ActionResponseRPdu.java b/src-generated/edu/nps/moves/dis7/ActionResponseRPdu.java
index bf187f8398..546580c69d 100644
--- a/src-generated/edu/nps/moves/dis7/ActionResponseRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/ActionResponseRPdu.java
@@ -37,7 +37,7 @@ public class ActionResponseRPdu extends SimulationManagementWithReliabilityFamil
/** Constructor */
public ActionResponseRPdu()
{
- setPduType( DISPDUType.ACTION_RESPONSE_R );
+ setPduType( DISPDUType.ACTION_RESPONSE_RELIABLE );
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/ArealObjectStatePdu.java b/src-generated/edu/nps/moves/dis7/ArealObjectStatePdu.java
index 7f7af49b9a..8e763b59c7 100644
--- a/src-generated/edu/nps/moves/dis7/ArealObjectStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/ArealObjectStatePdu.java
@@ -67,6 +67,7 @@ public int getMarshalledSize()
marshalSize += referencedObjectID.getMarshalledSize();
marshalSize += 2; // updateNumber
marshalSize += forceID.getMarshalledSize();
+ marshalSize += modifications.getMarshalledSize();
marshalSize += objectType.getMarshalledSize();
marshalSize += 4; // specificObjectAppearance
marshalSize += 2; // generalObjectAppearance
diff --git a/src-generated/edu/nps/moves/dis7/CommentRPdu.java b/src-generated/edu/nps/moves/dis7/CommentRPdu.java
index 0f7da02b6e..6d895985db 100644
--- a/src-generated/edu/nps/moves/dis7/CommentRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/CommentRPdu.java
@@ -31,7 +31,7 @@ public class CommentRPdu extends SimulationManagementWithReliabilityFamilyPdu im
/** Constructor */
public CommentRPdu()
{
- setPduType( DISPDUType.COMMENT_R );
+ setPduType( DISPDUType.COMMENT_RELIABLE );
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/CreateEntityRPdu.java b/src-generated/edu/nps/moves/dis7/CreateEntityRPdu.java
index ed6a5c8b39..7323409016 100644
--- a/src-generated/edu/nps/moves/dis7/CreateEntityRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/CreateEntityRPdu.java
@@ -29,7 +29,7 @@ public class CreateEntityRPdu extends SimulationManagementWithReliabilityFamilyP
/** Constructor */
public CreateEntityRPdu()
{
- setPduType( DISPDUType.CREATE_ENTITY_R );
+ setPduType( DISPDUType.CREATE_ENTITY_RELIABLE );
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/DataQueryRPdu.java b/src-generated/edu/nps/moves/dis7/DataQueryRPdu.java
index fb98d2788f..e3dc59d81d 100644
--- a/src-generated/edu/nps/moves/dis7/DataQueryRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DataQueryRPdu.java
@@ -46,7 +46,7 @@ public class DataQueryRPdu extends SimulationManagementWithReliabilityFamilyPdu
/** Constructor */
public DataQueryRPdu()
{
- setPduType( DISPDUType.DATA_QUERY_R );
+ setPduType( DISPDUType.DATA_QUERY_RELIABLE );
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/DataRPdu.java b/src-generated/edu/nps/moves/dis7/DataRPdu.java
index 40d8f2ceae..8e19761c53 100644
--- a/src-generated/edu/nps/moves/dis7/DataRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/DataRPdu.java
@@ -43,7 +43,7 @@ public class DataRPdu extends SimulationManagementWithReliabilityFamilyPdu imple
/** Constructor */
public DataRPdu()
{
- setPduType( DISPDUType.DATA_R );
+ setPduType( DISPDUType.DATA_RELIABLE );
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/DirectedEnergyDamage.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyDamage.java
index 2bc8046900..75f2149f36 100644
--- a/src-generated/edu/nps/moves/dis7/DirectedEnergyDamage.java
+++ b/src-generated/edu/nps/moves/dis7/DirectedEnergyDamage.java
@@ -69,6 +69,7 @@ public int getMarshalledSize()
marshalSize += 4; // temperature
marshalSize += componentIdentification.getMarshalledSize();
marshalSize += componentDamageStatus.getMarshalledSize();
+ marshalSize += componentVisualDamageStatus.getMarshalledSize();
marshalSize += componentVisualSmokeColor.getMarshalledSize();
marshalSize += fireEventID.getMarshalledSize();
marshalSize += 2; // padding2
diff --git a/src-generated/edu/nps/moves/dis7/DirectedEnergyFirePdu.java b/src-generated/edu/nps/moves/dis7/DirectedEnergyFirePdu.java
index 1e11454beb..a856e7ae8e 100644
--- a/src-generated/edu/nps/moves/dis7/DirectedEnergyFirePdu.java
+++ b/src-generated/edu/nps/moves/dis7/DirectedEnergyFirePdu.java
@@ -86,6 +86,7 @@ public int getMarshalledSize()
marshalSize += 4; // pad1
marshalSize += 4; // pulseRepititionFrequency
marshalSize += 4; // pulseWidth
+ marshalSize += flags.getMarshalledSize();
marshalSize += pulseShape.getMarshalledSize();
marshalSize += 1; // pad2
marshalSize += 4; // pad3
diff --git a/src-generated/edu/nps/moves/dis7/EntityStatePdu.java b/src-generated/edu/nps/moves/dis7/EntityStatePdu.java
index 56742e41b5..aa99c7a4fa 100644
--- a/src-generated/edu/nps/moves/dis7/EntityStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/EntityStatePdu.java
@@ -76,6 +76,7 @@ public int getMarshalledSize()
marshalSize += 4; // entityAppearance
marshalSize += deadReckoningParameters.getMarshalledSize();
marshalSize += marking.getMarshalledSize();
+ marshalSize += capabilities.getMarshalledSize();
for(int idx=0; idx < variableParameters.size(); idx++)
{
VariableParameter listElement = variableParameters.get(idx);
diff --git a/src-generated/edu/nps/moves/dis7/EnvironmentalProcessPdu.java b/src-generated/edu/nps/moves/dis7/EnvironmentalProcessPdu.java
index e9af04f6a2..a95b7fcd5a 100644
--- a/src-generated/edu/nps/moves/dis7/EnvironmentalProcessPdu.java
+++ b/src-generated/edu/nps/moves/dis7/EnvironmentalProcessPdu.java
@@ -51,6 +51,7 @@ public int getMarshalledSize()
marshalSize += environementalProcessID.getMarshalledSize();
marshalSize += environmentType.getMarshalledSize();
marshalSize += modelType.getMarshalledSize();
+ marshalSize += environmentStatus.getMarshalledSize();
marshalSize += 2; // numberOfEnvironmentRecords
marshalSize += 2; // sequenceNumber
for(int idx=0; idx < environmentRecords.size(); idx++)
diff --git a/src-generated/edu/nps/moves/dis7/EventReportRPdu.java b/src-generated/edu/nps/moves/dis7/EventReportRPdu.java
index c7be5bd68f..f24a880905 100644
--- a/src-generated/edu/nps/moves/dis7/EventReportRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/EventReportRPdu.java
@@ -37,7 +37,7 @@ public class EventReportRPdu extends SimulationManagementWithReliabilityFamilyPd
/** Constructor */
public EventReportRPdu()
{
- setPduType( DISPDUType.EVENT_REPORT_R );
+ setPduType( DISPDUType.EVENT_REPORT_RELIABLE );
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/IFFPdu.java b/src-generated/edu/nps/moves/dis7/IFFPdu.java
index db5beb9e79..4f0208fb16 100644
--- a/src-generated/edu/nps/moves/dis7/IFFPdu.java
+++ b/src-generated/edu/nps/moves/dis7/IFFPdu.java
@@ -37,7 +37,7 @@ public class IFFPdu extends DistributedEmissionsFamilyPdu implements Serializabl
/** Constructor */
public IFFPdu()
{
- setPduType( DISPDUType.IFF );
+ setPduType( DISPDUType.IDENTIFICATION_FRIEND_OR_FOE );
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/LEDetonationPdu.java b/src-generated/edu/nps/moves/dis7/LEDetonationPdu.java
index 69db424af1..40feac3ca7 100644
--- a/src-generated/edu/nps/moves/dis7/LEDetonationPdu.java
+++ b/src-generated/edu/nps/moves/dis7/LEDetonationPdu.java
@@ -44,7 +44,7 @@ public class LEDetonationPdu extends LiveEntityFamilyPdu implements Serializable
/** Constructor */
public LEDetonationPdu()
{
- setPduType( DISPDUType.LE_DETONATION );
+ setPduType( DISPDUType.LIVE_ENTITY_DETONATION );
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/LEFirePdu.java b/src-generated/edu/nps/moves/dis7/LEFirePdu.java
index a35b04b06f..f8f0173003 100644
--- a/src-generated/edu/nps/moves/dis7/LEFirePdu.java
+++ b/src-generated/edu/nps/moves/dis7/LEFirePdu.java
@@ -38,7 +38,7 @@ public class LEFirePdu extends LiveEntityFamilyPdu implements Serializable
/** Constructor */
public LEFirePdu()
{
- setPduType( DISPDUType.LE_FIRE );
+ setPduType( DISPDUType.LIVE_ENTITY_FIRE );
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/LinearSegmentParameter.java b/src-generated/edu/nps/moves/dis7/LinearSegmentParameter.java
index 5130a3b74b..cf7a730846 100644
--- a/src-generated/edu/nps/moves/dis7/LinearSegmentParameter.java
+++ b/src-generated/edu/nps/moves/dis7/LinearSegmentParameter.java
@@ -59,6 +59,8 @@ public int getMarshalledSize()
int marshalSize = 0;
marshalSize += 1; // segmentNumber
+ marshalSize += segmentModification.getMarshalledSize();
+ marshalSize += generalSegmentAppearance.getMarshalledSize();
marshalSize += 4; // specificSegmentAppearance
marshalSize += segmentLocation.getMarshalledSize();
marshalSize += segmentOrientation.getMarshalledSize();
diff --git a/src-generated/edu/nps/moves/dis7/MinefieldStatePdu.java b/src-generated/edu/nps/moves/dis7/MinefieldStatePdu.java
index 5fd6038c38..8fdc29eb85 100644
--- a/src-generated/edu/nps/moves/dis7/MinefieldStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/MinefieldStatePdu.java
@@ -71,6 +71,7 @@ public int getMarshalledSize()
marshalSize += 2; // numberOfMineTypes
marshalSize += minefieldLocation.getMarshalledSize();
marshalSize += minefieldOrientation.getMarshalledSize();
+ marshalSize += appearance.getMarshalledSize();
marshalSize += protocolMode.getMarshalledSize();
for(int idx=0; idx < perimeterPoints.size(); idx++)
{
diff --git a/src-generated/edu/nps/moves/dis7/PointObjectStatePdu.java b/src-generated/edu/nps/moves/dis7/PointObjectStatePdu.java
index 69ae281ddb..e336505e01 100644
--- a/src-generated/edu/nps/moves/dis7/PointObjectStatePdu.java
+++ b/src-generated/edu/nps/moves/dis7/PointObjectStatePdu.java
@@ -72,10 +72,12 @@ public int getMarshalledSize()
marshalSize += referencedObjectID.getMarshalledSize();
marshalSize += 4; // updateNumber
marshalSize += forceID.getMarshalledSize();
+ marshalSize += modifications.getMarshalledSize();
marshalSize += objectType.getMarshalledSize();
marshalSize += objectLocation.getMarshalledSize();
marshalSize += objectOrientation.getMarshalledSize();
marshalSize += 4; // specificObjectAppearance
+ marshalSize += generObjectAppearance.getMarshalledSize();
marshalSize += 2; // padding1
marshalSize += requesterID.getMarshalledSize();
marshalSize += receivingID.getMarshalledSize();
diff --git a/src-generated/edu/nps/moves/dis7/RecordQueryRPdu.java b/src-generated/edu/nps/moves/dis7/RecordQueryRPdu.java
index 8b14a152f0..7fafd9cd0d 100644
--- a/src-generated/edu/nps/moves/dis7/RecordQueryRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/RecordQueryRPdu.java
@@ -40,7 +40,7 @@ public class RecordQueryRPdu extends SimulationManagementWithReliabilityFamilyPd
/** Constructor */
public RecordQueryRPdu()
{
- setPduType( DISPDUType.RECORD_QUERY_R );
+ setPduType( DISPDUType.RECORD_QUERY_RELIABLE );
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/RecordRPdu.java b/src-generated/edu/nps/moves/dis7/RecordRPdu.java
index 6b63c6aff8..ee37f29537 100644
--- a/src-generated/edu/nps/moves/dis7/RecordRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/RecordRPdu.java
@@ -36,7 +36,7 @@ public class RecordRPdu extends SimulationManagementWithReliabilityFamilyPdu imp
/** Constructor */
public RecordRPdu()
{
- setPduType( DISPDUType.RECORD_R );
+ setPduType( DISPDUType.RECORD_RELIABLE );
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/RemoveEntityRPdu.java b/src-generated/edu/nps/moves/dis7/RemoveEntityRPdu.java
index 2b347778be..dbe7129db1 100644
--- a/src-generated/edu/nps/moves/dis7/RemoveEntityRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/RemoveEntityRPdu.java
@@ -29,7 +29,7 @@ public class RemoveEntityRPdu extends SimulationManagementWithReliabilityFamilyP
/** Constructor */
public RemoveEntityRPdu()
{
- setPduType( DISPDUType.REMOVE_ENTITY_R );
+ setPduType( DISPDUType.REMOVE_ENTITY_RELIABLE );
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/SetDataRPdu.java b/src-generated/edu/nps/moves/dis7/SetDataRPdu.java
index 4338e6b742..42df7099cd 100644
--- a/src-generated/edu/nps/moves/dis7/SetDataRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SetDataRPdu.java
@@ -43,7 +43,7 @@ public class SetDataRPdu extends SimulationManagementWithReliabilityFamilyPdu im
/** Constructor */
public SetDataRPdu()
{
- setPduType( DISPDUType.SET_DATA_R );
+ setPduType( DISPDUType.SET_DATA_RELIABLE );
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/SetRecordRPdu.java b/src-generated/edu/nps/moves/dis7/SetRecordRPdu.java
index 226875be2e..0ec2316274 100644
--- a/src-generated/edu/nps/moves/dis7/SetRecordRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/SetRecordRPdu.java
@@ -37,7 +37,7 @@ public class SetRecordRPdu extends SimulationManagementWithReliabilityFamilyPdu
/** Constructor */
public SetRecordRPdu()
{
- setPduType( DISPDUType.SET_RECORD_R );
+ setPduType( DISPDUType.SET_RECORD_RELIABLE );
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/StartResumeRPdu.java b/src-generated/edu/nps/moves/dis7/StartResumeRPdu.java
index 68849b3f71..893b6a3d6d 100644
--- a/src-generated/edu/nps/moves/dis7/StartResumeRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/StartResumeRPdu.java
@@ -35,7 +35,7 @@ public class StartResumeRPdu extends SimulationManagementWithReliabilityFamilyPd
/** Constructor */
public StartResumeRPdu()
{
- setPduType( DISPDUType.START_RESUME_R );
+ setPduType( DISPDUType.START_RESUME_RELIABLE );
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/StopFreezePdu.java b/src-generated/edu/nps/moves/dis7/StopFreezePdu.java
index 75784c85d7..0b35b9a9e6 100644
--- a/src-generated/edu/nps/moves/dis7/StopFreezePdu.java
+++ b/src-generated/edu/nps/moves/dis7/StopFreezePdu.java
@@ -44,6 +44,7 @@ public int getMarshalledSize()
marshalSize = super.getMarshalledSize();
marshalSize += realWorldTime.getMarshalledSize();
marshalSize += reason.getMarshalledSize();
+ marshalSize += frozenBehavior.getMarshalledSize();
marshalSize += 2; // padding1
marshalSize += 4; // requestID
diff --git a/src-generated/edu/nps/moves/dis7/StopFreezeRPdu.java b/src-generated/edu/nps/moves/dis7/StopFreezeRPdu.java
index c784a0c975..a2f93a3b87 100644
--- a/src-generated/edu/nps/moves/dis7/StopFreezeRPdu.java
+++ b/src-generated/edu/nps/moves/dis7/StopFreezeRPdu.java
@@ -37,7 +37,7 @@ public class StopFreezeRPdu extends SimulationManagementWithReliabilityFamilyPdu
/** Constructor */
public StopFreezeRPdu()
{
- setPduType( DISPDUType.STOP_FREEZE_R );
+ setPduType( DISPDUType.STOP_FREEZE_RELIABLE );
}
public int getMarshalledSize()
@@ -47,6 +47,7 @@ public int getMarshalledSize()
marshalSize = super.getMarshalledSize();
marshalSize += realWorldTime.getMarshalledSize();
marshalSize += reason.getMarshalledSize();
+ marshalSize += frozenBehavior.getMarshalledSize();
marshalSize += requiredReliablityService.getMarshalledSize();
marshalSize += 1; // pad1
marshalSize += 4; // requestID
diff --git a/src-generated/edu/nps/moves/dis7/TSPIPdu.java b/src-generated/edu/nps/moves/dis7/TSPIPdu.java
index 4505aeac0f..2aad352384 100644
--- a/src-generated/edu/nps/moves/dis7/TSPIPdu.java
+++ b/src-generated/edu/nps/moves/dis7/TSPIPdu.java
@@ -42,7 +42,7 @@ public class TSPIPdu extends LiveEntityFamilyPdu implements Serializable
/** Constructor */
public TSPIPdu()
{
- setPduType( DISPDUType.TSPI );
+ setPduType( DISPDUType.TIME_SPACE_POSITION_INFORMATION );
}
public int getMarshalledSize()
diff --git a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUType.java b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUType.java
index a1fbdb4cb8..e4f16a3eac 100644
--- a/src-generated/edu/nps/moves/dis7/enumerations/DISPDUType.java
+++ b/src-generated/edu/nps/moves/dis7/enumerations/DISPDUType.java
@@ -71,15 +71,11 @@ public enum DISPDUType
/** Receiver */
RECEIVER (27, "Receiver"),
/** IFF */
- IFF (28, "IFF"),
- /** IFF */
IDENTIFICATION_FRIEND_OR_FOE (28, "IFF"),
/** Underwater Acoustic */
UNDERWATER_ACOUSTIC (29, "Underwater Acoustic"),
/** Supplemental Emission / Entity State */
SUPPLEMENTAL_EMISSION_ENTITY_STATE (30, "Supplemental Emission / Entity State"),
- /** Supplemental Emission / Entity State */
- SEES (30, "Supplemental Emission / Entity State"),
/** Intercom Signal */
INTERCOM_SIGNAL (31, "Intercom Signal"),
/** Intercom Control */
@@ -111,80 +107,44 @@ public enum DISPDUType
/** Areal Object State */
AREAL_OBJECT_STATE (45, "Areal Object State"),
/** TSPI */
- TSPI (46, "TSPI"),
- /** TSPI */
TIME_SPACE_POSITION_INFORMATION (46, "TSPI"),
/** Appearance */
APPEARANCE (47, "Appearance"),
/** Articulated Parts */
ARTICULATED_PARTS (48, "Articulated Parts"),
/** LE Fire */
- LE_FIRE (49, "LE Fire"),
- /** LE Fire */
LIVE_ENTITY_FIRE (49, "LE Fire"),
/** LE Detonation */
- LE_DETONATION (50, "LE Detonation"),
- /** LE Detonation */
LIVE_ENTITY_DETONATION (50, "LE Detonation"),
/** Create Entity-R */
- CREATE_ENTITY_R (51, "Create Entity-R"),
- /** Create Entity-R */
CREATE_ENTITY_RELIABLE (51, "Create Entity-R"),
/** Remove Entity-R */
- REMOVE_ENTITY_R (52, "Remove Entity-R"),
- /** Remove Entity-R */
REMOVE_ENTITY_RELIABLE (52, "Remove Entity-R"),
/** Start/Resume-R */
- START_RESUME_R (53, "Start/Resume-R"),
- /** Start/Resume-R */
START_RESUME_RELIABLE (53, "Start/Resume-R"),
/** Stop/Freeze-R */
- STOP_FREEZE_R (54, "Stop/Freeze-R"),
- /** Stop/Freeze-R */
STOP_FREEZE_RELIABLE (54, "Stop/Freeze-R"),
/** Acknowledge-R */
- ACKNOWLEDGE_R (55, "Acknowledge-R"),
- /** Acknowledge-R */
ACKNOWLEDGE_RELIABLE (55, "Acknowledge-R"),
/** Action Request-R */
- ACTION_REQUEST_R (56, "Action Request-R"),
- /** Action Request-R */
ACTION_REQUEST_RELIABLE (56, "Action Request-R"),
/** Action Response-R */
- ACTION_RESPONSE_R (57, "Action Response-R"),
- /** Action Response-R */
ACTION_RESPONSE_RELIABLE (57, "Action Response-R"),
/** Data Query-R */
- DATA_QUERY_R (58, "Data Query-R"),
- /** Data Query-R */
DATA_QUERY_RELIABLE (58, "Data Query-R"),
/** Set Data-R */
- SET_DATA_R (59, "Set Data-R"),
- /** Set Data-R */
SET_DATA_RELIABLE (59, "Set Data-R"),
/** Data-R */
- DATA_R (60, "Data-R"),
- /** Data-R */
DATA_RELIABLE (60, "Data-R"),
/** Event Report-R */
- EVENT_REPORT_R (61, "Event Report-R"),
- /** Event Report-R */
EVENT_REPORT_RELIABLE (61, "Event Report-R"),
/** Comment-R */
- COMMENT_R (62, "Comment-R"),
- /** Comment-R */
COMMENT_RELIABLE (62, "Comment-R"),
/** Record-R */
- RECORD_R (63, "Record-R"),
- /** Record-R */
RECORD_RELIABLE (63, "Record-R"),
/** Set Record-R */
- SET_RECORD_R (64, "Set Record-R"),
- /** Set Record-R */
SET_RECORD_RELIABLE (64, "Set Record-R"),
/** Record Query-R */
- RECORD_QUERY_R (65, "Record Query-R"),
- /** Record Query-R */
RECORD_QUERY_RELIABLE (65, "Record Query-R"),
/** Collision-Elastic */
COLLISION_ELASTIC (66, "Collision-Elastic"),
--
GitLab