Add ADC Idly and MMCM controls to epics, add ADC SPI readback printouts

NSLS-II · Nov 24, 2024 · 5d847e5 · 5d847e5
1 parent b708fae
commit 5d847e5
Show file tree

Hide file tree

Showing 18 changed files with 353 additions and 116 deletions.
diff --git a/css/zubpm.bob b/css/zubpm.bob
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Saved on 2024-11-05 12:34:40 by mead-->
+<!--Saved on 2024-11-22 21:43:17 by mead-->
 <display version="2.0.0">
   <name>$(PRI):$(Sec)-BPM$(N)LN_LTB_bpm_Ctrl</name>
   <width>1350</width>
@@ -3321,6 +3321,56 @@ $(pv_value)</tooltip>
               </trace>
             </traces>
           </widget>
+          <widget type="bool_button" version="2.0.0">
+            <name>Boolean Button_6</name>
+            <pv_name>$(PRI)-BI{BPM:$(N)}ADC:MMCM0DLY-SP</pv_name>
+            <x>838</x>
+            <y>12</y>
+            <width>183</width>
+            <height>29</height>
+            <off_label>ADC0 MMCM DLYSTR</off_label>
+            <off_color>
+              <color red="0" green="100" blue="0">
+              </color>
+            </off_color>
+            <on_label>Trin On</on_label>
+            <on_color>
+              <color red="0" green="255" blue="0">
+              </color>
+            </on_color>
+            <background_color>
+              <color red="0" green="255" blue="255">
+              </color>
+            </background_color>
+            <actions>
+            </actions>
+            <mode>1</mode>
+          </widget>
+          <widget type="bool_button" version="2.0.0">
+            <name>Boolean Button_7</name>
+            <pv_name>$(PRI)-BI{BPM:$(N)}ADC:MMCM1DLY-SP</pv_name>
+            <x>1048</x>
+            <y>6</y>
+            <width>183</width>
+            <height>29</height>
+            <off_label>ADC1 MMCM DLYSTR</off_label>
+            <off_color>
+              <color red="0" green="100" blue="0">
+              </color>
+            </off_color>
+            <on_label>Trin On</on_label>
+            <on_color>
+              <color red="0" green="255" blue="0">
+              </color>
+            </on_color>
+            <background_color>
+              <color red="0" green="255" blue="255">
+              </color>
+            </background_color>
+            <actions>
+            </actions>
+            <mode>1</mode>
+          </widget>
         </children>
       </tab>
       <tab>
@@ -5785,6 +5835,42 @@ $(pv_value)</tooltip>
             <maximum>1.0E8</maximum>
             <limits_from_pv>false</limits_from_pv>
           </widget>
+          <widget type="spinner" version="2.0.0">
+            <name>Spinner_17</name>
+            <pv_name>$(PRI)-BI{BPM:$(N)}ADC:IDLY-SP</pv_name>
+            <x>147</x>
+            <y>499</y>
+            <width>79</width>
+            <height>25</height>
+            <format>0</format>
+            <precision>3</precision>
+            <background_color>
+              <color red="192" green="192" blue="192">
+              </color>
+            </background_color>
+            <horizontal_alignment>1</horizontal_alignment>
+            <vertical_alignment>1</vertical_alignment>
+            <actions>
+            </actions>
+            <maximum>1.0E8</maximum>
+            <limits_from_pv>false</limits_from_pv>
+          </widget>
+          <widget type="label" version="2.0.0">
+            <name>Label_85</name>
+            <text>ADC idly</text>
+            <x>54</x>
+            <y>493</y>
+            <width>107</width>
+            <height>36</height>
+            <horizontal_alignment>1</horizontal_alignment>
+            <vertical_alignment>1</vertical_alignment>
+            <actions>
+            </actions>
+            <border_color>
+              <color red="0" green="128" blue="255">
+              </color>
+            </border_color>
+          </widget>
         </children>
       </tab>
       <tab>
@@ -5925,16 +6011,53 @@ $(pv_value)</tooltip>
         </children>
       </tab>
     </tabs>
-    <x>37</x>
-    <y>29</y>
+    <x>36</x>
+    <y>30</y>
     <width>1290</width>
     <height>734</height>
     <background_color>
       <color red="240" green="240" blue="240">
       </color>
     </background_color>
+    <active_tab>2</active_tab>
     <tab_height>10</tab_height>
     <actions>
     </actions>
   </widget>
