From e7c4fe2e316f6ed787f8e8337d09781b6ccc6da6 Mon Sep 17 00:00:00 2001 From: kevin-f-ortega Date: Fri, 13 Sep 2024 09:53:28 -0700 Subject: [PATCH] Remove PacketsSpec.xml from sources in new deployments (#215) * updated cmakelist so we don't fail to compile when we fail to update tlm packetizer * made comment better. also commented out another line that depends on packetizer --- .../{{cookiecutter.deployment_name}}/Top/CMakeLists.txt | 3 ++- .../Top/{{cookiecutter.deployment_name}}Topology.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/fprime/cookiecutter_templates/cookiecutter-fprime-deployment/{{cookiecutter.deployment_name}}/Top/CMakeLists.txt b/src/fprime/cookiecutter_templates/cookiecutter-fprime-deployment/{{cookiecutter.deployment_name}}/Top/CMakeLists.txt index 78d2860d..7e2c8774 100644 --- a/src/fprime/cookiecutter_templates/cookiecutter-fprime-deployment/{{cookiecutter.deployment_name}}/Top/CMakeLists.txt +++ b/src/fprime/cookiecutter_templates/cookiecutter-fprime-deployment/{{cookiecutter.deployment_name}}/Top/CMakeLists.txt @@ -7,7 +7,8 @@ set(SOURCE_FILES "${CMAKE_CURRENT_LIST_DIR}/instances.fpp" - "${CMAKE_CURRENT_LIST_DIR}/{{cookiecutter.deployment_name}}Packets.xml" + # Note: Uncomment when using Svc:TlmPacketizer + #"${CMAKE_CURRENT_LIST_DIR}/{{cookiecutter.deployment_name}}Packets.xml" "${CMAKE_CURRENT_LIST_DIR}/topology.fpp" "${CMAKE_CURRENT_LIST_DIR}/{{cookiecutter.deployment_name}}Topology.cpp" ) diff --git a/src/fprime/cookiecutter_templates/cookiecutter-fprime-deployment/{{cookiecutter.deployment_name}}/Top/{{cookiecutter.deployment_name}}Topology.cpp b/src/fprime/cookiecutter_templates/cookiecutter-fprime-deployment/{{cookiecutter.deployment_name}}/Top/{{cookiecutter.deployment_name}}Topology.cpp index e8e1acc7..8e236b65 100644 --- a/src/fprime/cookiecutter_templates/cookiecutter-fprime-deployment/{{cookiecutter.deployment_name}}/Top/{{cookiecutter.deployment_name}}Topology.cpp +++ b/src/fprime/cookiecutter_templates/cookiecutter-fprime-deployment/{{cookiecutter.deployment_name}}/Top/{{cookiecutter.deployment_name}}Topology.cpp @@ -5,7 +5,8 @@ // ====================================================================== // Provides access to autocoded functions #include <{{cookiecutter.deployment_name}}/Top/{{cookiecutter.deployment_name}}TopologyAc.hpp> -#include <{{cookiecutter.deployment_name}}/Top/{{cookiecutter.deployment_name}}PacketsAc.hpp> +// Note: Uncomment when using Svc:TlmPacketizer +//#include <{{cookiecutter.deployment_name}}/Top/{{cookiecutter.deployment_name}}PacketsAc.hpp> // Necessary project-specified types #include