hostside: rename hostside-old to adhoc-test

diff --git a/hostside/.gitignore b/hostside/.gitignore
index 0cdbc7bbb10a345eecdd271cb4f901a429ed628f..06256ffce3803b5ece474df5342ab86f9e814135 100644 (file)
--- a/hostside/.gitignore
+++ b/hostside/.gitignore
@@ -1,5 +1,5 @@
 realtime
-hostside-old
+adhoc-test
 hostside
 topology-dump
 t

diff --git a/hostside/Makefile b/hostside/Makefile
index e077d939b092ec36b4fb0eb3c68d1b8833a403e3..118230a69918506bd22c2940eb2cdab5a63512cf 100644 (file)
--- a/hostside/Makefile
+++ b/hostside/Makefile
@@ -8,7 +8,7 @@ AUTOINCS=       auproto-pic.h layoutinfo.h retransmit-table.h           \
 
 CLIENT_TARGETS=        gui-plan-bot topology-dump evdev-manip
 
-TARGETS=       hostside-old realtime                                   \
+TARGETS=       adhoc-test realtime                                     \
                $(CLIENT_TARGETS)                                       \
                $(addsuffix .speeds.ps, $(TRAINS))                      \
                $(addsuffix .speeds.record, $(TRAINS))
@@ -29,7 +29,7 @@ client:               $(CLIENT_TARGETS)
 
 #---------- executables ----------
 
-hostside-old:  serialio.o nmra.o main.o encode.o utils.o
+adhoc-test:    serialio.o nmra.o adhoc-test.o encode.o utils.o
                $(LINK)
 
 topology-dump: topology-dump.o utils.o $(LAYOUT_DATA).o

diff --git a/hostside/README b/hostside/README.adhoc-test
similarity index 72%
rename from hostside/README
rename to hostside/README.adhoc-test
index 0ff35357a7593558fa57cd815c05881cfdb42679..ae2016a584baab30d03f95b608da2c1ad83d5f1f 100644 (file)
--- a/hostside/README
+++ b/hostside/README.adhoc-test
@@ -1,7 +1,7 @@
-./hostside-old [<options>] <nmra-command> <nmra-args...>    see nmra-packets.h
-./hostside-old [<options>] nmra_bytes <nmra-command-hex-no-csum>
-./hostside-old [<options>] nmra_raw <nmra-command-hex-with-csum>
-./hostside-old [<options>] command <literal-data-for-pic>
+./adhoc-test [<options>] <nmra-command> <nmra-args...>    see nmra-packets.h
+./adhoc-test [<options>] nmra_bytes <nmra-command-hex-no-csum>
+./adhoc-test [<options>] nmra_raw <nmra-command-hex-with-csum>
+./adhoc-test [<options>] command <literal-data-for-pic>
  options
   -s<serialport>   eg -s/dev/ttyS0  normally necessary
   -w<repeatdelay>  usleep; 0 = no usleep; default is -1 = don't repeat at all
@@ -11,7 +11,7 @@
   -f<fudgedelay>   usleep; each character; default is 0 = no usleep
 
 Eg,
- ./hostside-old -s/dev/ttyS0 -w10000 -i1000 nmra_bytes 0348
+ ./adhoc-test -s/dev/ttyS0 -w10000 -i1000 nmra_bytes 0348
 to tell decoder 3 to go speed 13 backwards every 10ms for 1000 times, ie 10s
  (on norway this means it actually happens every 20ms, ie for 20s,
    which makes it a bit of a fudge really)
@@ -25,4 +25,4 @@ to tell decoder 3 to go speed 13 backwards every 10ms for 1000 times, ie 10s
                     03    (+)  48       = 4b ok
 
 To test:
- ./hostside-old -st nmra_bytes 0348 && binview t
+ ./adhoc-test -st nmra_bytes 0348 && binview t

diff --git a/hostside/main.c b/hostside/adhoc-test.c
similarity index 97%
rename from hostside/main.c
rename to hostside/adhoc-test.c
index 08292ce4b009dcaa2703df801d2674b802f78b6e..d4291691f08b38466baf58bf1b7137136e59d147 100644 (file)
--- a/hostside/main.c
+++ b/hostside/adhoc-test.c
@@ -1,7 +1,7 @@
 /*
  * simple test harness for now
  * asserts on usage errors
- * see README for usage info
+ * see README.adhoc-test for usage info
  */
 
 #include <stdio.h>
@@ -14,7 +14,7 @@
 
 #include "common.h"
 
-const char *progname= "hostside-old";
+const char *progname= "adhoc-test";
 static FILE *dump_stream= 0;
 
 static int repeat_delay= -1, iterations= -1;

diff --git a/hostside/factory-reset-svc b/hostside/factory-reset-svc
index ccb34f32e9631ba555eae5d1523fe73871404dfa..2087e4511ecb4cc8a26e03f45f3683f3316d1964 100755 (executable)
--- a/hostside/factory-reset-svc
+++ b/hostside/factory-reset-svc
@@ -9,7 +9,7 @@ END
 
 port="$1"; shift
 
-ho () { ./hostside-old -s"$port" -w20000 -i0 -d "$@"; }
+ho () { ./adhoc-test -s"$port" -w20000 -i0 -d "$@"; }
 
 # Packet Sequence for Command Stations/Programmers using
 #  Physical Register Addressing

diff --git a/hostside/fun-randmore b/hostside/fun-randmore
index 49971d861117ae1cba63fc9d33dcd9373949c8d6..62d3e9fdbfaa6be71250bdfe9be85bf7e09ed1dc 100755 (executable)
--- a/hostside/fun-randmore
+++ b/hostside/fun-randmore
@@ -11,12 +11,12 @@ while true; do
                b2=$(hexdump </dev/urandom -n1 -e '"%d"')
                dirn=$(($b2 / 128))
                echo which=$which b1=$b1 speed=$speed b2=$b2 dirn=$dirn
