Gm dtacq

deploy/packaging/debian/kernel.noarch

@@ -31,10 +31,10 @@
 ./usr/local/mdsplus/pixmaps/mdstcl.png
 ./usr/local/mdsplus/pixmaps/small_mdsplus_logo.jpg
 ./usr/local/mdsplus/pixmaps/tdi.png
-./usr/local/mdsplus/rpm/mdsipd.xinetd
-./usr/local/mdsplus/rpm/mdsipsd.xinetd
 ./usr/local/mdsplus/rpm/mdsip.socket
 ./usr/local/mdsplus/rpm/mdsip@.service
+./usr/local/mdsplus/rpm/mdsipd.xinetd
+./usr/local/mdsplus/rpm/mdsipsd.xinetd
 ./usr/local/mdsplus/rpm/post_install_script
 ./usr/local/mdsplus/rpm/post_uninstall_script
 ./usr/local/mdsplus/rpm/python_module_install.sh

deploy/packaging/debian/rfxdevices.noarch

@@ -14,6 +14,7 @@
 ./usr/local/mdsplus/pydevices/RfxDevices/DEMOSTREAM.py
 ./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/ELPROBES_CFG.py
 ./usr/local/mdsplus/pydevices/RfxDevices/EPFE.py
 ./usr/local/mdsplus/pydevices/RfxDevices/EPFEM.py
@@ -27,6 +28,8 @@
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_COMPONENT.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_CONVERSION.py
+./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_DTACQAI.py
+./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_DTACQAO.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_DUTY_CYCLE.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_EPICS_IN.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_EPICS_OUT.py

deploy/packaging/redhat/kernel.noarch

@@ -39,10 +39,10 @@
 ./usr/local/mdsplus/pixmaps/small_mdsplus_logo.jpg
 ./usr/local/mdsplus/pixmaps/tdi.png
 ./usr/local/mdsplus/rpm
-./usr/local/mdsplus/rpm/mdsipd.xinetd
-./usr/local/mdsplus/rpm/mdsipsd.xinetd
 ./usr/local/mdsplus/rpm/mdsip.socket
 ./usr/local/mdsplus/rpm/mdsip@.service
+./usr/local/mdsplus/rpm/mdsipd.xinetd
+./usr/local/mdsplus/rpm/mdsipsd.xinetd
 ./usr/local/mdsplus/rpm/post_install_script
 ./usr/local/mdsplus/rpm/post_uninstall_script
 ./usr/local/mdsplus/rpm/python_module_install.sh

deploy/packaging/redhat/rfxdevices.noarch

@@ -15,6 +15,7 @@
 ./usr/local/mdsplus/pydevices/RfxDevices/DEMOSTREAM.py
 ./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/ELPROBES_CFG.py
 ./usr/local/mdsplus/pydevices/RfxDevices/EPFE.py
 ./usr/local/mdsplus/pydevices/RfxDevices/EPFEM.py
@@ -28,6 +29,8 @@
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_COMPONENT.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_CONVERSION.py
+./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_DTACQAI.py
+./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_DTACQAO.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_DUTY_CYCLE.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_EPICS_IN.py
 ./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_EPICS_OUT.py

java/devicebeans/src/main/java/DeviceOutputs.java

@@ -214,7 +214,7 @@ protected void displayData(String data, boolean is_on)
                 }
             }
 	}
-
+        public void setDisplayDimensions(boolean mode){}
 	protected String getData() {return null;}
  	protected  boolean getState(){return true;}
 

java/jdevices/src/main/java/DTACQ_SUPERVISORSetup.java

@@ -0,0 +1,298 @@
+/*
+ * 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 DTACQ_SUPERVISORSetup extends DeviceSetup {
+
+    /**
+     * Creates new form DTACQ_SUPERVISORSetup
+     */
+    public DTACQ_SUPERVISORSetup() {
+        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();
+        deviceField2 = new DeviceField();
+        jPanel3 = new javax.swing.JPanel();
+        deviceField3 = new DeviceField();
+        deviceField4 = new DeviceField();
+        jTabbedPane1 = new javax.swing.JTabbedPane();
+        jPanel4 = new javax.swing.JPanel();
+        jPanel5 = new javax.swing.JPanel();
+        deviceField5 = new DeviceField();
+        jPanel6 = new javax.swing.JPanel();
+        deviceField6 = new DeviceField();
+        jPanel7 = new javax.swing.JPanel();
+        deviceField7 = new DeviceField();
+        deviceField8 = new DeviceField();
+        deviceField9 = new DeviceField();
+        jPanel8 = new javax.swing.JPanel();
+        jPanel9 = new javax.swing.JPanel();
+        deviceField10 = new DeviceField();
+        jPanel10 = new javax.swing.JPanel();
+        deviceField11 = new DeviceField();
+        deviceField12 = new DeviceField();
+        jPanel11 = new javax.swing.JPanel();
+        jPanel12 = new javax.swing.JPanel();
+        deviceField13 = new DeviceField();
+        jPanel13 = new javax.swing.JPanel();
+        deviceChoice1 = new DeviceChoice();
+        deviceChoice2 = new DeviceChoice();
+        deviceChoice3 = new DeviceChoice();
+        deviceChoice4 = new DeviceChoice();
+        jPanel14 = new javax.swing.JPanel();
+        jPanel15 = new javax.swing.JPanel();
+        deviceChoice5 = new DeviceChoice();
+        deviceField14 = new DeviceField();
+        deviceField17 = new DeviceField();
+        jPanel16 = new javax.swing.JPanel();
+        deviceField15 = new DeviceField();
+        deviceField16 = new DeviceField();
+
+        setDeviceProvider("localhost:8100");
+        setDeviceTitle("DTACQ Supervisor");
+        setDeviceType("DTACQ_SUPERVISOR");
+        setHeight(300);
+        setWidth(800);
+        getContentPane().add(deviceButtons1, java.awt.BorderLayout.PAGE_END);
+
+        jPanel1.setLayout(new java.awt.GridLayout(2, 1));
+
+        deviceField1.setIdentifier("");
+        deviceField1.setLabelString("IP Address: ");
+        deviceField1.setNumCols(20);
+        deviceField1.setOffsetNid(1);
+        deviceField1.setTextOnly(true);
+        jPanel2.add(deviceField1);
+
+        deviceField2.setIdentifier("");
+        deviceField2.setLabelString("UDP gateway: ");
+        deviceField2.setNumCols(20);
+        deviceField2.setOffsetNid(3);
+        deviceField2.setTextOnly(true);
+        jPanel2.add(deviceField2);
+
+        jPanel1.add(jPanel2);
+
+        deviceField3.setIdentifier("");
+        deviceField3.setLabelString("UDP Address: ");
+        deviceField3.setNumCols(20);
+        deviceField3.setOffsetNid(2);
+        deviceField3.setTextOnly(true);
+        jPanel3.add(deviceField3);
+
+        deviceField4.setIdentifier("");
+        deviceField4.setLabelString("UDP Port: ");
+        deviceField4.setNumCols(6);
+        deviceField4.setOffsetNid(4);
+        jPanel3.add(deviceField4);
+
+        jPanel1.add(jPanel3);
+
+        getContentPane().add(jPanel1, java.awt.BorderLayout.PAGE_START);
+
+        jPanel4.setLayout(new java.awt.GridLayout(3, 1));
+
+        deviceField5.setIdentifier("");
+        deviceField5.setLabelString("Realtime MARTe2 AI device:");
+        deviceField5.setNumCols(30);
+        deviceField5.setOffsetNid(5);
+        jPanel5.add(deviceField5);
+
+        jPanel4.add(jPanel5);
+
+        deviceField6.setIdentifier("");
+        deviceField6.setLabelString("Bulk MARTe2 AI device: ");
+        deviceField6.setNumCols(30);
+        deviceField6.setOffsetNid(6);
+        jPanel6.add(deviceField6);
+
+        jPanel4.add(jPanel6);
+
+        deviceField7.setIdentifier("");
+        deviceField7.setLabelString("AI Sites: ");
+        deviceField7.setOffsetNid(7);
+        jPanel7.add(deviceField7);
+
+        deviceField8.setIdentifier("");
+        deviceField8.setLabelString("AI Channels: ");
+        deviceField8.setOffsetNid(8);
+        jPanel7.add(deviceField8);
+
+        deviceField9.setIdentifier("");
+        deviceField9.setLabelString("SPAD Size (Bytes): ");
+        deviceField9.setOffsetNid(9);
+        jPanel7.add(deviceField9);
+
+        jPanel4.add(jPanel7);
+
+        jTabbedPane1.addTab("AI", jPanel4);
+
+        jPanel8.setLayout(new java.awt.GridLayout(2, 1));
+
+        deviceField10.setIdentifier("");
+        deviceField10.setLabelString("MARTe2 AO device: ");
+        deviceField10.setNumCols(30);
+        deviceField10.setOffsetNid(10);
+        jPanel9.add(deviceField10);
+
+        jPanel8.add(jPanel9);
+
+        deviceField11.setIdentifier("");
+        deviceField11.setLabelString("AO Sites: ");
+        deviceField11.setOffsetNid(11);
+        jPanel10.add(deviceField11);
+
+        deviceField12.setIdentifier("");
+        deviceField12.setLabelString("AO Channels: ");
+        deviceField12.setOffsetNid(12);
+        jPanel10.add(deviceField12);
+
+        jPanel8.add(jPanel10);
+
+        jTabbedPane1.addTab("AO", jPanel8);
+
+        jPanel11.setLayout(new java.awt.GridLayout(2, 1));
+
+        deviceField13.setIdentifier("");
+        deviceField13.setLabelString("DIO Site: ");
+        deviceField13.setOffsetNid(13);
+        jPanel12.add(deviceField13);
+
+        jPanel11.add(jPanel12);
+
+        deviceChoice1.setChoiceItems(new String[] {"INPUT", "OUTPUT"});
+        deviceChoice1.setIdentifier("");
+        deviceChoice1.setLabelString("DIO Byte 1: ");
+        deviceChoice1.setOffsetNid(19);
+        deviceChoice1.setUpdateIdentifier("");
+        jPanel13.add(deviceChoice1);
+
+        deviceChoice2.setChoiceItems(new String[] {"INPUT", "OUTPUT"});
+        deviceChoice2.setIdentifier("");
+        deviceChoice2.setLabelString("DIO Byte 2: ");
+        deviceChoice2.setOffsetNid(20);
+        deviceChoice2.setUpdateIdentifier("");
+        jPanel13.add(deviceChoice2);
+
+        deviceChoice3.setChoiceItems(new String[] {"INPUT", "OUTPUT"});
+        deviceChoice3.setIdentifier("");
+        deviceChoice3.setLabelString("DIO Byte 3: ");
+        deviceChoice3.setOffsetNid(21);
+        deviceChoice3.setUpdateIdentifier("");
+        jPanel13.add(deviceChoice3);
+
+        deviceChoice4.setChoiceItems(new String[] {"INPUT", "OUTPUT"});
+        deviceChoice4.setIdentifier("");
+        deviceChoice4.setLabelString("DIO Byte 4: ");
+        deviceChoice4.setOffsetNid(22);
+        deviceChoice4.setUpdateIdentifier("");
+        jPanel13.add(deviceChoice4);
+
+        jPanel11.add(jPanel13);
+
+        jTabbedPane1.addTab("DIO", jPanel11);
+
+        jPanel14.setLayout(new java.awt.GridLayout(2, 1));
+
+        deviceChoice5.setChoiceItems(new String[] {"INTERNAL", "EXTERNAL"});
+        deviceChoice5.setIdentifier("");
+        deviceChoice5.setLabelString("Clock Mode: ");
+        deviceChoice5.setOffsetNid(14);
+        deviceChoice5.setUpdateIdentifier("");
+        jPanel15.add(deviceChoice5);
+
+        deviceField14.setIdentifier("");
+        deviceField14.setLabelString("Clock Freq. :");
+        deviceField14.setNumCols(15);
+        deviceField14.setOffsetNid(15);
+        jPanel15.add(deviceField14);
+
+        deviceField17.setIdentifier("");
+        deviceField17.setLabelString("UDP Clock Division: ");
+        deviceField17.setOffsetNid(16);
+        jPanel15.add(deviceField17);
+
+        jPanel14.add(jPanel15);
+
+        deviceField15.setIdentifier("");
+        deviceField15.setLabelString("Ext. Clock Freq: ");
+        deviceField15.setNumCols(15);
+        deviceField15.setOffsetNid(17);
+        jPanel16.add(deviceField15);
+
+        deviceField16.setIdentifier("");
+        deviceField16.setLabelString("Trigger: ");
+        deviceField16.setNumCols(20);
+        deviceField16.setOffsetNid(18);
+        jPanel16.add(deviceField16);
+
+        jPanel14.add(jPanel16);
+
+        jTabbedPane1.addTab("Clock/Trigger", jPanel14);
+
+        getContentPane().add(jTabbedPane1, 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 DeviceChoice deviceChoice5;
+    private DeviceField deviceField1;
+    private DeviceField deviceField10;
+    private DeviceField deviceField11;
+    private DeviceField deviceField12;
+    private DeviceField deviceField13;
+    private DeviceField deviceField14;
+    private DeviceField deviceField15;
+    private DeviceField deviceField16;
+    private DeviceField deviceField17;
+    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 jPanel11;
+    private javax.swing.JPanel jPanel12;
+    private javax.swing.JPanel jPanel13;
+    private javax.swing.JPanel jPanel14;
+    private javax.swing.JPanel jPanel15;
+    private javax.swing.JPanel jPanel16;
+    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;
+    private javax.swing.JTabbedPane jTabbedPane1;
+    // End of variables declaration//GEN-END:variables
+}