Merge branch 'uniax' into wip

Conflicts:
	cfg/uniax.cfg
	secop/core.py
	secop_psi/trinamic.py

cfg/ls240.cfg

@@ -0,0 +1,17 @@
+[NODE]
+id = ls240.psi.ch
+description = ls240 test
+
+[INTERFACE]
+uri = tcp://5000
+
+[T]
+description = temperature on uniax stick
+class = secop_psi.ls240.Ls240
+iodev = T_iodev
+
+[T_iodev]
+class = secop.bytesio.BytesIO
+description = IO device for LS240
+uri = serial:///dev/ttyUSB0?baudrate=9600+parity=EVEN
+timeout = 0.2

cfg/uniax.cfg

@@ -8,25 +8,39 @@ uri = tcp://5000
 [drv_iodev]
 description = 
 class = secop.core.BytesIO
-uri = serial:///dev/ttyUSB0?baudrate=57600
-# uri = serial:///dev/ttyUSB0?baudrate=9600
+# uri = serial:///dev/ttyUSB1?baudrate=57600
+uri = tcp://192.168.127.254:3002
 
 [drv]
 description = trinamic motor test
 class = secop_psi.trinamic.Motor
 iodev = drv_iodev
 standby_current=0.1
-maxcurrent=1.4
-acceleration=50
-maxspeed=200
-zero=-36
-enc_tolerance=3.6
-free_wheeling=0.001
-pull_up=1
+maxcurrent=0.2
+acceleration=150.
+movelimit=360
+speed=40
+encoder_tolerance=3.6
+free_wheeling=0.1
+power_down_delay=0.1
 
 [force]
 description = DPM driver to read out the transducer value, write and read the offset and scale factor
 class = secop_psi.dpm.DPM3
-uri = serial:///dev/ttyUSB1?baudrate=9600
+#uri = serial:///dev/ttyUSB0?baudrate=9600
+uri = tcp://192.168.127.254:3001
 digits = 2
 scale_factor = 0.0156
+motor = drv
+
+[res]
+description = temperature on uniax stick
+class = secop_psi.ls340res.ResChannel
+uri = tcp://192.168.127.254:3003
+channel = C
+
+[T]
+class = secop_psi.softcal.Sensor
+rawsensor = res
+calib = /home/l_samenv/frappy/secop_psi/calcurves/X132254.340
+value.unit = K