correct issues and change directory architecture

agaget · Feb 28, 2024 · 21c9e57 · 21c9e57
1 parent eaa4b13
commit 21c9e57
Show file tree

Hide file tree

Showing 21 changed files with 40 additions and 47 deletions.
diff --git a/bob/color.def → opi/bob/color.def b/bob/color.def → opi/bob/color.def
diff --git a/bob/evg/_evg_mxc.bob → opi/bob/evg/_evg_mxc.bob b/bob/evg/_evg_mxc.bob → opi/bob/evg/_evg_mxc.bob
diff --git a/bob/evg/_evg_trigevt.bob → opi/bob/evg/_evg_trigevt.bob b/bob/evg/_evg_trigevt.bob → opi/bob/evg/_evg_trigevt.bob
diff --git a/bob/evg/_evginput.bob → opi/bob/evg/_evginput.bob b/bob/evg/_evginput.bob → opi/bob/evg/_evginput.bob
diff --git a/bob/evg/_evm_fct.bob → opi/bob/evg/_evm_fct.bob b/bob/evg/_evm_fct.bob → opi/bob/evg/_evm_fct.bob
diff --git a/bob/evg/evg-seq.bob → opi/bob/evg/evg-seq.bob b/bob/evg/evg-seq.bob → opi/bob/evg/evg-seq.bob
diff --git a/bob/evg/evginputs.bob → opi/bob/evg/evginputs.bob b/bob/evg/evginputs.bob → opi/bob/evg/evginputs.bob
diff --git a/bob/evg/evm-fcts.bob → opi/bob/evg/evm-fcts.bob b/bob/evg/evm-fcts.bob → opi/bob/evg/evm-fcts.bob
diff --git a/bob/evg/evm-mtca-300-evr.bob → opi/bob/evg/evm-mtca-300-evr.bob b/bob/evg/evm-mtca-300-evr.bob → opi/bob/evg/evm-mtca-300-evr.bob
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Saved on 2024-01-31 11:55:56 by agaget-->
+<!--Saved on 2024-02-28 10:33:28 by agaget-->
 <display version="2.0.0">
   <name>$(TITLE) Expert</name>
   <width>1303</width>
@@ -271,7 +271,7 @@
       <name>Action Button</name>
       <actions>
         <action type="open_display">
-          <file>evr-expert.bob</file>
+          <file>../evr/evr-expert.bob</file>
           <target>tab</target>
           <description>Open Display</description>
         </action>
@@ -433,7 +433,7 @@
               <macros>
                 <O>FP3</O>
               </macros>
-              <file>_evroutput.bob</file>
+              <file>../evr/_evroutput.bob</file>
               <x>6</x>
               <y>166</y>
               <width>418</width>
@@ -451,7 +451,7 @@
               <macros>
                 <O>FP2</O>
               </macros>
-              <file>_evroutput.bob</file>
+              <file>../evr/_evroutput.bob</file>
               <x>6</x>
               <y>115</y>
               <width>418</width>
@@ -469,7 +469,7 @@
               <macros>
                 <O>FP1</O>
               </macros>
-              <file>_evroutput.bob</file>
+              <file>../evr/_evroutput.bob</file>
               <x>6</x>
               <y>63</y>
               <width>418</width>
@@ -487,7 +487,7 @@
               <macros>
                 <O>FP0</O>
               </macros>
-              <file>_evroutput.bob</file>
+              <file>../evr/_evroutput.bob</file>
               <x>6</x>
               <y>12</y>
               <width>418</width>
@@ -613,7 +613,7 @@ $(pv_value)</tooltip>
         <N>6</N>
         <GEN>DlyGen6</GEN>
       </macros>
-      <file>_evrdlygen.bob</file>
+      <file>../evr/_evrdlygen.bob</file>
       <x>12</x>
       <y>288</y>
       <width>523</width>
@@ -633,7 +633,7 @@ $(pv_value)</tooltip>
         <N>8</N>
         <GEN>DlyGen8</GEN>
       </macros>
-      <file>_evrdlygen.bob</file>
+      <file>../evr/_evrdlygen.bob</file>
       <x>12</x>
       <y>368</y>
       <width>523</width>
