Skip to content

Commit 87bb6eb

Browse files
MarkRiversMarkRivers
committed
New autoconvert file
1 parent 5be3fa3 commit 87bb6eb

File tree

11 files changed

+3191
-3072
lines changed

11 files changed

+3191
-3072
lines changed

‎measCompApp/op/adl/measCompTop.adl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
file {
3-
name="/home/epics/devel/measComp-4-0/measCompApp/op/adl/measCompTop.adl"
3+
name="/home/epics/devel/measComp-4-3/measCompApp/op/adl/measCompTop.adl"
44
version=030117
55
}
66
display {

‎measCompApp/op/bob/autoconvert/USB1608G_2AO_module.bob‎

Lines changed: 64 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--Saved on 2024-09-24 14:24:38 by epics-->
2+
<!--Saved on 2025-02-22 16:22:36 by epics-->
33
<display version="2.0.0">
44
<name>USB1608G_2AO_module</name>
55
<x>361</x>
66
<y>76</y>
77
<width>1090</width>
8-
<height>780</height>
8+
<height>795</height>
99
<background_color>
1010
<color red="187" green="187" blue="187">
1111
</color>
@@ -28,77 +28,72 @@
2828
</foreground_color>
2929
<horizontal_alignment>1</horizontal_alignment>
3030
</widget>
31-
<widget type="group" version="2.0.0">
31+
<widget type="embedded" version="2.0.0">
3232
<name>composite #9</name>
33-
<x>5</x>
33+
<file>measCompCounters2.bob</file>
34+
<x>280</x>
3435
<y>95</y>
35-
<width>1080</width>
36-
<height>680</height>
37-
<style>3</style>
38-
<transparent>true</transparent>
39-
<widget type="embedded" version="2.0.0">
40-
<name>composite #12</name>
41-
<file>measCompCounters2.bob</file>
42-
<x>275</x>
43-
<width>220</width>
44-
<height>85</height>
45-
</widget>
46-
<widget type="embedded" version="2.0.0">
47-
<name>composite #14</name>
48-
<file>measCompTrigger.bob</file>
49-
<x>65</x>
50-
<y>1</y>
51-
<width>180</width>
52-
<height>65</height>
53-
</widget>
54-
<widget type="embedded" version="2.0.0">
55-
<name>composite #16</name>
56-
<file>measCompAnalogIn8.bob</file>
57-
<x>520</x>
58-
<y>160</y>
59-
<width>295</width>
60-
<height>285</height>
61-
</widget>
62-
<widget type="embedded" version="2.0.0">
63-
<name>composite #18</name>
64-
<file>measCompWaveDig.bob</file>
65-
<x>820</x>
66-
<y>160</y>
67-
<width>260</width>
68-
<height>515</height>
69-
</widget>
70-
<widget type="embedded" version="2.0.0">
71-
<name>composite #20</name>
72-
<file>measCompAnalogOut2.bob</file>
73-
<x>520</x>
74-
<y>450</y>
75-
<width>295</width>
76-
<height>115</height>
77-
</widget>
78-
<widget type="embedded" version="2.0.0">
79-
<name>composite #22</name>
80-
<file>measCompDigitalIO8.bob</file>
81-
<x>520</x>
82-
<width>560</width>
83-
<height>155</height>
84-
</widget>
85-
<widget type="embedded" version="2.0.0">
86-
<name>composite #24</name>
87-
<file>measCompWaveGen2.bob</file>
88-
<y>90</y>
89-
<width>515</width>
90-
<height>465</height>
91-
</widget>
92-
<widget type="embedded" version="2.0.0">
93-
<name>composite #26</name>
94-
<file>measCompPulseGen1.bob</file>
95-
<y>570</y>
96-
<width>780</width>
97-
<height>110</height>
98-
</widget>
36+
<width>220</width>
37+
<height>85</height>
38+
</widget>
39+
<widget type="embedded" version="2.0.0">
40+
<name>composite #11</name>
41+
<file>measCompTrigger.bob</file>
42+
<x>70</x>
43+
<y>96</y>
44+
<width>180</width>
45+
<height>65</height>
46+
</widget>
47+
<widget type="embedded" version="2.0.0">
48+
<name>composite #13</name>
49+
<file>measCompAnalogIn8.bob</file>
50+
<x>525</x>
51+
<y>255</y>
52+
<width>295</width>
53+
<height>285</height>
54+
</widget>
55+
<widget type="embedded" version="2.0.0">
56+
<name>composite #15</name>
57+
<file>measCompWaveDig.bob</file>
58+
<x>825</x>
59+
<y>255</y>
60+
<width>260</width>
61+
<height>515</height>
62+
</widget>
63+
<widget type="embedded" version="2.0.0">
64+
<name>composite #17</name>
65+
<file>measCompAnalogOut2.bob</file>
66+
<x>525</x>
67+
<y>545</y>
68+
<width>295</width>
69+
<height>115</height>
70+
</widget>
71+
<widget type="embedded" version="2.0.0">
72+
<name>composite #19</name>
73+
<file>measCompDigitalIO8.bob</file>
74+
<x>525</x>
75+
<y>95</y>
76+
<width>560</width>
77+
<height>155</height>
78+
</widget>
79+
<widget type="embedded" version="2.0.0">
80+
<name>composite #21</name>
81+
<file>measCompWaveGen2.bob</file>
82+
<x>5</x>
83+
<y>185</y>
84+
<width>515</width>
85+
<height>490</height>
86+
</widget>
87+
<widget type="embedded" version="2.0.0">
88+
<name>composite #23</name>
89+
<file>measCompPulseGen1.bob</file>
90+
<x>5</x>
91+
<y>680</y>
92+
<width>780</width>
93+
<height>110</height>
9994
</widget>
10095
<widget type="embedded" version="2.0.0">
101-
<name>composite #28</name>
96+
<name>composite #25</name>
10297
<file>measCompDevice.bob</file>
10398
<x>65</x>
10499
<y>35</y>

‎measCompApp/op/bob/autoconvert/USB1808_module.bob‎

Lines changed: 74 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--Saved on 2024-09-24 14:24:38 by epics-->
2+
<!--Saved on 2025-02-22 12:27:34 by epics-->
33
<display version="2.0.0">
44
<name>USB1808_module</name>
5-
<x>539</x>
6-
<y>253</y>
5+
<x>298</x>
6+
<y>66</y>
77
<width>1090</width>
8-
<height>830</height>
8+
<height>845</height>
99
<background_color>
1010
<color red="187" green="187" blue="187">
1111
</color>
@@ -28,88 +28,84 @@
2828
</foreground_color>
2929
<horizontal_alignment>1</horizontal_alignment>
3030
</widget>
31-
<widget type="group" version="2.0.0">
31+
<widget type="embedded" version="2.0.0">
3232
<name>composite #9</name>
33+
<file>measCompCounters2.bob</file>
34+
<x>50</x>
35+
<y>590</y>
36+
<width>220</width>
37+
<height>85</height>
38+
</widget>
39+
<widget type="embedded" version="2.0.0">
40+
<name>composite #11</name>
41+
<file>measCompTrigger.bob</file>
42+
<x>525</x>
43+
<y>95</y>
44+
<width>180</width>
45+
<height>65</height>
46+
</widget>
47+
<widget type="embedded" version="2.0.0">
48+
<name>composite #13</name>
49+
<file>measCompAnalogIn8.bob</file>
50+
<x>525</x>
51+
<y>255</y>
52+
<width>295</width>
53+
<height>285</height>
54+
</widget>
55+
<widget type="embedded" version="2.0.0">
56+
<name>composite #15</name>
57+
<file>measCompWaveDig.bob</file>
58+
<x>825</x>
59+
<y>255</y>
60+
<width>260</width>
61+
<height>515</height>
62+
</widget>
63+
<widget type="embedded" version="2.0.0">
64+
<name>composite #17</name>
65+
<file>measCompAnalogOut2.bob</file>
66+
<x>525</x>
67+
<y>545</y>
68+
<width>295</width>
69+
<height>115</height>
70+
</widget>
71+
<widget type="embedded" version="2.0.0">
72+
<name>composite #19</name>
73+
<file>measCompDigitalIO4.bob</file>
74+
<x>710</x>
75+
<y>95</y>
76+
<width>375</width>
77+
<height>155</height>
78+
</widget>
79+
<widget type="embedded" version="2.0.0">
80+
<name>composite #21</name>
81+
<file>measCompPulseGen2.bob</file>
82+
<x>5</x>
83+
<y>680</y>
84+
<width>780</width>
85+
<height>160</height>
86+
</widget>
87+
<widget type="embedded" version="2.0.0">
88+
<name>composite #23</name>
89+
<file>measCompWaveGen2.bob</file>
3390
<x>5</x>
3491
<y>95</y>
35-
<width>1080</width>
36-
<height>730</height>
37-
<style>3</style>
38-
<transparent>true</transparent>
39-
<widget type="embedded" version="2.0.0">
40-
<name>composite #12</name>
41-
<file>measCompCounters2.bob</file>
42-
<x>45</x>
43-
<y>473</y>
44-
<width>220</width>
45-
<height>85</height>
46-
</widget>
47-
<widget type="embedded" version="2.0.0">
48-
<name>composite #14</name>
49-
<file>measCompTrigger.bob</file>
50-
<x>520</x>
51-
<width>180</width>
52-
<height>65</height>
53-
</widget>
54-
<widget type="embedded" version="2.0.0">
55-
<name>composite #16</name>
56-
<file>measCompAnalogIn8.bob</file>
57-
<x>520</x>
58-
<y>160</y>
59-
<width>295</width>
60-
<height>285</height>
61-
</widget>
62-
<widget type="embedded" version="2.0.0">
63-
<name>composite #18</name>
64-
<file>measCompWaveDig.bob</file>
65-
<x>820</x>
66-
<y>160</y>
67-
<width>260</width>
68-
<height>515</height>
69-
</widget>
70-
<widget type="embedded" version="2.0.0">
71-
<name>composite #20</name>
72-
<file>measCompAnalogOut2.bob</file>
73-
<x>520</x>
74-
<y>450</y>
75-
<width>295</width>
76-
<height>115</height>
77-
</widget>
78-
<widget type="embedded" version="2.0.0">
79-
<name>composite #22</name>
80-
<file>measCompDigitalIO4.bob</file>
81-
<x>705</x>
82-
<width>375</width>
83-
<height>155</height>
84-
</widget>
85-
<widget type="embedded" version="2.0.0">
86-
<name>composite #24</name>
87-
<file>measCompPulseGen2.bob</file>
88-
<y>570</y>
89-
<width>780</width>
90-
<height>160</height>
91-
</widget>
92-
<widget type="embedded" version="2.0.0">
93-
<name>composite #26</name>
94-
<file>measCompWaveGen2.bob</file>
95-
<width>515</width>
96-
<height>465</height>
97-
</widget>
98-
<widget type="embedded" version="2.0.0">
99-
<name>composite #28</name>
100-
<file>measCompEncoders2.bob</file>
101-
<x>276</x>
102-
<y>473</y>
103-
<width>220</width>
104-
<height>85</height>
105-
</widget>
92+
<width>515</width>
93+
<height>490</height>
94+
</widget>
95+
<widget type="embedded" version="2.0.0">
96+
<name>composite #25</name>
97+
<file>measCompEncoders2.bob</file>
98+
<x>281</x>
99+
<y>590</y>
100+
<width>220</width>
101+
<height>85</height>
106102
</widget>
107103
<widget type="embedded" version="2.0.0">
108-
<name>composite #30</name>
104+
<name>composite #27</name>
109105
<file>measCompDevice.bob</file>
110106
<x>60</x>
111107
<y>35</y>
112-
<width>970</width>
108+
<width>960</width>
113109
<height>55</height>
114110
</widget>
115111
</display>

‎measCompApp/op/bob/autoconvert/measCompTop.bob‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--Saved on 2024-09-24 14:24:36 by epics-->
2+
<!--Saved on 2025-02-22 16:22:36 by epics-->
33
<display version="2.0.0">
44
<name>measCompTop</name>
55
<x>10</x>

0 commit comments

Comments
 (0)