diff --git a/Autocoders/Python/bin/tlm_packet_gen.py b/Autocoders/Python/bin/tlm_packet_gen.py index bc09901302e..2502afe5648 100755 --- a/Autocoders/Python/bin/tlm_packet_gen.py +++ b/Autocoders/Python/bin/tlm_packet_gen.py @@ -177,6 +177,7 @@ def generate_channel_size_dict(self, the_parsed_topology_xml, xml_filename): # uses the topology model to process the items # create list of used parsed component xmls parsed_xml_dict = {} + # deployment = the_parsed_topology_xml.get_deployment() for comp in the_parsed_topology_xml.get_instances(): if comp.get_type() in topology_model.get_base_id_dict(): parsed_xml_dict[comp.get_type()] = comp.get_comp_xml() @@ -335,6 +336,18 @@ def gen_packet_file(self, xml_filename): channel_list = [] for channel in entry: channel_name = channel.attrib["name"] + # TKC 11/20/2024 - In order to work with the ground system, + # we have to strip off the leading module. This is a + # band-aid until FPP packets are done + name_parts = channel_name.split(".") + if len(name_parts) != 3: + raise TlmPacketParseValueError( + 'Channel %s must be of the format "module.component.channel_name"' + % channel_name + ) + + (module, component, channel) = name_parts + channel_name = "%s.%s" % (component, channel) if not channel_name in channel_size_dict: raise TlmPacketParseValueError( "Channel %s does not exist" % channel_name @@ -381,6 +394,19 @@ def gen_packet_file(self, xml_filename): ) for channel in entry: channel_name = channel.attrib["name"] + # TKC 11/20/2024 - In order to work with the ground system, + # we have to strip off the leading module. This is a + # band-aid until FPP packets are done + name_parts = channel_name.split(".") + if len(name_parts) != 3: + raise TlmPacketParseValueError( + 'Channel %s must be of the format "module.component.channel_name"' + % channel_name + ) + + (module, component, channel) = name_parts + channel_name = "%s.%s" % (component, channel) + if not channel_name in channel_size_dict: raise TlmPacketParseValueError( "Channel %s does not exist" % channel_name diff --git a/Ref/Top/RefPackets.xml b/Ref/Top/RefPackets.xml index 898a72bf16b..e212af7524f 100644 --- a/Ref/Top/RefPackets.xml +++ b/Ref/Top/RefPackets.xml @@ -3,241 +3,241 @@ Ref/Top/RefTopologyAppAi.xml - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - + - + - + - + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - + - + - + - + - + - + @@ -245,6 +245,6 @@ - + diff --git a/Ref/Top/instances.fpp b/Ref/Top/instances.fpp index 2dc30327622..33399937b92 100644 --- a/Ref/Top/instances.fpp +++ b/Ref/Top/instances.fpp @@ -77,10 +77,10 @@ module Ref { stack size Default.STACK_SIZE \ priority 97 - #instance tlmSend: Svc.TlmPacketizer base id 0x0C00 \ - # queue size Default.QUEUE_SIZE \ - # stack size Default.STACK_SIZE \ - # priority 97 +# instance tlmSend: Svc.TlmPacketizer base id 0x0C00 \ +# queue size Default.QUEUE_SIZE \ +# stack size Default.STACK_SIZE \ +# priority 97 instance prmDb: Svc.PrmDb base id 0x0D00 \ queue size Default.QUEUE_SIZE \