Skip to content
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

Fix_#833 #835

Merged
merged 2 commits into from
Jan 24, 2025
+10 −6
Merged

Fix_#833 #835

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f67419a
Fix_#833
xRowe Jan 23, 2025
c3c0280
Merge branch 'development' into Fix_#833
ebroecker Jan 24, 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
Next Next commit
Loading
Loading status checks…
Fix_#833
@xRowe
xRowe authored Jan 23, 2025
commit f67419a64bb57755019512fcbe627ee80188ba95
16 changes: 10 additions & 6 deletions src/canmatrix/formats/arxml.py
View file
Original file line number Diff line number Diff line change
@@ -1134,7 +1134,8 @@ def get_signals(signal_array, frame, ea, multiplex_id, float_factory, bit_offset
isignal_ub = canmatrix.Signal(ub_name,
start_bit=int(ub_start_bit.text, 0),
size = 1,
is_signed = False)
is_signed = False,
unit = "Unitless")
frame.add_signal(isignal_ub)

group_id = group_id + 1
@@ -1389,7 +1390,8 @@ def get_signals(signal_array, frame, ea, multiplex_id, float_factory, bit_offset
new_signal_ub = canmatrix.Signal(ub_name,
start_bit = int(ub_start_bit.text, 0),
size = 1,
is_signed = False)
is_signed = False,
unit = "Unitless")
frame.add_signal(new_signal_ub)


@@ -1631,19 +1633,21 @@ def get_frame(frame_triggering, ea, multiplex_translation, float_factory, header
if freshness_tx_length is not None and int(freshness_tx_length, 0) > 0:
freshness_name = f"{ea.get_element_name(frame_elem)}_Freshness"
signal_freshness = canmatrix.Signal(freshness_name,
start_bit = int(ipdu_length, 0)*8 + int(freshness_tx_length, 0) - 8,
start_bit = int(ipdu_length, 0) * 8 + int(freshness_tx_length, 0) - 16,
size = int(freshness_tx_length, 0),
is_signed = False,
is_little_endian = False)
is_little_endian = False,
unit = "Unitless")
new_frame.add_signal(signal_freshness)

if auth_tx_length is not None and int(auth_tx_length, 0) > 0:
authinfo_name = f"{ea.get_element_name(frame_elem)}_AuthInfo"
signal_authinfo = canmatrix.Signal(authinfo_name,
start_bit = int(ipdu_length, 0)*8 + int(freshness_tx_length, 0) + int(auth_tx_length, 0) - 8,
start_bit = int(ipdu_length, 0) * 8 + int(freshness_tx_length, 0),
size = int(auth_tx_length, 0),
is_signed = False,
is_little_endian = False)
is_little_endian = False,
unit = "Unitless")
new_frame.add_signal(signal_authinfo)

comment = ea.get_element_desc(frame_elem)