Skip to content

Commit

Permalink
Merge d920333 into 730305b
Browse files Browse the repository at this point in the history
  • Loading branch information
d-bohls authored Mar 9, 2018
2 parents 730305b + d920333 commit 2dc78ea
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions nixnet/database/_cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from nixnet.database import _dbc_attributes
from nixnet.database import _ecu
from nixnet.database import _frame
from nixnet.database import _linsched
from nixnet.database import _lin_sched
from nixnet.database import _pdu


Expand All @@ -28,8 +28,8 @@ def __init__(self, handle):
self._handle, constants.ObjectClass.ECU, _cconsts.NX_PROP_CLST_ECU_REFS, _ecu.Ecu)
self._frames = _collection.DbCollection(
self._handle, constants.ObjectClass.FRAME, _cconsts.NX_PROP_CLST_FRM_REFS, _frame.Frame)
self._linsched = _collection.DbCollection(
self._handle, constants.ObjectClass.LIN_SCHED, _cconsts.NX_PROP_CLST_LIN_SCHEDULES, _linsched.LinSched)
self._lin_sched = _collection.DbCollection(
self._handle, constants.ObjectClass.LIN_SCHED, _cconsts.NX_PROP_CLST_LIN_SCHEDULES, _lin_sched.LinSched)
self._pdus = _collection.DbCollection(
self._handle, constants.ObjectClass.PDU, _cconsts.NX_PROP_CLST_PDU_REFS, _pdu.Pdu)

Expand Down Expand Up @@ -415,7 +415,7 @@ def flex_ray_use_wakeup(self, value):

@property
def lin_schedules(self):
return self._linsched
return self._lin_sched

@property
def lin_tick(self):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from nixnet import constants

from nixnet.database import _collection
from nixnet.database import _linsched_entry
from nixnet.database import _lin_sched_entry


class LinSched(object):
Expand All @@ -21,7 +21,7 @@ def __init__(self, handle):
self._handle,
constants.ObjectClass.LIN_SCHED_ENTRY,
_cconsts.NX_PROP_LIN_SCHED_ENTRIES,
_linsched_entry.LinSchedEntry)
_lin_sched_entry.LinSchedEntry)

def __eq__(self, other):
if isinstance(other, self.__class__):
Expand Down
File renamed without changes.

0 comments on commit 2dc78ea

Please sign in to comment.