Gm rfx devices

deploy/packaging/debian/rfxdevices.noarch

@@ -116,11 +116,11 @@
 ./usr/local/mdsplus/pydevices/RfxDevices/PTGREY.py
 ./usr/local/mdsplus/pydevices/RfxDevices/PV2MDSEVENT.py
 ./usr/local/mdsplus/pydevices/RfxDevices/PV_WAVE_SETUP.py
-./usr/local/mdsplus/pydevices/RfxDevices/REDPYTADC.py
 ./usr/local/mdsplus/pydevices/RfxDevices/RFXVICONTROL.py
 ./usr/local/mdsplus/pydevices/RfxDevices/RFXWAVESETUP.py
 ./usr/local/mdsplus/pydevices/RfxDevices/RFX_PROTECTIONS.py
 ./usr/local/mdsplus/pydevices/RfxDevices/RFX_RPADC.py
+./usr/local/mdsplus/pydevices/RfxDevices/RFX_RPADC_SERIAL.py
 ./usr/local/mdsplus/pydevices/RfxDevices/RFX_RPDAC.py
 ./usr/local/mdsplus/pydevices/RfxDevices/RGA.py
 ./usr/local/mdsplus/pydevices/RfxDevices/SIG_SNAPSHOT.py

deploy/packaging/redhat/rfxdevices.noarch

@@ -117,11 +117,11 @@
 ./usr/local/mdsplus/pydevices/RfxDevices/PTGREY.py
 ./usr/local/mdsplus/pydevices/RfxDevices/PV2MDSEVENT.py
 ./usr/local/mdsplus/pydevices/RfxDevices/PV_WAVE_SETUP.py
-./usr/local/mdsplus/pydevices/RfxDevices/REDPYTADC.py
 ./usr/local/mdsplus/pydevices/RfxDevices/RFXVICONTROL.py
 ./usr/local/mdsplus/pydevices/RfxDevices/RFXWAVESETUP.py
 ./usr/local/mdsplus/pydevices/RfxDevices/RFX_PROTECTIONS.py
 ./usr/local/mdsplus/pydevices/RfxDevices/RFX_RPADC.py
+./usr/local/mdsplus/pydevices/RfxDevices/RFX_RPADC_SERIAL.py
 ./usr/local/mdsplus/pydevices/RfxDevices/RFX_RPDAC.py
 ./usr/local/mdsplus/pydevices/RfxDevices/RGA.py
 ./usr/local/mdsplus/pydevices/RfxDevices/SIG_SNAPSHOT.py

java/jdevices/src/main/java/ELADSetup.java

