Skip to content

Commit b6c5b4c

Browse files
committed
Merge branch 'release/1.2.5'
2 parents a12b8d1 + 943782e commit b6c5b4c

File tree

3 files changed

+32
-2
lines changed

3 files changed

+32
-2
lines changed

pypozyx/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
7373
"""
7474

75-
__version__ = '1.2.4'
75+
__version__ = '1.2.5'
7676

7777
VERSION = __version__
7878
version = __version__

pypozyx/lib.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def setSensorMode(self, sensor_mode, remote_id=None):
9191
"""
9292
if not dataCheck(sensor_mode):
9393
sensor_mode = SingleRegister(sensor_mode)
94-
if sensor_mode < 0 or sensor_mode > 12:
94+
if sensor_mode[0] < 0 or sensor_mode[0] > 12:
9595
warn("setSensorMode: mode {} not valid".format(sensor_mode))
9696
status = self.setWrite(PozyxRegisters.SENSORS_MODE, sensor_mode, remote_id)
9797
# legacy delay?

pypozyx/structures/generic.py

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,36 @@ def __str__(self):
231231
else:
232232
return str(self.data[0])
233233

234+
def __eq__(self, other):
235+
if SingleRegister == type(other):
236+
return self.value == other.value
237+
elif type(other) == int:
238+
return self.value == other
239+
else:
240+
raise ValueError("Can't compare SingleRegister value with non-integer values or registers")
241+
242+
def __le__(self, other):
243+
if SingleRegister == type(other):
244+
return self.value <= other.value
245+
elif type(other) == int:
246+
return self.value <= other
247+
else:
248+
raise ValueError("Can't compare SingleRegister value with non-integer values or registers")
249+
250+
def __lt__(self, other):
251+
if SingleRegister == type(other):
252+
return self.value < other.value
253+
elif type(other) == int:
254+
return self.value < other
255+
else:
256+
raise ValueError("Can't compare SingleRegister value with non-integer values or registers")
257+
258+
def __gt__(self, other):
259+
return not self.__le__(other)
260+
261+
def __ge__(self, other):
262+
return not self.__lt__(other)
263+
234264

235265
class SingleSensorValue(ByteStructure):
236266
"""

0 commit comments

Comments
 (0)