Skip to content

Commit ea7dbe5

Browse files
committed
Minor formatting updates
1 parent 6715f33 commit ea7dbe5

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

canopen/pdo/base.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,6 @@ def save_generator(self):
456456
# fixed number of entries (count not writable), generate dummy
457457
# mappings for an invalid object 0x0000:00 to overwrite any
458458
# excess entries with all-zeros.
459-
460459
self._fill_map(self.map_array[0].get_raw()) # FIXME: Blocking?
461460
subindex = 1
462461
for var in self.map:

canopen/profiles/p402.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ def homing(self, timeout=None, restore_op_mode=False):
370370

371371
@property
372372
def op_mode(self):
373-
logger.warning("Accessing BaseNode402.op_mode property is deprecated")
373+
logger.warning("Accessing BaseNode402.op_mode property is deprecated, use get_op_mode()")
374374
return self.get_op_mode()
375375

376376
def get_op_mode(self):
@@ -456,7 +456,7 @@ def is_op_mode_supported(self, mode):
456456
"""
457457
if not hasattr(self, '_op_mode_support'):
458458
# Cache value only on first lookup, this object should never change.
459-
self._op_mode_support = self.sdo[0x6502].get_raw()
459+
self._op_mode_support = self.sdo[0x6502].get_raw() # FIXME: Blocking
460460
logger.info('Caching node {n} supported operation modes 0x{m:04X}'.format(
461461
n=self.id, m=self._op_mode_support))
462462
bits = OperationMode.SUPPORTED[mode]
@@ -475,7 +475,7 @@ def on_TPDOs_update_callback(self, mapobject):
475475

476476
@property
477477
def statusword(self):
478-
logger.warning("Accessing BaseNode402.statusword property is deprecated")
478+
logger.warning("Accessing BaseNode402.statusword property is deprecated, use get_statusword()")
479479
return self.get_statusword()
480480

481481
def get_statusword(self):
@@ -537,7 +537,7 @@ def set_controlword(self, value):
537537

538538
@property
539539
def state(self):
540-
logger.warning("Accessing BaseNode402.state property is deprecated")
540+
logger.warning("Accessing BaseNode402.state property is deprecated, use get_state()")
541541
return self.get_state(self)
542542

543543
def get_state(self):

canopen/variable.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ def __init__(self, od: objectdictionary.Variable):
2626
self.subindex = od.subindex
2727

2828
def get_data(self) -> bytes:
29+
"""Byte representation of the object as :class:`bytes`."""
2930
raise NotImplementedError("Variable is not readable")
3031

3132
async def aget_data(self) -> bytes:
@@ -39,8 +40,7 @@ async def aset_data(self, data: bytes):
3940

4041
@property
4142
def data(self) -> bytes:
42-
"""Byte representation of the object as :class:`bytes`."""
43-
logger.warning("Accessing Variable.data property is deprecated")
43+
logger.warning("Accessing Variable.data property is deprecated, use get_data()")
4444
return self.get_data()
4545

4646
@data.setter
@@ -50,7 +50,7 @@ def data(self, data: bytes):
5050

5151
@property
5252
def raw(self) -> Union[int, bool, float, str, bytes]:
53-
logger.warning("Accessing Variable.raw property is deprecated")
53+
logger.warning("Accessing Variable.raw property is deprecated, use get_raw()")
5454
return self.get_raw()
5555

5656
def get_raw(self) -> Union[int, bool, float, str, bytes]:
@@ -119,7 +119,7 @@ def _set_raw(self, value: Union[int, bool, float, str, bytes]):
119119

120120
@property
121121
def phys(self) -> Union[int, bool, float, str, bytes]:
122-
logger.warning("Accessing Variable.phys attribute is deprecated")
122+
logger.warning("Accessing Variable.phys attribute is deprecated, use get_phys()")
123123
return self.get_phys()
124124

125125
def get_phys(self) -> Union[int, bool, float, str, bytes]:
@@ -153,11 +153,11 @@ async def aset_phys(self, value: Union[int, bool, float, str, bytes]):
153153

154154
@property
155155
def desc(self) -> str:
156-
"""Converts to and from a description of the value as a string."""
157-
logger.warning("Accessing Variable.desc attribute is deprecated")
156+
logger.warning("Accessing Variable.desc attribute is deprecated, use get_desc()")
158157
return self.get_desc()
159158

160159
def get_desc(self) -> str:
160+
"""Converts to and from a description of the value as a string."""
161161
value = self.od.decode_desc(self.get_raw())
162162
logger.debug("Description is '%s'", value)
163163
return value
@@ -180,8 +180,11 @@ async def aset_desc(self, desc: str):
180180

181181
@property
182182
def bits(self) -> "Bits":
183-
"""Access bits using integers, slices, or bit descriptions."""
184183
logger.warning("Accessing Variable.bits attribute is deprecated")
184+
return self.get_bits()
185+
186+
def get_bits(self) -> "Bits":
187+
"""Access bits using integers, slices, or bit descriptions."""
185188
return Bits(self)
186189

187190
def read(self, fmt: str = "raw") -> Union[int, bool, float, str, bytes]:

0 commit comments

Comments
 (0)