Skip to content

Extend Ixxat Driver CyclicSendTask with base ModifiableCyclicTaskABC to have modify_data() available #655

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

Closed
dmothes wants to merge 2 commits into from
Closed

Extend Ixxat Driver CyclicSendTask with base ModifiableCyclicTaskABC to have modify_data() available #655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c2c526
Extended Ixxat to "modify_data()" which is remove the scheduled messa…
mothesd Jul 24, 2019
7bfccad
GitIgnore
mothesd Aug 4, 2020
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
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ sdist/
var/
*.egg-info/
.installed.cfg
*.egg
# *.egg

# PyInstaller
# Usually these files are written by a python script from a template
Expand Down
19 changes: 18 additions & 1 deletion can/interfaces/ixxat/canlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
from can.broadcastmanager import (
LimitedDurationCyclicSendTaskABC,
RestartableCyclicTaskABC,
ModifiableCyclicTaskABC,
)
from can.ctypesutil import CLibrary, HANDLE, PHANDLE, HRESULT as ctypes_HRESULT

Expand Down Expand Up @@ -713,7 +714,7 @@ def shutdown(self):
_canlib.vciDeviceClose(self._device_handle)


class CyclicSendTask(LimitedDurationCyclicSendTaskABC, RestartableCyclicTaskABC):
class CyclicSendTask(LimitedDurationCyclicSendTaskABC, RestartableCyclicTaskABC, ModifiableCyclicTaskABC):
"""A message in the cyclic transmit list."""

def __init__(self, scheduler, msgs, period, duration, resolution):
Expand All @@ -736,8 +737,24 @@ def __init__(self, scheduler, msgs, period, duration, resolution):
self._msg.uMsgInfo.Bits.dlc = self.messages[0].dlc
for i, b in enumerate(self.messages[0].data):
self._msg.abData[i] = b
# self.updateMsgData(msg.data)
# for i, b in enumerate(msg.data):
# self._msg.abData[i] = b
self.start()

def updateMsgData(self, data):
for i, b in enumerate(data):
self._msg.abData[i] = b

def modify_data(self, msg):
self.updateMsgData(msg.data)
if self._index is None:
self.start()
else:
_canlib.canSchedulerRemMessage(self._scheduler, self._index)
_canlib.canSchedulerAddMessage(self._scheduler, self._msg, self._index)
_canlib.canSchedulerStartMessage(self._scheduler, self._index, self._count)

def start(self):
"""Start transmitting message (add to list if needed)."""
if self._index is None:
Expand Down