From 622d6c1cb419a7fbe9a88b82515a6a92a6510a4f Mon Sep 17 00:00:00 2001 From: "Kevin F. Ortega" Date: Wed, 11 Sep 2024 14:38:29 -0700 Subject: [PATCH 1/2] updated cmakelist so we don't fail to compile when we fail to update tlm packetizer --- .../{{cookiecutter.deployment_name}}/Top/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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..12f0d629 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" + # Uncomment this line if you are using 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" ) From 2b10c730c5c1e061cf6775ea62b4ca1c0ebcaf6d Mon Sep 17 00:00:00 2001 From: "Kevin F. Ortega" Date: Wed, 11 Sep 2024 14:49:47 -0700 Subject: [PATCH 2/2] made comment better. also commented out another line that depends on packetizer --- .../{{cookiecutter.deployment_name}}/Top/CMakeLists.txt | 2 +- .../Top/{{cookiecutter.deployment_name}}Topology.cpp | 3 ++- 2 files changed, 3 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 12f0d629..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,7 @@ set(SOURCE_FILES "${CMAKE_CURRENT_LIST_DIR}/instances.fpp" - # Uncomment this line if you are using TlmPacketizer + # 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