Skip to content

Gm wrtd timer #2491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndreaRigoni merged 2 commits into from
Oct 11, 2022
Merged

Gm wrtd timer #2491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b56c6c
Support for WRTD timer
GabrieleManduchi Oct 10, 2022
aa8f403
Added devices
GabrieleManduchi Oct 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions deploy/packaging/debian/rfxdevices.noarch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_SWTRIG.py
./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_UDP_RECEIVER.py
./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_UDP_SENDER.py
./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_WRTDTIMER.py
./usr/local/mdsplus/pydevices/RfxDevices/MARTE_BREAKDOWN.py
./usr/local/mdsplus/pydevices/RfxDevices/MARTE_COMMON.py
./usr/local/mdsplus/pydevices/RfxDevices/MARTE_CONFIG.py
Expand Down
1 change: 1 addition & 0 deletions deploy/packaging/redhat/rfxdevices.noarch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_SWTRIG.py
./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_UDP_RECEIVER.py
./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_UDP_SENDER.py
./usr/local/mdsplus/pydevices/RfxDevices/MARTE2_WRTDTIMER.py
./usr/local/mdsplus/pydevices/RfxDevices/MARTE_BREAKDOWN.py
./usr/local/mdsplus/pydevices/RfxDevices/MARTE_COMMON.py
./usr/local/mdsplus/pydevices/RfxDevices/MARTE_CONFIG.py
Expand Down
24 changes: 22 additions & 2 deletions java/jdevices/src/main/java/MARTE2_SIMULINK_GENERICSetup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,11 @@ private void initComponents() {
deviceField4 = new DeviceField();
jButton1 = new javax.swing.JButton();
deviceChoice17 = new DeviceChoice();
jPanel47 = new javax.swing.JPanel();
deviceField77 = new DeviceField();
deviceField78 = new DeviceField();

setDeviceProvider("spilds:8100");
setDeviceProvider("localhost:8100");
setDeviceTitle("MARTe2 Simulink Generic device");
setDeviceType("MARTE2_SIMULINK_GENERIC");
setHeight(400);
Expand Down Expand Up @@ -874,7 +877,7 @@ private void initComponents() {

getContentPane().add(jTabbedPane1, java.awt.BorderLayout.CENTER);

jPanel1.setLayout(new java.awt.GridLayout(2, 1));
jPanel1.setLayout(new java.awt.GridLayout(3, 0));

deviceField1.setIdentifier("");
deviceField1.setLabelString("Timebase:");
Expand Down Expand Up @@ -920,6 +923,20 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {

jPanel1.add(jPanel3);

deviceField77.setIdentifier("");
deviceField77.setLabelString("MDS write trigger:");
deviceField77.setNumCols(30);
deviceField77.setOffsetNid(96);
jPanel47.add(deviceField77);

deviceField78.setIdentifier("");
deviceField78.setLabelString("Post trig. Samples: ");
deviceField78.setNumCols(6);
deviceField78.setOffsetNid(98);
jPanel47.add(deviceField78);

jPanel1.add(jPanel47);

getContentPane().add(jPanel1, java.awt.BorderLayout.PAGE_START);
}// </editor-fold>//GEN-END:initComponents

Expand Down Expand Up @@ -1033,6 +1050,8 @@ private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS
private DeviceField deviceField74;
private DeviceField deviceField75;
private DeviceField deviceField76;
private DeviceField deviceField77;
private DeviceField deviceField78;
private DeviceField deviceField8;
private DeviceField deviceField9;
private javax.swing.JButton jButton1;
Expand Down Expand Up @@ -1077,6 +1096,7 @@ private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS
private javax.swing.JPanel jPanel44;
private javax.swing.JPanel jPanel45;
private javax.swing.JPanel jPanel46;
private javax.swing.JPanel jPanel47;
private javax.swing.JPanel jPanel5;
private javax.swing.JPanel jPanel6;
private javax.swing.JPanel jPanel7;
Expand Down
137 changes: 137 additions & 0 deletions java/jdevices/src/main/java/MARTE2_WRTDTIMERSetup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
/*
* 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 MARTE2_WRTDTIMERSetup extends DeviceSetup {

/**
* Creates new form MARTE2_WRTDTIMERSetup
*/
public MARTE2_WRTDTIMERSetup() {
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();
jPanel2 = new javax.swing.JPanel();
jPanel3 = new javax.swing.JPanel();
deviceChoice1 = new DeviceChoice();
deviceField1 = new DeviceField();
deviceField5 = new DeviceField();
jPanel4 = new javax.swing.JPanel();
deviceField2 = new DeviceField();
deviceField3 = new DeviceField();
deviceField4 = new DeviceField();
jPanel5 = new javax.swing.JPanel();
deviceField6 = new DeviceField();
deviceField7 = new DeviceField();
deviceField8 = new DeviceField();
jPanel1 = new javax.swing.JPanel();

setDeviceProvider("localhost:8100");
setDeviceTitle("WRTD Timer ");
setDeviceType("MARTE2_WRTDTIMER");
setHeight(200);
setWidth(700);
getContentPane().add(deviceButtons1, java.awt.BorderLayout.PAGE_END);

jPanel2.setLayout(new java.awt.GridLayout(3, 0));

deviceChoice1.setChoiceItems(new String[] {"CLOCK_TAI", "CLOCK_REALTIME", "CLOCK_MONOTONIC", "CLOCK_PTP"});
deviceChoice1.setIdentifier("");
deviceChoice1.setLabelString("Clock Mode: ");
deviceChoice1.setOffsetNid(7);
deviceChoice1.setUpdateIdentifier("");
jPanel3.add(deviceChoice1);

deviceField1.setIdentifier("");
deviceField1.setLabelString("Event Name (reg.expr.):");
deviceField1.setOffsetNid(16);
deviceField1.setTextOnly(true);
jPanel3.add(deviceField1);

deviceField5.setIdentifier("");
deviceField5.setLabelString("CPU Mask: ");
deviceField5.setNumCols(4);
deviceField5.setOffsetNid(10);
jPanel3.add(deviceField5);

jPanel2.add(jPanel3);

deviceField2.setIdentifier("");
deviceField2.setLabelString("UDP Port:");
deviceField2.setNumCols(5);
deviceField2.setOffsetNid(13);
jPanel4.add(deviceField2);

deviceField3.setIdentifier("");
deviceField3.setLabelString("Multicast Group");
deviceField3.setOffsetNid(19);
deviceField3.setTextOnly(true);
jPanel4.add(deviceField3);

deviceField4.setIdentifier("");
deviceField4.setLabelString("Leap Seconds: ");
deviceField4.setNumCols(4);
deviceField4.setOffsetNid(22);
jPanel4.add(deviceField4);

jPanel2.add(jPanel4);

deviceField6.setIdentifier("");
deviceField6.setLabelString("Perios(s): ");
deviceField6.setNumCols(6);
deviceField6.setOffsetNid(31);
jPanel5.add(deviceField6);

deviceField7.setIdentifier("");
deviceField7.setLabelString("Delay(s):");
deviceField7.setNumCols(6);
deviceField7.setOffsetNid(25);
jPanel5.add(deviceField7);

deviceField8.setIdentifier("");
deviceField8.setLabelString("Phase(s): ");
deviceField8.setNumCols(6);
deviceField8.setOffsetNid(28);
jPanel5.add(deviceField8);

jPanel2.add(jPanel5);

getContentPane().add(jPanel2, java.awt.BorderLayout.PAGE_START);
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 DeviceField deviceField1;
private DeviceField deviceField2;
private DeviceField deviceField3;
private DeviceField deviceField4;
private DeviceField deviceField5;
private DeviceField deviceField6;
private DeviceField deviceField7;
private DeviceField deviceField8;
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
}
28 changes: 25 additions & 3 deletions java/jdevices/src/main/resources/MARTE2_SIMULINK_GENERICSetup.form
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<Form version="1.7" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
<Properties>
<Property name="deviceProvider" type="java.lang.String" value="spilds:8100"/>
<Property name="deviceProvider" type="java.lang.String" value="localhost:8100"/>
<Property name="deviceTitle" type="java.lang.String" value="MARTe2 Simulink Generic device"/>
<Property name="deviceType" type="java.lang.String" value="MARTE2_SIMULINK_GENERIC"/>
<Property name="height" type="int" value="400"/>
Expand Down Expand Up @@ -1438,8 +1438,8 @@
</Constraints>

<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridLayout">
<Property name="columns" type="int" value="1"/>
<Property name="rows" type="int" value="2"/>
<Property name="columns" type="int" value="0"/>
<Property name="rows" type="int" value="3"/>
</Layout>
<SubComponents>
<Container class="javax.swing.JPanel" name="jPanel2">
Expand Down Expand Up @@ -1512,6 +1512,28 @@
</Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel47">

<Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
<SubComponents>
<Component class="DeviceField" name="deviceField77">
<Properties>
<Property name="identifier" type="java.lang.String" value=""/>
<Property name="labelString" type="java.lang.String" value="MDS write trigger:"/>
<Property name="numCols" type="int" value="30"/>
<Property name="offsetNid" type="int" value="96"/>
</Properties>
</Component>
<Component class="DeviceField" name="deviceField78">
<Properties>
<Property name="identifier" type="java.lang.String" value=""/>
<Property name="labelString" type="java.lang.String" value="Post trig. Samples: "/>
<Property name="numCols" type="int" value="6"/>
<Property name="offsetNid" type="int" value="98"/>
</Properties>
</Component>
</SubComponents>
</Container>
</SubComponents>
</Container>
</SubComponents>
Expand Down
Loading