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

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

@@ -1,5 +1,8 @@
 # CHANGE LOG
 
+### [1.3.2] - 2025-05-26
+- Fixed base command hinheritance bug
+
 ### [1.3.1] - 2025-05-15
 - Added documentation for utils.py
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rccn_gen
-Version: 1.3.1
+Version: 1.3.2
 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

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

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "rccn_gen"
-version = "1.3.1"
+version = "1.3.2"
 authors = [
   { name="Fabian Krech", email="f.krech@tu-berlin.de" },
 ]

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

@@ -974,7 +974,7 @@ class RCCNCommand(Command):
         - If no subtype is provided, a unique one will be assigned automatically
         - The command's APID is automatically set to match the service's application APID
         """
-        if not 'base' in self.init_kwargs and not any(command.name == 'base' for command in service.commands):
+        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)+".")
             self.init_kwargs['base'] = Command(
                 system=service, 
@@ -983,7 +983,7 @@ class RCCNCommand(Command):
                 base='/PUS/pus-tc',
                 assignments={'type': service.service_id}
             )
-        elif not 'base' in self.init_kwargs and any(command.name == 'base' for command in service.commands):
+        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.")
             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):
@@ -991,7 +991,7 @@ class RCCNCommand(Command):
         else:
             super().__init__(system=service, *self.init_args, **self.init_kwargs)
         self.assignments['apid'] = self.system.system.apid
-        if not 'subtype' in self.assignments and self.name is not 'base':
+        if not 'subtype' in self.assignments and self.name != 'base':
             used_subtypes = [command.assignments['subtype'] if 'subtype' in command.assignments else None for command in self.system.rccn_commands()]
             new_subtype = 1
             while new_subtype in used_subtypes:

rccn_gen-1.3.2/src/rccn_gen/text_modules/cargo_toml/cargo.txt

@@ -0,0 +1,17 @@
+[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"