From 041f79c1d3d529fec5137207c9bb2611bdcf61e5 Mon Sep 17 00:00:00 2001 From: sfop Date: Thu, 27 Apr 2017 10:37:41 +0200 Subject: [PATCH] Closedown --- devices/WireScanner motor.properties | 6 +++--- script/Devices/WireScanner.py | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/devices/WireScanner motor.properties b/devices/WireScanner motor.properties index efdcb02..61bbf91 100644 --- a/devices/WireScanner motor.properties +++ b/devices/WireScanner motor.properties @@ -1,12 +1,12 @@ -#Thu Apr 20 13:54:29 CEST 2017 -defaultSpeed=6000.0 +#Thu Apr 27 10:34:03 CEST 2017 +defaultSpeed=1000.0 estbilizationDelay=0 hasEnable=false homingType=None maxSpeed=8000.0 maxValue=64000.0 minSpeed=50.0 -minValue=-47100.0 +minValue=-47600.0 offset=0.0 precision=1 resolution=0.1 diff --git a/script/Devices/WireScanner.py b/script/Devices/WireScanner.py index 9454b29..0b3b689 100644 --- a/script/Devices/WireScanner.py +++ b/script/Devices/WireScanner.py @@ -108,9 +108,7 @@ class WireScanner(WireScanInfo): self.start = None self.end = None self.scan_range = scan_range; - if sel is not None: - self.set_selection(sel) - + if velocity is not None: self.wire_velocity.write(float(velocity)) if cycles is not None: