linse/frappy
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix merge errors

Browse Source
This commit is contained in:
zolliker 2021-09-21 16:58:29 +02:00
parent 8bbf65f6e8
commit 544e42033d
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
secop_psi/ls340res.py
View File

@ -24,7 +24,7 @@ import time
from secop.datatypes import StringType, FloatRange from secop.datatypes import StringType, FloatRange
from secop.modules import Parameter, Property, Readable from secop.modules import Parameter, Property, Readable
from secop.stringio import HasIodev, StringIO from secop.io import HasIodev, StringIO
class LscIO(StringIO): class LscIO(StringIO):

10
secop_psi/trinamic.py
View File

@ -28,7 +28,7 @@ from math import log10
from secop.core import BoolType, Command, EnumType, FloatRange, IntRange, \ from secop.core import BoolType, Command, EnumType, FloatRange, IntRange, \
HasIodev, Parameter, Property, Drivable, PersistentMixin, PersistentParam HasIodev, Parameter, Property, Drivable, PersistentMixin, PersistentParam
from secop.bytesio import BytesIO from secop.io import BytesIO
from secop.errors import CommunicationFailedError, HardwareError, BadValueError, IsBusyError from secop.errors import CommunicationFailedError, HardwareError, BadValueError, IsBusyError
@ -77,15 +77,7 @@ class HwParam(PersistentParam):
class Motor(PersistentMixin, HasIodev, Drivable): class Motor(PersistentMixin, HasIodev, Drivable):
address = Property('module address', IntRange(0, 255), default=1) address = Property('module address', IntRange(0, 255), default=1)
<<<<<<< HEAD
value = Parameter('motor position', FloatRange(unit='deg', fmtstr='%.3f'))
=======
# limit_pin_mask = Property('input pin mask for lower/upper limit switch',
# TupleOf(IntRange(0, 15), IntRange(0, 15)),
# default=(8, 0))
value = Parameter('motor position', FloatRange(unit='deg', fmtstr='%.3f'), poll=False, default=0) # polling by read_status value = Parameter('motor position', FloatRange(unit='deg', fmtstr='%.3f'), poll=False, default=0) # polling by read_status
>>>>>>> uniax
zero = PersistentParam('zero point', FloatRange(unit='$'), readonly=False, default=0) zero = PersistentParam('zero point', FloatRange(unit='$'), readonly=False, default=0)
encoder = HwParam('encoder reading', FloatRange(unit='$', fmtstr='%.1f'), encoder = HwParam('encoder reading', FloatRange(unit='$', fmtstr='%.1f'),
209, ANGLE_SCALE, readonly=True, initwrite=False, persistent=True) 209, ANGLE_SCALE, readonly=True, initwrite=False, persistent=True)