@@ -0,0 +1,123 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/**
+ *
+ * @author mdsplus
+ */
+public class ELADSetup extends DeviceSetup {
+
+    /**
+     * Creates new form ELADSetup
+     */
+    public ELADSetup() {
+        initComponents();
+    }
+
+    /**
+     * This method is called from within the constructor to initialize the form.
+     * WARNING: Do NOT modify this code. The content of this method is always
+     * regenerated by the Form Editor.
+     */
+    @SuppressWarnings("unchecked")
+    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+    private void initComponents() {
+
+        deviceButtons1 = new DeviceButtons();
+        jPanel1 = new javax.swing.JPanel();
+        jPanel2 = new javax.swing.JPanel();
+        deviceField1 = new DeviceField();
+        jPanel3 = new javax.swing.JPanel();
+        deviceField2 = new DeviceField();
+        deviceField3 = new DeviceField();
+        jPanel4 = new javax.swing.JPanel();
+        deviceField4 = new DeviceField();
+        deviceField5 = new DeviceField();
+        deviceField7 = new DeviceField();
+        jPanel5 = new javax.swing.JPanel();
+        deviceField6 = new DeviceField();
+
+        setDeviceProvider("localhost:8100");
+        setDeviceTitle("ELAD Setuo");
+        setDeviceType("ELAD");
+        setHeight(300);
+        setWidth(500);
+        getContentPane().add(deviceButtons1, java.awt.BorderLayout.PAGE_END);
+
+        jPanel1.setLayout(new java.awt.GridLayout(4, 1));
+
+        deviceField1.setIdentifier("");
+        deviceField1.setLabelString("Comment:");
+        deviceField1.setNumCols(30);
+        deviceField1.setOffsetNid(1);
+        deviceField1.setTextOnly(true);
+        jPanel2.add(deviceField1);
+
+        jPanel1.add(jPanel2);
+
+        deviceField2.setIdentifier("");
+        deviceField2.setLabelString("Device IP:");
+        deviceField2.setNumCols(20);
+        deviceField2.setOffsetNid(2);
+        deviceField2.setTextOnly(true);
+        jPanel3.add(deviceField2);
+
+        deviceField3.setIdentifier("");
+        deviceField3.setLabelString("Device Port: ");
+        deviceField3.setNumCols(6);
+        deviceField3.setOffsetNid(3);
+        jPanel3.add(deviceField3);
+
+        jPanel1.add(jPanel3);
+
+        deviceField4.setIdentifier("");
+        deviceField4.setLabelString("PTS: ");
+        deviceField4.setNumCols(6);
+        deviceField4.setOffsetNid(7);
+        jPanel4.add(deviceField4);
+
+        deviceField5.setIdentifier("");
+        deviceField5.setLabelString("Input Stream Port: ");
+        deviceField5.setNumCols(6);
+        deviceField5.setOffsetNid(10);
+        jPanel4.add(deviceField5);
+
+        deviceField7.setIdentifier("");
+        deviceField7.setLabelString("Stream freq div.: ");
+        deviceField7.setNumCols(6);
+        deviceField7.setOffsetNid(8);
+        jPanel4.add(deviceField7);
+
+        jPanel1.add(jPanel4);
+
+        deviceField6.setIdentifier("");
+        deviceField6.setLabelString("Trigger time: ");
+        deviceField6.setNumCols(30);
+        deviceField6.setOffsetNid(6);
+        jPanel5.add(deviceField6);
+
+        jPanel1.add(jPanel5);
+
+        getContentPane().add(jPanel1, java.awt.BorderLayout.CENTER);
+    }// </editor-fold>//GEN-END:initComponents
+
+
+    // Variables declaration - do not modify//GEN-BEGIN:variables
+    private DeviceButtons deviceButtons1;
+    private DeviceField deviceField1;
+    private DeviceField deviceField2;
+    private DeviceField deviceField3;
+    private DeviceField deviceField4;
+    private DeviceField deviceField5;
+    private DeviceField deviceField6;
+    private DeviceField deviceField7;
+    private javax.swing.JPanel jPanel1;
+    private javax.swing.JPanel jPanel2;
+    private javax.swing.JPanel jPanel3;
+    private javax.swing.JPanel jPanel4;
+    private javax.swing.JPanel jPanel5;
+    // End of variables declaration//GEN-END:variables
+}

java/jdevices/src/main/java/RFX_RPADC_SERIALSetup.java

