Merge branch 241009-bifrost-piezo into HEAD

EuropeanSpallationSource · Oct 25, 2024 · 40dd4a8 · 40dd4a8
2 parents 2b05a6d + 6398264
commit 40dd4a8
Show file tree

Hide file tree

Showing 53 changed files with 44,221 additions and 33,868 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,26 +1,31 @@
-.#*
+*.pyc
+*.swp
+*BAK.adl
 *~
+.#*
+.cvsignore
+.iocsh_history
+/db/
+/dbmotor/
+O.*
 \#*#
-*BAK.adl
 bin/
 builddir/
 configure/*local*
-.cvsignore
-/db/
 dbd/
-/dbmotor/
 ethercatmc.Makefile
+ethercatmcExApp/op/Boy/tools/e-cnen.mid
+ethercatmcExApp/op/Boy/tools/e-foff.mid
+ethercatmcExApp/op/Boy/tools/e-homf-homr.mid
+ethercatmcExApp/op/Boy/tools/motorx-piezo.mid
+ethercatmcExApp/op/Boy/tools/motorx-pils.mid
 html/
 include/
 iocBoot/
-.iocsh_history
 lib/
 logs/
-O.*
-*.pyc
-*.swp
-test/logs
 test/log-*.txt
+test/logs
 test/motionTestV2/*.*log*
 test/motionTestV2/venvpython3*/
 test/pytests36/*.*log*

diff --git a/ethercatmcExApp/op/Boy/IOC.opi b/ethercatmcExApp/op/Boy/IOC.opi
@@ -988,7 +988,7 @@ $(pv_value)</tooltip>
   <widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
     <actions hook="false" hook_all="false">
       <action type="OPEN_DISPLAY">
-        <path>motor-1-pils.opi</path>
+        <path>motor-1-piezo.opi</path>
         <macros>
           <include_parent_macros>true</include_parent_macros>
           <PREFIX>BIFROST-SpSl1:MC-SlXm:</PREFIX>