From 41e0175571a314a02bf76d46e395f08aa3b5ff2a Mon Sep 17 00:00:00 2001 From: koennecke Date: Fri, 4 Dec 2009 13:02:32 +0000 Subject: [PATCH] - Added tests setups for new drivers --- test/DataNumber | 2 +- test/testini.tcl | 30 ++++++++++++++++++++++++++++++ test/testsoll.xml | 47 ++++++++++++++++++++++------------------------- 3 files changed, 53 insertions(+), 26 deletions(-) diff --git a/test/DataNumber b/test/DataNumber index e102f056..7c379b19 100644 --- a/test/DataNumber +++ b/test/DataNumber @@ -1,3 +1,3 @@ - 271 + 287 NEVER, EVER modify or delete this file You'll risk eternal damnation and a reincarnation as a cockroach!|n \ No newline at end of file diff --git a/test/testini.tcl b/test/testini.tcl index ce2668e8..4678e151 100644 --- a/test/testini.tcl +++ b/test/testini.tcl @@ -648,3 +648,33 @@ phytron::make alge X phyto -360 0 +set stddrive 0 +if {$stddrive == 1} { + makesctcontroller stdsct std localhost:8080 "\r" 10 + source ../tcl/stddrive.tcl + stddrive::makestddrive eule EuleDrive stdsct +} + +set el755 0 + +if {$el755 == 1} { +source ../tcl/stddrive.tcl +source ../tcl/el755.tcl +makesctcontroller el755sct std localhost:8080 "\r" 10 +#el755sct debug 1 +for {set i 0} {$i < 3} {incr i} { + el755sct transact "RMT 1" + el755sct transact "ECHO 2" +} +el755::makeel755 mf 5 el755sct +el755sct queue /sics/mf progress read +mf upperlimit 10 +mf lowerlimit -10 +mf tolerance .1 +} + +set dc-804 1 + +source ../tcl/pimotor.tcl +makesctcontroller dc804sct std localhost:8080 "\r" 10 "\x03" "\x03" +pimotor::makepimotor dc1 1 dc804sct -10000 10000 \ No newline at end of file diff --git a/test/testsoll.xml b/test/testsoll.xml index 9a91e331..c6ba63d8 100644 --- a/test/testsoll.xml +++ b/test/testsoll.xml @@ -1,8 +1,9 @@ - + - Hugo ist eine Nassnase + Hugo ist eine Nassnase + 27.8000 @@ -19,7 +20,8 @@ file_time="2007-02-21 10:51:15+0100" Instrument="Washmaschine"> 10.0000 - timer + timer + @@ -41,37 +43,32 @@ file_time="2007-02-21 10:51:15+0100" Instrument="Washmaschine"> - 55 55 55 55 - 55 55 55 55 - 55 55 55 55 - 55 55 55 55 - 55 55 55 55 + 55 55 55 55 55 + 55 55 55 55 55 + 55 55 55 55 55 + 55 55 55 55 55 55 55 55 - 500.0000 800.0000 1100.0000 1400.0000 - 1700.0000 2000.0000 2300.0000 2600.0000 - 2900.0000 3200.0000 3500.0000 3800.0000 - 4100.0000 4400.0000 4700.0000 5000.0000 - 5300.0000 5600.0000 5900.0000 6200.0000 + 500.0000 800.0000 1100.0000 1400.0000 1700.0000 + 2000.0000 2300.0000 2600.0000 2900.0000 3200.0000 + 3500.0000 3800.0000 4100.0000 4400.0000 4700.0000 + 5000.0000 5300.0000 5600.0000 5900.0000 6200.0000 - 10.0000 11.0000 12.0000 13.0000 - 14.0000 15.0000 16.0000 17.0000 - 18.0000 19.0000 + 10.0000 11.0000 12.0000 13.0000 14.0000 + 15.0000 16.0000 17.0000 18.0000 19.0000 - 10 11 12 13 - 14 15 16 17 - 18 19 + 10 11 12 13 14 + 15 16 17 18 19 - 23 23 23 23 - 23 23 23 23 - 23 23 23 23 - 23 23 23 23 - 23 23 23 23 + 23 23 23 23 23 + 23 23 23 23 23 + 23 23 23 23 23 + 23 23 23 23 23 23 23 23