From fae83b3d9e4f5d3f486336aab1dcfb317f58f277 Mon Sep 17 00:00:00 2001
From: Ferdi Franceschini <ffr@ansto.gov.au>
Date: Thu, 5 Feb 2015 17:00:34 +1100
Subject: [PATCH] Only set the posit_count parameter on motors that need to
 drive to discrete positions.

---
 .../motors/generated_motor_configuration.tcl   | 18 ------------------
 .../instrument/util/genmotconf_procs.tcl       |  8 +++++---
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/site_ansto/instrument/bilby/config/motors/generated_motor_configuration.tcl b/site_ansto/instrument/bilby/config/motors/generated_motor_configuration.tcl
index e60315c5..a198b077 100644
--- a/site_ansto/instrument/bilby/config/motors/generated_motor_configuration.tcl
+++ b/site_ansto/instrument/bilby/config/motors/generated_motor_configuration.tcl
@@ -336,7 +336,6 @@ Motor bs3 $motor_driver_type [params\
   maxAccel $bs3_maxaccel\
   maxDecel $bs3_maxdecel\
   stepsPerX $bs3_steps_per_x\
-  posit_count 0\
   absEnc 1\
   absEncHome $bs3_absenchome\
   cntsPerX $bs3_cnts_per_x]
@@ -362,7 +361,6 @@ Motor bs4 $motor_driver_type [params\
   maxAccel $bs4_maxaccel\
   maxDecel $bs4_maxdecel\
   stepsPerX $bs4_steps_per_x\
-  posit_count 0\
   absEnc 1\
   absEncHome $bs4_absenchome\
   cntsPerX $bs4_cnts_per_x]
@@ -388,7 +386,6 @@ Motor bs5 $motor_driver_type [params\
   maxAccel $bs5_maxaccel\
   maxDecel $bs5_maxdecel\
   stepsPerX $bs5_steps_per_x\
-  posit_count 0\
   absEnc 1\
   absEncHome $bs5_absenchome\
   cntsPerX $bs5_cnts_per_x]
@@ -414,7 +411,6 @@ Motor curtaind $motor_driver_type [params\
   maxAccel $curtaind_maxaccel\
   maxDecel $curtaind_maxdecel\
   stepsPerX $curtaind_steps_per_x\
-  posit_count 0\
   absEnc 1\
   absEncHome $curtaind_absenchome\
   cntsPerX $curtaind_cnts_per_x]
@@ -440,7 +436,6 @@ Motor curtaindet $motor_driver_type [params\
   maxAccel $curtaindet_maxaccel\
   maxDecel $curtaindet_maxdecel\
   stepsPerX $curtaindet_steps_per_x\
-  posit_count 0\
   absEnc 1\
   absEncHome $curtaindet_absenchome\
   cntsPerX $curtaindet_cnts_per_x]
@@ -466,7 +461,6 @@ Motor curtainl $motor_driver_type [params\
   maxAccel $curtainl_maxaccel\
   maxDecel $curtainl_maxdecel\
   stepsPerX $curtainl_steps_per_x\
-  posit_count 0\
   absEnc 1\
   absEncHome $curtainl_absenchome\
   cntsPerX $curtainl_cnts_per_x]
@@ -492,7 +486,6 @@ Motor curtainr $motor_driver_type [params\
   maxAccel $curtainr_maxaccel\
   maxDecel $curtainr_maxdecel\
   stepsPerX $curtainr_steps_per_x\
-  posit_count 0\
   absEnc 1\
   absEncHome $curtainr_absenchome\
   cntsPerX $curtainr_cnts_per_x]
@@ -518,7 +511,6 @@ Motor curtainu $motor_driver_type [params\
   maxAccel $curtainu_maxaccel\
   maxDecel $curtainu_maxdecel\
   stepsPerX $curtainu_steps_per_x\
-  posit_count 0\
   absEnc 1\
   absEncHome $curtainu_absenchome\
   cntsPerX $curtainu_cnts_per_x]
@@ -572,7 +564,6 @@ Motor det $motor_driver_type [params\
   maxAccel $det_maxaccel\
   maxDecel $det_maxdecel\
   stepsPerX $det_steps_per_x\
-  posit_count 0\
   absEnc 1\
   absEncHome $det_absenchome\
   cntsPerX $det_cnts_per_x]
