rccn-gen 1.0.2__py3-none-any.whl → 1.1.0__py3-none-any.whl

rccn_gen/__init__.py

@@ -1,6 +1,5 @@
 from .systems import *
 from .utils import *
-from .telemetry import *
 
 __version__ = "0.1.0"
 

rccn_gen/systems.py

@@ -1,12 +1,10 @@
-from yamcs.pymdb import System, Subsystem, Command
+from yamcs.pymdb import System, Subsystem, Command, Container, AndExpression, EqExpression
 import shutil
 import difflib
 import datetime
 from caseconverter import *
 from importlib.resources import files
 from .utils import *
-from .telemetry import *
-
 
 class Application(Subsystem):
     """
@@ -191,7 +189,7 @@ class Service(Subsystem):
     def __init__(
         self,
         name: str,
-        service_id: int = None,
+        service_id: int,
         *args,
         **kwargs
     ):
@@ -258,7 +256,7 @@ class Service(Subsystem):
         return paths
 
     def rccn_commands(self):
-        return [command for command in self.commands if isinstance(command, RCCNCommand)]
+        return [command for command in self.commands if isinstance(command, RCCNCommand) and command.name != 'base']
 
     def find_and_replace_keywords(self, text, text_modules_path):
         # Find and replace service module keywords
@@ -274,23 +272,20 @@ class Service(Subsystem):
             replacement_text = (self.find_and_replace_keywords(module_text, text_modules_path) + '\n')
             text = insert_before_with_indentation(text, service_module_keyword, replacement_text)
         
-        # Call keyword replacement for all associated commands (Later, there needs to be checking to account for user changes to the generated files)
-        if len(self.rccn_commands()) == 0:
-            print('RCCN-Gen: Service '+self.name+' does not have any commands associated with it.')
         for command in self.rccn_commands():
             text = command.find_and_replace_keywords(text, text_modules_path)
         
         # Find and replace service variable keywords
         var_keywords = get_var_keywords(text)
         service_var_translation = {
-            '<<VAR_SERVICE_NAME>>': self.name,
-            '<<VAR_SERVICE_ID>>': str(self.service_id),
-            '<<VAR_SERVICE_NAME_UCASE>>': pascalcase(self.name),
-            '<<VAR_SERVICE_TELEMETRY>>': self.generate_rust_telemetry_definition(),
+            '<<VAR_SERVICE_NAME>>': lambda: snakecase(self.name),
+            '<<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(),
         }
         for var_keyword in var_keywords:
             if var_keyword in service_var_translation.keys():
-                text = replace_with_indentation(text, var_keyword, service_var_translation[var_keyword])
+                text = replace_with_indentation(text, var_keyword, service_var_translation[var_keyword]())
         
         # Delete all command module keywords
         text = delete_all_command_module_keywords(text)
@@ -327,7 +322,7 @@ class Service(Subsystem):
             self.generate_snapshot('command', 'command_user_snapshot')
         # Generate command.rs file
         if len(self.rccn_commands()) == 0:
-            print('RCCN-Gen: Service '+self.name+' has no implemented commands. Generation of command.rs file will be skipped.')
+            print('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:
@@ -385,7 +380,8 @@ class Service(Subsystem):
     def generate_rust_telemetry_definition(self):
         telemetry_definition_text = ''
         for container in self.containers:
-            container.__class__ = RCCNContainer
+            if not isinstance(container, RCCNContainer):
+                container.__class__ = RCCNContainer
             telemetry_definition_text += container.generate_rccn_telemetry()
         return telemetry_definition_text
 
@@ -396,22 +392,28 @@ class RCCNCommand(Command):
         self.init_kwargs = kwargs
         if 'system' in kwargs and isinstance(kwargs['system'], Service):
             self.add_to_service(kwargs['system'])
+        elif 'base' in kwargs and (isinstance(kwargs['base'], Command) or isinstance(kwargs['base'], RCCNCommand)):
+            self.add_to_service(kwargs['base'].system)
 
     def add_to_service(self, service):
-        if not any(command.name == 'base' for command in service.commands):
-            base_command = Command(
+        if not 'base' in self.init_kwargs 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 used with system = \'"+service.name+"\' and type = "+str(service.service_id)+".")
+            self.init_kwargs['base'] = Command(
                 system=service, 
                 name='base',
                 abstract=True,
                 base='/PUS/pus-tc',
                 assignments={'type': service.service_id}
             )
-            self.init_kwargs['base'] = base_command
+        elif not 'base' in self.init_kwargs 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):
             super().__init__(*self.init_args, **self.init_kwargs)
         else:
             super().__init__(system=service, *self.init_args, **self.init_kwargs)
         self.assignments['apid'] = self.system.system.apid
+        self.struct_name = self.name + 'Args'
 
     
     def find_and_replace_keywords(self, text, text_modules_path):
@@ -431,14 +433,16 @@ class RCCNCommand(Command):
         # Find and replace command variable keywords
         command_var_keywords = get_var_keywords(text)
         command_var_translation = {
-            '<<VAR_COMMAND_NAME_UCASE>>': pascalcase(self.name),
-            '<<VAR_COMMAND_NAME>>': self.name,
-            '<<VAR_COMMAND_SUBTYPE>>': str(self.assignments['subtype']),
-            '<<VAR_COMMAND_STRUCT>>': self.struct_definition()
+            '<<VAR_COMMAND_NAME_UCASE>>': lambda: pascalcase(self.name),
+            '<<VAR_COMMAND_NAME>>': lambda: self.name,
+            '<<VAR_COMMAND_STRUCT_NAME>>': lambda: self.struct_name,
+            '<<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 "",
         }
         for command_var_keyword in command_var_keywords:
             if command_var_keyword in command_var_translation.keys():
-                text = replace_with_indentation(text, command_var_keyword, command_var_translation[command_var_keyword])
+                text = replace_with_indentation(text, command_var_keyword, command_var_translation[command_var_keyword]())
         return text
     
     def check_user_input(self):
@@ -449,37 +453,78 @@ class RCCNCommand(Command):
         return os.path.join(self.snapshot_file_path, 'user', datetime.datetime.now().strftime("%Y-%m-%d_%H-%M-%S"))
 
     def struct_definition(self):
+        struct_definition_text = ""
         if len(self.arguments) == 0:
             return ''
-        struct_definition_text = "#[derive(BitStruct, Debug, PartialEq)]\npub struct "+pascalcase(self.name)+" {\n"
+        if hasattr(self, 'long_description') and self.long_description is not None:
+            struct_definition_text += "/// "+str(self.long_description)+"\n"
+        struct_definition_text += "#[derive(BitStruct, Debug, PartialEq)]\npub struct "+pascalcase(self.struct_name)+" {\n"
+        ins = ""
+        append = ""
         for argument in self.arguments:
-            struct_definition_text += rust_type_definition(argument)[0]
+            arg_def = rust_type_definition(argument)
+            ins += arg_def[0]
+            append += arg_def[1]
+        struct_definition_text += ins
         struct_definition_text += "}\n"
-        for argument in self.arguments:
-            struct_definition_text += rust_type_definition(argument)[1]
+        struct_definition_text += append
         return struct_definition_text
 
 class RCCNContainer(Container):
-    def __init__(self, base="/PUS/pus-tm", *args, **kwargs):
+    def __init__(self, base="/PUS/pus-tm", subtype = None, *args, **kwargs):
         self.base = base
+        self.subtype = subtype
         self.init_args = args
         self.init_kwargs = kwargs
+        self.init_kwargs['base'] = base
+        self.name = kwargs['name']
         if 'system' in kwargs and isinstance(kwargs['system'], Service):
             self.add_to_service(kwargs['system'])
 
     def add_to_service(self, service):
+        self.type = service.service_id
+        condition_type = None
+        condition_subtype = None
+        if 'condition' in self.init_kwargs:
+            for eq_expression in self.init_kwargs['condition'].expressions:
+                if eq_expression.ref == self.base+'/type':
+                    condition_type = eq_expression.value
+                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.')
+            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.')
+        elif condition_subtype is not None:
+            self.subtype = condition_subtype
+        elif self.subtype is not None and not 'condition' in self.init_kwargs:
+            self.init_kwargs['condition'] = AndExpression(
+                EqExpression(self.base+'/type', self.type),
+                EqExpression(self.base+'/subtype', self.subtype)
+                )
+        else:
+            raise ValueError('RCCN-Error: Container '+self.name+' has no \'condition\' argument and condition could not be created due to a missing \'subtype\' argument.')
+
         if 'system' in self.init_kwargs and isinstance(self.init_kwargs['system'], Service):
             super().__init__(*self.init_args, **self.init_kwargs)
         else:
             super().__init__(system=service, *self.init_args, **self.init_kwargs)
 
     def generate_rccn_telemetry(self):
-        rccn_telemetry_text = "pub struct " + self.name + " {\n"
-        for parameter_entry in self.entries:
-            rccn_telemetry_text += rust_type_definition(parameter_entry.parameter)[0]
-            #rccn_telemetry_text += parameter_entry.generate_rccn_telemetry()[0]
-        rccn_telemetry_text += "}\n"
+        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"
+        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"
+        insert, append = ["",""]
         for parameter_entry in self.entries:
-            rccn_telemetry_text += rust_type_definition(parameter_entry.parameter)[1]
-        
+            par_def = rust_type_definition(parameter_entry.parameter)
+            insert += par_def[0]
+            append += par_def[1]
+        rccn_telemetry_text += insert
+        rccn_telemetry_text += "}\n\n"
+        rccn_telemetry_text += append        
         return rccn_telemetry_text

rccn_gen/text_modules/cargo_toml/cargo.txt

@@ -11,4 +11,7 @@ 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"
+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/text_modules/command/command_module_enum.txt

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

rccn_gen/text_modules/main/main.txt

@@ -1,3 +1,4 @@
+use anyhow::Result;
 <<SERVICE_MODULE_IMPORT_SERVICE>>
 use rccn_usr::pus::app::PusApp;
 use rccn_usr::zenoh::key_expr::OwnedKeyExpr;

rccn_gen/text_modules/main/service_module_import_service.txt

@@ -1 +1 @@
-use picture_service::service::<<VAR_SERVICE_NAME_UCASE>>;
+use <<VAR_SERVICE_NAME>>::service::<<VAR_SERVICE_NAME_UCASE>>;

rccn_gen/text_modules/service/service.txt

@@ -21,7 +21,7 @@ impl <<VAR_SERVICE_NAME_UCASE>> {
 impl PusService for <<VAR_SERVICE_NAME_UCASE>> {
     type CommandT = command::Command;
 
-    fn handle_tc(&mut self, tc: AcceptedTc, cmd: Self::CommandT) -> AcceptanceResult {
+    fn handle_tc(&mut self, mut tc: AcceptedTc, cmd: Self::CommandT) -> AcceptanceResult {
         println!("PUS-Service: Command received.");
         match cmd {
             <<COMMAND_MODULE_MATCH_CMD>>

rccn_gen/utils.py

@@ -133,7 +133,9 @@ def rust_type_definition(pymdb_data_instance, parent_name="MyStruct"):
             pymdb_data_instance.name = singular_name
         print("RCCN-Gen: Information: An unnamed "+base_type+" has been named \""+pascalcase(pymdb_data_instance.name)+"\" in the generated RCCN code.")
     sc_instance_name = snakecase(pymdb_data_instance.name)
-
+    definition_text = ["",""]
+    if pymdb_data_instance.short_description is not None:
+        definition_text[0] += ("\n\t/// "+str(pymdb_data_instance.short_description)+"\n")
     if data_type == 'IntegerDataType':
         if pymdb_data_instance.encoding is None or pymdb_data_instance.encoding.bits is None:
             raw_bit_number = 8
@@ -143,41 +145,51 @@ def rust_type_definition(pymdb_data_instance, parent_name="MyStruct"):
         raw_bit_number_str = str(raw_bit_number)
         eng_bit_number = engineering_bit_number(raw_bit_number)
         eng_bit_number_str = str(eng_bit_number)
-        definition_text = ["\t#[bits("+raw_bit_number_str+")]\n"]
+        definition_text[0] += "\t#[bits("+raw_bit_number_str+")]\n"
         if pymdb_data_instance.signed:
             definition_text[0] += ("\tpub "+sc_instance_name+": i"+eng_bit_number_str+",\n")
         else:
             definition_text[0] += ("\tpub "+sc_instance_name+": u"+eng_bit_number_str+",\n")
-        definition_text.append("")
     
     elif data_type == 'BooleanDataType':
-        definition_text = ["\t#[bits(1)]\n\tpub "+sc_instance_name+": bool,\n"]
-        definition_text.append("")
+        definition_text[0] += ("\t#[bits(1)]\n\tpub "+sc_instance_name+": bool,\n")
     
     elif data_type == 'StringDataType':
-        definition_text = ["\t#[null_terminated]\n\tpub "+sc_instance_name+": String,\n", ""]
+        definition_text[0] += "\t#[null_terminated]\n\tpub "+sc_instance_name+": String,\n"
     
     elif data_type == 'ArrayDataType':
         definition_text = rust_type_definition(pymdb_data_instance.data_type, parent_name=pymdb_data_instance.name)
         definition_text[0] = definition_text[0].replace(': ', ': Vec<').replace(',\n', '>,\n')
+        if pymdb_data_instance.short_description is not None:
+            definition_text[0] = "\n\t/// "+pymdb_data_instance.short_description+"\n"+definition_text[0]
+        if pymdb_data_instance.long_description is not None:
+            definition_text[1] = "/// "+pymdb_data_instance.long_description+"\n" + definition_text[1]
     
     elif data_type == 'EnumeratedDataType':
-        definition_text = ["\tpub "+pymdb_data_instance.name+": "+pascalcase(pymdb_data_instance.name)+",\n"]
-        definition_text.append("pub enum "+pascalcase(pymdb_data_instance.name)+" {\n")
+        definition_text[0] += "\t#[bits("+str(pymdb_data_instance.encoding.bits)+")]\n"
+        definition_text[0] += "\tpub "+pymdb_data_instance.name+": "+pascalcase(pymdb_data_instance.name)+",\n"
+        definition_text[1] += ("#[derive(FromPrimative, ToPrimative, Debug)]\npub enum "+pascalcase(pymdb_data_instance.name)+" {\n")
         for choice in pymdb_data_instance.choices:
             definition_text[1] += "\t"+str(choice[1])+" = "+str(choice[0])+",\n"
-        definition_text[1] += "}\n"
+        definition_text[1] += "}\n\n"
+        if pymdb_data_instance.long_description is not None:
+            definition_text[1] = "/// "+pymdb_data_instance.long_description+"\n" + definition_text[1]
     
     elif data_type == 'AggregateDataType':
         struct_name = pascalcase(pymdb_data_instance.name)
-        definition_text = ["\tpub "+sc_instance_name+": "+struct_name+",\n"]
-        definition_text.append("pub struct "+struct_name+" {\n")
-        for member in pymdb_data_instance.members:
-            definition_text[1] += rust_type_definition(member, parent_name=pymdb_data_instance.name)[0]
-        definition_text[1] += "}\n"
+        definition_text[0] += "\tpub "+sc_instance_name+": "+struct_name+",\n"
+        if pymdb_data_instance.long_description is not None:
+            definition_text[1] += "\t/// "+pymdb_data_instance.long_description+"\n"
+        definition_text[1] += ("#[derive(FromPrimative, ToPrimative, Debug)]\n")
+        definition_text[1] += ("pub struct "+struct_name+" {\n")
+        insert, append = ["",""]
         for member in pymdb_data_instance.members:
-            definition_text[1] += rust_type_definition(member, parent_name=pymdb_data_instance.name)[1]
-
+            mem_def = rust_type_definition(member, parent_name=pymdb_data_instance.name)
+            insert += mem_def[0]
+            append += mem_def[1]
+        definition_text[1] += insert
+        definition_text[1] += "}\n\n"
+        definition_text[1] += append
     else:
         definition_text = ["\t// Please implement datatype "+data_type+" here.\n", ""]
     return definition_text

{rccn_gen-1.0.2.dist-info → rccn_gen-1.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rccn_gen
-Version: 1.0.2
+Version: 1.1.0
 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
@@ -16,19 +16,18 @@ Description-Content-Type: text/markdown
 
 # RCCN Code Generator
 This generator is used to generate Rust files to deploy on the RACCOON OS satellite based on the pymdb config files used to generate the ground station XTCE files.
+
+To see whats new, see the [CHANGELOG](CHANGELOG.md).
 ## Setup
-- Pull the repo
 - Set up a virtual python environment with `python3` and activate:
     ```zsh
     python -m venv .venv
     source .venv/bin/activate
     ```
-- Install pymdb with `pip install yamcs-pymdb`
+- Install with `pip install rccn-gen`
 
 ## Using the Generator
 The generator is based on [`pymdb`](https://github.com/yamcs/pymdb) and uses the same structure. Where `pymdb` gives the user freedom in defining systems, subsystems and their respective relations, the definitions for rust code generation is more restricted. For the rust generation, the user is bound to the following classes:
-- Application,
-- Service, and
 - `Application`,
 - `Service`, and
 - `RCCNCommand`.
@@ -53,7 +52,13 @@ A service may be defined with the following command.
 ```python
 service = Service(name="ExampleService", system=app, service_id = 131)
 ```
-It has the obligatory arguments **name** and **system**. The system corresponds to the application where the service is associated to. Note that each service has one associated app. A service cannot be associated to more than one apps. You may think of the Application-Service-Command structure as a mathematical tree, where merging branches are not allowed. However, you can create multiple instances of the same service and associate them to different applications, or create multiple identical command instances and associate them to different services. 
+Or like this:
+```python
+service = Service(name="ExampleService", service_id = 131)
+app.add_service(service)
+```
+
+It has the obligatory arguments **name** and **system**. The system corresponds to the application where the service is associated to. Note that each service has one associated app. A service cannot be associated to more than one app. You may think of the Application-Service-Command structure as a mathematical tree, where merging branches are not allowed. However, you can create multiple instances of the same service and associate them to different applications, or create multiple identical command instances and associate them to different services. 
 
 ### RCCNCommand
 An RCCNCommand can be defined with the following statement.
@@ -65,7 +70,33 @@ RCCNCommand(
     arguments=[StringArgument("name", encoding=StringEncoding())],
 )
 ```
-Obligatory arguments are **system**, **base**, **name** and **arguments**. The latter can be an empty list. The definition must contain a subtype definition in the assignment property, like shown in the example. 
+
+Or like this:
+```python
+my_command = RCCNCommand(
+    assignments={"subtype": 2},
+    name="StopProcess",
+    arguments=[StringArgument("name", encoding=StringEncoding())],
+)
+service.add_command(my_command)
+```
+
+The only obligatory arguments are **name** and a **subtype assignment**, like shown in the example. The connection to a service can also be achieved with base commands, where every base command must be unique to a service. For example:
+
+```python
+base_cmd = RCCNCommand(
+    system=service,
+    assignments={"type": service.service_id},
+    name="base",
+    base="/PUS/pus-tc"
+)
+my_command = RCCNCommand(
+    base=base_cmd,
+    assignments={"subtype": 2},
+    name="StopProcess",
+    arguments=[StringArgument("name", encoding=StringEncoding())],
+)
+```
 
 ## Output
 From the python configuration, the `main.rs`, `service.rs`, `command.rs`, `mod.rs`, `Cargo.toml` and `telemetry.rs` files are generated and are structured accordingly:

rccn_gen-1.1.0.dist-info/RECORD

@@ -0,0 +1,19 @@
+rccn_gen/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+rccn_gen/__init__.py,sha256=rBnqIw3uQk-uBbRh9VnungoTRSr2V0Bqos32xFZ44Eo,168
+rccn_gen/systems.py,sha256=a_ylpOnHQL-RSL16HSjPZgonf4wGXiakNsvZcnq-5P8,30079
+rccn_gen/utils.py,sha256=VKnTC2hrgMyLdneksAifnqEgXO27zLQJ9x5igaF35rE,8269
+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
+rccn_gen/text_modules/command/command_module_enum.txt,sha256=35sBlAV_CzQw95Uf2dNynrYOxVD2tT2XWfEvS4Zx_KY,121
+rccn_gen/text_modules/command/command_module_struct.txt,sha256=FT7Ke0uOVxWYpGC_oj9zafr1ahrH-nf0nSxQje6kToY,22
+rccn_gen/text_modules/main/main.txt,sha256=t8lAYNCgxY8XHHGt8lVeZC103O1YLEY82UoTZ2U7S2I,446
+rccn_gen/text_modules/main/service_module_import_service.txt,sha256=BYPvt2VrTV4yjt7SSAPYKzvQOBIqeDQsMzgzTQ8XmZY,62
+rccn_gen/text_modules/main/service_module_mod_service.txt,sha256=guvXFdV_-YezhTD_PWA-Z0tL8ReSZc0rh3RuWraJnQE,25
+rccn_gen/text_modules/main/service_module_register_service.txt,sha256=4EIsgaxDLh51u0WjXfy7Xgo-6UFTdb4Nh2O4J7uFjS0,115
+rccn_gen/text_modules/mod/mod.txt,sha256=BF8LablBE4ddutdl5m0prvpvLdBRejueVOujkyrLe7I,52
+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.1.0.dist-info/METADATA,sha256=O6tvxJsBHrtdX0kxFW9j7MU_oSFGW0CAVD_9Mi_WCnk,8924
+rccn_gen-1.1.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+rccn_gen-1.1.0.dist-info/RECORD,,

rccn_gen/telemetry.py

@@ -1,83 +0,0 @@
-from yamcs.pymdb import Container, ParameterEntry, AggregateParameter, ArrayParameter, BinaryParameter, StringParameter, BooleanParameter, FloatParameter, IntegerParameter, StringMember, EnumeratedMember
-from .utils import *
-    
-
-def generate_rccn_parameter_telemetry(parameter):
-    sc_parameter_name = to_snake_case(parameter.name)
-
-    if isinstance(parameter, ArrayParameter):
-        struct_name = to_upper_camel_case(parameter.name)
-        telemetry = ["\tpub "+sc_parameter_name+": Vec<"+struct_name+">,\n"]
-        telemetry.append("pub struct "+struct_name+" {\n")
-        for member in parameter.data_type.members:
-            telemetry[1] += generate_rccn_member_telementry(member)[0]
-        telemetry[1] += "}\n"
-        for member in parameter.data_type.members:
-            telemetry[1] += generate_rccn_member_telementry(member)[1]
-
-    elif isinstance(parameter, BooleanParameter):
-        telemetry = ["\t#[bits(1)]\n\tpub "+sc_parameter_name+": bool,\n"]
-        telemetry.append("")
-
-    elif isinstance(parameter, IntegerParameter):
-        if parameter.encoding is None or parameter.encoding.bits is None:
-            raw_bit_number_str = '8'
-            print("Warning: No encoding for parameter "+parameter.name+" found. Using 8 as default for raw bit number.")
-        else:
-            raw_bit_number = parameter.encoding.bits
-            raw_bit_number_str = str(raw_bit_number)
-            eng_bit_number = engineering_bit_number(raw_bit_number)
-            eng_bit_number_str = str(eng_bit_number)
-        telemetry = ["\t#[bits("+raw_bit_number_str+")]\n"]
-        if parameter.signed:
-            telemetry[0] += ("\tpub "+sc_parameter_name+": i"+eng_bit_number_str+",\n")
-        else:
-            telemetry += ("\tpub "+sc_parameter_name+": u"+eng_bit_number_str+",\n")
-        telemetry.append("")
-
-    elif isinstance(parameter, StringParameter):
-        telemetry = ["#[null_terminated]\npub "+sc_parameter_name+": String,\n"]
-        telemetry.append("")
-
-    else:
-        telemetry = ["\t// Please implement datatype "+type(parameter).__name__+" here.\n", ""]
-    return telemetry
-
-def generate_rccn_member_telementry(member):
-    sc_member_name = to_snake_case(member.name)
-
-    if isinstance(member, StringMember):
-        member_telemetry = ["#[null_terminated]\n\tpub "+member.name+": String,\n"]
-        member_telemetry.append("")
-
-    elif isinstance(member, EnumeratedMember):
-        member_telemetry = ["\tpub "+member.name+": "+to_upper_camel_case(member.name)+",\n"]
-        member_telemetry.append("pub enum "+to_upper_camel_case(member.name)+" {\n")
-        for choice in member.choices:
-            member_telemetry[1] += "\t"+str(choice[1])+" = "+str(choice[0])+",\n"
-        member_telemetry[1] += "}\n"
-
-    elif isinstance(member, BooleanParameter):
-        telemetry = ["pub "+sc_member_name+": bool,\n"]
-        telemetry.append("")
-
-    elif isinstance(member, IntegerParameter):
-        if member.encoding is None or member.encoding.bits is None:
-            raw_bit_number = 8
-            print("Warning: No encoding for member "+member.name+" found. Using 8 as default for raw bit number.")
-        else:
-            raw_bit_number = member.encoding.bits
-        raw_bit_number_str = str(raw_bit_number)
-        eng_bit_number = engineering_bit_number(raw_bit_number)
-        eng_bit_number_str = str(eng_bit_number)
-        telemetry = ["\t#[bits("+raw_bit_number_str+")]\n"]
-        if member.signed:
-            telemetry[0] += ("\tpub "+sc_member_name+": i"+eng_bit_number_str+",\n")
-        else:
-            telemetry += ("\tpub "+sc_member_name+": u"+eng_bit_number_str+",\n")
-        telemetry.append("")
-    
-    else:
-        member_telemetry[0] += "\t// Please implement datatype "+type(member).__name__+" here.\n"
-        member_telemetry.append("")
-    return member_telemetry

rccn_gen-1.0.2.dist-info/RECORD

@@ -1,22 +0,0 @@
-rccn_gen/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-rccn_gen/__init__.py,sha256=XVvKYcWw9K1P3J1BTbzbODY71Nc1FApCc0wf7ezd4Gc,193
-rccn_gen/application.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rccn_gen/service.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rccn_gen/systems.py,sha256=ibpegtBKPF-w6hmiWC_-TgJII6uvWP8wRSDpwEq8rjY,26755
-rccn_gen/telemetry.py,sha256=huVcqGs95IXlpETWdlIyR9lK4ctZUsq7czgJwvTYtBk,3855
-rccn_gen/utils.py,sha256=HF79aMpovRdqLdVjL1w0iEPTEvOl7VSPrf_9QifUyoc,7290
-rccn_gen/text_modules/cargo_toml/cargo.txt,sha256=2e6xKomkml6-onfQ0QHNqvKnhGLYMUl8zYgbykmm83Y,292
-rccn_gen/text_modules/command/command.txt,sha256=8Y-uJilhFLoinftIbn7uKfia9LLMZno2LkoDJ-4Y-9M,345
-rccn_gen/text_modules/command/command_module_enum.txt,sha256=ApzRDQIs-BHJHtFA4ysfpYuWElGntXakkzZkgy57b74,94
-rccn_gen/text_modules/command/command_module_struct.txt,sha256=FT7Ke0uOVxWYpGC_oj9zafr1ahrH-nf0nSxQje6kToY,22
-rccn_gen/text_modules/main/main.txt,sha256=UQ0oHbzH7H3G4mxfeiTh5UeQ-X4C0Fw7IrCyZNH2clQ,426
-rccn_gen/text_modules/main/service_module_import_service.txt,sha256=qPrU4fLs7Y65X5KJ868ut-izV5pHq7hU2nVRLxPnFCE,57
-rccn_gen/text_modules/main/service_module_mod_service.txt,sha256=guvXFdV_-YezhTD_PWA-Z0tL8ReSZc0rh3RuWraJnQE,25
-rccn_gen/text_modules/main/service_module_register_service.txt,sha256=4EIsgaxDLh51u0WjXfy7Xgo-6UFTdb4Nh2O4J7uFjS0,115
-rccn_gen/text_modules/mod/mod.txt,sha256=BF8LablBE4ddutdl5m0prvpvLdBRejueVOujkyrLe7I,52
-rccn_gen/text_modules/service/command_module_match_cmd.txt,sha256=eVGo6ltuerG37rVxpXtL-JYuLyLW4c0i6NXb5g1_U-A,89
-rccn_gen/text_modules/service/service.txt,sha256=0KwwrfrjXuY4e3VNpCdTTzgW8bmYRQ21i-Lvhkz3hVA,691
-rccn_gen/text_modules/telemetry/telemetry.txt,sha256=Re1d3BfpyXT_CEe7jJzLF3MARik0-J-K98K85iPOE40,193
-rccn_gen-1.0.2.dist-info/METADATA,sha256=SmSD9_-46j9ZXvYAhuVPr2hINx0_xHOihSPJ31vfwVc,8260
-rccn_gen-1.0.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-rccn_gen-1.0.2.dist-info/RECORD,,