From 5dda393ac32fbefd2c6d43b09da50d6ab827b516 Mon Sep 17 00:00:00 2001 From: carlocorradini Date: Tue, 10 Oct 2023 21:04:28 +0200 Subject: [PATCH] fix: replaced invalid UTF8 characters --- .../pdu/environmental_process_pdu/src/main.cpp | 2 +- include/KDIS/DataTypes/BeamData.hpp | 2 +- .../KDIS/DataTypes/Enums/EnumEntityManagement.hpp | 2 +- .../KDIS/DataTypes/GED_BasicFixedWingAircraft.hpp | 2 +- .../DataTypes/GED_BasicGroundCombatSoldier.hpp | 2 +- .../DataTypes/GED_BasicGroundCombatVehicle.hpp | 2 +- .../KDIS/DataTypes/GED_GroundLogisticsVehicle.hpp | 2 +- .../KDIS/DataTypes/Mode5InterrogatorBasicData.hpp | 2 +- .../KDIS/DataTypes/Mode5TransponderBasicData.hpp | 6 +- include/KDIS/DataTypes/NamedLocationIdentifier.hpp | 2 +- .../KDIS/DataTypes/RelativeWorldCoordinates.hpp | 4 +- include/KDIS/DataTypes/Vector.hpp | 4 +- include/KDIS/KDataStream.hpp | 5 +- include/KDIS/KEncodersDecoders.hpp | 5 +- include/KDIS/KSymbolicNames.hpp | 355 +++++++++++---------- .../PDU/Entity_Management/Aggregate_State_PDU.hpp | 8 +- .../KDIS/PDU/Entity_Management/IsPartOf_PDU.hpp | 6 +- .../PDU/Information_Operations/IO_Action_PDU.hpp | 2 +- .../PDU/Information_Operations/IO_Report_PDU.hpp | 2 +- include/KDIS/PDU/Live_Entity/Appearance_PDU.hpp | 10 +- include/KDIS/PDU/Live_Entity/LE_Detonation_PDU.hpp | 4 +- include/KDIS/PDU/Live_Entity/LE_Fire_PDU.hpp | 34 +- include/KDIS/PDU/Live_Entity/TSPI_PDU.hpp | 14 +- include/KDIS/PDU/Minefield/Minefield_Data_PDU.hpp | 2 +- include/KDIS/PDU/Minefield/Minefield_Query_PDU.hpp | 2 +- .../Areal_Object_State_PDU.hpp | 6 +- .../Point_Object_State_PDU.hpp | 4 +- src/PDU/Minefield/Minefield_Data_PDU.cpp | 4 +- 28 files changed, 255 insertions(+), 240 deletions(-) rewrite include/KDIS/KSymbolicNames.hpp (85%) diff --git a/examples/pdu/environmental_process_pdu/src/main.cpp b/examples/pdu/environmental_process_pdu/src/main.cpp index 988eaaf..a2f7576 100644 --- a/examples/pdu/environmental_process_pdu/src/main.cpp +++ b/examples/pdu/environmental_process_pdu/src/main.cpp @@ -61,7 +61,7 @@ int main() { // SISO-REF-010-2006. It represents a small cloud. // Convert local coordinate systems to DIS - // 51.5� N 3.2� W. Cardiff, Wales. + // 51.5° N 3.2° W. Cardiff, Wales. // A cloud over Wales, what a surprise! // Convert Degrees, Minutes, Seconds to decimal and then convert to // geocentric. diff --git a/include/KDIS/DataTypes/BeamData.hpp b/include/KDIS/DataTypes/BeamData.hpp index 1d905ac..b101791 100644 --- a/include/KDIS/DataTypes/BeamData.hpp +++ b/include/KDIS/DataTypes/BeamData.hpp @@ -73,7 +73,7 @@ class KDIS_EXPORT BeamData : public DataTypeBase { // Description: Beam azimuth center angle in radians. All angles shall be // measured in // relation to the emitter coordinate system. - // The azimuth center for 360� scan systems shall be 0�. + // The azimuth center for 360° scan systems shall be 0°. // Parameter: KFLOAT32 AC //************************************ void SetAzimuthCenter(KFLOAT32 AC); diff --git a/include/KDIS/DataTypes/Enums/EnumEntityManagement.hpp b/include/KDIS/DataTypes/Enums/EnumEntityManagement.hpp index 2ffd639..cbc897a 100644 --- a/include/KDIS/DataTypes/Enums/EnumEntityManagement.hpp +++ b/include/KDIS/DataTypes/Enums/EnumEntityManagement.hpp @@ -773,7 +773,7 @@ KDIS_EXPORT KBOOL GetEnumFromStringRelationshipPosition(const KString& Value, /* StationName */ /* Specifies the station name within the host at which the part entity */ /* is located. If the part entity is On Station, this field shall */ -/* specify the representation of the part�s location data fields. */ +/* specify the representation of the part's location data fields. */ /* Used In: */ /* IsPartOf_PDU */ /************************************************************************/ diff --git a/include/KDIS/DataTypes/GED_BasicFixedWingAircraft.hpp b/include/KDIS/DataTypes/GED_BasicFixedWingAircraft.hpp index 755a9e1..93dbadf 100644 --- a/include/KDIS/DataTypes/GED_BasicFixedWingAircraft.hpp +++ b/include/KDIS/DataTypes/GED_BasicFixedWingAircraft.hpp @@ -192,7 +192,7 @@ class KDIS_EXPORT GED_BasicFixedWingAircraft : public GED { //************************************ // FullName: KDIS::DATA_TYPE::GED_BasicFixedWingAircraft::SetSpeed // KDIS::DATA_TYPE::GED_BasicFixedWingAircraft::GetSpeed - // Description: Signed magnitude value of the entity�s absolute velocity + // Description: Signed magnitude value of the entity's absolute velocity // vector. // A negative value shall indicate that the entity is moving // backwards. Specified in 0.1 meter per second increments for diff --git a/include/KDIS/DataTypes/GED_BasicGroundCombatSoldier.hpp b/include/KDIS/DataTypes/GED_BasicGroundCombatSoldier.hpp index 25d3dc3..4ed8d9a 100644 --- a/include/KDIS/DataTypes/GED_BasicGroundCombatSoldier.hpp +++ b/include/KDIS/DataTypes/GED_BasicGroundCombatSoldier.hpp @@ -166,7 +166,7 @@ class KDIS_EXPORT GED_BasicGroundCombatSoldier : public GED { //************************************ // FullName: KDIS::DATA_TYPE::GED_BasicGroundCombatSoldier::SetSpeed // KDIS::DATA_TYPE::GED_BasicGroundCombatSoldier::GetSpeed - // Description: Signed magnitude value of the entity�s absolute velocity + // Description: Signed magnitude value of the entity's absolute velocity // vector. // A negative value shall indicate that the entity is moving // backwards. Measured in Meters Per Secound (m/s). diff --git a/include/KDIS/DataTypes/GED_BasicGroundCombatVehicle.hpp b/include/KDIS/DataTypes/GED_BasicGroundCombatVehicle.hpp index 8da027e..cd033d9 100644 --- a/include/KDIS/DataTypes/GED_BasicGroundCombatVehicle.hpp +++ b/include/KDIS/DataTypes/GED_BasicGroundCombatVehicle.hpp @@ -166,7 +166,7 @@ class KDIS_EXPORT GED_BasicGroundCombatVehicle : public GED { //************************************ // FullName: KDIS::DATA_TYPE::GED_BasicGroundCombatVehicle::SetSpeed // KDIS::DATA_TYPE::GED_BasicGroundCombatVehicle::GetSpeed - // Description: Signed magnitude value of the entity�s absolute velocity + // Description: Signed magnitude value of the entity's absolute velocity // vector. // A negative value shall indicate that the entity is moving // backwards. Measured in Meters Per Secound (m/s). diff --git a/include/KDIS/DataTypes/GED_GroundLogisticsVehicle.hpp b/include/KDIS/DataTypes/GED_GroundLogisticsVehicle.hpp index d23916b..adfde9b 100644 --- a/include/KDIS/DataTypes/GED_GroundLogisticsVehicle.hpp +++ b/include/KDIS/DataTypes/GED_GroundLogisticsVehicle.hpp @@ -155,7 +155,7 @@ class KDIS_EXPORT GED_GroundLogisticsVehicle : public GED { //************************************ // FullName: KDIS::DATA_TYPE::GED_GroundLogisticsVehicle::SetSpeed // KDIS::DATA_TYPE::GED_GroundLogisticsVehicle::GetSpeed - // Description: Signed magnitude value of the entity�s absolute velocity + // Description: Signed magnitude value of the entity's absolute velocity // vector. // A negative value shall indicate that the entity is moving // backwards. Specified in 0.1 meter per second increments for diff --git a/include/KDIS/DataTypes/Mode5InterrogatorBasicData.hpp b/include/KDIS/DataTypes/Mode5InterrogatorBasicData.hpp index a3ae5d5..3e7c12b 100644 --- a/include/KDIS/DataTypes/Mode5InterrogatorBasicData.hpp +++ b/include/KDIS/DataTypes/Mode5InterrogatorBasicData.hpp @@ -99,7 +99,7 @@ class KDIS_EXPORT Mode5InterrogatorBasicData : public DataTypeBase { // Mode 5 interrogator is capableof supporting and could be sent // in a Mode 5 interrogation as indicated by the Message Formats // Status field being set to Capability (0). 2) Only the specific - // message formats associated with this Mode 5 interrogator�s + // message formats associated with this Mode 5 interrogator's // current active interrogation as indicated by the Message // Formats Status field being set to Active Interrogation (1). // When a Mode 5 interrogator is in the Interactive Mode, the diff --git a/include/KDIS/DataTypes/Mode5TransponderBasicData.hpp b/include/KDIS/DataTypes/Mode5TransponderBasicData.hpp index 213758c..0ab2c1f 100644 --- a/include/KDIS/DataTypes/Mode5TransponderBasicData.hpp +++ b/include/KDIS/DataTypes/Mode5TransponderBasicData.hpp @@ -116,8 +116,8 @@ class KDIS_EXPORT Mode5TransponderBasicData : public DataTypeBase { // KDIS::DATA_TYPE::Mode5TransponderBasicData::SetMessageFormatsPresent // KDIS::DATA_TYPE::Mode5TransponderBasicData::GetMessageFormatsPresentBitSet // KDIS::DATA_TYPE::Mode5TransponderBasicData::GetMessageFormatsPresent - // Description: When a Mode 5 transponder is in the Regeneration Mode, the - // included message + // Description: When a Mode 5 transponder is in the Regeneration Mode, + // the included message // formats shall be those that this Mode 5 transponder is capable // of supporting and could be in a reply to a Mode 5 // interrogation. The Message Formats Status field of the Mode 5 @@ -146,7 +146,7 @@ class KDIS_EXPORT Mode5TransponderBasicData : public DataTypeBase { // FullName: KDIS::DATA_TYPE::Mode5TransponderBasicData::SetNationalOrigin // KDIS::DATA_TYPE::Mode5TransponderBasicData::GetNationalOrigin // Description: The national origin is the country that owns the platform - // carrying a Mode 5 transponder. NOTE�The National Origin is + // carrying a Mode 5 transponder. NOTE: The National Origin is // not the same as the Country field enumerations contained in // Entity Type records. For simulations that have modeled Mode 5 // (e.g., Mark XIIA) transponders based on the original AIMS diff --git a/include/KDIS/DataTypes/NamedLocationIdentifier.hpp b/include/KDIS/DataTypes/NamedLocationIdentifier.hpp index fbee5ab..a1b7282 100644 --- a/include/KDIS/DataTypes/NamedLocationIdentifier.hpp +++ b/include/KDIS/DataTypes/NamedLocationIdentifier.hpp @@ -68,7 +68,7 @@ class KDIS_EXPORT NamedLocationIdentifier : public DataTypeBase { // Description: Specifies the station name within the host at which the part // entity // is located. If the part entity is On Station, this field shall - // specify the representation of the part�s location data fields. + // specify the representation of the part's location data fields. // Parameter: StationName SN //************************************ void SetStationName(KDIS::DATA_TYPE::ENUMS::StationName SN); diff --git a/include/KDIS/DataTypes/RelativeWorldCoordinates.hpp b/include/KDIS/DataTypes/RelativeWorldCoordinates.hpp index b381771..c6804b1 100644 --- a/include/KDIS/DataTypes/RelativeWorldCoordinates.hpp +++ b/include/KDIS/DataTypes/RelativeWorldCoordinates.hpp @@ -32,7 +32,7 @@ http://p.sf.net/kdis/UserGuide created: 02/07/2010 author: Karl Jones - purpose: Location of the origin of the LE�s coordinate system. + purpose: Location of the origin of the LE's coordinate system. size: 64 bits / 8 octets *********************************************************************/ @@ -79,7 +79,7 @@ class KDIS_EXPORT RelativeWorldCoordinates : public DataTypeBase { //************************************ // FullName: KDIS::DATA_TYPE::RelativeWorldCoordinates::SetDelta // KDIS::DATA_TYPE::RelativeWorldCoordinates::GetDelta - // Description: The difference between LE�s X, Y and Z direction coordinate + // Description: The difference between LE's X, Y and Z direction coordinate // and the // X, Y and Z direction coordinate of the reference point. // Parameter: KFIXED16_3 diff --git a/include/KDIS/DataTypes/Vector.hpp b/include/KDIS/DataTypes/Vector.hpp index 8495283..109dcf4 100644 --- a/include/KDIS/DataTypes/Vector.hpp +++ b/include/KDIS/DataTypes/Vector.hpp @@ -48,13 +48,13 @@ entity. Each vector component shall represent meters from the origin. 2)Linear Acceleration Vector - m/s2 Represented as a vector with components in either world -coordinate system or entity�s coordinate system depending on the value in the +coordinate system or entity's coordinate system depending on the value in the Dead Reckoning Algorithm field. Each vector component shall represent acceleration in meters per second squared. 3)Linear Velocity Vector - m/s Represented as a vector with three components in either -world coordinate system or entity�s coordinate system depending on the value in +world coordinate system or entity's coordinate system depending on the value in the Dead Reckoning Algorithm field. Each vector component shall represent velocity in meters per second. diff --git a/include/KDIS/KDataStream.hpp b/include/KDIS/KDataStream.hpp index 160df12..4f610e8 100644 --- a/include/KDIS/KDataStream.hpp +++ b/include/KDIS/KDataStream.hpp @@ -36,7 +36,8 @@ http://p.sf.net/kdis/UserGuide via a network/writing to file. *********************************************************************/ -#pragma once +#ifndef KDIS_KDATASTREAM_HPP_ +#define KDIS_KDATASTREAM_HPP_ #include @@ -258,3 +259,5 @@ KDataStream& KDataStream::operator>>(Type& T) { ////////////////////////////////////////////////////////////////////////// } // END namespace KDIS + +#endif // KDIS_KDATASTREAM_HPP_ diff --git a/include/KDIS/KEncodersDecoders.hpp b/include/KDIS/KEncodersDecoders.hpp index 3963b45..ceac11f 100644 --- a/include/KDIS/KEncodersDecoders.hpp +++ b/include/KDIS/KEncodersDecoders.hpp @@ -37,7 +37,8 @@ http://p.sf.net/kdis/UserGuide appropriate data type *********************************************************************/ -#pragma once +#ifndef KDIS_KENCODERSDECORDS_HPP_ +#define KDIS_KENCODERSDECORDS_HPP_ #include "KDIS/KDefines.hpp" @@ -109,3 +110,5 @@ typedef NetToDataType NetToKFLOAT32; typedef NetToDataType NetToKFLOAT64; }; // namespace KDIS + +#endif // KDIS_KENCODERSDECORDS_HPP_ diff --git a/include/KDIS/KSymbolicNames.hpp b/include/KDIS/KSymbolicNames.hpp dissimilarity index 85% index 01cbd97..4bbb07f 100644 --- a/include/KDIS/KSymbolicNames.hpp +++ b/include/KDIS/KSymbolicNames.hpp @@ -1,173 +1,182 @@ -/********************************************************************* -Copyright 2013 Karl Jones -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -For Further Information Please Contact me at -Karljj1@yahoo.com -http://p.sf.net/kdis/UserGuide -*********************************************************************/ - -/******************************************************************** - KSymbolicNames - created: 20/9/2008 - updated: 14/12/2012 - author: Karl Jones - - purpose: DIS Symbolic names used to represent DIS numeric values -*********************************************************************/ - -#define AGG_RESPONSE 10 // s -#define ALL_AGGREGATES 0xffff -#define ALL_APPLIC 0xffff -#define ALL_BEAMS 0xffff -#define ALL_EMITTERS 0xffff -#define ALL_ENTITIES 0xffff -#define ALL_OBJECTS 0xffff -#define ALL_SITES 0xffff -#define COLLISION_ELASTIC_TIMEOUT 5 // s -#define COLLISION_THRSH 0.1f // m/s -#define DE_ENERGY_THRSH 0.01f -#define DE_PRECISION_AIMING_THRSH 0.5f // m -#define DRA_ORIENT_THRSH_DFLT 3 // degs -#define DRA_POS_THRSH_DFLT 1 // m -#define D_SPOT_NO_ENTITY NO_SITE , NO_APPLIC , NO_ENTITY -#define EE_AD_PULRAT_THRSH 0.017f // rads/s -#define EE_AD_PULACC_THRSH 0.017f // rads/s^2 -#define EE_AZ_THRSH 1 // degs -#define EE_EL_THRSH 1 // degs -#define EE_ERP_THRSH 1 // dB -#define EE_FREQ_THRSH 1 // Hz -#define EE_FRNG_THRSH 1 // Hz -#define EE_FT_VEL_THRSH 1 // m/s -#define EE_FT_ACC_THRSH 1 // m/s^2 -#define EE_FT_MWD_THRSH 10000 // m -#define EE_FT_KT_THRSH 10 // s -#define EE_FT_ESP_THRSH 10 // m -#define EE_HIGH_DENSITY_THRSH 10 // entities/beam -#define EE_PRF_THRSH 1 // Hz -#define EE_PW_THRSH 1 // µs -#define ENTITY_ID_UNKNOWN NO_SITE , NO_APPLIC , NO_ENTITY -#define EP_DIMENSION_THRSH 1 // m -#define EP_NO_SEQUENCE 0xffff -#define EP_POS_THRSH 1 // m -#define EP_STATE_THRSH 10 // ±% -#define GD_GEOMETRY_CHANGE 10 // ±% -#define GD_STATE_CHANGE 10 // ±% -#define HBT_ESPDU_KIND_CULTURAL_FEATURE 1 // min Tolerance: ±10% -#define HBT_ESPDU_KIND_ENVIRONMENTAL 1 // min Tolerance: ±10% -#define HBT_ESPDU_KIND_EXPENDABLE 5 // s Tolerance: ±10% -#define HBT_ESPDU_KIND_LIFE_FORM 1 // min Tolerance: ±10% -#define HBT_ESPDU_KIND_MUNITION 5 // s Tolerance: ±10% -#define HBT_ESPDU_KIND_RADIO 5 // s Tolerance: ±10% -#define HBT_ESPDU_KIND_SENSOR_EMITTER 5 // s Tolerance: ±10% -#define HBT_ESPDU_KIND_SUPPLY 5 // s Tolerance: ±10% -#define HBT_ESPDU_PLATFORM_AIR 5 // s Tolerance: ±10% -#define HBT_ESPDU_PLATFORM_LAND 55 // s Tolerance: ±10% -#define HBT_ESPDU_PLATFORM_SPACE 5 // s Tolerance: ±10% -#define HBT_ESPDU_PLATFORM_SUBSURFACE 55 // s Tolerance: ±10% -#define HBT_ESPDU_PLATFORM_SURFACE 55 // s Tolerance: ±10% -#define HBT_PDU_AGGREGATE_STATE 30 // s Tolerance: ±10% -#define HBT_PDU_APPEARANCE 60 // s Tolerance: ±10% -#define HBT_PDU_DE_FIRE 0.5f // s Tolerance: ±10% -#define HBT_PDU_DESIGNATOR 5 // s Tolerance: ±10% -#define HBT_PDU_EE 10 // s Tolerance: ±10% -#define HBT_PDU_ENTITY_DAMAGE 10 // s Tolerance: ±10% -#define HBT_PDU_ENVIRONMENTAL_PROCESS 15 // s Tolerance: ±10% -#define HBT_PDU_GRIDDED_DATA 15 // min Tolerance: ±10% -#define HBT_PDU_IFF 10 // s Tolerance: ±10% -#define HBT_PDU_ISGROUPOF 1 // min Tolerance: ±10% -#define HBT_PDU_MINEFIELD_DATA 5 // s Tolerance: ±10% -#define HBT_PDU_MINEFIELD_STATE 5 // s Tolerance: ±10% -#define HBT_PDU_RECEIVER 1 // min Tolerance: ±10% -#define HBT_PDU_SEES 3 // min Tolerance: ±10% -#define HBT_PDU_TRANSMITTER 2 // s Tolerance: ±10% -#define HBT_PDU_TSPI 30 // s Tolerance: ±10% -#define HBT_PDU_UA 3 // min Tolerance: ±10% -#define HBT_STATIONARY 1 // min Tolerance: ±10% -#define HBT_TIMEOUT_MPLIER 2.4f // NOTE - The entity timeout parameter is based on taking the specific entity heartbeat parameter and multiplying it by the HBT_TIMEOUT_MPLIER. -#define HQ_TOD_DIFF_THRSH 20 // ms -#define IFF_CHG_LATENCY 2 // s -#define IFF_AZ_THRSH 3 // deg -#define IFF_EL_THRSH 3 // deg -#define IFF_PDU_FINAL 10 // s -#define IFF_PDU_RESUME 10 // s -#define MAX_PDU_SIZE_BITS 65536 -#define MAX_PDU_SIZE_OCTETS 8192 -#define MINEFIELD_CHANGE 2.5f // s -#define MINEFIELD_RESPONSE_TIMER 1 // s Tolerance: ±10% -#define MULTIPLES_PRESENT 0 -#define NO_AGG 0 -#define NO_APPLIC 0 -#define NO_BEAM 0 -#define NO_CATEGORY 0 -#define NO_EMITTER 0 -#define NO_ENTITY 0 -#define NO_ENTITY_IMPACTED NO_SITE , NO_APPLIC , NO_ENTITY -#define NO_FIRE_MISSION 0 -#define NO_KIND 0 -#define NO_LOCATION NO_SITE , NO_APPLIC , NO_ENTITY -#define NO_OBJECT 0 -#define NO_PATTERN 0 -#define NO_REF_NUMBER 0 -#define NO_SITE 0 -#define NO_SPECIFIC 0 -#define NO_SPECIFIC_ENTITY NO_SITE , NO_APPLIC , NO_ENTITY -#define NO_SUBCAT 0 -#define NO_VALUE 0 -#define NON_SYNC_THRSH 1 // min -#define REPAR_REC_T1_DFLT 5 // s -#define REPAR_SUP_T1_DFLT 12 // s -#define REPAR_SUP_T2_DFLT 12 // s -#define RESUP_REC_T1_DFLT 5 // s -#define RESUP_REC_T2_DFLT 55 // s -#define RESUP_SUP_T1_DFLT 1 // min -#define RQST_ASSIGN_ID 0xfffe -#define SEES_NDA_THRSH 2 // ±° in the axis of deflection -#define SEES_PS_THRSH 10 // ±% of the maximum value of the Power -#define SEES_RPM_THRSH 5 // ±% of the maximum speed in RPM -#define SMALLEST_MTU_OCTETS 1400 // Octets for Internet Protocol Version 4 networks -#define SM_REL_RETRY_CNT 3 -#define SM_REL_RETRY_DELAY 2 // s -#define TARGET_ID_UNKNOWN NO_SITE , NO_APPLIC , NO_ENTITY -#define TIMESTAMP_AHEAD 5 // s -#define TIMESTAMP_BEHIND 5 // s -#define TI_TIMER1 2 // s -#define TI_TIMER2 12 // s -#define TO_AUTO_RESPONSE_TIMER 5 // s -#define TO_MAN_RESPONSE_TIMER 120 // s -#define TR_TIMER1 5 // s -#define TR_TIMER2 60 // s -#define TRANS_ORIENT_THRSH_DFLT 180 // deg -#define TRANS_POS_THRSH_DFLT 500 // m -#define UA_ORIENT_THRSH 2 // deg -#define UA_POS_THRSH 10 // m -#define UA_SRPM_ROC_THRSH 10 // ±% of maximum rate of change -#define UA_SRPM_THRSH 5 // ±% of maximum shaft rate in RPM -#define UNTIL_FURTHER_NOTICE 65535 -#define MUNITION_NOT_TRACKED NO_SITE , NO_APPLIC , NO_ENTITY -#define TARGET_IN_TJ_FIELD_DFLT 10 - -// Deprecated Symbolic Values -#define HRT_BEAT_MOVE_TIMER 2 -#define HRT_BEAT_MPLIER 2.4f -#define HRT_BEAT_TIMER 5 +/********************************************************************* +Copyright 2013 Karl Jones +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +For Further Information Please Contact me at +Karljj1@yahoo.com +http://p.sf.net/kdis/UserGuide +*********************************************************************/ + +/******************************************************************** + KSymbolicNames + created: 20/9/2008 + updated: 14/12/2012 + author: Karl Jones + + purpose: DIS Symbolic names used to represent DIS numeric values +*********************************************************************/ + +#ifndef KDIS_KSYMBOLICNAMES_HPP_ +#define KDIS_KSYMBOLICNAMES_HPP_ + +#define AGG_RESPONSE 10 // s +#define ALL_AGGREGATES 0xffff +#define ALL_APPLIC 0xffff +#define ALL_BEAMS 0xffff +#define ALL_EMITTERS 0xffff +#define ALL_ENTITIES 0xffff +#define ALL_OBJECTS 0xffff +#define ALL_SITES 0xffff +#define COLLISION_ELASTIC_TIMEOUT 5 // s +#define COLLISION_THRSH 0.1f // m/s +#define DE_ENERGY_THRSH 0.01f +#define DE_PRECISION_AIMING_THRSH 0.5f // m +#define DRA_ORIENT_THRSH_DFLT 3 // degs +#define DRA_POS_THRSH_DFLT 1 // m +#define D_SPOT_NO_ENTITY NO_SITE, NO_APPLIC, NO_ENTITY +#define EE_AD_PULRAT_THRSH 0.017f // rads/s +#define EE_AD_PULACC_THRSH 0.017f // rads/s^2 +#define EE_AZ_THRSH 1 // degs +#define EE_EL_THRSH 1 // degs +#define EE_ERP_THRSH 1 // dB +#define EE_FREQ_THRSH 1 // Hz +#define EE_FRNG_THRSH 1 // Hz +#define EE_FT_VEL_THRSH 1 // m/s +#define EE_FT_ACC_THRSH 1 // m/s^2 +#define EE_FT_MWD_THRSH 10000 // m +#define EE_FT_KT_THRSH 10 // s +#define EE_FT_ESP_THRSH 10 // m +#define EE_HIGH_DENSITY_THRSH 10 // entities/beam +#define EE_PRF_THRSH 1 // Hz +#define EE_PW_THRSH 1 // µs +#define ENTITY_ID_UNKNOWN NO_SITE, NO_APPLIC, NO_ENTITY +#define EP_DIMENSION_THRSH 1 // m +#define EP_NO_SEQUENCE 0xffff +#define EP_POS_THRSH 1 // m +#define EP_STATE_THRSH 10 // ±% +#define GD_GEOMETRY_CHANGE 10 // ±% +#define GD_STATE_CHANGE 10 // ±% +#define HBT_ESPDU_KIND_CULTURAL_FEATURE 1 // min Tolerance: ±10% +#define HBT_ESPDU_KIND_ENVIRONMENTAL 1 // min Tolerance: ±10% +#define HBT_ESPDU_KIND_EXPENDABLE 5 // s Tolerance: ±10% +#define HBT_ESPDU_KIND_LIFE_FORM 1 // min Tolerance: ±10% +#define HBT_ESPDU_KIND_MUNITION 5 // s Tolerance: ±10% +#define HBT_ESPDU_KIND_RADIO 5 // s Tolerance: ±10% +#define HBT_ESPDU_KIND_SENSOR_EMITTER 5 // s Tolerance: ±10% +#define HBT_ESPDU_KIND_SUPPLY 5 // s Tolerance: ±10% +#define HBT_ESPDU_PLATFORM_AIR 5 // s Tolerance: ±10% +#define HBT_ESPDU_PLATFORM_LAND 55 // s Tolerance: ±10% +#define HBT_ESPDU_PLATFORM_SPACE 5 // s Tolerance: ±10% +#define HBT_ESPDU_PLATFORM_SUBSURFACE 55 // s Tolerance: ±10% +#define HBT_ESPDU_PLATFORM_SURFACE 55 // s Tolerance: ±10% +#define HBT_PDU_AGGREGATE_STATE 30 // s Tolerance: ±10% +#define HBT_PDU_APPEARANCE 60 // s Tolerance: ±10% +#define HBT_PDU_DE_FIRE 0.5f // s Tolerance: ±10% +#define HBT_PDU_DESIGNATOR 5 // s Tolerance: ±10% +#define HBT_PDU_EE 10 // s Tolerance: ±10% +#define HBT_PDU_ENTITY_DAMAGE 10 // s Tolerance: ±10% +#define HBT_PDU_ENVIRONMENTAL_PROCESS 15 // s Tolerance: ±10% +#define HBT_PDU_GRIDDED_DATA 15 // min Tolerance: ±10% +#define HBT_PDU_IFF 10 // s Tolerance: ±10% +#define HBT_PDU_ISGROUPOF 1 // min Tolerance: ±10% +#define HBT_PDU_MINEFIELD_DATA 5 // s Tolerance: ±10% +#define HBT_PDU_MINEFIELD_STATE 5 // s Tolerance: ±10% +#define HBT_PDU_RECEIVER 1 // min Tolerance: ±10% +#define HBT_PDU_SEES 3 // min Tolerance: ±10% +#define HBT_PDU_TRANSMITTER 2 // s Tolerance: ±10% +#define HBT_PDU_TSPI 30 // s Tolerance: ±10% +#define HBT_PDU_UA 3 // min Tolerance: ±10% +#define HBT_STATIONARY 1 // min Tolerance: ±10% +#define HBT_TIMEOUT_MPLIER \ + 2.4f // NOTE - The entity timeout parameter is based on taking the specific + // entity heartbeat parameter and multiplying it by the + // HBT_TIMEOUT_MPLIER. +#define HQ_TOD_DIFF_THRSH 20 // ms +#define IFF_CHG_LATENCY 2 // s +#define IFF_AZ_THRSH 3 // deg +#define IFF_EL_THRSH 3 // deg +#define IFF_PDU_FINAL 10 // s +#define IFF_PDU_RESUME 10 // s +#define MAX_PDU_SIZE_BITS 65536 +#define MAX_PDU_SIZE_OCTETS 8192 +#define MINEFIELD_CHANGE 2.5f // s +#define MINEFIELD_RESPONSE_TIMER 1 // s Tolerance: ±10% +#define MULTIPLES_PRESENT 0 +#define NO_AGG 0 +#define NO_APPLIC 0 +#define NO_BEAM 0 +#define NO_CATEGORY 0 +#define NO_EMITTER 0 +#define NO_ENTITY 0 +#define NO_ENTITY_IMPACTED NO_SITE, NO_APPLIC, NO_ENTITY +#define NO_FIRE_MISSION 0 +#define NO_KIND 0 +#define NO_LOCATION NO_SITE, NO_APPLIC, NO_ENTITY +#define NO_OBJECT 0 +#define NO_PATTERN 0 +#define NO_REF_NUMBER 0 +#define NO_SITE 0 +#define NO_SPECIFIC 0 +#define NO_SPECIFIC_ENTITY NO_SITE, NO_APPLIC, NO_ENTITY +#define NO_SUBCAT 0 +#define NO_VALUE 0 +#define NON_SYNC_THRSH 1 // min +#define REPAR_REC_T1_DFLT 5 // s +#define REPAR_SUP_T1_DFLT 12 // s +#define REPAR_SUP_T2_DFLT 12 // s +#define RESUP_REC_T1_DFLT 5 // s +#define RESUP_REC_T2_DFLT 55 // s +#define RESUP_SUP_T1_DFLT 1 // min +#define RQST_ASSIGN_ID 0xfffe +#define SEES_NDA_THRSH 2 // ±° in the axis of deflection +#define SEES_PS_THRSH 10 // ±% of the maximum value of the Power +#define SEES_RPM_THRSH 5 // ±% of the maximum speed in RPM +#define SMALLEST_MTU_OCTETS \ + 1400 // Octets for Internet Protocol Version 4 networks +#define SM_REL_RETRY_CNT 3 +#define SM_REL_RETRY_DELAY 2 // s +#define TARGET_ID_UNKNOWN NO_SITE, NO_APPLIC, NO_ENTITY +#define TIMESTAMP_AHEAD 5 // s +#define TIMESTAMP_BEHIND 5 // s +#define TI_TIMER1 2 // s +#define TI_TIMER2 12 // s +#define TO_AUTO_RESPONSE_TIMER 5 // s +#define TO_MAN_RESPONSE_TIMER 120 // s +#define TR_TIMER1 5 // s +#define TR_TIMER2 60 // s +#define TRANS_ORIENT_THRSH_DFLT 180 // deg +#define TRANS_POS_THRSH_DFLT 500 // m +#define UA_ORIENT_THRSH 2 // deg +#define UA_POS_THRSH 10 // m +#define UA_SRPM_ROC_THRSH 10 // ±% of maximum rate of change +#define UA_SRPM_THRSH 5 // ±% of maximum shaft rate in RPM +#define UNTIL_FURTHER_NOTICE 65535 +#define MUNITION_NOT_TRACKED NO_SITE, NO_APPLIC, NO_ENTITY +#define TARGET_IN_TJ_FIELD_DFLT 10 + +// Deprecated Symbolic Values +#define HRT_BEAT_MOVE_TIMER 2 +#define HRT_BEAT_MPLIER 2.4f +#define HRT_BEAT_TIMER 5 + +#endif // KDIS_KSYMBOLICNAMES_HPP_ diff --git a/include/KDIS/PDU/Entity_Management/Aggregate_State_PDU.hpp b/include/KDIS/PDU/Entity_Management/Aggregate_State_PDU.hpp index d22ca80..5e9e49b 100644 --- a/include/KDIS/PDU/Entity_Management/Aggregate_State_PDU.hpp +++ b/include/KDIS/PDU/Entity_Management/Aggregate_State_PDU.hpp @@ -233,7 +233,7 @@ class KDIS_EXPORT Aggregate_State_PDU : public Header { //************************************ // FullName: KDIS::PDU::Aggregate_State_PDU::SetCenterOfMassLocation // KDIS::PDU::Aggregate_State_PDU::GetCenterOfMassLocation - // Description: Location of the aggregate�s center of mass in the simulated + // Description: Location of the aggregate's center of mass in the simulated // world. Parameter: const WorldCoordinates & COML //************************************ void SetCenterOfMassLocation(const KDIS::DATA_TYPE::WorldCoordinates& COML); @@ -243,10 +243,10 @@ class KDIS_EXPORT Aggregate_State_PDU : public Header { //************************************ // FullName: KDIS::PDU::Aggregate_State_PDU::SetAggregateVelocity // KDIS::PDU::Aggregate_State_PDU::GetAggregateVelocity - // Description: Specifies an aggregate�s linear velocity. - // The coordinate system for an aggregate�s linear velocity + // Description: Specifies an aggregate's linear velocity. + // The coordinate system for an aggregate's linear velocity // depends on the dead reckoning algorithm used. Represented by a - // Linear Velocity Vector. An aggreagte�s velocity is calculated + // Linear Velocity Vector. An aggreagte's velocity is calculated // by taking the average velocity of its constituent entities. // The velocity of the aggregate is directed from the center of // mass. See fig 39 from IEEE 1278.1A-1998. diff --git a/include/KDIS/PDU/Entity_Management/IsPartOf_PDU.hpp b/include/KDIS/PDU/Entity_Management/IsPartOf_PDU.hpp index 08cf304..b2e695e 100644 --- a/include/KDIS/PDU/Entity_Management/IsPartOf_PDU.hpp +++ b/include/KDIS/PDU/Entity_Management/IsPartOf_PDU.hpp @@ -88,10 +88,10 @@ class KDIS_EXPORT IsPartOf_PDU : public Simulation_Management_Header { //************************************ // FullName: KDIS::PDU::IsPartOf_PDU::SetLocationOfPart // KDIS::PDU::IsPartOf_PDU::GetLocationOfPart - // Description: Specifies the location of the part�s centroid in the host - // entity�s coordinate system. + // Description: Specifies the location of the part's centroid in the host + // entity's coordinate system. // Represented by an Entity Coordinate Vector record. - // The syntax of the part�s location data shall be specified by + // The syntax of the part's location data shall be specified by // the Station Name enumeration. When the Station Name // enumeration indicates On station (Range/Bearing or RNG/BRG), // the three location data fields shall represent the Range (in diff --git a/include/KDIS/PDU/Information_Operations/IO_Action_PDU.hpp b/include/KDIS/PDU/Information_Operations/IO_Action_PDU.hpp index 65ad86a..a9c47af 100644 --- a/include/KDIS/PDU/Information_Operations/IO_Action_PDU.hpp +++ b/include/KDIS/PDU/Information_Operations/IO_Action_PDU.hpp @@ -136,7 +136,7 @@ class KDIS_EXPORT IO_Action_PDU : public IO_Header { // Description: Identifies the name of the simulation model issuing this PDU. // 0 No statement. // 1-200 Reserved for future Io simulation sources. - // 201-255 Reserved for United States IO Simulation Sources � + // 201-255 Reserved for United States IO Simulation Sources - // See applicable agreement or the organizers of the // event (training, exercise, etc) in which information // operations is included. diff --git a/include/KDIS/PDU/Information_Operations/IO_Report_PDU.hpp b/include/KDIS/PDU/Information_Operations/IO_Report_PDU.hpp index 5639769..14629dc 100644 --- a/include/KDIS/PDU/Information_Operations/IO_Report_PDU.hpp +++ b/include/KDIS/PDU/Information_Operations/IO_Report_PDU.hpp @@ -91,7 +91,7 @@ class KDIS_EXPORT IO_Report_PDU : public IO_Header { // Description: Identifies the name of the simulation model issuing this PDU. // 0 No statement. // 1-200 Reserved for future Io simulation sources. - // 201-255 Reserved for United States IO Simulation Sources � + // 201-255 Reserved for United States IO Simulation Sources - // See applicable agreement or the organizers of the // event (training, exercise, etc) in which information // operations is included. diff --git a/include/KDIS/PDU/Live_Entity/Appearance_PDU.hpp b/include/KDIS/PDU/Live_Entity/Appearance_PDU.hpp index a7175e5..a103394 100644 --- a/include/KDIS/PDU/Live_Entity/Appearance_PDU.hpp +++ b/include/KDIS/PDU/Live_Entity/Appearance_PDU.hpp @@ -36,7 +36,7 @@ http://p.sf.net/kdis/UserGuide purpose: The Appearance PDU communicates information about the appearance of an Live Entity. This includes state information that is necessary for the receiving simulation applications to represent - the issuing entity�s appearance in the simulation application�s + the issuing entity's appearance in the simulation application's own simulation. size: 136 bits / 17 octets - Min size @@ -232,7 +232,7 @@ class KDIS_EXPORT Appearance_PDU : public LE_Header { //************************************ // FullName: KDIS::PDU::Appearance_PDU::SetAppearanceVisual // KDIS::PDU::Appearance_PDU::GetAppearanceVisual - // Description: Optional field. Specifies the dynamic changes to the entity�s + // Description: Optional field. Specifies the dynamic changes to the entity's // visual appearance attributes. // Note: Setting this value will also cause the relevant flag to // be set to true. @@ -245,7 +245,7 @@ class KDIS_EXPORT Appearance_PDU : public LE_Header { //************************************ // FullName: KDIS::PDU::Appearance_PDU::SetAppearanceIR // KDIS::PDU::Appearance_PDU::GetAppearanceIR - // Description: Optional field. Specifies the dynamic changes to the entity�s + // Description: Optional field. Specifies the dynamic changes to the entity's // infrared appearance attributes. // Note: Setting this value will also cause the relevant flag to // be set to true. @@ -258,7 +258,7 @@ class KDIS_EXPORT Appearance_PDU : public LE_Header { //************************************ // FullName: KDIS::PDU::Appearance_PDU::SetAppearanceEM // KDIS::PDU::Appearance_PDU::GetAppearanceEM - // Description: Optional field. Specifies the dynamic changes to the entity�s + // Description: Optional field. Specifies the dynamic changes to the entity's // electromagnetic appearance attributes. // Note: Setting this value will also cause the relevant flags to // be set to true. @@ -271,7 +271,7 @@ class KDIS_EXPORT Appearance_PDU : public LE_Header { //************************************ // FullName: KDIS::PDU::Appearance_PDU::SetAppearanceAudio // KDIS::PDU::Appearance_PDU::GetAppearanceAudio - // Description: Optional field. Specifies the dynamic changes to the entity�s + // Description: Optional field. Specifies the dynamic changes to the entity's // acoustic appearance attributes. // Note: Setting this value will also cause the relevant flags to // be set to true. diff --git a/include/KDIS/PDU/Live_Entity/LE_Detonation_PDU.hpp b/include/KDIS/PDU/Live_Entity/LE_Detonation_PDU.hpp index 6160dc0..60ab598 100644 --- a/include/KDIS/PDU/Live_Entity/LE_Detonation_PDU.hpp +++ b/include/KDIS/PDU/Live_Entity/LE_Detonation_PDU.hpp @@ -59,7 +59,7 @@ class KDIS_EXPORT LE_Detonation_PDU : public LE_Header { KUINT8 m_ui8MunitionSiteApp : 1; // F1 : 0 = Site Number and Application // Number data are the same as the firing - // entity�s and are not included + // entity's and are not included // in the Munition ID // 1 = Site Number and Application // Number fields are included in the @@ -68,7 +68,7 @@ class KDIS_EXPORT LE_Detonation_PDU : public LE_Header { // 1 = Munition ID field is included KUINT8 m_ui8EventSiteAppId : 1; // F3 : 0 = Site Number and Application // Number data are the same as the firing - // entity�s and are not included + // entity's and are not included // in the Event ID // 1 = Site Number and Application // Number fields are included in the diff --git a/include/KDIS/PDU/Live_Entity/LE_Fire_PDU.hpp b/include/KDIS/PDU/Live_Entity/LE_Fire_PDU.hpp index 9aa366b..998c33a 100644 --- a/include/KDIS/PDU/Live_Entity/LE_Fire_PDU.hpp +++ b/include/KDIS/PDU/Live_Entity/LE_Fire_PDU.hpp @@ -52,33 +52,33 @@ class KDIS_EXPORT LE_Fire_PDU : public LE_Header { union { struct { KUINT8 - m_ui8TargetId : 1; // F0 : 0 = Target Entity ID field is not included - // 1 = Target Entity ID field is included + m_ui8TargetId : 1; // F0 : 0 = Target Entity ID field is not included + // 1 = Target Entity ID field is included KUINT8 - m_ui8MunitionSiteApp : 1; // F1 : 0 = Site Number and Application - // Number data are the same as the firing - // entity�s and are not included - // in the Munition ID - // 1 = Site Number and Application - // Number fields are included in the - // Munition ID + m_ui8MunitionSiteApp : 1; // F1 : 0 = Site Number and Application + // Number data are the same as the firing + // entity's and are not included + // in the Munition ID + // 1 = Site Number and Application + // Number fields are included in the + // Munition ID KUINT8 m_ui8MunitionId : 1; // F2 : 0 = Munition ID field is not included // 1 = Munition ID field is included KUINT8 m_ui8EventSiteAppId : 1; // F3 : 0 = Site Number and Application // Number data are the same as the firing - // entity�s and are not included + // entity's and are not included // in the Event ID // 1 = Site Number and Application // Number fields are included in the // Event ID KUINT8 - m_ui8WarheadFuse : 1; // F4 : 0 = Warhead and Fuse fields of the - // Munition Descriptor record are not - // included (use munition default) - // 1 = Warhead and Fuse fields of the - // Munition Descriptor record are present + m_ui8WarheadFuse : 1; // F4 : 0 = Warhead and Fuse fields of the + // Munition Descriptor record are not + // included (use munition default) + // 1 = Warhead and Fuse fields of the + // Munition Descriptor record are present KUINT8 - m_ui8QuantRate : 1; // F5 : 0 = Quantity and Rate fields of the + m_ui8QuantRate : 1; // F5 : 0 = Quantity and Rate fields of the // Munition Descriptor record are not // included // 1 = Quantity and Rate fields of the @@ -267,7 +267,7 @@ class KDIS_EXPORT LE_Fire_PDU : public LE_Header { //************************************ // FullName: KDIS::PDU::LE_Fire_PDU::SetRange // KDIS::PDU::LE_Fire_PDU::GetRange - // Description: Range in meters that an entity�s fire control system has + // Description: Range in meters that an entity's fire control system has // assumed in // computing the fire control solution. For systems where range // is unknown or unavailable, this field shall contain the value diff --git a/include/KDIS/PDU/Live_Entity/TSPI_PDU.hpp b/include/KDIS/PDU/Live_Entity/TSPI_PDU.hpp index c78a9d5..7e2c728 100644 --- a/include/KDIS/PDU/Live_Entity/TSPI_PDU.hpp +++ b/include/KDIS/PDU/Live_Entity/TSPI_PDU.hpp @@ -34,9 +34,9 @@ http://p.sf.net/kdis/UserGuide author: Karl Jones purpose: Time Space Position Information(TSPI). - The TSPI PDU shall communicate information about a LE�s state + The TSPI PDU shall communicate information about a LE's state vector. This PDU includes state information that is necessary for the receiving - simulation applications to represent the issuing LE�s location + simulation applications to represent the issuing LE's location and movement in its own simulation. size: 200 bits / 25 octets - Min size @@ -141,7 +141,7 @@ class KDIS_EXPORT TSPI_PDU : public LE_Header { //************************************ // FullName: KDIS::PDU::TSPI_PDU::SetEntityLocation // KDIS::PDU::TSPI_PDU::GetEntityLocation - // Description: The entity�s physical location in the real world. + // Description: The entity's physical location in the real world. // Each delta distance component shall represent distance in // decimeters. // Parameter: const RelativeWorldCoordinates & L @@ -153,8 +153,8 @@ class KDIS_EXPORT TSPI_PDU : public LE_Header { //************************************ // FullName: KDIS::PDU::TSPI_PDU::SetEntityLinearVelocity // KDIS::PDU::TSPI_PDU::GetEntityLinearVelocity - // Description: Optional field. Specifies an entity�s linear velocity. - // The coordinate system for an entity�s linear velocity depends + // Description: Optional field. Specifies an entity's linear velocity. + // The coordinate system for an entity's linear velocity depends // on the dead reckoning algorithm used. Each vector component // shall represent velocity in decimeters per second. Note: // Setting this value will also cause the relevant flag to be set @@ -168,7 +168,7 @@ class KDIS_EXPORT TSPI_PDU : public LE_Header { //************************************ // FullName: KDIS::PDU::TSPI_PDU::SetEntityLinearOrientation // KDIS::PDU::TSPI_PDU::GetEntityLinearOrientation - // Description: Optional field. The entity�s orientation. + // Description: Optional field. The entity's orientation. // Note: Setting this value will also cause the relevant flag to // be set to true. // Parameter: const LE_EulerAngles & O @@ -229,7 +229,7 @@ class KDIS_EXPORT TSPI_PDU : public LE_Header { //************************************ // FullName: KDIS::PDU::TSPI_PDU::SetMeasuredSpeed // KDIS::PDU::TSPI_PDU::GetMeasuredSpeed - // Description: Optional field. Specifies the entity�s own measurement of + // Description: Optional field. Specifies the entity's own measurement of // speed (e.g., air speed for aircraft). // Speed in deci-meters per second. // Note: The position of the binary point is not defined in the diff --git a/include/KDIS/PDU/Minefield/Minefield_Data_PDU.hpp b/include/KDIS/PDU/Minefield/Minefield_Data_PDU.hpp index 22f325b..2289531 100644 --- a/include/KDIS/PDU/Minefield/Minefield_Data_PDU.hpp +++ b/include/KDIS/PDU/Minefield/Minefield_Data_PDU.hpp @@ -93,7 +93,7 @@ class KDIS_EXPORT Minefield_Data_PDU : public Minefield_Header { //************************************ // FullName: KDIS::PDU::Minefield_Data_PDU::calcPaddingPaintScheme // Description: Calculates the padding after the paint scheme. - // Padding � 8{[4 � N(2 F(8) + M F(9) + F(10) + 2)] mod4} bits + // Padding - 8{[4 - N(2 F(8) + M F(9) + F(10) + 2)] mod4} bits // unused PDU lies on a 32 bit boundary. //************************************ KUINT8 calcPaddingPaintScheme() const; diff --git a/include/KDIS/PDU/Minefield/Minefield_Query_PDU.hpp b/include/KDIS/PDU/Minefield/Minefield_Query_PDU.hpp index b523dca..d5d3acc 100644 --- a/include/KDIS/PDU/Minefield/Minefield_Query_PDU.hpp +++ b/include/KDIS/PDU/Minefield/Minefield_Query_PDU.hpp @@ -148,7 +148,7 @@ class KDIS_EXPORT Minefield_Query_PDU : public Minefield_Header { // queried by the requesting // simulation. // If a subfield within the Requested Minefield Type filter - // record (e.g., the country field) contains the value �1 (all + // record (e.g., the country field) contains the value -1 (all // bits set), then all subfield values shall match the filter // (e.g., all countries are allowed). // Parameter: const EntityType & MT diff --git a/include/KDIS/PDU/Synthetic_Environment/Areal_Object_State_PDU.hpp b/include/KDIS/PDU/Synthetic_Environment/Areal_Object_State_PDU.hpp index 1b76f71..313733e 100644 --- a/include/KDIS/PDU/Synthetic_Environment/Areal_Object_State_PDU.hpp +++ b/include/KDIS/PDU/Synthetic_Environment/Areal_Object_State_PDU.hpp @@ -105,7 +105,7 @@ class KDIS_EXPORT Areal_Object_State_PDU : public Object_State_Header { // KDIS::PDU::Areal_Object_State_PDU::SetModificationLocation // KDIS::PDU::Areal_Object_State_PDU::IsModificationLocation // Description: Identifies whether a modification has been made to the point - // object�s location . + // object's location . // Modification is represented by a single 8 bit unsigned int, // where bit 0 is the location modified flag. A value of 1(true) // indicates the field has been changed. All values are set to @@ -130,7 +130,7 @@ class KDIS_EXPORT Areal_Object_State_PDU : public Object_State_Header { //************************************ // FullName: KDIS::PDU::Areal_Object_State_PDU::SetObjectAppearance // KDIS::PDU::Areal_Object_State_PDU::GetObjectAppearance - // Description: Specifies the dynamic changes to an object�s appearance + // Description: Specifies the dynamic changes to an object's appearance // attributes. Parameter: const ArealObjectAppearance & A //************************************ void SetObjectAppearance(const KDIS::DATA_TYPE::ArealObjectAppearance& A); @@ -169,7 +169,7 @@ class KDIS_EXPORT Areal_Object_State_PDU : public Object_State_Header { // FullName: KDIS::PDU::Areal_Object_State_PDU::AddPoint // KDIS::PDU::Areal_Object_State_PDU::SetPoints // KDIS::PDU::Areal_Object_State_PDU::GetPoints - // Description: Specifies the points that make up the object�s physical + // Description: Specifies the points that make up the object's physical // location. Parameter: const WorldCoordinates & P, const // vector & P, void //************************************ diff --git a/include/KDIS/PDU/Synthetic_Environment/Point_Object_State_PDU.hpp b/include/KDIS/PDU/Synthetic_Environment/Point_Object_State_PDU.hpp index 6bf8f55..b0ede8a 100644 --- a/include/KDIS/PDU/Synthetic_Environment/Point_Object_State_PDU.hpp +++ b/include/KDIS/PDU/Synthetic_Environment/Point_Object_State_PDU.hpp @@ -109,7 +109,7 @@ class KDIS_EXPORT Point_Object_State_PDU : public Object_State_Header { // KDIS::PDU::Point_Object_State_PDU::SetModificationOrientation // KDIS::PDU::Point_Object_State_PDU::IsModificationOrientation // Description: Identifies whether a modification has been made to the point - // object�s + // object's // location or orientation. Modification is represented by a // single 8 bit unsigned int, where bit 0 is the location // modified flag and bit 1 is the orientation flag. A value of @@ -159,7 +159,7 @@ class KDIS_EXPORT Point_Object_State_PDU : public Object_State_Header { //************************************ // FullName: KDIS::PDU::Point_Object_State_PDU::SetObjectAppearance // KDIS::PDU::Point_Object_State_PDU::GetObjectAppearance - // Description: Specifies the dynamic changes to an object�s appearance + // Description: Specifies the dynamic changes to an object's appearance // attributes. Parameter: const PointObjectAppearance & O //************************************ void SetObjectAppearance(const KDIS::DATA_TYPE::PointObjectAppearance& A); diff --git a/src/PDU/Minefield/Minefield_Data_PDU.cpp b/src/PDU/Minefield/Minefield_Data_PDU.cpp index 25a7ca9..f0a3f1a 100644 --- a/src/PDU/Minefield/Minefield_Data_PDU.cpp +++ b/src/PDU/Minefield/Minefield_Data_PDU.cpp @@ -43,7 +43,7 @@ using namespace UTILS; ////////////////////////////////////////////////////////////////////////// KUINT8 Minefield_Data_PDU::calcPaddingPaintScheme() const { - // Padding � 8{[4 � N(2 F(8) + M F(9) + F(10) + 2)] mod4} bits unused + // Padding - 8{[4 - N(2 F(8) + M F(9) + F(10) + 2)] mod4} bits unused KUINT8 ui8NeedPadding = 2, ui8Pad = 0; if (m_DataFilter.IsFusing()) ui8NeedPadding += 2; if (m_DataFilter.IsScalarDetectionCoefficient()) @@ -425,7 +425,7 @@ void Minefield_Data_PDU::Decode(KDataStream& stream, MINE_DECODE_CLASS(MinePaintScheme, SetPaintSchemeValue) // Do we need to add padding? - // Padding � 8{[4 � N(2 F(8) + M F(9) + F(10) + 2)] mod4} bits unused + // Padding - 8{[4 - N(2 F(8) + M F(9) + F(10) + 2)] mod4} bits unused KUINT8 ui8PaddingNeeded2 = calcPaddingPaintScheme(); KUINT8 ui8Pad = 0; for (KUINT8 i = 0; i < ui8PaddingNeeded2; ++i) { -- 2.11.4.GIT