@@ -653,7 +653,7 @@ $(pv_value)</tooltip>
         <N>3</N>
         <GEN>DlyGen3</GEN>
       </macros>
-      <file>_evrdlygen.bob</file>
+      <file>../evr/_evrdlygen.bob</file>
       <x>12</x>
       <y>167</y>
       <width>523</width>
@@ -673,7 +673,7 @@ $(pv_value)</tooltip>
         <N>7</N>
         <GEN>DlyGen7</GEN>
       </macros>
-      <file>_evrdlygen.bob</file>
+      <file>../evr/_evrdlygen.bob</file>
       <x>12</x>
       <y>327</y>
       <width>523</width>
@@ -693,7 +693,7 @@ $(pv_value)</tooltip>
         <N>9</N>
         <GEN>DlyGen9</GEN>
       </macros>
-      <file>_evrdlygen.bob</file>
+      <file>../evr/_evrdlygen.bob</file>
       <x>12</x>
       <y>407</y>
       <width>523</width>
@@ -713,9 +713,9 @@ $(pv_value)</tooltip>
         <N>5</N>
         <GEN>DlyGen5</GEN>
       </macros>
-      <file>_evrdlygen.bob</file>
+      <file>../evr/_evrdlygen.bob</file>
       <x>12</x>
-      <y>247</y>
+      <y>248</y>
       <width>523</width>
       <height>39</height>
       <resize>2</resize>
@@ -733,7 +733,7 @@ $(pv_value)</tooltip>
         <N>4</N>
         <GEN>DlyGen4</GEN>
       </macros>
-      <file>_evrdlygen.bob</file>
+      <file>../evr/_evrdlygen.bob</file>
       <x>12</x>
       <y>208</y>
       <width>523</width>
@@ -753,7 +753,7 @@ $(pv_value)</tooltip>
         <N>2</N>
         <GEN>DlyGen2</GEN>
       </macros>
-      <file>_evrdlygen.bob</file>
+      <file>../evr/_evrdlygen.bob</file>
       <x>12</x>
       <y>128</y>
       <width>523</width>
@@ -773,7 +773,7 @@ $(pv_value)</tooltip>
         <N>1</N>
         <GEN>DlyGen1</GEN>
       </macros>
-      <file>_evrdlygen.bob</file>
+      <file>../evr/_evrdlygen.bob</file>
       <x>12</x>
       <y>87</y>
       <width>523</width>
@@ -793,7 +793,7 @@ $(pv_value)</tooltip>
         <N>0</N>
         <GEN>DlyGen0</GEN>
       </macros>
-      <file>_evrdlygen.bob</file>
+      <file>../evr/_evrdlygen.bob</file>
       <x>12</x>
       <y>48</y>
       <width>523</width>
@@ -905,7 +905,7 @@ $(pv_value)</tooltip>
         <N>10</N>
         <GEN>DlyGen10</GEN>
       </macros>
-      <file>_evrdlygen.bob</file>
+      <file>../evr/_evrdlygen.bob</file>
       <x>12</x>
       <y>448</y>
       <width>523</width>
@@ -925,7 +925,7 @@ $(pv_value)</tooltip>
         <N>11</N>
         <GEN>DlyGen11</GEN>
       </macros>
-      <file>_evrdlygen.bob</file>
+      <file>../evr/_evrdlygen.bob</file>
       <x>12</x>
       <y>489</y>
       <width>523</width>
@@ -945,7 +945,7 @@ $(pv_value)</tooltip>
         <N>13</N>
         <GEN>DlyGen13</GEN>
       </macros>
-      <file>_evrdlygen.bob</file>
+      <file>../evr/_evrdlygen.bob</file>
       <x>12</x>
       <y>569</y>
       <width>523</width>
@@ -965,7 +965,7 @@ $(pv_value)</tooltip>
         <N>12</N>
         <GEN>DlyGen12</GEN>
       </macros>
-      <file>_evrdlygen.bob</file>
+      <file>../evr/_evrdlygen.bob</file>
       <x>12</x>
       <y>528</y>
       <width>523</width>