@@ -822,7 +813,6 @@ Motor samx $motor_driver_type [params\
   maxAccel $samx_maxaccel\
   maxDecel $samx_maxdecel\
   stepsPerX $samx_steps_per_x\
-  posit_count 0\
   absEnc 1\
   absEncHome $samx_absenchome\
   cntsPerX $samx_cnts_per_x]
@@ -848,7 +838,6 @@ Motor samy $motor_driver_type [params\
   maxAccel $samy_maxaccel\
   maxDecel $samy_maxdecel\
   stepsPerX $samy_steps_per_x\
-  posit_count 0\
   absEnc 1\
   absEncHome $samy_absenchome\
   cntsPerX $samy_cnts_per_x]
@@ -874,7 +863,6 @@ Motor samz $motor_driver_type [params\
   maxAccel $samz_maxaccel\
   maxDecel $samz_maxdecel\
   stepsPerX $samz_steps_per_x\
-  posit_count 0\
   absEnc 1\
   absEncHome $samz_absenchome\
   cntsPerX $samz_cnts_per_x]
@@ -900,7 +888,6 @@ Motor sapmot $motor_driver_type [params\
   maxAccel $sapmot_maxaccel\
   maxDecel $sapmot_maxdecel\
   stepsPerX $sapmot_steps_per_x\
-  posit_count 0\
   absEnc 1\
   absEncHome $sapmot_absenchome\
   cntsPerX $sapmot_cnts_per_x]
@@ -926,7 +913,6 @@ Motor som $motor_driver_type [params\
   maxAccel $som_maxaccel\
   maxDecel $som_maxdecel\
   stepsPerX $som_steps_per_x\
-  posit_count 0\
   absEnc 1\
   absEncHome $som_absenchome\
   cntsPerX $som_cnts_per_x]
@@ -952,7 +938,6 @@ Motor ss1d $motor_driver_type [params\
   maxAccel $ss1d_maxaccel\
   maxDecel $ss1d_maxdecel\
   stepsPerX $ss1d_steps_per_x\
-  posit_count 0\
   absEnc 1\
   absEncHome $ss1d_absenchome\
   cntsPerX $ss1d_cnts_per_x]
@@ -978,7 +963,6 @@ Motor ss1l $motor_driver_type [params\
   maxAccel $ss1l_maxaccel\
   maxDecel $ss1l_maxdecel\
   stepsPerX $ss1l_steps_per_x\
-  posit_count 0\
   absEnc 1\
   absEncHome $ss1l_absenchome\
   cntsPerX $ss1l_cnts_per_x]
@@ -1004,7 +988,6 @@ Motor ss1r $motor_driver_type [params\
   maxAccel $ss1r_maxaccel\
   maxDecel $ss1r_maxdecel\
   stepsPerX $ss1r_steps_per_x\
-  posit_count 0\
   absEnc 1\
   absEncHome $ss1r_absenchome\
   cntsPerX $ss1r_cnts_per_x]
@@ -1030,7 +1013,6 @@ Motor ss1u $motor_driver_type [params\
   maxAccel $ss1u_maxaccel\
   maxDecel $ss1u_maxdecel\
   stepsPerX $ss1u_steps_per_x\
-  posit_count 0\
   absEnc 1\
   absEncHome $ss1u_absenchome\
   cntsPerX $ss1u_cnts_per_x]
diff --git a/site_ansto/instrument/util/genmotconf_procs.tcl b/site_ansto/instrument/util/genmotconf_procs.tcl
index 3c0e5e80..24ddfe85 100755
--- a/site_ansto/instrument/util/genmotconf_procs.tcl
+++ b/site_ansto/instrument/util/genmotconf_procs.tcl
@@ -140,9 +140,11 @@ proc mk_motconf {mot fh absEnc posnum posit_list} {
   puts $fh "  maxAccel \$$maxAccel\\"
   puts $fh "  maxDecel \$$maxDecel\\"
   puts $fh "  stepsPerX \$$stepsPerX\\"
-  puts $fh "  posit_count $posnum\\"
-  foreach positline $::posit_list {
-    puts $fh "  $positline\\"
+  if {$posnum > 0} {
+    puts $fh "  posit_count $posnum\\"
+    foreach positline $::posit_list {
+      puts $fh "  $positline\\"
+    }
   }
   if {$absEnc} {
     puts $fh "  absEnc 1\\"