+  <widget type="spinner" version="2.0.0">
+    <name>Spinner_18</name>
+    <pv_name>$(PRI)-BI{BPM:$(N)}ADC:IDLY-SP</pv_name>
+    <x>762</x>
+    <y>97</y>
+    <width>79</width>
+    <height>25</height>
+    <format>0</format>
+    <precision>3</precision>
+    <background_color>
+      <color red="192" green="192" blue="192">
+      </color>
+    </background_color>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <actions>
+    </actions>
+    <maximum>1.0E8</maximum>
+    <limits_from_pv>false</limits_from_pv>
+  </widget>
+  <widget type="label" version="2.0.0">
+    <name>Label_87</name>
+    <text>ADC idly</text>
+    <x>669</x>
+    <y>91</y>
+    <width>107</width>
+    <height>36</height>
+    <horizontal_alignment>1</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+    <actions>
+    </actions>
+    <border_color>
+      <color red="0" green="128" blue="255">
+      </color>
+    </border_color>
+  </widget>
 </display>
diff --git a/ioc/st.cmd b/ioc/st.cmd
@@ -1,7 +1,7 @@
-#!//home/diag/epics/pscdrv/bin/linux-x86_64/pscdemo 
-epicsEnvSet("TOP","/home/diag/epics/pscdrv")
+#!//home/mead/epics/pscdrv/bin/linux-x86_64/pscdemo 
+epicsEnvSet("TOP","/home/mead/epics/pscdrv")
 epicsEnvSet("BPMDIR","$(TOP)")
-epicsEnvSet("ZUBPM_DBDIR","/home/diag/fwk/zubpm/ioc")
+epicsEnvSet("ZUBPM_DBDIR","/home/mead/rfbpm/fwk/zubpm/ioc")
 
 
 #epicsEnvSet("CNO","40")   ## Cell Number
@@ -54,8 +54,8 @@ var(PSCDebug, 5)	#5 full debug
 
 #bpm1 Create the PSC
 createPSC("aie_tx_1", $(BPM1_IP), 7, 0)
-createPSC("aie_wfm_rx_1", $(BPM1_IP), 20, 2)
-createPSC("Rx1", $(BPM1_IP), 600, 2)
+createPSC("aie_wfm_rx_1", $(BPM1_IP), 20, 1)
+createPSC("Rx1", $(BPM1_IP), 600, 1)
 
 ###########
 iocInit

diff --git a/ioc/zubpm.db b/ioc/zubpm.db
@@ -75,10 +75,35 @@ record(bo, "$(P){BPM:$(NO)}Rf:PtPwr-SP") {
 }
 
 #ADC IDLY Value
-record(bo, "$(P){BPM:$(NO)}ADC:IDLY-SP") {
+record(ao, "$(P){BPM:$(NO)}ADC:IDLY-SP") {
     field(DESC, "ADC IDLY Ctrl")
-    field(DTYP, "PSC Single U32")
+    field(DTYP, "PSC Single I32")
     field(OUT , "@aie_tx_$(NO) 1 12")
+    info(autosaveFields, "VAL")
+    field(FLNK, "$(P){BPM:$(NO)}GoRegSingleWrite")
+}
+
+
+
+
+#ADC FCO MMCM Delay Strobe
+record(bo, "$(P){BPM:$(NO)}ADC:MMCM0DLY-SP") {
+    field(DESC, "MMCM0 FCO Delay Strobe")
+    field(DTYP, "PSC Single U32")
+    #field(DOL , "$(SYS=SR)-HLA{}AllBPMs-Rf:PtPwr-SP CP")
+    field(OUT , "@aie_tx_$(NO) 1 16")
+    field(ZNAM,"Off")
+    field(ONAM,"On")
+    info(autosaveFields, "VAL")
+    field(FLNK, "$(P){BPM:$(NO)}GoRegSingleWrite")
+}
+
+#ADC FCO MMCM Delay Strobe
+record(bo, "$(P){BPM:$(NO)}ADC:MMCM1DLY-SP") {
+    field(DESC, "MMCM1 FCO Delay Strobe")
+    field(DTYP, "PSC Single U32")
+    #field(DOL , "$(SYS=SR)-HLA{}AllBPMs-Rf:PtPwr-SP CP")
+    field(OUT , "@aie_tx_$(NO) 1 20")
     field(ZNAM,"Off")
     field(ONAM,"On")
     info(autosaveFields, "VAL")
@@ -90,6 +115,7 @@ record(bo, "$(P){BPM:$(NO)}ADC:IDLY-SP") {
 
 
 
+
 #Trigger source (Internal/External)
 record(bo, "$(P){BPM:$(NO)}Trig:TrigSrc-SP") {
     field(DESC, "Trigger source")

diff --git a/src/hw/cstr/afepins.xdc b/src/hw/cstr/afepins.xdc
@@ -296,3 +296,4 @@ set_property DIFF_TERM_ADV TERM_100 [get_ports {adc_sdata_n[15]}]
 
 
 
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -296,3 +296,4 @@ set_property DIFF_TERM_ADV TERM_100 [get_ports {adc_sdata_n[15]}]