From 27f6d6c76b26e3338dd8fe9a17f7b14234c6c36f Mon Sep 17 00:00:00 2001 From: "Peter F. Patel-Schneider" Date: Thu, 23 Sep 2021 09:15:25 -0400 Subject: [PATCH] settings: don't use time_ns so as not to require Python 3.7 --- lib/logitech_receiver/settings.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/logitech_receiver/settings.py b/lib/logitech_receiver/settings.py index 648e0f76..61e3997c 100644 --- a/lib/logitech_receiver/settings.py +++ b/lib/logitech_receiver/settings.py @@ -24,7 +24,9 @@ import math from copy import copy as _copy from logging import DEBUG as _DEBUG from logging import getLogger -from time import time_ns as _time_ns +## use regular time instead of time_ns so as not to require Python 3.7 +# from time import time_ns as _time_ns +from time import time as _time from . import hidpp20 as _hidpp20 from . import special_keys as _special_keys @@ -1093,7 +1095,7 @@ class DivertedMouseMovement(object): def handle_move_event(self, dx, dy): # This multiplier yields a more-or-less DPI-independent dx of about 5/cm # The multiplier could be configurable to allow adjusting dx - now = _time_ns() / 1e6 + now = _time() * 1000 # _time_ns() / 1e6 dpi = self.dpiSetting.read() if self.dpiSetting else 1000 dx = float(dx) / float(dpi) * 15. self.dx += dx @@ -1113,7 +1115,7 @@ class DivertedMouseMovement(object): self.fsmState = 'pressed' self.dx = 0. self.dy = 0. - self.lastEv = _time_ns() / 1e6 + self.lastEv = _time() * 1000 # _time_ns() / 1e6 self.skip = True elif self.fsmState == 'pressed' or self.fsmState == 'moved': if self.key not in cids: @@ -1135,7 +1137,7 @@ class DivertedMouseMovement(object): self.data.append(1) self.data.append(list(last)[0]) self.data[0] += 1 - self.lastEv = _time_ns() / 1e6 + self.lastEv = _time() * 1000 # _time_ns() / 1e6 return True