|
13 | 13 | class AcceptAllCA(j1939.ControllerApplication):
|
14 | 14 | """CA to accept all messages"""
|
15 | 15 |
|
16 |
| - def __init__(self, name, device_address_preferred=None): |
| 16 | + def __init__(self, name, device_address_preferred, bypass_address_claim): |
17 | 17 | # 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) |
19 | 19 |
|
20 | 20 | def message_acceptable(self, dest_address):
|
21 | 21 | """Indicates if this CA would accept a message
|
@@ -115,13 +115,9 @@ def accept_all_messages(
|
115 | 115 | self, device_address_preferred=None, bypass_address_claim=False
|
116 | 116 | ):
|
117 | 117 | # 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) |
119 | 119 |
|
120 | 120 | 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) |
125 | 121 | return ca
|
126 | 122 |
|
127 | 123 | def receive(self):
|
|
0 commit comments