@@ -985,7 +985,7 @@ $(pv_value)</tooltip>
         <N>14</N>
         <GEN>DlyGen14</GEN>
       </macros>
-      <file>_evrdlygen.bob</file>
+      <file>../evr/_evrdlygen.bob</file>
       <x>12</x>
       <y>608</y>
       <width>523</width>
@@ -1005,7 +1005,7 @@ $(pv_value)</tooltip>
         <N>15</N>
         <GEN>DlyGen15</GEN>
       </macros>
-      <file>_evrdlygen.bob</file>
+      <file>../evr/_evrdlygen.bob</file>
       <x>12</x>
       <y>649</y>
       <width>523</width>
@@ -1020,9 +1020,4 @@ $(pv_value)</tooltip>
       </border_color>
     </widget>
   </widget>
-  <widget type="led" version="2.0.0">
-    <name>LED</name>
-    <x>414</x>
-    <y>810</y>
-  </widget>
 </display>
diff --git a/bob/evg/evm-mtca-300.bob → opi/bob/evg/evm-mtca-300.bob b/bob/evg/evm-mtca-300.bob → opi/bob/evg/evm-mtca-300.bob
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Saved on 2024-01-31 14:51:52 by agaget-->
+<!--Saved on 2024-02-28 11:16:30 by agaget-->
 <display version="2.0.0">
   <name>$(TITLE)</name>
   <width>810</width>
@@ -1447,7 +1447,7 @@ $(pv_value)</tooltip>
       <action type="open_display">
         <file>evm-mtca-300-evr.bob</file>
         <macros>
-          <D>$(D)D</D>
+          <P>$(P)D</P>
         </macros>
         <target>tab</target>
         <description>Open Display</description>

diff --git a/bob/evr/_evrdlygen.bob → opi/bob/evr/_evrdlygen.bob b/bob/evr/_evrdlygen.bob → opi/bob/evr/_evrdlygen.bob
diff --git a/bob/evr/_evrinput.bob → opi/bob/evr/_evrinput.bob b/bob/evr/_evrinput.bob → opi/bob/evr/_evrinput.bob
diff --git a/bob/evr/_evroutput.bob → opi/bob/evr/_evroutput.bob b/bob/evr/_evroutput.bob → opi/bob/evr/_evroutput.bob
diff --git a/bob/evr/evr-cml-output.bob → opi/bob/evr/evr-cml-output.bob b/bob/evr/evr-cml-output.bob → opi/bob/evr/evr-cml-output.bob
diff --git a/bob/evr/evr-cml-pat40.bob → opi/bob/evr/evr-cml-pat40.bob b/bob/evr/evr-cml-pat40.bob → opi/bob/evr/evr-cml-pat40.bob
diff --git a/bob/evr/evr-cpci-300.bob → opi/bob/evr/evr-cpci-300.bob b/bob/evr/evr-cpci-300.bob → opi/bob/evr/evr-cpci-300.bob
diff --git a/bob/evr/evr-expert.bob → opi/bob/evr/evr-expert.bob b/bob/evr/evr-expert.bob → opi/bob/evr/evr-expert.bob
diff --git a/bob/evr/evr-mtca-300.bob → opi/bob/evr/evr-mtca-300.bob b/bob/evr/evr-mtca-300.bob → opi/bob/evr/evr-mtca-300.bob
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Saved on 2024-01-31 15:16:45 by agaget-->
+<!--Saved on 2024-02-28 11:14:31 by agaget-->
 <display version="2.0.0">
   <name>$(TITLE) Advanced</name>
   <width>1920</width>
@@ -180,7 +180,6 @@
       </widget>
       <widget type="group" version="3.0.0">
         <name>Physical Inputs</name>
-        <x>-1</x>
         <y>7</y>
         <width>156</width>
         <height>280</height>
@@ -832,23 +831,23 @@
       <name>Menu Button</name>
       <actions>
         <action type="open_display">
-          <file>evg-seq.bob</file>
+          <file>../evg/evg-seq.bob</file>
           <macros>
             <SS>SoftSeq0</SS>
           </macros>
           <target>tab</target>
           <description>SoftSeq #0</description>
         </action>
         <action type="open_display">