-               ./hostside-old -s$s speed126 2 $speed $dirn
+               ./adhoc-test -s$s speed126 2 $speed $dirn
        fi
        if [ $which -lt 128 ]; then
                value=$(( $which * 16 ))
                printf "which=%s value=%s value=0x%x\n" $which $value $value
-               ./hostside-old -s$s funcs5to8 2 $value
+               ./adhoc-test -s$s funcs5to8 2 $value
        fi
        delay=$(hexdump </dev/urandom -n1 -e '"%d"')
        delayv=$(( $delay / 2 + 10 ))

diff --git a/hostside/fun-random b/hostside/fun-random
index f05082ea742f9c612dfa87d491abba5cbd1d7087..ad84aed1eb298dc51bd92c8ff4df5c34363eb83b 100755 (executable)
--- a/hostside/fun-random
+++ b/hostside/fun-random
@@ -8,6 +8,6 @@ while true; do
        b2=$(hexdump </dev/urandom -n1 -e '"%d"')
        dirn=$(($b2 / 128))
        echo b1=$b1 speed=$speed b2=$b2 dirn=$dirn
-       ./hostside-old -s$s speed126 2 $speed $dirn
+       ./adhoc-test -s$s speed126 2 $speed $dirn
        sleep 30
 done

diff --git a/hostside/fun-updown b/hostside/fun-updown
index f33085e77a727057f937d40a96b98b17db2a6fbc..e7b01fdfda17e50d232f6acfbbcd84b649afe562 100755 (executable)
--- a/hostside/fun-updown
+++ b/hostside/fun-updown
@@ -7,7 +7,7 @@ while true; do
                for f in `seq $x`; do
                        sleep 20; g=$(($f*$f));
                        echo $f $g;
-                       ./hostside-old -s$s speed126 2 $g 0
+                       ./adhoc-test -s$s speed126 2 $g 0
                done
        done
 done

diff --git a/hostside/measure-speeds b/hostside/measure-speeds
index 70844e76899f34e0f837c32d996505ec8f3c8ca5..f7f55bf865a2b3707021077a5367738ce7d3addf 100755 (executable)
--- a/hostside/measure-speeds
+++ b/hostside/measure-speeds
@@ -45,7 +45,7 @@ proc startup {} {
 #    foreach f {funcs0to4 funcs5to8} {
 #    }
     foreach f {funcs5to8} {
-       set m [exec ./hostside-old -s/dev/stdout $f $loco 0x1fff]
+       set m [exec ./adhoc-test -s/dev/stdout $f $loco 0x1fff]
        set m [hbytes raw2h $m]
        lappend funcs_msgs ffff$m {}
     }
@@ -200,7 +200,7 @@ proc xmit-now {until_funcs} {
 }
 proc xmit {nmral} {
     global xmit_msg xmit_after detend settle_detend settle_time funcs_msgs
-    set msg [eval [list exec ./hostside-old -s/dev/stdout] $nmral]
+    set msg [eval [list exec ./adhoc-test -s/dev/stdout] $nmral]
     set xmit_msg [hbytes raw2h $msg]
     debug "> $xmit_msg $nmral (E $detend $settle_detend $settle_time) \[$funcs_msgs]"
     catch { after cancel $xmit_after }

diff --git a/hostside/program-cv b/hostside/program-cv
index a987a91666236d2a3f6f0eec9b68f7868eeae7e2..f3526f2c755dba92f8f25da32ca5304ad38eea0f 100755 (executable)
--- a/hostside/program-cv
+++ b/hostside/program-cv
@@ -16,5 +16,5 @@ addr="$1"; shift
 cv="$1"; shift
 value="$1"; shift
 
-./hostside-old "$@" -s"$port" command 11
-./hostside-old "$@" -s"$port" -i100 -w10000 cvwrite "$addr" "$cv" "$value"
+./adhoc-test "$@" -s"$port" command 11
+./adhoc-test "$@" -s"$port" -i100 -w10000 cvwrite "$addr" "$cv" "$value"

diff --git a/hostside/program-cv-svc b/hostside/program-cv-svc
index 0e2f63142aeab1da6374840a147b5bdae8163804..0c32f4c327f76fffb8aa30a5ec6b1859f3decf45 100755 (executable)
--- a/hostside/program-cv-svc
+++ b/hostside/program-cv-svc
@@ -12,7 +12,7 @@ port="$1"; shift
 cv="$1"; shift
 value="$1"; shift
 
-ho () { ./hostside-old -s"$port" -w20000 -i0 -d "$@"; }
+ho () { ./adhoc-test -s"$port" -w20000 -i0 -d "$@"; }
 
 # Packet Sequence for Command Stations/Programmers using Direct Mode
 # RP 9.2.3 E l.100-

diff --git a/hostside/stopgap-controller b/hostside/stopgap-controller
index 677abe29e0bb41a477aa15db52cd3efe0f88892a..77eb84cec426aa1291ccdb99a1fccbdb21f3e595 100755 (executable)
--- a/hostside/stopgap-controller
+++ b/hostside/stopgap-controller
@@ -436,7 +436,7 @@ proc newfuncs {} {
 
 proc nmrachange {thing argstring} {
     global $thing
-    set bin [eval exec ./hostside-old -s/dev/stdout $argstring]
+    set bin [eval exec ./adhoc-test -s/dev/stdout $argstring]
     binary scan $bin H* x
     debug "changed $thing=$x ($argstring)"
     set $thing ff$x