WindhoverLabs · mbenson1 · Mar 22, 2022 · Mar 22, 2022 · Mar 22, 2022 · Mar 22, 2022
diff --git a/Makefile b/Makefile
@@ -12,8 +12,8 @@
 #    notice, this list of conditions and the following disclaimer in
 #    the documentation and/or other materials provided with the
 #    distribution.
-# 3. Neither the name Windhover Labs nor the names of its 
-#    contributors may be used to endorse or promote products derived 
+# 3. Neither the name Windhover Labs nor the names of its
+#    contributors may be used to endorse or promote products derived
 #    from this software without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -108,14 +108,10 @@ help::
 	@echo '                              reference build.                                  '
 	@echo '    docs-sphinx             : Generate the Sphinx documentation from the        '
 	@echo '                              reference build.                                  '
-
-
-.PHONY: help Makefile docs obc
 
 
-obc:: obc/ppd obc/cpd
-	@echo 'Done'
-
+.PHONY: help Makefile docs obc
+
 
 $(GENERIC_TARGET_NAMES)::
 	@echo 'Building '$@'.'
@@ -141,16 +137,41 @@ $(GENERIC_TARGET_NAMES)::
 					$(MAKE) --no-print-directory); \
 				fi \
 		done;
-
+
+
+obc:: obc/ppd obc/cpd
+	@rm -Rf build/obc/target
+	@echo 'Done'
+
+
 workspace::
-	@echo 'Generating ground products.'
+	@echo 'Generating PPD message definitions.'
 	@make -C build/obc/ppd/target ground-tools
+	@echo 'Generating CPD message definitions.'
 	@make -C build/obc/cpd/target ground-tools
