Gm fix devices (#2622)

* Fix:fixed several issues * Fix:fixed lasr issue * Fix:fixed another last issue * Fix:fixed another last issue * Added devices
MDSplus · Sep 22, 2023 · 21ead65 · 21ead65
1 parent d6df3eb
commit 21ead65
Show file tree

Hide file tree

Showing 13 changed files with 1,399 additions and 36 deletions.
diff --git a/deploy/packaging/debian/rfxdevices.noarch b/deploy/packaging/debian/rfxdevices.noarch
@@ -16,6 +16,7 @@
 ./usr/local/mdsplus/pydevices/RfxDevices/DIO2_ENCDEC.py
 ./usr/local/mdsplus/pydevices/RfxDevices/DIO4.py
 ./usr/local/mdsplus/pydevices/RfxDevices/DTACQ_SUPERVISOR.py
+./usr/local/mdsplus/pydevices/RfxDevices/ELAD.py
 ./usr/local/mdsplus/pydevices/RfxDevices/ELPROBES_CFG.py
 ./usr/local/mdsplus/pydevices/RfxDevices/EPFE.py
 ./usr/local/mdsplus/pydevices/RfxDevices/EPFEM.py
@@ -61,6 +62,7 @@
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_SIMULINK.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_SIMULINK_DTT.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_SIMULINK_DTT_PCS.py
+./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_SIMULINK_DTT_VS.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_SIMULINK_FLUXMAP.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_SIMULINK_GENERIC.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_SIMULINK_LEV_CTRLR.py
@@ -132,6 +134,7 @@
 ./usr/local/mdsplus/pydevices/RfxDevices/SPIDER_SM.py
 ./usr/local/mdsplus/pydevices/RfxDevices/STK_TEMP.py
 ./usr/local/mdsplus/pydevices/RfxDevices/STREAM_SETUP.py
+./usr/local/mdsplus/pydevices/RfxDevices/TRIG_HUB.py
 ./usr/local/mdsplus/pydevices/RfxDevices/ZELOS2150GV.py
 ./usr/local/mdsplus/pydevices/RfxDevices/__init__.py
 ./usr/local/mdsplus/pydevices/RfxDevices/_version.py
@@ -846,6 +849,7 @@
 ./usr/local/mdsplus/tdi/RfxDevices/pxdtest.fun
 ./usr/local/mdsplus/tdi/RfxDevices/sawtooth.fun
 ./usr/local/mdsplus/tdi/RfxDevices/sawtooth1.fun
+./usr/local/mdsplus/tdi/RfxDevices/setAbsoluteTime.py
 ./usr/local/mdsplus/tdi/RfxDevices/setversion.fun
 ./usr/local/mdsplus/tdi/RfxDevices/shotsDate.fun
 ./usr/local/mdsplus/tdi/RfxDevices/sigBit.fun

diff --git a/deploy/packaging/redhat/rfxdevices.noarch b/deploy/packaging/redhat/rfxdevices.noarch
@@ -17,6 +17,7 @@
 ./usr/local/mdsplus/pydevices/RfxDevices/DIO2_ENCDEC.py
 ./usr/local/mdsplus/pydevices/RfxDevices/DIO4.py
 ./usr/local/mdsplus/pydevices/RfxDevices/DTACQ_SUPERVISOR.py
+./usr/local/mdsplus/pydevices/RfxDevices/ELAD.py
 ./usr/local/mdsplus/pydevices/RfxDevices/ELPROBES_CFG.py
 ./usr/local/mdsplus/pydevices/RfxDevices/EPFE.py
 ./usr/local/mdsplus/pydevices/RfxDevices/EPFEM.py
@@ -62,6 +63,7 @@
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_SIMULINK.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_SIMULINK_DTT.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_SIMULINK_DTT_PCS.py
+./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_SIMULINK_DTT_VS.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_SIMULINK_FLUXMAP.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_SIMULINK_GENERIC.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_SIMULINK_LEV_CTRLR.py
@@ -133,6 +135,7 @@
 ./usr/local/mdsplus/pydevices/RfxDevices/SPIDER_SM.py
 ./usr/local/mdsplus/pydevices/RfxDevices/STK_TEMP.py
 ./usr/local/mdsplus/pydevices/RfxDevices/STREAM_SETUP.py
+./usr/local/mdsplus/pydevices/RfxDevices/TRIG_HUB.py
 ./usr/local/mdsplus/pydevices/RfxDevices/ZELOS2150GV.py
 ./usr/local/mdsplus/pydevices/RfxDevices/__init__.py
 ./usr/local/mdsplus/pydevices/RfxDevices/_version.py
@@ -848,6 +851,7 @@
 ./usr/local/mdsplus/tdi/RfxDevices/pxdtest.fun
 ./usr/local/mdsplus/tdi/RfxDevices/sawtooth.fun
 ./usr/local/mdsplus/tdi/RfxDevices/sawtooth1.fun
+./usr/local/mdsplus/tdi/RfxDevices/setAbsoluteTime.py
 ./usr/local/mdsplus/tdi/RfxDevices/setversion.fun
 ./usr/local/mdsplus/tdi/RfxDevices/shotsDate.fun
 ./usr/local/mdsplus/tdi/RfxDevices/sigBit.fun

diff --git a/java/jdevices/src/main/java/RFX_RPADCSetup.java b/java/jdevices/src/main/java/RFX_RPADCSetup.java
@@ -55,17 +55,21 @@ private void initComponents() {
         deviceField10 = new DeviceField();
         deviceField6 = new DeviceField();
         deviceField3 = new DeviceField();
+        jPanel9 = new javax.swing.JPanel();
+        deviceField12 = new DeviceField();
+        deviceField13 = new DeviceField();
+        deviceField14 = new DeviceField();
         jPanel5 = new javax.swing.JPanel();
         deviceField5 = new DeviceField();
 
-        setDeviceProvider("ropc1.rfx.local:8100");
+        setDeviceProvider("localhost:8000");
         setDeviceTitle("RedPitaya ADC");
         setDeviceType("RFX_RPADC");
         setHeight(300);
         setWidth(800);
         getContentPane().add(deviceButtons1, java.awt.BorderLayout.PAGE_END);
 
-        jPanel1.setLayout(new java.awt.GridLayout(7, 1));
+        jPanel1.setLayout(new java.awt.GridLayout(8, 1));
 
         deviceField1.setIdentifier("");
         deviceField1.setLabelString("Comment:");
@@ -112,7 +116,7 @@ private void initComponents() {
 
         jPanel1.add(jPanel4);
 
-        deviceChoice4.setChoiceItems(new String[] {"INTERNAL", "EXTERNAL", "SYNC", "TRIG_EXTERNAL", "TRIG_SYNC"});
+        deviceChoice4.setChoiceItems(new String[] {"INTERNAL", "TRIG_EXTERNAL", "EXTERNAL", "HIGHWAY"});
         deviceChoice4.setIdentifier("");
         deviceChoice4.setLabelString("Clock Mode:");
         deviceChoice4.setOffsetNid(14);
@@ -158,13 +162,33 @@ private void initComponents() {
         jPanel8.add(deviceField6);
 
         deviceField3.setIdentifier("");
-        deviceField3.setLabelString("Dead time: ");
-        deviceField3.setNumCols(8);
-        deviceField3.setOffsetNid(34);
+        deviceField3.setLabelString("Timing Highway event code: ");
+        deviceField3.setNumCols(4);
+        deviceField3.setOffsetNid(23);
         jPanel8.add(deviceField3);
 
         jPanel1.add(jPanel8);
 
+        deviceField12.setIdentifier("");
+        deviceField12.setLabelString("Dead Time(s):");
+        deviceField12.setNumCols(6);
+        deviceField12.setOffsetNid(34);
+        jPanel9.add(deviceField12);
+
+        deviceField13.setIdentifier("");
+        deviceField13.setLabelString("Offset A (raw):");
+        deviceField13.setNumCols(6);
+        deviceField13.setOffsetNid(35);
+        jPanel9.add(deviceField13);
+
+        deviceField14.setIdentifier("");
+        deviceField14.setLabelString("Offset B (raw): ");
+        deviceField14.setNumCols(6);
+        deviceField14.setOffsetNid(22);
+        jPanel9.add(deviceField14);
+
+        jPanel1.add(jPanel9);
+
         deviceField5.setIdentifier("");
         deviceField5.setLabelString("Trigger: ");
         deviceField5.setNumCols(35);
@@ -186,6 +210,9 @@ private void initComponents() {
     private DeviceField deviceField1;
     private DeviceField deviceField10;
     private DeviceField deviceField11;
+    private DeviceField deviceField12;
+    private DeviceField deviceField13;
+    private DeviceField deviceField14;
     private DeviceField deviceField2;
     private DeviceField deviceField3;
     private DeviceField deviceField4;
@@ -202,5 +229,6 @@ private void initComponents() {
     private javax.swing.JPanel jPanel6;
     private javax.swing.JPanel jPanel7;
     private javax.swing.JPanel jPanel8;
+    private javax.swing.JPanel jPanel9;
     // End of variables declaration//GEN-END:variables
 }