OpenDDS · sonndinh · Mar 20, 2025 · Mar 19, 2025 · Mar 19, 2025 · Mar 19, 2025
diff --git a/.github/workflows/TMS.yml b/.github/workflows/TMS.yml
@@ -2,15 +2,12 @@ name: "TMS Builds"
 
 on:
   push:
-    paths:
-      - '**'
-      - '!**/.gitignore'
+    branches:
+      - main
   pull_request:
     paths:
       - '**'
       - '!**/.gitignore'
-    branches:
-      - main
   workflow_dispatch:
 
 concurrency:

diff --git a/tactical-microgrid-standard/CMakeLists.txt b/tactical-microgrid-standard/CMakeLists.txt
@@ -15,7 +15,7 @@ add_library(Common
 target_include_directories(Common PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 opendds_target_sources(Common
   PUBLIC
-    idl/mil-std-3071_data_model.idl
+    common/mil-std-3071_data_model.idl
   INCLUDE_BASE ${CMAKE_CURRENT_SOURCE_DIR}
   OPENDDS_IDL_OPTIONS -Lc++11
   USE_EXPORT "common/opendds_tms_export.h" OpenDDS_TMS_Export

diff --git a/tactical-microgrid-standard/cli/CLI.mpc b/tactical-microgrid-standard/cli/CLI.mpc
diff --git a/tactical-microgrid-standard/cli_idl/CLICommands.idl b/tactical-microgrid-standard/cli_idl/CLICommands.idl
@@ -1,4 +1,4 @@
-#include "idl/mil-std-3071_data_model.idl"
+#include "common/mil-std-3071_data_model.idl"
 
 module cli {
 

diff --git a/tactical-microgrid-standard/cli_idl/CLICommands.mpc b/tactical-microgrid-standard/cli_idl/CLICommands.mpc
diff --git a/tactical-microgrid-standard/common/Common.mpc b/tactical-microgrid-standard/common/Common.mpc
diff --git a/tactical-microgrid-standard/common/DeviceInfoDataReaderListenerImpl.cpp b/tactical-microgrid-standard/common/DeviceInfoDataReaderListenerImpl.cpp
@@ -1,4 +1,4 @@
-#include "idl/mil-std-3071_data_modelTypeSupportImpl.h"
+#include "common/mil-std-3071_data_modelTypeSupportImpl.h"
 #include "DeviceInfoDataReaderListenerImpl.h"
 
 void DeviceInfoDataReaderListenerImpl::on_data_available(DDS::DataReader_ptr reader)

diff --git a/tactical-microgrid-standard/common/Handshaking.h b/tactical-microgrid-standard/common/Handshaking.h
@@ -2,10 +2,9 @@
 #define HANDSHAKING_H
 
 #include "TimerHandler.h"
+#include "common/mil-std-3071_data_modelTypeSupportImpl.h"
 #include "opendds_tms_export.h"
 
-#include <idl/mil-std-3071_data_modelTypeSupportImpl.h>
-
 #include <dds/DCPS/Service_Participant.h>
 
 #include <functional>

diff --git a/tactical-microgrid-standard/common/HeartbeatDataReaderListenerImpl.cpp b/tactical-microgrid-standard/common/HeartbeatDataReaderListenerImpl.cpp
@@ -1,4 +1,4 @@
-#include "idl/mil-std-3071_data_modelTypeSupportImpl.h"
+#include "common/mil-std-3071_data_modelTypeSupportImpl.h"
 #include "HeartbeatDataReaderListenerImpl.h"
 
 void HeartbeatDataReaderListenerImpl::on_data_available(DDS::DataReader_ptr reader)

diff --git a/tactical-microgrid-standard/common/QosHelper.h b/tactical-microgrid-standard/common/QosHelper.h
@@ -1,7 +1,7 @@
 #ifndef QOS_HELPER_H
 #define QOS_HELPER_H
 
-#include "idl/mil-std-3071_data_modelTypeSupportImpl.h"
+#include "common/mil-std-3071_data_modelTypeSupportImpl.h"
 
 #include <dds/DdsDcpsCoreC.h>
 

diff --git a/...-standard/idl/mil-std-3071_data_model.idl → ...andard/common/mil-std-3071_data_model.idl b/...-standard/idl/mil-std-3071_data_model.idl → ...andard/common/mil-std-3071_data_model.idl
diff --git a/tactical-microgrid-standard/controller/Common.h b/tactical-microgrid-standard/controller/Common.h
@@ -1,7 +1,7 @@
 #ifndef CONTROLLER_COMMON_H
 #define CONTROLLER_COMMON_H
 
-#include "idl/mil-std-3071_data_modelTypeSupportImpl.h"
+#include "common/mil-std-3071_data_modelTypeSupportImpl.h"
 
 #include <dds/DCPS/optional.h>
 

diff --git a/tactical-microgrid-standard/controller/Controller.mpc b/tactical-microgrid-standard/controller/Controller.mpc
diff --git a/tactical-microgrid-standard/idl/tms.mpc b/tactical-microgrid-standard/idl/tms.mpc