Skip to content

Commit 21d23c5

Browse files
authored
Merge pull request juergenH87#29 from snideto/feature/memory_access
correct indexing for received data conversion
2 parents 1972745 + a92e677 commit 21d23c5

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

j1939/memory_access.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ def _bytes_to_values(self, raw_bytes):
145145
for i in range(len(raw_bytes) // self.object_byte_size):
146146
values.append(
147147
int.from_bytes(
148-
raw_bytes[i : self.object_byte_size - 1],
148+
raw_bytes[i : self.object_byte_size],
149149
byteorder="little",
150150
signed=self.signed,
151151
)

test/feeder.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
class AcceptAllCA(j1939.ControllerApplication):
1414
"""CA to accept all messages"""
1515

16-
def __init__(self, name, device_address_preferred=None):
16+
def __init__(self, name, device_address_preferred, bypass_address_claim):
1717
# old fashion calling convention for compatibility with Python2
18-
j1939.ControllerApplication.__init__(self, name, device_address_preferred)
18+
j1939.ControllerApplication.__init__(self, name, device_address_preferred, bypass_address_claim)
1919

2020
def message_acceptable(self, dest_address):
2121
"""Indicates if this CA would accept a message
@@ -115,13 +115,9 @@ def accept_all_messages(
115115
self, device_address_preferred=None, bypass_address_claim=False
116116
):
117117
# install a fake-CA to accept all messages
118-
ca = AcceptAllCA(None, device_address_preferred=device_address_preferred)
118+
ca = AcceptAllCA(None, device_address_preferred, bypass_address_claim)
119119

120120
self.ecu.add_ca(controller_application=ca)
121-
if bypass_address_claim: # hack
122-
ca._device_address = device_address_preferred
123-
ca._device_address_state = j1939.ControllerApplication.State.NORMAL
124-
self.ecu.subscribe(self._on_message)
125121
return ca
126122

127123
def receive(self):

0 commit comments

Comments
 (0)