merged master with work

Change-Id: Iedfb2bf7f28bfe45201adacec0645cc13abffe59

cfg/ls370res.cfg

@@ -0,0 +1,25 @@
+[NODE]
+id = ls370res.psi.ch
+description = Lsc370 Test
+
+[INTERFACE]
+uri = tcp://5000
+
+[lsmain_iodev]
+description = the communication device
+class = secop_psi.ls370res.StringIO
+uri = lollypop-ts:3001
+
+[lsmain]
+class = secop_psi.ls370res.Main
+description = main control of Lsc controller
+uri = lollypop-ts:3001
+
+[res]
+class = secop_psi.ls370res.ResChannel
+iexc = '1mA'
+channel = 5
+description = resistivity
+main = lsmain
+# the auto created iodev from lsmain:
+iodev = lsmain_iodev