diff --git a/simulators/active_surface/__init__.py b/simulators/active_surface/__init__.py index 303b5d0..36b5540 100644 --- a/simulators/active_surface/__init__.py +++ b/simulators/active_surface/__init__.py @@ -62,7 +62,7 @@ class System(ListeningSystem): max_usd_per_line = 32 - delay_step = 0.000512 # 512 microseconds + delay_step = 0.000256 # 256 microseconds slope_time = 10 # msec bits_per_byte = 10 @@ -152,19 +152,14 @@ def _parse(self, msg): if msg[1] == self.byte_switchall: driver = None - nparams = ord(msg[2]) cparams = msg[4:(4 + nparams - 1)] - command = ord(msg[3]) else: binary = bin(ord(msg[1]))[2:].zfill(8) - driver = int(binary[3:], 2) - nparams = int(binary[:3], 2) cparams = msg[3:(3 + nparams - 1)] - command = ord(msg[2]) name = self.functions.get(command) @@ -174,26 +169,27 @@ def _parse(self, msg): params = [driver, byte_start, [ord(x) for x in cparams]] method = getattr(self, name) - request_tx_time = len(msg) * self.bits_per_byte / self.baud_rate - time.sleep(request_tx_time) - t0 = time.time() retval = method(params) + + request_tx_time = len(msg) * self.bits_per_byte / self.baud_rate + if driver is not None: if self.drivers[driver].delay_multiplier == 255: return True - else: - response_delay = ( - self.drivers[driver].delay_multiplier - * self.delay_step - ) - elapsed_time = time.time() - t0 - time.sleep(max(0, response_delay - elapsed_time)) - if retval is not None: - response_tx_time = ( - len(retval) * self.bits_per_byte / self.baud_rate - ) - time.sleep(response_tx_time) + response_delay = ( + self.drivers[driver].delay_multiplier + * self.delay_step + ) + response_tx_time = ( + len(retval) * self.bits_per_byte / self.baud_rate + ) if retval is not None else 0.0 + total_target_time = request_tx_time + total_target_time += response_delay + total_target_time += response_tx_time + remaining_sleep = total_target_time - (time.time() - t0) + if remaining_sleep > 0: + time.sleep(remaining_sleep) return retval else: return True diff --git a/simulators/active_surface/usd.py b/simulators/active_surface/usd.py index cc424a2..ab9c47c 100644 --- a/simulators/active_surface/usd.py +++ b/simulators/active_surface/usd.py @@ -58,7 +58,7 @@ def _set_default(self): self.reference_position = 0 self._current_position = 0 self._pending_position = None - self.delay_multiplier = 5 # x * delay_step. 255: no response + self.delay_multiplier = 3 # x * delay_step. 255: no response self.standby_delay_multiplier = 0 self.standby_mode = self.standby_modes.get(0) self._current_percentage = 1.0