From 224f86febf98cd5a6fdc6577b642702bdb7d55c7 Mon Sep 17 00:00:00 2001
From: brutzman <brutzman@nps.edu>
Date: Sat, 22 Jan 2022 18:43:51 -0800
Subject: [PATCH] adjust project paths to latest open-dis7-java .jar, improved
log strings
---
.../src/OpenDis7Examples/EspduReceiver.java | 4 +-
.../src/OpenDis7Examples/EspduReceiverLog.txt | 8 +--
.../src/OpenDis7Examples/EspduSenderLog.txt | 72 +++++++++----------
3 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/examples/src/OpenDis7Examples/EspduReceiver.java b/examples/src/OpenDis7Examples/EspduReceiver.java
index ab0c16822a..99157ab3c5 100755
--- a/examples/src/OpenDis7Examples/EspduReceiver.java
+++ b/examples/src/OpenDis7Examples/EspduReceiver.java
@@ -41,8 +41,8 @@ public class EspduReceiver
InetAddress multicastInetAddress;
DatagramPacket packet;
PduFactory pduFactory = new PduFactory();
- PduFactory.TimestampStyle timestampStyle = PduFactory.TimestampStyle.YEAR;
- pduFactory.setTimestampStyle(timestampStyle);
+ DisTime.TimestampStyle timestampStyle = DisTime.TimestampStyle.YEAR;
+ DisTime.setTimestampStyle(timestampStyle);
int pduCount = 0;
System.out.println(TRACE_PREFIX + "started...");
diff --git a/examples/src/OpenDis7Examples/EspduReceiverLog.txt b/examples/src/OpenDis7Examples/EspduReceiverLog.txt
index 6a1fa9e38c..1cf80d97a3 100644
--- a/examples/src/OpenDis7Examples/EspduReceiverLog.txt
+++ b/examples/src/OpenDis7Examples/EspduReceiverLog.txt
@@ -18,15 +18,15 @@ To quit: stop or kill this process
===============
3. received PDU type 1=ENTITY_STATE EntityStatePdu
entityID triplet: [1, 2, 3]
- Location in DIS coordinates: [-2707497.4860692197, -4353661.0646844525, 3781450.3202754413]
+ Location in DIS coordinates: [-2707492.9269245286, -4353663.899966802, 3781450.3202754413]
4. received PDU type 2=FIRE FirePdu
- FirePdu locationInWorldCoordinates: [-2707497.4860692197, -4353661.0646844525, 3781450.3202754413]
+ FirePdu locationInWorldCoordinates: [-2707492.9269245286, -4353663.899966802, 3781450.3202754413]
===============
5. received PDU type 1=ENTITY_STATE EntityStatePdu
entityID triplet: [1, 2, 3]
- Location in DIS coordinates: [-2707492.9269245286, -4353663.899966802, 3781450.3202754413]
+ Location in DIS coordinates: [-2707497.4860692197, -4353661.0646844525, 3781450.3202754413]
6. received PDU type 2=FIRE FirePdu
- FirePdu locationInWorldCoordinates: [-2707492.9269245286, -4353663.899966802, 3781450.3202754413]
+ FirePdu locationInWorldCoordinates: [-2707497.4860692197, -4353661.0646844525, 3781450.3202754413]
===============
7. received PDU type 1=ENTITY_STATE EntityStatePdu
entityID triplet: [1, 2, 3]
diff --git a/examples/src/OpenDis7Examples/EspduSenderLog.txt b/examples/src/OpenDis7Examples/EspduSenderLog.txt
index 99c47dbe62..fecb271f01 100644
--- a/examples/src/OpenDis7Examples/EspduSenderLog.txt
+++ b/examples/src/OpenDis7Examples/EspduSenderLog.txt
@@ -10,7 +10,7 @@ run-single:
[OpenDis7Examples.EspduSender] sending multicast ESPDU packets to 239.1.2.3 port 3000
===============
espdu entityType information:
- EntityKind =edu.nps.moves.dis7.enumerations.EntityKind 1 PLATFORM
+ EntityKind =EntityKind 1 PLATFORM
Country =Country 225 UNITED_STATES_OF_AMERICA_USA
Domain =Land
Category =1
@@ -22,61 +22,61 @@ Create new PDUs
latitude, longitude: [36.595517, -121.87706]
coordinate conversion: [-2707497.4860692197, -4353661.0646844525, 3781450.3202754413]
Espdu #1 entityID=[1,2,3]
-FirePdu #1 firePdu=[FireMissionIndex=0, descriptor=MunitionDescriptor munitionType:EntityType entityKind:edu.nps.moves.dis7.enumerations.EntityKind 0 OTHER domain:Other country:Country 0 OTHER category:0 subCategory:0 specific:0 extra:0 warhead:MunitionDescriptorWarhead 0 OTHER fuse:MunitionDescriptorFuse 0 OTHER quantity:0 rate:0]
-[OpenDis7Examples.EspduSender] sending datagram packet [edu.nps.moves.dis7.enumerations.DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 127.255.255.255 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [edu.nps.moves.dis7.enumerations.DisPduType 02 FIRE ] packet.getLength()= 96, to 127.255.255.255 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [edu.nps.moves.dis7.enumerations.DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 172.20.210.244 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [edu.nps.moves.dis7.enumerations.DisPduType 02 FIRE ] packet.getLength()= 96, to 172.20.210.244 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [edu.nps.moves.dis7.enumerations.DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 172.16.0.255 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [edu.nps.moves.dis7.enumerations.DisPduType 02 FIRE ] packet.getLength()= 96, to 172.16.0.255 port 3000
+FirePdu #1 firePdu=[FireMissionIndex=0, descriptor=MunitionDescriptor munitionType:EntityType entityKind:EntityKind 0 OTHER domain:Other country:Country 0 OTHER category:0 subCategory:0 specific:0 extra:0 warhead:MunitionDescriptorWarhead 0 OTHER fuse:MunitionDescriptorFuse 0 OTHER quantity:0 rate:0]
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 127.255.255.255 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 96, to 127.255.255.255 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 172.20.210.244 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 96, to 172.20.210.244 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 172.16.0.255 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 96, to 172.16.0.255 port 3000
===============
Create new PDUs
latitude, longitude: [36.595517, -121.877]
coordinate conversion: [-2707492.9269245286, -4353663.899966802, 3781450.3202754413]
Espdu #2 entityID=[1,2,3]
-FirePdu #2 firePdu=[FireMissionIndex=0, descriptor=MunitionDescriptor munitionType:EntityType entityKind:edu.nps.moves.dis7.enumerations.EntityKind 0 OTHER domain:Other country:Country 0 OTHER category:0 subCategory:0 specific:0 extra:0 warhead:MunitionDescriptorWarhead 0 OTHER fuse:MunitionDescriptorFuse 0 OTHER quantity:0 rate:0]
-[OpenDis7Examples.EspduSender] sending datagram packet [edu.nps.moves.dis7.enumerations.DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 127.255.255.255 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [edu.nps.moves.dis7.enumerations.DisPduType 02 FIRE ] packet.getLength()= 96, to 127.255.255.255 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [edu.nps.moves.dis7.enumerations.DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 172.20.210.244 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [edu.nps.moves.dis7.enumerations.DisPduType 02 FIRE ] packet.getLength()= 96, to 172.20.210.244 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [edu.nps.moves.dis7.enumerations.DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 172.16.0.255 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [edu.nps.moves.dis7.enumerations.DisPduType 02 FIRE ] packet.getLength()= 96, to 172.16.0.255 port 3000
+FirePdu #2 firePdu=[FireMissionIndex=0, descriptor=MunitionDescriptor munitionType:EntityType entityKind:EntityKind 0 OTHER domain:Other country:Country 0 OTHER category:0 subCategory:0 specific:0 extra:0 warhead:MunitionDescriptorWarhead 0 OTHER fuse:MunitionDescriptorFuse 0 OTHER quantity:0 rate:0]
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 127.255.255.255 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 96, to 127.255.255.255 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 172.20.210.244 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 96, to 172.20.210.244 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 172.16.0.255 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 96, to 172.16.0.255 port 3000
===============
Create new PDUs
latitude, longitude: [36.595517, -121.87706]
coordinate conversion: [-2707497.4860692197, -4353661.0646844525, 3781450.3202754413]
Espdu #3 entityID=[1,2,3]
-FirePdu #3 firePdu=[FireMissionIndex=0, descriptor=MunitionDescriptor munitionType:EntityType entityKind:edu.nps.moves.dis7.enumerations.EntityKind 0 OTHER domain:Other country:Country 0 OTHER category:0 subCategory:0 specific:0 extra:0 warhead:MunitionDescriptorWarhead 0 OTHER fuse:MunitionDescriptorFuse 0 OTHER quantity:0 rate:0]
-[OpenDis7Examples.EspduSender] sending datagram packet [edu.nps.moves.dis7.enumerations.DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 127.255.255.255 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [edu.nps.moves.dis7.enumerations.DisPduType 02 FIRE ] packet.getLength()= 96, to 127.255.255.255 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [edu.nps.moves.dis7.enumerations.DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 172.20.210.244 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [edu.nps.moves.dis7.enumerations.DisPduType 02 FIRE ] packet.getLength()= 96, to 172.20.210.244 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [edu.nps.moves.dis7.enumerations.DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 172.16.0.255 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [edu.nps.moves.dis7.enumerations.DisPduType 02 FIRE ] packet.getLength()= 96, to 172.16.0.255 port 3000
+FirePdu #3 firePdu=[FireMissionIndex=0, descriptor=MunitionDescriptor munitionType:EntityType entityKind:EntityKind 0 OTHER domain:Other country:Country 0 OTHER category:0 subCategory:0 specific:0 extra:0 warhead:MunitionDescriptorWarhead 0 OTHER fuse:MunitionDescriptorFuse 0 OTHER quantity:0 rate:0]
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 127.255.255.255 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 96, to 127.255.255.255 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 172.20.210.244 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 96, to 172.20.210.244 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 172.16.0.255 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 96, to 172.16.0.255 port 3000
===============
Create new PDUs
latitude, longitude: [36.595517, -121.877]
coordinate conversion: [-2707492.9269245286, -4353663.899966802, 3781450.3202754413]
Espdu #4 entityID=[1,2,3]
-FirePdu #4 firePdu=[FireMissionIndex=0, descriptor=MunitionDescriptor munitionType:EntityType entityKind:edu.nps.moves.dis7.enumerations.EntityKind 0 OTHER domain:Other country:Country 0 OTHER category:0 subCategory:0 specific:0 extra:0 warhead:MunitionDescriptorWarhead 0 OTHER fuse:MunitionDescriptorFuse 0 OTHER quantity:0 rate:0]
-[OpenDis7Examples.EspduSender] sending datagram packet [edu.nps.moves.dis7.enumerations.DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 127.255.255.255 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [edu.nps.moves.dis7.enumerations.DisPduType 02 FIRE ] packet.getLength()= 96, to 127.255.255.255 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [edu.nps.moves.dis7.enumerations.DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 172.20.210.244 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [edu.nps.moves.dis7.enumerations.DisPduType 02 FIRE ] packet.getLength()= 96, to 172.20.210.244 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [edu.nps.moves.dis7.enumerations.DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 172.16.0.255 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [edu.nps.moves.dis7.enumerations.DisPduType 02 FIRE ] packet.getLength()= 96, to 172.16.0.255 port 3000
+FirePdu #4 firePdu=[FireMissionIndex=0, descriptor=MunitionDescriptor munitionType:EntityType entityKind:EntityKind 0 OTHER domain:Other country:Country 0 OTHER category:0 subCategory:0 specific:0 extra:0 warhead:MunitionDescriptorWarhead 0 OTHER fuse:MunitionDescriptorFuse 0 OTHER quantity:0 rate:0]
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 127.255.255.255 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 96, to 127.255.255.255 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 172.20.210.244 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 96, to 172.20.210.244 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 172.16.0.255 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 96, to 172.16.0.255 port 3000
===============
Create new PDUs
latitude, longitude: [36.595517, -121.87706]
coordinate conversion: [-2707497.4860692197, -4353661.0646844525, 3781450.3202754413]
Espdu #5 entityID=[1,2,3]
-FirePdu #5 firePdu=[FireMissionIndex=0, descriptor=MunitionDescriptor munitionType:EntityType entityKind:edu.nps.moves.dis7.enumerations.EntityKind 0 OTHER domain:Other country:Country 0 OTHER category:0 subCategory:0 specific:0 extra:0 warhead:MunitionDescriptorWarhead 0 OTHER fuse:MunitionDescriptorFuse 0 OTHER quantity:0 rate:0]
-[OpenDis7Examples.EspduSender] sending datagram packet [edu.nps.moves.dis7.enumerations.DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 127.255.255.255 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [edu.nps.moves.dis7.enumerations.DisPduType 02 FIRE ] packet.getLength()= 96, to 127.255.255.255 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [edu.nps.moves.dis7.enumerations.DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 172.20.210.244 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [edu.nps.moves.dis7.enumerations.DisPduType 02 FIRE ] packet.getLength()= 96, to 172.20.210.244 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [edu.nps.moves.dis7.enumerations.DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 172.16.0.255 port 3000
-[OpenDis7Examples.EspduSender] sending datagram packet [edu.nps.moves.dis7.enumerations.DisPduType 02 FIRE ] packet.getLength()= 96, to 172.16.0.255 port 3000
+FirePdu #5 firePdu=[FireMissionIndex=0, descriptor=MunitionDescriptor munitionType:EntityType entityKind:EntityKind 0 OTHER domain:Other country:Country 0 OTHER category:0 subCategory:0 specific:0 extra:0 warhead:MunitionDescriptorWarhead 0 OTHER fuse:MunitionDescriptorFuse 0 OTHER quantity:0 rate:0]
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 127.255.255.255 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 96, to 127.255.255.255 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 172.20.210.244 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 96, to 172.20.210.244 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 01 ENTITY_STATE] packet.getLength()=144, to 172.16.0.255 port 3000
+[OpenDis7Examples.EspduSender] sending datagram packet [DisPduType 02 FIRE ] packet.getLength()= 96, to 172.16.0.255 port 3000
===============
[OpenDis7Examples.EspduSender] complete.
BUILD SUCCESSFUL (total time: 7 seconds)
--
GitLab