-          <file>evg-seq.bob</file>
+          <file>../evg/evg-seq.bob</file>
           <macros>
             <SS>SoftSeq1</SS>
           </macros>
           <target>tab</target>
           <description>SoftSeq #1</description>
         </action>
         <action type="open_display">
-          <file>evg-seq.bob</file>
+          <file>../evg/evg-seq.bob</file>
           <macros>
             <SS>SoftSeq2</SS>
           </macros>

diff --git a/bob/evr/evr-mtca-300u.bob → opi/bob/evr/evr-mtca-300u.bob b/bob/evr/evr-mtca-300u.bob → opi/bob/evr/evr-mtca-300u.bob
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Saved on 2024-01-31 14:59:49 by agaget-->
+<!--Saved on 2024-02-28 11:12:19 by agaget-->
 <display version="2.0.0">
   <name>$(TITLE) Advanced</name>
   <width>1920</width>
@@ -838,23 +838,23 @@
       <name>Menu Button</name>
       <actions>
         <action type="open_display">
-          <file>evg-seq.bob</file>
+          <file>../evg/evg-seq.bob</file>
           <macros>
             <SS>SoftSeq0</SS>
           </macros>
           <target>tab</target>
           <description>SoftSeq #0</description>
         </action>
         <action type="open_display">
-          <file>evg-seq.bob</file>
+          <file>../evg/evg-seq.bob</file>
           <macros>
             <SS>SoftSeq1</SS>
           </macros>
           <target>tab</target>
           <description>SoftSeq #1</description>
         </action>
         <action type="open_display">
-          <file>evg-seq.bob</file>
+          <file>../evg/evg-seq.bob</file>
           <macros>
             <SS>SoftSeq2</SS>
           </macros>

diff --git a/bob/evr/evr-pcie-300dc.bob → opi/bob/evr/evr-pcie-300dc.bob b/bob/evr/evr-pcie-300dc.bob → opi/bob/evr/evr-pcie-300dc.bob
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Saved on 2024-01-31 15:31:01 by agaget-->
+<!--Saved on 2024-02-28 11:12:48 by agaget-->
 <display version="2.0.0">
   <name>$(TITLE) Advanced</name>
   <width>1920</width>
@@ -602,23 +602,23 @@
       <name>Menu Button</name>
       <actions>
         <action type="open_display">
-          <file>evg-seq.bob</file>
+          <file>../evg/evg-seq.bob</file>
           <macros>
             <SS>SoftSeq0</SS>
           </macros>
           <target>tab</target>
           <description>SoftSeq #0</description>
         </action>
         <action type="open_display">
-          <file>evg-seq.bob</file>
+          <file>../evg/evg-seq.bob</file>
           <macros>
             <SS>SoftSeq1</SS>
           </macros>
           <target>tab</target>
           <description>SoftSeq #1</description>
         </action>
         <action type="open_display">
-          <file>evg-seq.bob</file>
+          <file>../evg/evg-seq.bob</file>
           <macros>
             <SS>SoftSeq2</SS>
           </macros>
@@ -817,7 +817,6 @@
           </children>
         </tab>
       </tabs>
-      <x>-1</x>
       <y>5</y>
       <width>541</width>
       <height>443</height>

diff --git a/bob/launcher.bob → opi/bob/launcher.bob b/bob/launcher.bob → opi/bob/launcher.bob
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Saved on 2024-01-31 15:19:53 by agaget-->
+<!--Saved on 2024-02-28 11:32:19 by agaget-->
 <display version="2.0.0">
   <name>Launcher timing Labo</name>
   <width>200</width>
@@ -84,9 +84,9 @@
     <name>Action Button_5</name>
     <actions>
       <action type="open_display">
-        <file>evr/evr-mtca-300.bob</file>
+        <file>evr/evr-pcie-300dc.bob</file>
         <macros>
-          <P>Labo:titan-EVR</P>
+          <P>Labo:titan-PCIEVR</P>
           <TITLE>EVR Demo</TITLE>
         </macros>
         <target>tab</target>