Skip to content

fix: do not generate invalid initial_values for Signals #869

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

Draft
wants to merge 1 commit into
base: development
Choose a base branch
from
Draft

fix: do not generate invalid initial_values for Signals #869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/canmatrix/canmatrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,8 +455,8 @@ def phys2raw(self, value=None):
# if not (0 <= value <= 10):
if not (self.min <= value <= self.max):
logger.warning(
"Value {} is not valid for {}. Min={} and Max={}".format(
value, self, self.min, self.max)
"Signal {}: Value {} is not valid for {}. Min={} and Max={}".format(
self.name, value, self, self.min, self.max)
)
raw_value = (self.float_factory(value) - self.float_factory(self.offset)) / self.float_factory(self.factor)

Expand Down
18 changes: 18 additions & 0 deletions src/canmatrix/formats/arxml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1373,6 +1373,11 @@ def get_signals(signal_array, frame, ea, multiplex_id, float_factory, bit_offset
new_signal.initial_value = (float_factory(initvalue.text) * factor) + offset
except decimal.InvalidOperation:
logger.error("could not decode value {}".format(initvalue.text))
else:
# no init-value found, check if existing initialized initial_value of Signal-object is between min/max,
# if not => INVALID! => set it to min to at least not generate an invalid Signal
if new_signal.min > new_signal.initial_value or new_signal.max < new_signal.initial_value:
new_signal.initial_value = new_signal.min

for key, value in list(values.items()):
new_signal.add_values(canmatrix.utils.decode_number(key, float_factory), value)
Expand Down Expand Up @@ -1478,6 +1483,19 @@ def get_frame_from_container_ipdu(pdu, target_frame, ea, float_factory, headers_
ipdu = ea.follow_ref(cpdu, "I-PDU-REF")
if ipdu in ipdus_refs:
continue
try:
if header_type == "SHORT-HEADER":
header_id = ea.get_child(ipdu, "HEADER-ID-SHORT-HEADER").text
elif header_type == "LONG-HEADER":
header_id = ea.get_child(ipdu, "HEADER-ID-LONG-HEADER").text
else:
# none type
header_id = None
except AttributeError:
header_id = None
if header_id is not None:
header_id = int(header_id, 0)

ipdus_refs.append(ipdu)
timing_spec = ea.get_child(ipdu, "I-PDU-TIMING-SPECIFICATION")
if timing_spec is None:
Expand Down
Loading