-	-rm build/obc/commander_workspace/etc/registry.yaml
-	python3 core/base/tools/config/yaml_path_merger.py --yaml_output build/obc/commander_workspace/etc/registry.yaml --yaml_input build/obc/cpd/target/wh_defs.yaml --yaml_path /modules/cpd
-	python3 core/base/tools/config/yaml_path_merger.py --yaml_output build/obc/commander_workspace/etc/registry.yaml --yaml_input build/obc/ppd/target/wh_defs.yaml --yaml_path /modules/ppd
-
-
+	@echo 'Adding XTCE configuration to registries.'
+	@yaml-merge  core/base/tools/commander/xtce_config.yaml build/obc/cpd/target/wh_defs.yaml --overwrite build/obc/cpd/target/wh_defs.yaml
+	@yaml-merge  core/base/tools/commander/xtce_config.yaml build/obc/ppd/target/wh_defs.yaml --overwrite build/obc/ppd/target/wh_defs.yaml
+	@echo 'Generating combined registry.'
+	@rm -Rf build/obc/commander_workspace >/dev/null
+	@mkdir -p build/obc/commander_workspace/etc
+	@python3 core/base/tools/config/yaml_path_merger.py --yaml_output build/obc/commander_workspace/etc/registry.yaml --yaml_input build/obc/cpd/target/wh_defs.yaml --yaml_path /modules/cpd
+	@python3 core/base/tools/config/yaml_path_merger.py --yaml_output build/obc/commander_workspace/etc/registry.yaml --yaml_input build/obc/ppd/target/wh_defs.yaml --yaml_path /modules/ppd
+	@echo 'Generating Commander workspace.'
+	@python3 core/base/tools/commander/generate_workspace.py build/obc/commander_workspace/etc/registry.yaml build/obc/commander_workspace/
+	@echo 'Generating CPD XTCE'
+	@core/tools/auto-yamcs/src/generate_xtce.sh ${PWD}/build/obc/cpd/target/wh_defs.yaml ${PWD}/build/obc/cpd/target/wh_defs.db ${PWD}/build/obc/commander_workspace/mdb/cpd.xml
+	@echo 'Generating PPD XTCE'
+	@core/tools/auto-yamcs/src/generate_xtce.sh ${PWD}/build/obc/ppd/target/wh_defs.yaml ${PWD}/build/obc/ppd/target/wh_defs.db ${PWD}/build/obc/commander_workspace/mdb/ppd.xml
+
+
+workspace-pyliner:: workspace
+	@echo "Generating pyliner workspace"
+	@mkdir -p build/obc/pyliner/commander_workspace
+	@cp -r ${PWD}/build/obc/commander_workspace/* build/obc/pyliner/commander_workspace
+	@cp -r config/obc/ppd/pyliner/server_overlay/etc  ${PWD}/build/obc/pyliner/commander_workspace
+
+
 workspace-sitl::
 	@echo 'Generating ground products.'
 	@ln -s cf build/obc/cpd/sitl/target/target/exe/ram || /bin/true
@@ -159,27 +180,27 @@ workspace-sitl::
 	-rm build/obc/sitl_commander_workspace/etc/registry.yaml
 	python3 core/base/tools/config/yaml_path_merger.py --yaml_output build/obc/sitl_commander_workspace/etc/registry.yaml --yaml_input build/obc/cpd/sitl/target/wh_defs.yaml --yaml_path /modules/cpd
 	python3 core/base/tools/config/yaml_path_merger.py --yaml_output build/obc/sitl_commander_workspace/etc/registry.yaml --yaml_input build/obc/ppd/sitl/target/wh_defs.yaml --yaml_path /modules/ppd
-	
-	
+
+
 obc-sitl:: obc/ppd/sitl obc/cpd/sitl
 	@echo 'Done'
-	
-	
+
+
 docs-doxygen:
 	mkdir -p build/${SPHINX_FSW_BUILD}/target; \
 	(cd build/${SPHINX_FSW_BUILD}/target; /usr/bin/cmake -DBUILDNAME:STRING=${SPHINX_FSW_BUILD} \
 		-G"Eclipse CDT4 - Unix Makefiles" -DCMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT=TRUE CMAKE_BUILD_TYPE=Debug $(ROOT_DIR); make docs);
-	
-	
-docs-sphinx: 
+
+
+docs-sphinx:
 	@echo 'Building $$SPHINX_FSW_BUILD.'
 	mkdir -p build/${SPHINX_FSW_BUILD}/target; \
 	(cd build/${SPHINX_FSW_BUILD}/target; /usr/bin/cmake -DBUILDNAME:STRING=${SPHINX_FSW_BUILD} \
 		-G"Eclipse CDT4 - Unix Makefiles" -DCMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT=TRUE CMAKE_BUILD_TYPE=Debug $(ROOT_DIR));
 	@$(SPHINX_BUILD) -M html "$(SOURCE_DIR)" "$(SPHINX_BUILDDIR)" $(SPHINX_OPTS) -c build/$(SPHINX_FSW_BUILD)/target/docs $(O)
 	@echo 'Completed'
-	
-	
+
+
 docs: docs-doxygen docs-sphinx
 	@echo 'Completed'
 
@@ -195,13 +216,14 @@ python-env::
 	@echo 'Deactivate:                                                                     '
 	@echo '    deactivate                                                                  '
 	@echo '                                                                                '
-	
-	
-submodule-update: 
+
+
+submodule-update:
 	@echo 'Completed'
 	@echo 'Updating submodules'
 	git submodule update --init --recursive
 
+
 remote-install::
 	@echo 'Installing onto test flight vehicle at $(REMOTE_ADDRESS)'
 	ssh-keygen -f "${HOME}/.ssh/known_hosts" -R "$(REMOTE_ADDRESS)"
@@ -211,14 +233,15 @@ remote-install::
 	scp build/obc/cpd/target/target/exe/airliner windhover@$(REMOTE_ADDRESS):~
 	scp config/obc/ppd/target/airliner.service windhover@$(REMOTE_ADDRESS):~
 
+
 local-install::
 	@echo 'Installing onto test flight vehicle at /media/${USER}/'
 	-sudo rm -Rf /media/${USER}/rootfs/opt/airliner
 	sudo cp -R build/obc/ppd/target/target/exe /media/${USER}/rootfs/opt/airliner
 	sudo cp build/obc/cpd/target/target/exe/airliner /media/${USER}/rootfs/lib/firmware
 	-sudo cp build/obc/ppd/target/target/hitl_bridge/hitl_bridge /media/${USER}/rootfs/usr/local/bin/
 
+
 clean::
 	@echo 'Cleaning flight software builds                                                 '
 	rm -rf build
-
diff --git a/apps/bat/cdr/Main.opi b/apps/bat/cdr/Main.opi
@@ -19,7 +19,7 @@
   <macros>
     <APP>cf</APP>
     <include_parent_macros>true</include_parent_macros>
-    <CPUID>@BUILDLINER_CDR_CPUID@</CPUID>
+    <CPUID>{{ cpu_id }}</CPUID>
     <REGISTRY_PATH>/modules/$(CPUID)/modules/$(APP)</REGISTRY_PATH>
 @BUILDLINER_CDR_MACRO_BLOCK@
 @BUILDLINER_CDR_MACRO_BLOCK_CUSTOM@

diff --git a/apps/cf/cdr/Downlink/DeleteQueueNode.bob b/apps/cf/cdr/Downlink/DeleteQueueNode.bob
@@ -4,7 +4,7 @@
   <macros>
     <APP>cf</APP>
     <include_parent_macros>true</include_parent_macros>
-    <CPUID>@BUILDLINER_CDR_CPUID@</CPUID>
+    <CPUID>{{ cpu_id }}</CPUID>
     <REGISTRY_PATH>/modules/$(CPUID)/modules/$(APP)</REGISTRY_PATH>
 @BUILDLINER_CDR_MACRO_BLOCK@
 @BUILDLINER_CDR_MACRO_BLOCK_CUSTOM@

diff --git a/apps/cf/cdr/Downlink/DisableDequeue.bob b/apps/cf/cdr/Downlink/DisableDequeue.bob
@@ -4,7 +4,7 @@
   <macros>
     <APP>cf</APP>
     <include_parent_macros>true</include_parent_macros>
-    <CPUID>@BUILDLINER_CDR_CPUID@</CPUID>
+    <CPUID>{{ cpu_id }}</CPUID>
     <REGISTRY_PATH>/modules/$(CPUID)/modules/$(APP)</REGISTRY_PATH>
 @BUILDLINER_CDR_MACRO_BLOCK@
 @BUILDLINER_CDR_MACRO_BLOCK_CUSTOM@

diff --git a/apps/cf/cdr/Downlink/DisablePollingDirectory.bob b/apps/cf/cdr/Downlink/DisablePollingDirectory.bob
@@ -4,7 +4,7 @@
   <macros>
     <APP>cf</APP>
     <include_parent_macros>true</include_parent_macros>
-    <CPUID>@BUILDLINER_CDR_CPUID@</CPUID>
+    <CPUID>{{ cpu_id }}</CPUID>
     <REGISTRY_PATH>/modules/$(CPUID)/modules/$(APP)</REGISTRY_PATH>
 @BUILDLINER_CDR_MACRO_BLOCK@
 @BUILDLINER_CDR_MACRO_BLOCK_CUSTOM@

diff --git a/apps/cf/cdr/Downlink/EnableDequeue.bob b/apps/cf/cdr/Downlink/EnableDequeue.bob
@@ -4,7 +4,7 @@
   <macros>
     <APP>cf</APP>
     <include_parent_macros>true</include_parent_macros>
-    <CPUID>@BUILDLINER_CDR_CPUID@</CPUID>
+    <CPUID>{{ cpu_id }}</CPUID>
     <REGISTRY_PATH>/modules/$(CPUID)/modules/$(APP)</REGISTRY_PATH>
 @BUILDLINER_CDR_MACRO_BLOCK@
 @BUILDLINER_CDR_MACRO_BLOCK_CUSTOM@

diff --git a/apps/cf/cdr/Downlink/EnablePollingDirectory.bob b/apps/cf/cdr/Downlink/EnablePollingDirectory.bob
@@ -4,7 +4,7 @@
   <macros>
     <APP>cf</APP>
     <include_parent_macros>true</include_parent_macros>
-    <CPUID>@BUILDLINER_CDR_CPUID@</CPUID>
+    <CPUID>{{ cpu_id }}</CPUID>
     <REGISTRY_PATH>/modules/$(CPUID)/modules/$(APP)</REGISTRY_PATH>
 @BUILDLINER_CDR_MACRO_BLOCK@
 @BUILDLINER_CDR_MACRO_BLOCK_CUSTOM@

diff --git a/apps/cf/cdr/Downlink/GiveTake.bob b/apps/cf/cdr/Downlink/GiveTake.bob
@@ -4,7 +4,7 @@
   <macros>
     <APP>cf</APP>
     <include_parent_macros>true</include_parent_macros>
-    <CPUID>@BUILDLINER_CDR_CPUID@</CPUID>
+    <CPUID>{{ cpu_id }}</CPUID>
     <REGISTRY_PATH>/modules/$(CPUID)/modules/$(APP)</REGISTRY_PATH>
 @BUILDLINER_CDR_MACRO_BLOCK@
 @BUILDLINER_CDR_MACRO_BLOCK_CUSTOM@

diff --git a/apps/cf/cdr/Downlink/Kickstart.bob b/apps/cf/cdr/Downlink/Kickstart.bob
@@ -4,7 +4,7 @@
   <macros>
     <APP>cf</APP>
     <include_parent_macros>true</include_parent_macros>
-    <CPUID>@BUILDLINER_CDR_CPUID@</CPUID>
+    <CPUID>{{ cpu_id }}</CPUID>
     <REGISTRY_PATH>/modules/$(CPUID)/modules/$(APP)</REGISTRY_PATH>
 @BUILDLINER_CDR_MACRO_BLOCK@
 @BUILDLINER_CDR_MACRO_BLOCK_CUSTOM@

diff --git a/apps/cf/cdr/Downlink/Main.bob b/apps/cf/cdr/Downlink/Main.bob
@@ -4,7 +4,7 @@
   <macros>
     <APP>cf</APP>
     <include_parent_macros>true</include_parent_macros>
-    <CPUID>@BUILDLINER_CDR_CPUID@</CPUID>
+    <CPUID>{{ cpu_id }}</CPUID>
     <REGISTRY_PATH>/modules/$(CPUID)/modules/$(APP)</REGISTRY_PATH>
 @BUILDLINER_CDR_MACRO_BLOCK@
 @BUILDLINER_CDR_MACRO_BLOCK_CUSTOM@

diff --git a/apps/cf/cdr/Downlink/PlaybackDirectory.bob b/apps/cf/cdr/Downlink/PlaybackDirectory.bob
@@ -4,7 +4,7 @@
   <macros>
     <APP>cf</APP>
     <include_parent_macros>true</include_parent_macros>
-    <CPUID>@BUILDLINER_CDR_CPUID@</CPUID>
+    <CPUID>{{ cpu_id }}</CPUID>
     <REGISTRY_PATH>/modules/$(CPUID)/modules/$(APP)</REGISTRY_PATH>
 @BUILDLINER_CDR_MACRO_BLOCK@
 @BUILDLINER_CDR_MACRO_BLOCK_CUSTOM@

diff --git a/apps/cf/cdr/Downlink/PlaybackFile.bob b/apps/cf/cdr/Downlink/PlaybackFile.bob
@@ -4,7 +4,7 @@
   <macros>
     <APP>cf</APP>
     <include_parent_macros>true</include_parent_macros>
-    <CPUID>@BUILDLINER_CDR_CPUID@</CPUID>
+    <CPUID>{{ cpu_id }}</CPUID>
     <REGISTRY_PATH>/modules/$(CPUID)/modules/$(APP)</REGISTRY_PATH>
 @BUILDLINER_CDR_MACRO_BLOCK@
 @BUILDLINER_CDR_MACRO_BLOCK_CUSTOM@

diff --git a/apps/cf/cdr/Downlink/QuickStatus.bob b/apps/cf/cdr/Downlink/QuickStatus.bob
@@ -4,7 +4,7 @@
   <macros>
     <APP>cf</APP>
     <include_parent_macros>true</include_parent_macros>
-    <CPUID>@BUILDLINER_CDR_CPUID@</CPUID>
+    <CPUID>{{ cpu_id }}</CPUID>
     <REGISTRY_PATH>/modules/$(CPUID)/modules/$(APP)</REGISTRY_PATH>
 @BUILDLINER_CDR_MACRO_BLOCK@
 @BUILDLINER_CDR_MACRO_BLOCK_CUSTOM@

diff --git a/apps/cf/cdr/Downlink/SetPollParam.bob b/apps/cf/cdr/Downlink/SetPollParam.bob
@@ -4,7 +4,7 @@
   <macros>
     <APP>cf</APP>
     <include_parent_macros>true</include_parent_macros>
-    <CPUID>@BUILDLINER_CDR_CPUID@</CPUID>
+    <CPUID>{{ cpu_id }}</CPUID>
     <REGISTRY_PATH>/modules/$(CPUID)/modules/$(APP)</REGISTRY_PATH>
 @BUILDLINER_CDR_MACRO_BLOCK@
 @BUILDLINER_CDR_MACRO_BLOCK_CUSTOM@

diff --git a/apps/cf/cdr/Downlink/WriteActiveTrans.bob b/apps/cf/cdr/Downlink/WriteActiveTrans.bob
@@ -4,7 +4,7 @@
   <macros>
     <APP>cf</APP>
     <include_parent_macros>true</include_parent_macros>
-    <CPUID>@BUILDLINER_CDR_CPUID@</CPUID>
+    <CPUID>{{ cpu_id }}</CPUID>
     <REGISTRY_PATH>/modules/$(CPUID)/modules/$(APP)</REGISTRY_PATH>
 @BUILDLINER_CDR_MACRO_BLOCK@
 @BUILDLINER_CDR_MACRO_BLOCK_CUSTOM@

diff --git a/apps/cf/cdr/Downlink/WriteQueueInfo.bob b/apps/cf/cdr/Downlink/WriteQueueInfo.bob
@@ -4,7 +4,7 @@
   <macros>
     <APP>cf</APP>
     <include_parent_macros>true</include_parent_macros>
-    <CPUID>@BUILDLINER_CDR_CPUID@</CPUID>
+    <CPUID>{{ cpu_id }}</CPUID>
     <REGISTRY_PATH>/modules/$(CPUID)/modules/$(APP)</REGISTRY_PATH>
 @BUILDLINER_CDR_MACRO_BLOCK@
 @BUILDLINER_CDR_MACRO_BLOCK_CUSTOM@

diff --git a/apps/cf/cdr/Engine/Abandon.bob b/apps/cf/cdr/Engine/Abandon.bob
@@ -4,7 +4,7 @@
   <macros>
     <APP>cf</APP>
     <include_parent_macros>true</include_parent_macros>
-    <CPUID>@BUILDLINER_CDR_CPUID@</CPUID>
+    <CPUID>{{ cpu_id }}</CPUID>
     <REGISTRY_PATH>/modules/$(CPUID)/modules/$(APP)</REGISTRY_PATH>
 @BUILDLINER_CDR_MACRO_BLOCK@
 @BUILDLINER_CDR_MACRO_BLOCK_CUSTOM@

diff --git a/apps/cf/cdr/Engine/Cancel.bob b/apps/cf/cdr/Engine/Cancel.bob
@@ -4,7 +4,7 @@
   <macros>
     <APP>cf</APP>
     <include_parent_macros>true</include_parent_macros>
-    <CPUID>@BUILDLINER_CDR_CPUID@</CPUID>
+    <CPUID>{{ cpu_id }}</CPUID>
     <REGISTRY_PATH>/modules/$(CPUID)/modules/$(APP)</REGISTRY_PATH>
 @BUILDLINER_CDR_MACRO_BLOCK@
 @BUILDLINER_CDR_MACRO_BLOCK_CUSTOM@

diff --git a/apps/cf/cdr/Engine/GetMIBParam.bob b/apps/cf/cdr/Engine/GetMIBParam.bob
@@ -4,7 +4,7 @@
   <macros>
     <APP>cf</APP>
     <include_parent_macros>true</include_parent_macros>
-    <CPUID>@BUILDLINER_CDR_CPUID@</CPUID>
+    <CPUID>{{ cpu_id }}</CPUID>
     <REGISTRY_PATH>/modules/$(CPUID)/modules/$(APP)</REGISTRY_PATH>
 @BUILDLINER_CDR_MACRO_BLOCK@
 @BUILDLINER_CDR_MACRO_BLOCK_CUSTOM@

diff --git a/apps/cf/cdr/Engine/Main.bob b/apps/cf/cdr/Engine/Main.bob
@@ -4,7 +4,7 @@
   <macros>
     <APP>cf</APP>
     <include_parent_macros>true</include_parent_macros>
-    <CPUID>@BUILDLINER_CDR_CPUID@</CPUID>
+    <CPUID>{{ cpu_id }}</CPUID>
     <REGISTRY_PATH>/modules/$(CPUID)/modules/$(APP)</REGISTRY_PATH>
 @BUILDLINER_CDR_MACRO_BLOCK@
 @BUILDLINER_CDR_MACRO_BLOCK_CUSTOM@

diff --git a/apps/cf/cdr/Engine/Resume.bob b/apps/cf/cdr/Engine/Resume.bob
@@ -4,7 +4,7 @@
   <macros>
     <APP>cf</APP>
     <include_parent_macros>true</include_parent_macros>
-    <CPUID>@BUILDLINER_CDR_CPUID@</CPUID>
+    <CPUID>{{ cpu_id }}</CPUID>
     <REGISTRY_PATH>/modules/$(CPUID)/modules/$(APP)</REGISTRY_PATH>
 @BUILDLINER_CDR_MACRO_BLOCK@
 @BUILDLINER_CDR_MACRO_BLOCK_CUSTOM@

diff --git a/apps/cf/cdr/Engine/SetMIBParam.bob b/apps/cf/cdr/Engine/SetMIBParam.bob
@@ -4,7 +4,7 @@
   <macros>
     <APP>cf</APP>
     <include_parent_macros>true</include_parent_macros>
-    <CPUID>@BUILDLINER_CDR_CPUID@</CPUID>
+    <CPUID>{{ cpu_id }}</CPUID>
     <REGISTRY_PATH>/modules/$(CPUID)/modules/$(APP)</REGISTRY_PATH>
 @BUILDLINER_CDR_MACRO_BLOCK@
 @BUILDLINER_CDR_MACRO_BLOCK_CUSTOM@

diff --git a/apps/cf/cdr/Engine/Suspend.bob b/apps/cf/cdr/Engine/Suspend.bob
@@ -4,7 +4,7 @@
   <macros>
     <APP>cf</APP>
     <include_parent_macros>true</include_parent_macros>
-    <CPUID>@BUILDLINER_CDR_CPUID@</CPUID>
+    <CPUID>{{ cpu_id }}</CPUID>
     <REGISTRY_PATH>/modules/$(CPUID)/modules/$(APP)</REGISTRY_PATH>
 @BUILDLINER_CDR_MACRO_BLOCK@
 @BUILDLINER_CDR_MACRO_BLOCK_CUSTOM@

diff --git a/apps/cf/cdr/Engine/ViewConfig.bob b/apps/cf/cdr/Engine/ViewConfig.bob
@@ -4,7 +4,7 @@
   <macros>
     <APP>cf</APP>
     <include_parent_macros>true</include_parent_macros>
-    <CPUID>@BUILDLINER_CDR_CPUID@</CPUID>
+    <CPUID>{{ cpu_id }}</CPUID>
     <REGISTRY_PATH>/modules/$(CPUID)/modules/$(APP)</REGISTRY_PATH>
 @BUILDLINER_CDR_MACRO_BLOCK@
 @BUILDLINER_CDR_MACRO_BLOCK_CUSTOM@

diff --git a/apps/cf/cdr/Engine/ViewTransDiag.bob b/apps/cf/cdr/Engine/ViewTransDiag.bob
@@ -4,7 +4,7 @@
   <macros>
     <APP>cf</APP>
     <include_parent_macros>true</include_parent_macros>
-    <CPUID>@BUILDLINER_CDR_CPUID@</CPUID>
+    <CPUID>{{ cpu_id }}</CPUID>
     <REGISTRY_PATH>/modules/$(CPUID)/modules/$(APP)</REGISTRY_PATH>
 @BUILDLINER_CDR_MACRO_BLOCK@
 @BUILDLINER_CDR_MACRO_BLOCK_CUSTOM@

diff --git a/apps/cf/cdr/Faults/Main.bob b/apps/cf/cdr/Faults/Main.bob
@@ -4,7 +4,7 @@
   <macros>
     <APP>cf</APP>
     <include_parent_macros>true</include_parent_macros>
-    <CPUID>@BUILDLINER_CDR_CPUID@</CPUID>
+    <CPUID>{{ cpu_id }}</CPUID>
     <REGISTRY_PATH>/modules/$(CPUID)/modules/$(APP)</REGISTRY_PATH>
 @BUILDLINER_CDR_MACRO_BLOCK@
 @BUILDLINER_CDR_MACRO_BLOCK_CUSTOM@

diff --git a/apps/cf/cdr/Main.bob b/apps/cf/cdr/Main.bob
@@ -4,7 +4,7 @@
   <macros>
     <APP>cf</APP>
     <include_parent_macros>true</include_parent_macros>
-    <CPUID>@BUILDLINER_CDR_CPUID@</CPUID>
+    <CPUID>{{ cpu_id }}</CPUID>
     <REGISTRY_PATH>/modules/$(CPUID)/modules/$(APP)</REGISTRY_PATH>
 @BUILDLINER_CDR_MACRO_BLOCK@
 @BUILDLINER_CDR_MACRO_BLOCK_CUSTOM@

diff --git a/apps/cf/cdr/PurgeQueue.bob b/apps/cf/cdr/PurgeQueue.bob
@@ -4,7 +4,7 @@
   <macros>
     <APP>cf</APP>
     <include_parent_macros>true</include_parent_macros>
-    <CPUID>@BUILDLINER_CDR_CPUID@</CPUID>
+    <CPUID>{{ cpu_id }}</CPUID>
     <REGISTRY_PATH>/modules/$(CPUID)/modules/$(APP)</REGISTRY_PATH>
 @BUILDLINER_CDR_MACRO_BLOCK@
 @BUILDLINER_CDR_MACRO_BLOCK_CUSTOM@