rccn-gen 1.3.1__py3-none-any.whl → 1.3.2__py3-none-any.whl

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.1.dist-info → rccn_gen-1.3.2.dist-info}/METADATA

@@ -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.dist-info → rccn_gen-1.3.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
 rccn_gen/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
 rccn_gen/__init__.py,sha256=rBnqIw3uQk-uBbRh9VnungoTRSr2V0Bqos32xFZ44Eo,168
-rccn_gen/systems.py,sha256=NewVHJVITt3svMBkAigD23Wl3_-srjNBbiMsOqUstg4,83907
+rccn_gen/systems.py,sha256=vaagjFcQX3PmnylEdi0ThfS_JkBHlIuguUu6VLfn5DE,83907
 rccn_gen/utils.py,sha256=q5YSmyc3qADNYcycxQJBvrG6Df8CJelL4lhXF-dN_Ms,17016
 rccn_gen/text_modules/cargo_toml/cargo.txt,sha256=AYjSo3WJE7lhOcJaiNgXP9Y-DXHDIFIt6p42rDTVNVE,427
 rccn_gen/text_modules/command/command.txt,sha256=8Y-uJilhFLoinftIbn7uKfia9LLMZno2LkoDJ-4Y-9M,345
@@ -14,6 +14,6 @@ rccn_gen/text_modules/mod/mod.txt,sha256=BF8LablBE4ddutdl5m0prvpvLdBRejueVOujkyr
 rccn_gen/text_modules/service/command_module_match_cmd.txt,sha256=eVGo6ltuerG37rVxpXtL-JYuLyLW4c0i6NXb5g1_U-A,89
 rccn_gen/text_modules/service/service.txt,sha256=qTxoOD5i7wH4yFiDn13rOJW9hIZyACA8W3m6UABe22U,695
 rccn_gen/text_modules/telemetry/telemetry.txt,sha256=Re1d3BfpyXT_CEe7jJzLF3MARik0-J-K98K85iPOE40,193
-rccn_gen-1.3.1.dist-info/METADATA,sha256=xYy5MKpPdYKRgTCLHeabF2vOG_laMSP1NidCw5FiAeM,9911
-rccn_gen-1.3.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-rccn_gen-1.3.1.dist-info/RECORD,,
+rccn_gen-1.3.2.dist-info/METADATA,sha256=AZYmynW8QvCwT83y5LzL3d9ynFHX8LT9Dc9YVlN6Nns,9911
+rccn_gen-1.3.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+rccn_gen-1.3.2.dist-info/RECORD,,