Skip to content

Commit 14b7758

Browse files
-Add LongDescription
-Update config_reference.yaml
1 parent 4690bc9 commit 14b7758

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

config/config_reference.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
root_spacesystem: cfs #Used to assemble the output file name for now.
1+
root_spacesystem: reference #Used to assemble the output file name for now.
22
#cpu_id: reference #useful for obc builds
33

44
# The global settings affect every namespace except for the root namespace/spacesystem since the root spacesystem is

src/xtce/xtce_generator.py

+8-5
Original file line numberDiff line numberDiff line change
@@ -1226,7 +1226,7 @@ def __get_aggregate_paramtype(self, symbol_record: tuple, module_name: str,
12261226
out_param.set_MemberList(member_list)
12271227
symbol_id = str(symbol_record[0])
12281228

1229-
for field_id, field_symbol, field_name, field_byte_offset, field_type, field_little_endian, bit_size, bit_offset, description in fields:
1229+
for field_id, field_symbol, field_name, field_byte_offset, field_type, field_little_endian, bit_size, bit_offset, short_description, long_description in fields:
12301230
# If this field is standalone array, ignore it for now
12311231
if field_type == field_symbol:
12321232
continue
@@ -1422,7 +1422,7 @@ def __get_aggregate_argtype(self, symbol_record: tuple, module_name: str,
14221422

14231423
member_list = xtce.MemberListType()
14241424
out_param.set_MemberList(member_list)
1425-
for field_id, field_symbol, field_name, field_byte_offset, field_type, field_little_endian, bit_size, bit_offset, PROJECT_SOURCE_DIR in fields:
1425+
for field_id, field_symbol, field_name, field_byte_offset, field_type, field_little_endian, bit_size, bit_offset, short_description, long_description in fields:
14261426
field_multiplicity = 0
14271427
if self.__is_array(field_id):
14281428
# Add 1 to upper bound since it is a zero-indexed and inclusive bound
@@ -1620,13 +1620,15 @@ def add_telemetry_containers(self, module_name: str, module_id: int, parent_cont
16201620
tlm_module = tlm[5]
16211621
min_rate = tlm[6]
16221622
short_description = tlm[7]
1623+
long_description = tlm[8]
16231624

16241625
default_rate = None
16251626
if min_rate is not None:
16261627
default_rate = xtce.RateInStreamType(minimumValue=min_rate)
16271628

16281629
seq_container = xtce.SequenceContainerType(name=str(tlm_name), DefaultRateInStream=default_rate,
1629-
shortDescription=short_description)
1630+
shortDescription=short_description,
1631+
LongDescription=long_description)
16301632
container_entry_list = xtce.EntryListType()
16311633
seq_container.set_EntryList(container_entry_list)
16321634

@@ -1644,7 +1646,8 @@ def add_telemetry_containers(self, module_name: str, module_id: int, parent_cont
16441646
base_paramtype_set.add_AggregateParameterType(aggregate_type)
16451647
telemetry_param = xtce.ParameterType(name=tlm_name,
16461648
parameterTypeRef=aggregate_type.get_name(),
1647-
shortDescription=short_description)
1649+
shortDescription=short_description,
1650+
LongDescription=long_description)
16481651

16491652
container_param_ref = xtce.ParameterRefEntryType(parameterRef=telemetry_param.get_name())
16501653

@@ -1706,7 +1709,7 @@ def __get_command_length(self, symbol_id: int):
17061709
out_length = 0
17071710
fields = self.db_cursor.execute('SELECT * FROM fields where symbol=?',
17081711
(symbol_id,)).fetchall()
1709-
for field_id, field_symbol, field_name, field_byte_offset, field_type, field_little_endian, bit_offset, bit_size, description in \
1712+
for field_id, field_symbol, field_name, field_byte_offset, field_type, field_little_endian, bit_offset, bit_size, short_description, long_description in \
17101713
fields:
17111714
field_multiplicity = self.__get_array(field_id)
17121715

0 commit comments

Comments
 (0)