rccn-gen 1.3.2__tar.gz → 1.3.4__tar.gz

{rccn_gen-1.3.2 → rccn_gen-1.3.4}/.gitignore

@@ -3,7 +3,8 @@
 *.ipynb
 *.pyc
 .venv/
-examples/
+examples/*
+!examples/generate-user-example.py
 tests/
 *.diff
 *.rs

{rccn_gen-1.3.2 → rccn_gen-1.3.4}/CHANGELOG.md

@@ -1,7 +1,26 @@
 # CHANGE LOG
 
+### [1.3.4] - 2025-07-16
+- Fixed Rust edition in autogenerated Cargo.toml file
+- Removed 'rccn_usr'-prefix from generated user workspace
+- Removed '(args)' from autogenerated commands if they don't take any arguments
+- Fixed handler function call for commands that request telemetry
+- RCCNCommand now has a 'specify_target_telemetry' parameter
+  - used if a RCCNCommand should request a RCCNContainer (Telemetry)
+  - specifies name of the target RCCNContainer to request
+- generated files and directories no longer hold the 'rccn_usr_' prefix
+- fixed major bug of receiving multiple telemetries of different apps when apid's are the same
+- Added autogenerated output for missing implementation of commands
+- Added dedicated example script for users to experiment with
+- Added generation info texts as logging.info (user has to set 'include-system-site-packages = true' in pyvenv.py)
+
+### [1.3.3] - 2025-05-26
+- Fixed toml file error. Added new create_toml_file method for the Application class.
+- Updated minimum required python version
+- Updated toml file contents
+
 ### [1.3.2] - 2025-05-26
-- Fixed base command hinheritance bug
+- Fixed base command inheritance bug
 
 ### [1.3.1] - 2025-05-15
 - Added documentation for utils.py

{rccn_gen-1.3.2 → rccn_gen-1.3.4}/PKG-INFO

@@ -1,14 +1,14 @@
 Metadata-Version: 2.4
 Name: rccn_gen
-Version: 1.3.2
+Version: 1.3.4
 Summary: A python based generator for RACCOON OS source files in Rust from yamcs-pymdb config files.
 Project-URL: Homepage, https://gitlab.com/rccn/pymdb_code_generation
 Project-URL: Issues, https://gitlab.com/rccn/pymdb_code_generation/issues
-Author-email: Fabian Krech <f.krech@tu-berlin.de>
+Author-email: Fabian Krech <f.krech@tu-berlin.de>, Alexander Balke <a.balke@tu-berlin.de>
 License-Expression: GPL-3.0
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.8
+Requires-Python: >=3.12
 Requires-Dist: case-converter>=1.2.0
 Requires-Dist: inflect>=7.5.0
 Requires-Dist: yamcs-pymdb>=0.1.0

rccn_gen-1.3.4/examples/generate-user-example.py

@@ -0,0 +1,263 @@
+#!/usr/bin/env python3.13 
+import sys
+import os
+
+from yamcs.pymdb import *
+from rccn_gen import *
+
+root_system = System("RACCOON_GS")
+app = Application(system = root_system, name = "AutogeneratedUserApp", apid = 67)
+
+service = Service(name="CommConfigService", system=app, service_id=133)
+
+virtual_channel_id = IntegerArgument(
+    name="virtual channel id",
+    signed=False,
+    encoding=uint8_t,
+)
+
+fop1_set_v_s_command = RCCNCommand(
+    system=service,
+    name="SetVsDirective",
+    short_description="Set Next Expected Frame Sequence Number [V(s)]",
+    arguments=[
+        virtual_channel_id,
+        IntegerArgument(
+            name="NextExpectedSequenceNumber",
+            encoding=uint8_t,
+            signed=False,
+            
+        ),
+    ],
+)
+
+fop1_set_sliding_window_command = RCCNCommand(
+    system=service,
+    name="SetSlidingWindowDirective",
+    short_description="Set Sliding Window Width [k]",
+    arguments=[
+        virtual_channel_id,
+        IntegerArgument(
+            name="SlidingWindowWidth",
+            encoding=uint8_t,
+            signed=False,
+        ),
+    ],
+)
+
+fop1_set_t1_initial_command = RCCNCommand(
+    system=service,
+    name="SetT1initialDirective",
+    short_description="Set the initial value [t1] in ms to which the countdown Timer is set",
+    arguments=[
+        virtual_channel_id,
+        IntegerArgument(
+            name="T1Initial",
+            encoding=uint32_t,
+            signed=False,
+        ),
+    ],
+)
+
+fop1_set_transmission_limit_command = RCCNCommand(
+    system=service,
+    name="SetTransmissionLimitDirective",
+    short_description="Set the Transmission Limit",
+    arguments=[
+        virtual_channel_id,
+        IntegerArgument(
+            name="TransmissionLimit",
+            encoding=uint8_t,
+            signed=False,
+        ),
+    ],
+)
+
+fop1_set_timeout_type_command = RCCNCommand(
+    system=service,
+    name="SetTimeoutTypeDirective",
+    short_description="Set the Timeout Type",
+    arguments=[
+        virtual_channel_id,
+        IntegerArgument(
+            name="TimeoutType",
+            encoding=uint8_t,
+            minimum=0,
+            maximum=1,
+            signed=False,
+        ),
+    ],
+)
+
+fop1_initiate_ad_service_command = RCCNCommand(
+    system=service,
+    name="InitADServiceDirective",
+    short_description="Set AD Service",
+    arguments=[
+        virtual_channel_id,
+        BooleanArgument(
+            name="CLCW Check",
+            short_description="Set if CLCW check shall be performed",
+        ),
+    ],
+)
+
+fop1_initiate_ad_service_with_unlock_command = RCCNCommand(
+    system=service,
+    name="InitADServiceWithUnlockDirective",
+    short_description="Set AD Service With Unlock",
+    arguments=[
+        virtual_channel_id
+    ]
+)
+
+fop1_initiate_ad_service_with_set_v_r_command = RCCNCommand(
+    system=service,
+    name="InitADServiceWithSetVrDirective",
+    short_description="Set AD Service With Set Vr",
+    arguments=[
+        virtual_channel_id,
+        IntegerArgument(
+            name="ReceiverFrameSequenceNumber",
+            short_description="Receiver Frame Sequence Number [V(R)]",
+            encoding=uint8_t,
+            signed=False,
+        ),
+    ],
+)
+
+fop1_terminate_ad_service_command = RCCNCommand(
+    system=service,
+    name="TerminateADServiceDirective",
+    short_description="Terminate AD Service",
+    arguments=[
+        virtual_channel_id
+    ]
+)
+
+request_my_first_telemetry = RCCNCommand(
+    system=service,
+    name="RQ_my_first_telemetry",
+    short_description="Request-command for reading MyFirstTelemetry",
+    specify_target_telemetry='MyFirstTelemetry'
+)
+
+request_my_second_telemetry = RCCNCommand(
+    system=service,
+    name="RQ_my_second_telemetry",
+    short_description="Request-command for reading MyFirstTelemetry",
+    specify_target_telemetry = "MySecondTelemetry"
+)
+
+
+my_first_telemetry = RCCNContainer(
+    system=service,
+    name="MyFirstTelemetry",
+    entries=[
+        ParameterEntry(
+            IntegerParameter(
+                system=service,
+                name="State",
+                encoding=uint8_t,
+                
+            )
+        ),
+        ParameterEntry(
+            IntegerParameter(
+                system=service,
+                name="VS",
+                encoding=uint8_t
+            )
+        ),
+        ParameterEntry(
+            BooleanParameter(
+                system=service,
+                name="ad_out_flag",
+                encoding=uint1_t
+            )
+        ),
+        ParameterEntry(
+            BooleanParameter(
+                system=service,
+                name="bd_out_flag",
+                encoding=uint1_t
+            )
+        ),
+        ParameterEntry(
+            BooleanParameter(
+                system=service,
+                name="bc_out_flag",
+                encoding=uint1_t
+            )
+        ),
+        ParameterEntry(
+            IntegerParameter(
+                system=service,
+                name="ExpectedAcknowledgementFrameSequenceNumber",
+                encoding=uint8_t
+            )
+        ),
+        ParameterEntry(
+            IntegerParameter(
+                system=service,
+                name="T1_Initial",
+                encoding=uint32_t
+            )
+        ),
+        ParameterEntry(
+            IntegerParameter(
+                system=service,
+                name="TransmissionLimitTM",
+                encoding=uint8_t
+            )
+        ),
+        ParameterEntry(
+            IntegerParameter(
+                system=service,
+                name="TransmissionCount",
+                encoding=uint8_t
+            )
+        ),
+        ParameterEntry(
+            IntegerParameter(
+                system=service,
+                name="FopSlidingWindwWidth",
+                encoding=uint8_t
+            )
+        ),
+    ]
+)
+
+my_second_telemetry = RCCNContainer(
+    system=service,
+    name="MySecondTelemetry",
+    entries=[
+        ParameterEntry(
+            IntegerParameter(
+                system=service,
+                name="MyOtherState",
+                encoding=uint8_t
+            )
+        ),
+    ]
+)
+
+if __name__ == '__main__':
+    ## change target userspace directory to put generated rust code into
+    ## "../../rccn-userspace-ws/src/"
+    target_dir_userspace    = "./"
+
+    ## change target mdb directory to put generated .xml into
+    ## "../../yamcs-instance/src/main/yamcs/mdb/"
+    target_dir_mdb          = "./"
+
+    ## Specify name of autogenerated *.xml
+    target_file_xml         = "AUTOGENERATED_USER_GS.xml"
+
+    app.generate_rccn_code(export_directory=target_dir_userspace)
+    with open(target_dir_mdb + target_file_xml, "wt") as f:
+        app.dump(f)
+
+    print(f"----- Autogeneration done -----")
+    print(f"[ TODO 1/2 ] Add the path to your generated src/ directory to '[packages]' in the '<project>/Cargo.toml'")
+    print(f"[ TODO 2/2 ] Add the path to your generated '{target_file_xml}' to the 'mdb'-section of your *.yaml file")

{rccn_gen-1.3.2 → rccn_gen-1.3.4}/pyproject.toml

@@ -4,13 +4,14 @@ build-backend = "hatchling.build"
 
 [project]
 name = "rccn_gen"
-version = "1.3.2"
+version = "1.3.4"
 authors = [
   { name="Fabian Krech", email="f.krech@tu-berlin.de" },
+  { name="Alexander Balke", email="a.balke@tu-berlin.de" },
 ]
 description = "A python based generator for RACCOON OS source files in Rust from yamcs-pymdb config files."
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.12"
 dependencies = [
     "yamcs-pymdb>=0.1.0",
     "inflect>=7.5.0",

{rccn_gen-1.3.2 → rccn_gen-1.3.4}/src/rccn_gen/systems.py

@@ -19,6 +19,8 @@ from yamcs.pymdb.parameters import (
     StringParameter
 )
 from yamcs.pymdb.commands import Command, CommandLevel, CommandEntry, Argument, TransmissionConstraint
+import logging
+logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.INFO)
 
 class Application(Subsystem):
     """
@@ -162,13 +164,16 @@ class Application(Subsystem):
             A dictionary mapping file types to their absolute paths.
         """
         paths = {
-            'main': os.path.join(self.export_directory, 'rccn_usr_'+snakecase(self.name), 'src', 'main.rs'),
-            'main_generated_snapshot': os.path.join(self.snapshot_directory, 'generated', 'rccn_usr_'+snakecase(self.name), 'src', 'main.rs'),
-            'main_user_snapshot': os.path.join(self.user_snapshot_path(), 'rccn_usr_'+snakecase(self.name), 'src', 'main.rs'),
-            'main_diff': os.path.join(self.diff_directory, 'rccn_usr_'+snakecase(self.name), 'src', 'main.diff'),
+            'main': os.path.join(self.export_directory, snakecase(self.name), 'src', 'main.rs'),
+            'main_generated_snapshot': os.path.join(self.snapshot_directory, 'generated', snakecase(self.name), 'src', 'main.rs'),
+            'main_user_snapshot': os.path.join(self.user_snapshot_path(), snakecase(self.name), 'src', 'main.rs'),
+            'main_diff': os.path.join(self.diff_directory, snakecase(self.name), 'src', 'main.diff'),
             'main_template': os.path.join(self.text_modules_main_path, 'main.txt'),
-            'cargo_toml': os.path.join(self.export_directory, 'rccn_usr_'+snakecase(self.name), 'Cargo.toml'),
+            'cargo_toml': os.path.join(self.export_directory, snakecase(self.name), 'Cargo.toml'),
             'cargo_toml_template': os.path.join(self.text_modules_path, 'cargo_toml', 'cargo.txt'),
+            'cargo_toml_generated_snapshot': os.path.join(self.snapshot_directory, 'generated', snakecase(self.name), 'cargo.toml'),
+            'cargo_toml_user_snapshot': os.path.join(self.user_snapshot_path(), snakecase(self.name), 'cargo.toml'),
+            'cargo_toml_diff': os.path.join(self.diff_directory, snakecase(self.name), 'cargo.diff'),
         }
         return paths
 
@@ -201,7 +206,7 @@ class Application(Subsystem):
         Creates the necessary directory structure for the application and its services
         in the export directory.
         """
-        app_src_dir = os.path.join(self.export_directory, 'rccn_usr_'+snakecase(self.name), 'src')
+        app_src_dir = os.path.join(self.export_directory, snakecase(self.name), 'src')
         if not os.path.exists(app_src_dir):
             os.makedirs(app_src_dir)
         for service in self.services():
@@ -230,9 +235,11 @@ class Application(Subsystem):
         # Generate main.rs file
         with open(self.file_paths()['main_template'], 'r') as file:
             main_template_text = file.read()
+            logging.debug(f"[{__class__.__name__}] {self.file_paths()['main_template']} read")
         with open(self.file_paths()['main'], 'w') as file:
             new_main_text = self.find_and_replace_keywords(main_template_text)
             file.write("".join(new_main_text))
+            logging.info(f"[{__class__.__name__}] {self.file_paths()['main']} written")
         # Create snapshot of newly generated main.rs if instructed
         if self.snapshots:
             self.generate_snapshot('main', 'main_generated_snapshot')
@@ -321,7 +328,7 @@ class Application(Subsystem):
             if not os.path.exists(service.file_paths()['mod']):
                 service.generate_mod_file()
             service.generate_telemetry_file()
-            service.generate_rccn_command_file(os.path.join(self.export_directory, 'rccn_usr_'+snakecase(self.name), 'src'), os.path.join(self.text_modules_path, 'command'))
+            service.generate_rccn_command_file(os.path.join(self.export_directory, snakecase(self.name), 'src'), os.path.join(self.text_modules_path, 'command'))
         self.delete_old_snapshots()
 
     def generate_snapshot(self, current_file_reference, snapshot_file_reference):
@@ -407,12 +414,34 @@ class Application(Subsystem):
         
     def generate_cargo_toml_file(self):
         """
-        Generate the Cargo.toml file for the application.
+        Generate the cargo.toml file for the application.
+        
+        Performs several tasks:
+        1. Creates diff file if both current and snapshot files exist
+        2. Creates snapshot of current main with user changes if snapshots are enabled
+        3. Generates new cargo.toml file from template
+        4. Creates snapshot of newly generated main if snapshots are enabled
+        5. Applies user changes from diff file if rebase_changes is enabled
         """
+        # Create cargo_toml.diff file
+        if os.path.exists(self.file_paths()['cargo_toml']) and os.path.exists(self.file_paths()['cargo_toml_generated_snapshot']):
+            os.maked(os.path.dirname(self.file_paths()['cargo_toml_diff']), exist_ok=True)
+            self.generate_diff_file('cargo_toml', 'cargo_toml_generated_snapshot', 'cargo_toml_diff')
+        # Create snapshot of cargo_toml with user changes if instructed
+        if self.snapshots and os.path.exists(self.file_paths()['cargo_toml']):
+            self.generate_snapshot('cargo_toml', 'cargo_toml_user_snapshot')
+        # Generate cargo_toml file
         with open(self.file_paths()['cargo_toml_template'], 'r') as file:
             cargo_toml_template_text = file.read()
         with open(self.file_paths()['cargo_toml'], 'w') as file:
-            file.write(cargo_toml_template_text)
+            new_cargo_toml_text = self.find_and_replace_keywords(cargo_toml_template_text)
+            file.write("".join(new_cargo_toml_text))
+        # Create snapshot of newly generated cargo_toml if instructed
+        if self.snapshots:
+            self.generate_snapshot('cargo_toml', 'cargo_toml_generated_snapshot')
+        # Rebase cargo_toml.diff on cargo_toml if instructed
+        if self.rebase_changes and os.path.exists(self.file_paths()['cargo_toml_diff']):
+            os.system('patch '+self.file_paths()['cargo_toml']+' <  '+self.file_paths()['cargo_toml_diff'])
 
 
 class Service(Subsystem):
@@ -532,22 +561,22 @@ class Service(Subsystem):
             source files, generated snapshots, user snapshots, diff files, and templates.
         """
         paths = {
-            'service': os.path.join(self.export_directory, 'rccn_usr_'+snakecase(self.system.name), 'src', snakecase(self.name), 'service.rs'),
-            'service_generated_snapshot': os.path.join(self.snapshot_directory, 'generated', 'rccn_usr_'+snakecase(self.system.name), 'src', snakecase(self.name), 'service.rs'),
-            'service_user_snapshot': os.path.join(self.snapshot_directory, 'user', datetime.datetime.now().strftime("%Y-%m-%d_%H-%M-%S"), 'rccn_usr_'+snakecase(self.system.name), 'src', snakecase(self.name), 'service.rs'),
-            'service_diff': os.path.join(self.diff_directory, 'rccn_usr_'+snakecase(self.system.name), 'src', snakecase(self.name), 'service.diff'),
+            'service': os.path.join(self.export_directory, snakecase(self.system.name), 'src', snakecase(self.name), 'service.rs'),
+            'service_generated_snapshot': os.path.join(self.snapshot_directory, 'generated', snakecase(self.system.name), 'src', snakecase(self.name), 'service.rs'),
+            'service_user_snapshot': os.path.join(self.snapshot_directory, 'user', datetime.datetime.now().strftime("%Y-%m-%d_%H-%M-%S"), snakecase(self.system.name), 'src', snakecase(self.name), 'service.rs'),
+            'service_diff': os.path.join(self.diff_directory, snakecase(self.system.name), 'src', snakecase(self.name), 'service.diff'),
             'service_template': os.path.join(self.text_modules_service_path, 'service.txt'),
-            'command': os.path.join(self.export_directory, 'rccn_usr_'+snakecase(self.system.name), 'src', snakecase(self.name), 'command.rs'),
-            'command_generated_snapshot': os.path.join(self.snapshot_directory, 'generated', 'rccn_usr_'+snakecase(self.system.name), 'src', snakecase(self.name), 'command.rs'),
-            'command_user_snapshot': os.path.join(self.snapshot_directory, 'user', datetime.datetime.now().strftime("%Y-%m-%d_%H-%M-%S"), 'rccn_usr_'+snakecase(self.system.name), 'src', snakecase(self.name), 'command.rs'),
-            'command_diff': os.path.join(self.diff_directory, 'rccn_usr_'+snakecase(self.system.name), 'src', snakecase(self.name), 'command.diff'),
+            'command': os.path.join(self.export_directory, snakecase(self.system.name), 'src', snakecase(self.name), 'command.rs'),
+            'command_generated_snapshot': os.path.join(self.snapshot_directory, 'generated', snakecase(self.system.name), 'src', snakecase(self.name), 'command.rs'),
+            'command_user_snapshot': os.path.join(self.snapshot_directory, 'user', datetime.datetime.now().strftime("%Y-%m-%d_%H-%M-%S"), snakecase(self.system.name), 'src', snakecase(self.name), 'command.rs'),
+            'command_diff': os.path.join(self.diff_directory, snakecase(self.system.name), 'src', snakecase(self.name), 'command.diff'),
             'command_template': os.path.join(self.text_modules_command_path, 'command.txt'),
-            'mod': os.path.join(self.export_directory, 'rccn_usr_'+snakecase(self.system.name), 'src', snakecase(self.name), 'mod.rs'),
+            'mod': os.path.join(self.export_directory, snakecase(self.system.name), 'src', snakecase(self.name), 'mod.rs'),
             'mod_template': os.path.join(self.text_modules_path, 'mod', 'mod.txt'),
-            'telemetry': os.path.join(self.export_directory, 'rccn_usr_'+snakecase(self.system.name), 'src', snakecase(self.name), 'telemetry.rs'),
-            'telemetry_generated_snapshot': os.path.join(self.snapshot_directory, 'generated', 'rccn_usr_'+snakecase(self.system.name), 'src', snakecase(self.name), 'telemetry.rs'),
-            'telemetry_user_snapshot': os.path.join(self.snapshot_directory, 'user', datetime.datetime.now().strftime("%Y-%m-%d_%H-%M-%S"), 'rccn_usr_'+snakecase(self.system.name), 'src', snakecase(self.name), 'command.rs'),
-            'telemetry_diff': os.path.join(self.diff_directory, 'rccn_usr_'+snakecase(self.system.name), 'src', snakecase(self.name), 'telemetry.diff'),
+            'telemetry': os.path.join(self.export_directory, snakecase(self.system.name), 'src', snakecase(self.name), 'telemetry.rs'),
+            'telemetry_generated_snapshot': os.path.join(self.snapshot_directory, 'generated', snakecase(self.system.name), 'src', snakecase(self.name), 'telemetry.rs'),
+            'telemetry_user_snapshot': os.path.join(self.snapshot_directory, 'user', datetime.datetime.now().strftime("%Y-%m-%d_%H-%M-%S"), snakecase(self.system.name), 'src', snakecase(self.name), 'command.rs'),
+            'telemetry_diff': os.path.join(self.diff_directory, snakecase(self.system.name), 'src', snakecase(self.name), 'telemetry.diff'),
             'telemetry_template': os.path.join(self.text_modules_telemetry_path, 'telemetry.txt'),
         } 
         return paths
@@ -605,6 +634,10 @@ class Service(Subsystem):
         for command in self.rccn_commands():
             text = command.find_and_replace_keywords(text, text_modules_path)
         
+        containers = self.rccn_container()
+        cnames = [c.name for c in containers]
+        telemetries = ", ".join(cnames)
+
         # Find and replace service variable keywords
         var_keywords = get_var_keywords(text)
         service_var_translation = {
@@ -612,6 +645,7 @@ class Service(Subsystem):
             '<<VAR_SERVICE_ID>>': lambda: str(self.service_id),
             '<<VAR_SERVICE_NAME_UCASE>>': lambda: pascalcase(self.name),
             '<<VAR_SERVICE_TELEMETRY>>': lambda: self.generate_rust_telemetry_definition(),
+            '<<VAR_IMPORTS_TELEMETRIES>>' : lambda: "use super::{command" + ("};" if len(containers) == 0 else ", telemetry};"),
         }
         for var_keyword in var_keywords:
             if var_keyword in service_var_translation.keys():
@@ -644,6 +678,7 @@ class Service(Subsystem):
             service_template_file_text = file.read()
         with open(self.file_paths()['service'], 'w') as file:
             file.write(self.find_and_replace_keywords(service_template_file_text, self.text_modules_service_path))
+            logging.info(f"[{__class__.__name__}] {self.file_paths()['service']} written")
         # Create snapshot of service.rs if instructed
         if self.snapshots:
             self.generate_snapshot('service', 'service_generated_snapshot')
@@ -678,7 +713,7 @@ class Service(Subsystem):
             self.generate_snapshot('command', 'command_user_snapshot')
         # Generate command.rs file
         if len(self.rccn_commands()) == 0:
-            print('RCCN-Information: Service \''+self.name+'\' has no commands other than base command. Generation of command.rs file will be skipped.')
+            logging.debug(f'[{__class__.__name__}] RCCN-Information: Service \''+self.name+'\' has no commands other than base command. Generation of command.rs file will be skipped.')
             return
         command_file_path = self.file_paths()['command_template']
         with open(command_file_path, 'r') as file:
@@ -686,6 +721,7 @@ class Service(Subsystem):
         command_export_directory = os.path.join(export_file_dir, snakecase(self.name), 'command.rs')
         with open(command_export_directory, 'w') as file:
             file.write(self.find_and_replace_keywords(command_file_text, text_modules_path))
+            logging.info(f"[{__class__.__name__}] {command_export_directory} written")
         # Create snapshot of command.rs if instructed
         if self.snapshots:
             self.generate_snapshot('command', 'command_generated_snapshot')
@@ -762,6 +798,7 @@ class Service(Subsystem):
             telemetry_template_file_text = file.read()
         with open(self.file_paths()['telemetry'], 'w') as file:
             file.write(self.find_and_replace_keywords(telemetry_template_file_text, self.text_modules_telemetry_path))
+            logging.info(f"[{__class__.__name__}] {self.file_paths()['telemetry']} written")
         # Create snapshot of telemetry.rs if instructed
         if self.snapshots:
             self.generate_snapshot('telemetry', 'telemetry_generated_snapshot')
@@ -886,6 +923,7 @@ class RCCNCommand(Command):
         long_description: str | None = None,
         extra: Mapping[str, str] | None = None,
         abstract: bool = False,
+        specify_target_telemetry: str = None,
         base: Command | str | None = None,
         assignments: Mapping[str, Any] | None = None,
         arguments: Sequence[Argument] | None = None,
@@ -914,6 +952,8 @@ class RCCNCommand(Command):
             Arbitrary information about the command, keyed by name.
         abstract : bool, optional
             Whether this command is abstract. Default is False.
+        specify_target_telemetry : str, optional
+            Specify target telemetry that this command is supposed to request.
         base : Command | str, optional
             The base command or reference to a base command.
         assignments : Mapping[str, Any], optional
@@ -949,6 +989,7 @@ class RCCNCommand(Command):
             'constraint': constraint,
             **kwargs
         }
+        self.target_telemetry = specify_target_telemetry
         if 'system' in kwargs and isinstance(kwargs['system'], Service):
             self.add_to_service(kwargs['system'])
         elif base and (isinstance(base, Command) or isinstance(base, RCCNCommand)):
@@ -975,7 +1016,7 @@ class RCCNCommand(Command):
         - The command's APID is automatically set to match the service's application APID
         """
         if self.init_kwargs['base'] is None and not any(command.name == 'base' for command in service.commands):
-            print("RCCN-Information: Command \'"+self.init_kwargs['name']+"\' doesn\'t have a base argument and no base command was found in service \'"+service.name+"\'.\nStandard base command will be created with system = \'"+service.name+"\' and type = "+str(service.service_id)+".")
+            logging.debug(f"[{__class__.__name__}] RCCN-Information: Command \'"+self.init_kwargs['name']+"\' doesn\'t have a base argument and no base command was found in service \'"+service.name+"\'.\nStandard base command will be created with system = \'"+service.name+"\' and type = "+str(service.service_id)+".")
             self.init_kwargs['base'] = Command(
                 system=service, 
                 name='base',
@@ -984,7 +1025,7 @@ class RCCNCommand(Command):
                 assignments={'type': service.service_id}
             )
         elif self.init_kwargs['base'] is None and any(command.name == 'base' for command in service.commands):
-            print("RCCN-Information: Command \'"+self.init_kwargs['name']+"\' doesn\'t have a \'base\' argument. Existing base command for service \'"+service.name+"\' will be used.")
+            logging.debug(f"[{__class__.__name__}] RCCN-Information: Command \'"+self.init_kwargs['name']+"\' doesn\'t have a \'base\' argument. Existing base command for service \'"+service.name+"\' will be used.")
             self.init_kwargs['base'] = next(command for command in service.commands if command.name == 'base')
         if 'system' in self.init_kwargs and isinstance(self.init_kwargs['system'], Service):
             super().__init__(*self.init_args, **self.init_kwargs)
@@ -996,12 +1037,13 @@ class RCCNCommand(Command):
             new_subtype = 1
             while new_subtype in used_subtypes:
                 new_subtype = new_subtype + 1
-            print('RCCN-Information: Command \''+self.name+'\' has no subtype specified. Subtype will be set to '+str(new_subtype)+'.')
+            logging.debug(f'[{__class__.__name__}] RCCN-Information: Command \''+self.name+'\' has no subtype specified. Subtype will be set to '+str(new_subtype)+'.')
             self.assignments['subtype'] = new_subtype
-        self.struct_name = self.name + 'Args'
+        if len(self.arguments) != 0:
+            self.struct_name = self.name + 'Args'
 
     
-    def find_and_replace_keywords(self, text, text_modules_path):
+    def find_and_replace_keywords(self, text, text_modules_path): # , service : Service):
         """
         Replace template keywords with actual command values.
         
@@ -1040,15 +1082,24 @@ class RCCNCommand(Command):
             replacement_text = (self.find_and_replace_keywords(module_text, text_modules_path) + '\n')
             text = insert_before_with_indentation(text, command_module_keyword, replacement_text)
 
+        cmd_requests_tm = (self.target_telemetry is not None)
+
         # Find and replace command variable keywords
         command_var_keywords = get_var_keywords(text)
         command_var_translation = {
             '<<VAR_COMMAND_NAME_UCASE>>': lambda: pascalcase(self.name),
+            '<<VAR_ARGS>>' : lambda: "(args)" if len(self.arguments) != 0 else "",
+            '<<VAR_HANDLER_FUNCTION>>' : lambda: "tc.handle_with_tm" if cmd_requests_tm else "tc.handle",
             '<<VAR_COMMAND_NAME>>': lambda: self.name,
-            '<<VAR_COMMAND_STRUCT_NAME>>': lambda: self.struct_name,
+            '<<VAR_COMMAND_STRUCT_NAME>>': lambda: f"({self.struct_name})" if len(self.arguments) != 0 else '',
             '<<VAR_COMMAND_SUBTYPE>>': lambda: str(self.assignments['subtype']),
             '<<VAR_COMMAND_STRUCT>>': lambda: self.struct_definition(),
-            '<<VAR_SHORT_DESCRIPTION>>': lambda: "\n/// " + self.short_description if self.short_description is not None else "",
+            '<<VAR_SHORT_DESCRIPTION>>': lambda: "// " + self.short_description if self.short_description is not None else "No short description provided",
+            '<<VAR_INFO_TEXT>>' : lambda: "User functionality missing in" if not cmd_requests_tm else "Returning default telemetry from",
+            '<<VAR_RETURN_TYPE>>' : lambda : "if false { return Err(()); }" if cmd_requests_tm else "return false;",
+            '<<VAR_RETURN_TARGET_TM_TEMPLATE>>' : lambda : "" if not cmd_requests_tm else \
+                f"\nlet mut tm = telemetry::{self.target_telemetry}::default();\n" \
+                f"\nOk(tm)",
         }
         for command_var_keyword in command_var_keywords:
             if command_var_keyword in command_var_translation.keys():
@@ -1223,16 +1274,17 @@ class RCCNContainer(Container):
                 if eq_expression.ref == self.base+'/subtype':
                     condition_subtype = eq_expression.value
         if condition_type is not None and condition_type != self.type:
-            print('RCCN-Warning: Container '+self.name+' has a user-defined type of '+str(eq_expression.value)+', which does\'nt match the service ID. User-defined type will be used.')
+            logging.debug(f'[{__class__.__name__}] RCCN-Warning: Container '+self.name+' has a user-defined type of '+str(eq_expression.value)+', which doesn\'t match the service ID. User-defined type will be used.')
             self.type = condition_type
         if condition_subtype is not None and self.subtype is not None and condition_subtype != self.subtype:
-            print('RCCN-Warning: Container '+self.name+' has an ambiguous user-defined subtype. \'subtype\' argument should match the \'condition\' argument.')
+            logging.debug(f'[{__class__.__name__}] RCCN-Warning: Container '+self.name+' has an ambiguous user-defined subtype. \'subtype\' argument should match the \'condition\' argument.')
         elif condition_subtype is not None:
             self.subtype = condition_subtype
         elif self.subtype is not None and self.init_kwargs['condition'] is not None:
             self.init_kwargs['condition'] = AndExpression(
                 EqExpression(self.base+'/type', self.type),
-                EqExpression(self.base+'/subtype', self.subtype)
+                EqExpression(self.base+'/subtype', self.subtype),
+                EqExpression('/PUS/ccsds/apid', service.system.apid)
                 )
         else:
             used_subtypes = [container.subtype for container in service.rccn_container()]
@@ -1242,9 +1294,10 @@ class RCCNContainer(Container):
             self.subtype = new_subtype
             self.init_kwargs['condition'] = AndExpression(
                 EqExpression(self.base+'/type', self.type),
-                EqExpression(self.base+'/subtype', self.subtype)
+                EqExpression(self.base+'/subtype', self.subtype),
+                EqExpression('/PUS/ccsds/apid', service.system.apid)
                 )
-            print('RCCN-Information: Subtype for Container '+self.name+' is not specified through \'subtype\' or \'condition\' arguments. Subtype will be set to '+str(self.subtype)+'.')
+            logging.debug(f'[{__class__.__name__}] RCCN-Information: Subtype for Container '+self.name+' is not specified through \'subtype\' or \'condition\' arguments. Subtype will be set to '+str(self.subtype)+'.')
 
         if 'system' in self.init_kwargs and isinstance(self.init_kwargs['system'], Service):
             super().__init__(**self.init_kwargs)
@@ -1269,7 +1322,7 @@ class RCCNContainer(Container):
         rccn_telemetry_text = ""
         if hasattr(self, 'short_description') and self.short_description is not None:
             rccn_telemetry_text += "/// "+str(self.short_description)+"\n"
-        rccn_telemetry_text += "#[derive(ServiceTelemetry, BitStruct, Debug)]\n"
+        rccn_telemetry_text += "#[derive(ServiceTelemetry, BitStruct, Debug, Default)]\n"
         if hasattr(self, 'subtype') and self.subtype is not None:
             rccn_telemetry_text += "#[subtype("+str(self.subtype)+")]\n"
         rccn_telemetry_text += "pub struct " + self.name + " {\n"

{rccn_gen-1.3.2 → rccn_gen-1.3.4}/src/rccn_gen/text_modules/cargo_toml/cargo.txt

@@ -1,7 +1,7 @@
 [package]
-name = "rccn_usr_example_app"
+name = "<<VAR_APP_NAME_SCASE>>"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 anyhow = "1.0.91"
@@ -14,4 +14,7 @@ spacepackets = "0.12.0"
 tokio = "1.41.1"
 env_logger = { version = "0.11.7", default-features = false, features = ["color", "humantime"] }
 num-derive = "0.4"
-num-traits = "0.2"
+num-traits = "0.2"
+rccn_usr_bitstruct_derive = { version = "0.1.0", path = "../rccn_usr_bitstruct_derive" }
+rccn_usr_pus_macros = { version = "0.1.0", path = "../rccn_usr_pus_macros" }
+chrono = "0.4.40"

{rccn_gen-1.3.2 → rccn_gen-1.3.4}/src/rccn_gen/text_modules/command/command.txt

@@ -5,6 +5,7 @@ use rccn_usr_pus_macros::ServiceCommand;
 
 #[derive(ServiceCommand)]
 pub enum Command {
+    
     <<COMMAND_MODULE_ENUM>> 
 }
 

{rccn_gen-1.3.2 → rccn_gen-1.3.4}/src/rccn_gen/text_modules/command/command_module_enum.txt

@@ -1,3 +1,3 @@
 <<VAR_SHORT_DESCRIPTION>>
 #[subservice(<<VAR_COMMAND_SUBTYPE>>)]
-<<VAR_COMMAND_NAME_UCASE>>(<<VAR_COMMAND_STRUCT_NAME>>),
+<<VAR_COMMAND_NAME_UCASE>><<VAR_COMMAND_STRUCT_NAME>>,

rccn_gen-1.3.4/src/rccn_gen/text_modules/service/command_module_match_cmd.txt

@@ -0,0 +1,5 @@
+command::Command::<<VAR_COMMAND_NAME_UCASE>><<VAR_ARGS>> => <<VAR_HANDLER_FUNCTION>>(|| {
+    <<VAR_SHORT_DESCRIPTION>>
+    println!("[ INFO ] <<VAR_INFO_TEXT>> <<VAR_COMMAND_NAME_UCASE>><<VAR_ARGS>>.");
+    <<VAR_RETURN_TYPE>><<VAR_RETURN_TARGET_TM_TEMPLATE>>
+}),

{rccn_gen-1.3.2 → rccn_gen-1.3.4}/src/rccn_gen/text_modules/service/service.txt

@@ -1,6 +1,6 @@
 use std::process::Command;
 use rccn_usr::service::{AcceptanceResult, AcceptedTc, PusService};
-use super::command;
+<<VAR_IMPORTS_TELEMETRIES>>
 use anyhow::Result;
 use std::error::Error;
 use chrono::Local;
@@ -8,6 +8,7 @@ use std::fs;
 
 
 pub struct <<VAR_SERVICE_NAME_UCASE>> {
+// tm_parameter
 }
 
 

rccn_gen-1.3.2/rccn_usr_bi_x1_cntrl_app/Cargo.toml

@@ -1,17 +0,0 @@
-[package]
-name = "rccn_usr_example_app"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-anyhow = "1.0.91"
-binary_serde = "1.0.24"
-crossbeam-channel = "0.5.13"
-futures = "0.3.31"
-rccn_usr = { version = "0.1.0", path = "../rccn_usr" }
-satrs = "0.2.1"
-spacepackets = "0.12.0"
-tokio = "1.41.1"
-env_logger = { version = "0.11.7", default-features = false, features = ["color", "humantime"] }
-num-derive = "0.4"
-num-traits = "0.2"

rccn_gen-1.3.2/src/rccn_gen/text_modules/service/command_module_match_cmd.txt

@@ -1,3 +0,0 @@
-command::Command::<<VAR_COMMAND_NAME_UCASE>>(args) => tc.handle(|| {
-                
-}),