Skip to content

add support for ArrayArgument in commands #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fqqb merged 2 commits into from
Jan 29, 2025
Merged

add support for ArrayArgument in commands #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01c9a6b
add support for ArrayArgument in commands
m-sc Jan 27, 2025
c1e8d6a
flake8 lint
m-sc Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 107 additions & 0 deletions src/yamcs/pymdb/xtce.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,8 @@ def add_argument_type(
self.add_integer_argument_type(parent, system, name, default, data_type)
elif isinstance(data_type, StringDataType):
self.add_string_argument_type(parent, system, name, default, data_type)
elif isinstance(data_type, ArrayDataType):
self.add_array_argument_type(parent, system, name, data_type)
else:
raise ExportError(f"Unexpected data type {data_type.__class__}")

Expand Down Expand Up @@ -860,6 +862,111 @@ def add_string_argument_type(
if data_type.max_length is not None:
range_el.attrib["maxInclusive"] = str(data_type.max_length)

def add_array_argument_type(
self,
parent: ET.Element,
system: System,
name: str,
data_type: ArrayDataType,
):
el = ET.SubElement(parent, "ArrayArgumentType")
el.attrib["name"] = name

element_type_name = f"{name}__el"
el.attrib["arrayTypeRef"] = element_type_name

dims_el = ET.SubElement(el, "DimensionList")
dim_el = ET.SubElement(dims_el, "Dimension")
start_idx_el = ET.SubElement(dim_el, "StartingIndex")
ET.SubElement(start_idx_el, "FixedValue").text = "0"

end_idx_el = ET.SubElement(dim_el, "EndingIndex")
if isinstance(data_type.length, DynamicInteger):
dyn_el = ET.SubElement(end_idx_el, "DynamicValue")
ref_el = ET.SubElement(dyn_el, "ArgumentInstanceRef")
parameter = data_type.length.parameter
ref_el.attrib["argumentRef"] = self.make_parameter_ref(
parameter,
start=system,
)
adj_el = ET.SubElement(dyn_el, "LinearAdjustment")
adj_el.attrib["intercept"] = "-1"
else:
ET.SubElement(end_idx_el, "FixedValue").text = str(data_type.length - 1)

el_type = data_type.data_type
if isinstance(el_type, AbsoluteTimeDataType):
self.add_absolute_time_argument_type(
parent,
system,
name=element_type_name,
data_type=el_type,
)
# elif isinstance(el_type, AggregateDataType):
# self.add_aggregate_argument_type(
# parent,
# system,
# name=element_type_name,
# data_type=el_type,
# )
elif isinstance(el_type, ArrayDataType):
self.add_array_argument_type(
parent,
system,
name=element_type_name,
data_type=el_type,
)
elif isinstance(el_type, BinaryDataType):
self.add_binary_argument_type(
parent,
system,
name=element_type_name,
default=None,
data_type=el_type,
)
elif isinstance(el_type, BooleanDataType):
self.add_boolean_argument_type(
parent,
system,
name=element_type_name,
default=None,
data_type=el_type,
)
elif isinstance(el_type, EnumeratedDataType):
self.add_enumerated_argument_type(
parent,
system,
name=element_type_name,
default=None,
data_type=el_type,
)
elif isinstance(el_type, FloatDataType):
self.add_float_argument_type(
parent,
system,
name=element_type_name,
default=None,
data_type=el_type,
)
elif isinstance(el_type, IntegerDataType):
self.add_integer_argument_type(
parent,
system,
name=element_type_name,
default=None,
data_type=el_type,
)
elif isinstance(el_type, StringDataType):
self.add_string_argument_type(
parent,
system,
name=element_type_name,
default=None,
data_type=el_type,
)
else:
raise ExportError(f"Unexpected data type {el_type.__class__}")

def add_aggregate_parameter_type(
self,
parent: ET.Element,
Expand Down