From 46c8d8de3ea5b57a85fc7ca44cb0be3b27e34e43 Mon Sep 17 00:00:00 2001 From: "Dr. Torsten Wierschin" Date: Thu, 13 Aug 2026 18:43:10 +0200 Subject: [PATCH] Saves latest changes made in migration effort --- .gitignore | 1 + Lts/DDS/CMakeLists.txt | 5 + cmake/FindGrantlee5.cmake | 6 +- lts-cc.conf | 546 +++++++++++++++++++++++++++++++++++++- 4 files changed, 555 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c9a0442e5..c84e5e769 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ strix_runs/ .env-swy build/ +build_*/ diff --git a/Lts/DDS/CMakeLists.txt b/Lts/DDS/CMakeLists.txt index 703678813..91a2edecc 100755 --- a/Lts/DDS/CMakeLists.txt +++ b/Lts/DDS/CMakeLists.txt @@ -16,4 +16,9 @@ ADD_SUBDIRECTORY(Routing) ADD_SUBDIRECTORY(Core) ADD_SUBDIRECTORY(QosProfile) +# During stepwise migration, add placeholder CTest entries before the +# real DdsUnitTests subdir so the test-suite shows migration status even +# when internal codegen targets are not yet available. +ADD_SUBDIRECTORY(DdsUnitTestsPlaceholder) + ADD_SUBDIRECTORY(DdsUnitTests) diff --git a/cmake/FindGrantlee5.cmake b/cmake/FindGrantlee5.cmake index 04521b6ec..df65e26c8 100644 --- a/cmake/FindGrantlee5.cmake +++ b/cmake/FindGrantlee5.cmake @@ -19,7 +19,11 @@ if (PKG_CONFIG_FOUND) endif() # Try config-mode: look for Grantlee5Config.cmake in CMAKE_PREFIX_PATH or installed location -find_file(_Grantlee5Config NAMES Grantlee5Config.cmake PATHS ${CMAKE_PREFIX_PATH} NO_DEFAULT_PATH PATH_SUFFIXES Grantlee5) +# Try to locate Grantlee5Config.cmake via common locations: CMAKE_PREFIX_PATH, EXTERNAL_DIR, repo/external, and typical install paths +find_file(_Grantlee5Config NAMES Grantlee5Config.cmake + PATHS ${CMAKE_PREFIX_PATH} $ENV{EXTERNAL_DIR} /repo/external /repo/external/grantlee + NO_DEFAULT_PATH + PATH_SUFFIXES Grantlee5 lib/cmake/Grantlee5) if(_Grantlee5Config) include(${_Grantlee5Config}) if(TARGET Grantlee5::Templates) diff --git a/lts-cc.conf b/lts-cc.conf index 47afc1401..6a64bff96 100644 --- a/lts-cc.conf +++ b/lts-cc.conf @@ -1,2 +1,544 @@ -# Minimal lts-cc.conf placeholder -# Created to satisfy configure step +# +# @RDE_HEADER@ +# $Id$ +# $HeadURL$ +# $Author$ +# + +# use ";" in front to use the Default Values for the given entry +# use "true/false" or "1/0" for boolean values + +#----------------# +# Global Options # +#----------------# +[Global] + +# DatabaseHostname: Database Server Hostname to connect to +# -> Default: EXCDBS01 +DatabaseHostname=localhost + +# DatabaseName: Database to connect to on the DatabaseHostname +# -> Default: lts_ets_pro +DatabaseName=lts_ets_pro + +# DomainId: DDS DomainId to use for every started Service +# DomainId must be between 1 and 232 +# -> Default: last 8 Bits of the first ip adress found +;DomainId=42 + +# ServerHostname: Server Hostname to connect to for example: for svcReplayService +# -> Default: EXCTDS01 +;ServerHostname=EXCTDS01 + +# LogPath: Path log4cxx should put LogFiles into +# user needs rights to access the directory +# -> Default: /shd/CTC/LOG +;LogPath=/shd/CTC/LOG + + +#---------------------------------# +#Options for Excercise Management # +#---------------------------------# +[ExerciseManagement] + +# maxStartedExercises: Maximum Started Exercises +# Default -> 1 +;maxStartedExercises=1 + +# maxPreparedExercises: Maximum Pepared Exercises +# Default -> 4 +;maxPreparedExercises=4 + +# maxStoppedExercises: Maximum Stopped Exercises +# Default -> 5 +;maxStoppedExercises=5 + +# maxHlaExercises: Maximum HLA Exercises +# Default -> 1 +;maxHlaExercises=1 + +#--------------------------------# +#Options for Evaluation Database # +#--------------------------------# +[EvaluationDb] + +# DatabaseHostname: Database Hostname to Access +# Default -> "EXCADB01" +;DatabaseHostname = "EXCADB01" + +# DatabaseName: Database Name to Access +# Default -> "dbAdmin" +;DatabaseName = "dbAdmin" + + +#---------------------------------------# +#Options for Central Effect Simulations # +#---------------------------------------# +[CES] +# geopairingIniPath: Path where the GeoParing Ini Files are located +;geopairingIniPath=/shd/CTC/TOOLS/TDS/TDS-build/bin/GeoPairing/firingTables + +# geopairingIniFile: Name of the GeoParing Ini File +;geopairingIniFile=GeoPairing.ini + +# ammunitionIniFile: Name of the Ammunition Ini File +;ammunitionIniFile=Ammunition.ini + +# cesCheatingDistanceVehicle: maximum Cheating Distance for Vehicles in CES +;cesCheatingDistanceVehicle=20 + +# cesCheatingDistanceSoldier: maximum Cheating Distance for Soldiers in CES +;cesCheatingDistanceSoldier=5 + +# calculateCentralAes: enable Central Area Effect Simulation +# 0 = OFF +# 1 = AES calculation ON +# 2 = AES calculation ONLY in WLS-Areas +# Default -> 0 +;calculateCentralAes=0 : +calculateCentralAes=1 + +# handleBlockedAreas: enable handling of Blocked Areas +# Default -> false +handleBlockedAreas=false + + +# Settings for Artillerie-Sounds: + +# playArtillerieSounds: Enable Artillery Sounds +# Default -> 0 +playArtillerieSounds=1 + +# user: Username for Artillerie Sounds +user="katar" + +# passwd: Password for Artillerie Sounds +passwd="mout11de" + +# distanceThreshold: distanceThreshold for CES Artillerie Sound +# Default -> 1.415 +distanceThreshold=1.415 + +# factor: Volume factor for CES Artillerie Sounds +# Default -> 15.05 +factor=15.05 + +# soundId: SoundId to play on Artillere Hit +# Default -> 1 +soundId=1 + +# reduceFactor: reduceFactor for Artillerie Sounds +# 1.0 = 100 percent +# Default -> 1.0 +reduceFactor=1.0 ; for Tests 1.0 = 100 percent + +#-----------------------------------# +# Settings for CES-Plugins # +#-----------------------------------# +[CES_MINE_AREAS] +# older entries of mines are outdated +#PeriodStoredMinesOutdated=5000 + + +#-----------------------------------# +# Settings for AreaEffectSimulation # +#-----------------------------------# +[AES] + +# use2BytesForSingleFireDiameter: +# Default = 1 +use2BytesForSingleFireDiameter=1 + +# geopairingIniPath: path where the geoparing Ini Files are located +# Default -> "./GeoPairing/firingTables" +geopairingIniPath="./GeoPairing/firingTables" + +# geopairingIniFile: GeoParing Ini File in AES +# Default -> "GeoPairing.ini" +geopairingIniFile="GeoPairing.ini" + +# ammunitionIniFile: Ammunition file name for GeoParing in AES +# Default -> "Ammunition.ini" +ammunitionIniFile="Ammunition.ini" + +# DusSingleMineEffectStartOffset=30 * 1000 // 30 seconds default +# Default -> 30 seconds default + +# ActivationTimeAfterStopSupplyTruck Time that a Supply Truck must have been stationary before the functional Area becomes active. +# Default -> 5000 [ms] +# ActivationTimeAfterStopSupplyTruck=5000 + +# MaximumStepLengthStanding: Radius in which the vehicle is detected as stationary. +# Default -> 20 [m] +# MaximumStepLengthStanding=20 + +#----------------------------# +# Settings for FireAutomaton # +#----------------------------# +[FIRE_PATTERN] +# Effector pattern for the fire automaton +# Default -> "next" +# pattern_id = pattern_string +0 = "next" + +#-------- +# Effects +#-------- +# Confluence->Legatus->03_PROJEKTE->ADLER III Anbindung ->Konzepte->ADLER-generierte Steilfeuer->State-Machine Effector +# +#Default = 10 s ( 10 * 1000) +#The timer is not used for negative values. +;EffectorIntervalFireMin=10000 +#Default = 15 s ( 15 * 1000) +;EffectorIntervalFireMax=15000 +#Default = 10 s ( 10 * 1000) +#The timer is not used for negative values. +;EffectorIntervalReportFiredMin=10000 +#Default = 15 s ( 15 * 1000) +;EffectorIntervalReportFiredMax=15000 +#Default = 10 s ( 10 * 1000) +#The timer is not used for negative values. +;EffectormIntervalReportFireReadinessMin=10000 +#Default = 15 s ( 15 * 1000) +;EffectormIntervalReportFireReadinessMax=15000 +#Default = 10 s ( 10 * 1000) +#The timer is not used for negative values. +;getEffectorInitialReportFireReadinessMin=10000 +#Default = 15 s ( 15 * 1000) +;getEffectorInitialReportFireReadinessMax=15000 + +#---------------------------------------# +#Options for Central Effect Simulations # +#---------------------------------------# +[EEM] +# cleanupTimeout: timeout in ms for cleanup AVS events +# Default -> 600000 +cleanupTimeout = 0 + +#------------------# +# Settings for HLA # +#------------------# +[hla] + +# webSocketListenPort: HLA Websocket Port +# Default -> 12347 +;webSocketListenPort=12347 + +# webSocketHostname: HLA Websocket hostname to connect to +# Default -> "localhost" +;webSocketHostname="localhost" + + +#-------------------------# +# Settings for GueZ Nasat # +#-------------------------# +[GNA] + +# socketListenPort: GNA Listen Port +# Default -> 8420 +;socketListenPort= 8420 + +# useWebSocket: Enable GNA Websocket +# Default -> false +;useWebSocket = false + +# simulationPosLatDegree: GNA simulated Position Lat in Degree +# Default -> 11.560 +;simulationPosLatDegree=11.560 + +# simulationPosLonDegree: GNA simulated Position Lon in Degree +# Default -> 52.457 +;simulationPosLonDegree=52.457 + + +#------------------------------# +# Settings for AVS Workstation # +#------------------------------# +[AVS_WORKSTATION] + +# host: AVS Workstation host to connect to +# Default -> localhost +;host = localhost + +# port: AVS Workstation Port to connect to +# Default -> 6370 +;port = 6370 + +# KeepAlive: enable KeepAlive Signals to AVS +# Default -> true +;KeepAlive = true + +# Timeout: Timeout time in ms +# 0 :disable +# Default -> 3000 +;Timeout = 3000 + + +#------------------------------------------# +# Settings for AVS Workstation VD (Export) # +#------------------------------------------# +[AVS_WORKSTATION_VD] + +# host: AVS Workstation VD host to connect to +# Default -> localhost +;host = localhost + +# port: AVS Workstation VD Port to connect to +#Default -> 6380 +;port = 6380 + +# KeepAlive: enable KeepAlive Signals to AVS VD +# Default -> true +;KeepAlive = true + +# Timeout: Timeout time in ms VD +# 0 :disable +# Default -> 60000 +;Timeout = 3000 + + +#--------------------------------# +# Options for Training Area Base # +#--------------------------------# +[TrainingAreaBase] + +# TimeDelayAhead: Time Delay max ahead in ms where topics are send to dds from TAB +# Default -> 60000 +;TimeDelayAhead=60000 + +# TimeDelayBack: Time Delay max back in ms where topics are send to dds from TAB +# Default -> 60000 +;TimeDelayBack=60000 + +# UseTetraScrambling: enable Tetra Scrambling for Training Area Base +# Default -> BUILD GUEZ_MODE = true +# Default -> NO GUEZ MODE = false +;UseTetraScrambling=false + +# UsePvSan: enable PVSan functionality for TAB (add 2 Bytes to INIT BE CAREFULL!) +# Default -> false +;UsePvSan=false + +############################# +# IPS/OPS GPS transition +# DistanceIpsToGps=0 Distance of the first GPS coordinate to the building after an IPS position default = 0 [m] (int) +# DistanceOpsToGps=0 Distance of the first GPS coordinate to the building after an OPS position default = 0 [m] (int) +# MaxSoldierSpeed=4.0 fastest plausible speed of a soldier when transitioning from IPS/OPS to GPS [m/s] (double) +# MaxSpeedCheckTimeout=10 Time in which the speed-plausibility check is made [s] (int). After that, the GPS reports are valid again + +#-------------------------------------# +# Settings for TrainingAreaBaseOc # +#-------------------------------------# +[TabOC] +# remoteServerHostname: servername to connect the websocket to get portfinformation and ppmEX port +# Default -> "EXCTDS01" +;remoteServerHostname="EXCTDS01" + +#-------------------------------------# +# Settings for Oc Base Download # +#-------------------------------------# +[OcBaseDownload] + +# remoteDbName: Remote DB Name to Download from +# Default -> lts_ets_pro +;remoteDbName="lts_ets_pro" + +# remoteDbHostName: Remote Hostname to Download from +# Default -> EXCDBS01 +;remoteDbHostName="EXCDBS01" + +#-------------------------------------# +# Settings for Audio Video Management # +#-------------------------------------# +[AVM] + +# addacServerNamePrefix: ADDAC Servername Prefix +# Default -> ECCORIF +;addacServerNamePrefix="ECCORIF" + +# addacPortsPerServer: ADDAC Ports per Server +# Default -> 16 +;addacPortsPerServer=16 + + +#-------------------------------------# +# Settings for Participant Management # +#-------------------------------------# +[PPM] + +# markVehiclesAsReservedFromExcon: enable mark Vehicles as Reserves +# Default -> true +;markVehiclesAsReservedFromExcon=true + + +#--------------------------------# +# Settings for Target Management # +#--------------------------------# +[TGT] +# useL400Targets: enable L400 Target calculation +# Default -> false +;useL400Targets = false + + +#-----------------------------------# +# Settings for Recording Management # +#-----------------------------------# +[RecordingManagement] +# UpdateFrequency: Update Frequency in ms to write into recording tables +# Default -> 1000 +;UpdateFrequency = 1000 + + +#----------------------------------------------# +# Options for Wireless Location System Service # +#----------------------------------------------# +[WLS] + +# wlsListenPort: Port to listen to for WLS Connections +# Default -> 12002 +;wlsListenPort=12002 + +# webSocketListenPort: set Websocket Listen Port for WLS +# Default -> 123456 +;webSocketListenPort=12346 + +# wlsBasePoint: BasePoint for WLS Position Calculations +# MGRS format +# Default -> 32UMD0000000000000000 +;wlsBasePoint=32UMD0000000000000000 + +# wlsZOffset: Z offset for WLS Positions +# Default -> 0 +;wlsZOffset=0 + +# squareDistanceMax: squared maximum distance before sending to ppm +# Default -> 0.0 +#squareDistanceMax=0.0 + +#-----------------------------------------# +# Options for BuildingControlUnit Service # +#-----------------------------------------# +[BuildingControlUnit] + +# fireThreshold: +# Default -> 70 +;fireThreshold=70 + +# killThreshold: Threshold destruction until Building is destroyed +# Default -> 80 +;killThreshold=80 + +# effectSoundIdEccActivate: Activate Sound Id to play +# Default -> 0 +;effectSoundIdEccActivate=0 + +# effectSoundIdEccDestroy: Destroy Sound Id to play +# Default -> 1 +;effectSoundIdEccDestroy=1 + +# hitSoundVolume: Volume for Hit Sound +# Volume in Percent from 0-100 +# Default - > 100 +;hitSoundVolume=100 + +# activationSoundId: Activation sound to play on building init +# Default -> 0 +;activationSoundId=0 + +# activationSoundVolume: Activations Sounds Volume +# Volume in Percent from 0-100 +# Default - > 100 +;activationSoundVolume=100 + +# fireSoundId: Fire sound to play on building hit +# Default -> 4 +;fireSoundId=4 + +# fireSoundVolume: Volume for Fire Sound +# Volume in Percent from 0-100 +# Default - > 100 +;fireSoundVolume=100 + +# fireSoundCategory: Sound Categories +# OTHER VALUES??? +# Default -> Inside_buildings +;fireSoundCategory=Inside_buildings + +# minimumRemainEffectThreshold: Threshold until hits get relayed to neighbouring rooms +#Default -> 10 +minimumRemainEffectThreshold=1 + +# transitionMultiplier: Force Multiplier for every building hit +# Default -> 3.0 +;transitionMultiplier=3.0 + +# numberOfFlashes: Numbers of flashes or groups per hit +# 0 - 254 : Number of flashes (or groups) +# 255 : infinte flashes +# Default -> 10 +;numberOfFlashes=10 + +# pauseDuration: Pause between two flashes (or Groups) in Seconds +# 1 - 10 +# Default -> 1 +;pauseDuration=1 + +# choppedConfiguration: Number of Single Flash Pulses inside a group +# 0 - 1 : NO chopped flash +# 2 - 20: Number of flashes +# Default -> 10 +;choppedConfiguration=10 + +# flashDuration: Duration in ms for Building Sensor Module flashes +# Default -> 30 +;flashDuration=30 + +# laserRangeCode: Laser Code to ignore when handling Laser Hits on Building +# Default -> 2178 +;laserRangeCode=2178 + + +#------------------------------# +# Options for Sound Management # +#------------------------------# +[SOM] + +# user: Username to use for SOM +# Default -> "katar" +;user="katar" + +# passwd: Password to use for SOM +# Default -> "Mout11de" +;passwd="mout11de" + + +#-------------------------------# +# Options for ServiceManagement # +#-------------------------------# +[ServiceManagement] + +# ObserverIntervall: Time in ms the ServiceManagement waits for a Service's Heartbeat until it's restarts the Service +# Default -> 10000 (10 Seconds) +;ObserverIntervall=10000 + +#------------------------------------# +# Options for NotificationManagement # +#------------------------------------# +[NOM] +# expiryIntervalMSec: default 2 tage +# notificationPriority: Highest = 1, High = 2, Normal = 3, Low = 4 +expiryIntervalMSec=172800000 +notificationPriority=2 + +#-------------------------------# +# Options for db Administration # +#-------------------------------# +[dbAdministration] + +# DatabaseHostname: Database Hostname to connect to +# Default -> "EXCDBS01" +;DatabaseHostname="EXCDBS01" + +# DatabaseName: Database name to connect to +# Default -> "lts_ets_pro" +;DatabaseName="lts_ets_pro"