@@ -0,0 +1,222 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/**
+ *
+ * @author mdsplus
+ */
+public class RFX_RPADC_SERIALSetup extends DeviceSetup {
+
+    /**
+     * Creates new form RFX_RPADC_SERIALSetup
+     */
+    public RFX_RPADC_SERIALSetup() {
+        initComponents();
+    }
+
+    /**
+     * This method is called from within the constructor to initialize the form.
+     * WARNING: Do NOT modify this code. The content of this method is always
+     * regenerated by the Form Editor.
+     */
+    @SuppressWarnings("unchecked")
+    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+    private void initComponents() {
+
+        deviceButtons1 = new DeviceButtons();
+        jPanel1 = new javax.swing.JPanel();
+        jPanel2 = new javax.swing.JPanel();
+        deviceField1 = new DeviceField();
+        deviceDispatch1 = new DeviceDispatch();
+        jPanel3 = new javax.swing.JPanel();
+        deviceField2 = new DeviceField();
+        deviceField3 = new DeviceField();
+        jPanel4 = new javax.swing.JPanel();
+        deviceChoice1 = new DeviceChoice();
+        deviceChoice2 = new DeviceChoice();
+        deviceChoice3 = new DeviceChoice();
+        jPanel5 = new javax.swing.JPanel();
+        deviceChoice4 = new DeviceChoice();
+        deviceField4 = new DeviceField();
+        jPanel6 = new javax.swing.JPanel();
+        deviceField5 = new DeviceField();
+        deviceField6 = new DeviceField();
+        jPanel7 = new javax.swing.JPanel();
+        deviceField7 = new DeviceField();
+        deviceField8 = new DeviceField();
+        jPanel8 = new javax.swing.JPanel();
+        deviceField9 = new DeviceField();
+        deviceField10 = new DeviceField();
+        deviceField11 = new DeviceField();
+        jPanel9 = new javax.swing.JPanel();
+        deviceField12 = new DeviceField();
+        deviceField13 = new DeviceField();
+        jPanel10 = new javax.swing.JPanel();
+
+        setDeviceProvider("localhost:8100");
+        setDeviceTitle("RPADC Serial");
+        setDeviceType("RFX_RPADC_SERIAL");
+        setHeight(500);
+        setUpdateEvent("");
+        setWidth(900);
+        getContentPane().add(deviceButtons1, java.awt.BorderLayout.PAGE_END);
+
+        jPanel1.setLayout(new java.awt.GridLayout(9, 1));
+
+        deviceField1.setIdentifier("");
+        deviceField1.setLabelString("Comment");
+        deviceField1.setNumCols(30);
+        deviceField1.setOffsetNid(1);
+        jPanel2.add(deviceField1);
+        jPanel2.add(deviceDispatch1);
+
+        jPanel1.add(jPanel2);
+
+        deviceField2.setIdentifier("");
+        deviceField2.setLabelString("Decimation");
+        deviceField2.setOffsetNid(2);
+        jPanel3.add(deviceField2);
+
+        deviceField3.setIdentifier("");
+        deviceField3.setLabelString("Segment Size");
+        deviceField3.setNumCols(20);
+        deviceField3.setOffsetNid(3);
+        jPanel3.add(deviceField3);
+
+        jPanel1.add(jPanel3);
+
+        deviceChoice1.setChoiceItems(new String[] {"STREAMING", "EVENT_STREAMING", "EVENT_SINGLE", "TRIGGER_STREAMING", "TRIGGER_SINGLE"});
+        deviceChoice1.setIdentifier("");
+        deviceChoice1.setLabelString("Mode");
+        deviceChoice1.setOffsetNid(5);
+        deviceChoice1.setUpdateIdentifier("");
+        jPanel4.add(deviceChoice1);
+
+        deviceChoice2.setChoiceItems(new String[] {"UPPER", "LOWER"});
+        deviceChoice2.setIdentifier("");
+        deviceChoice2.setLabelString("Event Mode");
+        deviceChoice2.setOffsetNid(6);
+        deviceChoice2.setUpdateIdentifier("");
+        jPanel4.add(deviceChoice2);
+
+        deviceChoice3.setChoiceItems(new String[] {"A", "B"});
+        deviceChoice3.setIdentifier("");
+        deviceChoice3.setLabelString("Event Chan");
+        deviceChoice3.setOffsetNid(7);
+        deviceChoice3.setUpdateIdentifier("");
+        jPanel4.add(deviceChoice3);
+
+        jPanel1.add(jPanel4);
+
+        deviceChoice4.setChoiceItems(new String[] {"INTERNAL", "TRIG_EXTERNAL", "TRIG ABS", "EXTERNAL", "SYNC"});
+        deviceChoice4.setIdentifier("");
+        deviceChoice4.setLabelString("Clock Mode");
+        deviceChoice4.setOffsetNid(12);
+        deviceChoice4.setUpdateIdentifier("");
+        jPanel5.add(deviceChoice4);
+
+        deviceField4.setIdentifier("");
+        deviceField4.setLabelString("External Clock");
+        deviceField4.setNumCols(30);
+        deviceField4.setOffsetNid(13);
+        jPanel5.add(deviceField4);
+
+        jPanel1.add(jPanel5);
+
+        deviceField5.setIdentifier("");
+        deviceField5.setLabelString("Pre Samples");
+        deviceField5.setOffsetNid(10);
+        jPanel6.add(deviceField5);
+
+        deviceField6.setIdentifier("");
+        deviceField6.setLabelString("Post Samples");
+        deviceField6.setOffsetNid(11);
+        jPanel6.add(deviceField6);
+
+        jPanel1.add(jPanel6);
+
+        deviceField7.setIdentifier("");
+        deviceField7.setLabelString("Ev. streaming level");
+        deviceField7.setNumCols(5);
+        deviceField7.setOffsetNid(8);
+        jPanel7.add(deviceField7);
+
+        deviceField8.setIdentifier("");
+        deviceField8.setLabelString("Ev. streaming samples");
+        deviceField8.setNumCols(5);
+        deviceField8.setOffsetNid(9);
+        jPanel7.add(deviceField8);
+
+        jPanel1.add(jPanel7);
+
+        deviceField9.setIdentifier("");
+        deviceField9.setLabelString("Dead time (s)");
+        deviceField9.setNumCols(8);
+        deviceField9.setOffsetNid(24);
+        jPanel8.add(deviceField9);
+
+        deviceField10.setIdentifier("");
+        deviceField10.setLabelString("Offset A (raw)");
+        deviceField10.setOffsetNid(14);
+        jPanel8.add(deviceField10);
+
+        deviceField11.setIdentifier("");
+        deviceField11.setLabelString("Offset B (raw)");
+        deviceField11.setOffsetNid(15);
+        jPanel8.add(deviceField11);
+
+        jPanel1.add(jPanel8);
+
+        deviceField12.setIdentifier("");
+        deviceField12.setLabelString("Trigger");
+        deviceField12.setNumCols(20);
+        deviceField12.setOffsetNid(4);
+        jPanel9.add(deviceField12);
+
+        deviceField13.setIdentifier("");
+        deviceField13.setLabelString("Temperature");
+        deviceField13.setOffsetNid(26);
+        jPanel9.add(deviceField13);
+
+        jPanel1.add(jPanel9);
+        jPanel1.add(jPanel10);
+
+        getContentPane().add(jPanel1, java.awt.BorderLayout.CENTER);
+    }// </editor-fold>//GEN-END:initComponents
+
+
+    // Variables declaration - do not modify//GEN-BEGIN:variables
+    private DeviceButtons deviceButtons1;
+    private DeviceChoice deviceChoice1;
+    private DeviceChoice deviceChoice2;
+    private DeviceChoice deviceChoice3;
+    private DeviceChoice deviceChoice4;
+    private DeviceDispatch deviceDispatch1;
+    private DeviceField deviceField1;
+    private DeviceField deviceField10;
+    private DeviceField deviceField11;
+    private DeviceField deviceField12;
+    private DeviceField deviceField13;
+    private DeviceField deviceField2;
+    private DeviceField deviceField3;
+    private DeviceField deviceField4;
+    private DeviceField deviceField5;
+    private DeviceField deviceField6;
+    private DeviceField deviceField7;
+    private DeviceField deviceField8;
+    private DeviceField deviceField9;
+    private javax.swing.JPanel jPanel1;
+    private javax.swing.JPanel jPanel10;
+    private javax.swing.JPanel jPanel2;
+    private javax.swing.JPanel jPanel3;
+    private javax.swing.JPanel jPanel4;
+    private javax.swing.JPanel jPanel5;
+    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
+}