2023-04-28 11:29:07 +02:00
parent da12278cc3
commit 509cfd333d
19 changed files with 388 additions and 350 deletions
@@ -185,6 +185,9 @@ public class Commands extends Panel {
        buttonGetRT = new javax.swing.JButton();
        buttonPutRT = new javax.swing.JButton();
        buttonMoveRT = new javax.swing.JButton();
+        buttonMoveGonioWait = new javax.swing.JButton();
+        buttonOpenLid = new javax.swing.JButton();
+        buttonCloseLid = new javax.swing.JButton();
        pnDatabase = new javax.swing.JPanel();
        buttonClearSampleDb = new javax.swing.JButton();
        buttonResetPuckIds = new javax.swing.JButton();
@@ -626,32 +629,57 @@ public class Commands extends Panel {
            }
        });

+        buttonMoveGonioWait.setText("Move G Wait");
+        buttonMoveGonioWait.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                buttonMoveGonioWaitActionPerformed(evt);
+            }
+        });
+
+        buttonOpenLid.setText("Open Lid");
+        buttonOpenLid.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                buttonOpenLidActionPerformed(evt);
+            }
+        });
+
+        buttonCloseLid.setText("Close Lid");
+        buttonCloseLid.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                buttonCloseLidActionPerformed(evt);
+            }
+        });
+
        javax.swing.GroupLayout pnLowLevelLayout = new javax.swing.GroupLayout(pnLowLevel);
        pnLowLevel.setLayout(pnLowLevelLayout);
        pnLowLevelLayout.setHorizontalGroup(
            pnLowLevelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
            .addGroup(pnLowLevelLayout.createSequentialGroup()
                .addContainerGap()
+                .addGroup(pnLowLevelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+                    .addComponent(buttonMovePark, javax.swing.GroupLayout.DEFAULT_SIZE, 114, Short.MAX_VALUE)
+                    .addComponent(buttonMoveAux, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(buttonMoveCold, javax.swing.GroupLayout.DEFAULT_SIZE, 114, Short.MAX_VALUE)
+                    .addComponent(buttonMoveHeater, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(buttonGetGonio, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(buttonGetDewar, javax.swing.GroupLayout.DEFAULT_SIZE, 114, Short.MAX_VALUE)
+                    .addComponent(buttonGetAux, javax.swing.GroupLayout.DEFAULT_SIZE, 114, Short.MAX_VALUE)
+                    .addComponent(buttonGetRT, javax.swing.GroupLayout.DEFAULT_SIZE, 114, Short.MAX_VALUE)
+                    .addComponent(buttonMoveRT, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(buttonOpenLid, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                .addGroup(pnLowLevelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(buttonMovePark, javax.swing.GroupLayout.PREFERRED_SIZE, 114, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(buttonMoveAux)
-                    .addComponent(buttonMoveCold, javax.swing.GroupLayout.PREFERRED_SIZE, 114, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(buttonMoveHeater)
-                    .addComponent(buttonGetGonio)
-                    .addComponent(buttonGetDewar, javax.swing.GroupLayout.PREFERRED_SIZE, 114, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(buttonGetAux, javax.swing.GroupLayout.PREFERRED_SIZE, 114, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(buttonGetRT, javax.swing.GroupLayout.PREFERRED_SIZE, 114, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(buttonMoveRT))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 64, Short.MAX_VALUE)
-                .addGroup(pnLowLevelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(buttonPutDewar, javax.swing.GroupLayout.PREFERRED_SIZE, 101, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(buttonPutGonio, javax.swing.GroupLayout.PREFERRED_SIZE, 101, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(buttonMoveGonio, javax.swing.GroupLayout.PREFERRED_SIZE, 101, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(buttonMoveHome, javax.swing.GroupLayout.PREFERRED_SIZE, 101, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(buttonMoveDewar, javax.swing.GroupLayout.PREFERRED_SIZE, 101, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(buttonMoveScanner)
-                    .addComponent(buttonPutAux, javax.swing.GroupLayout.PREFERRED_SIZE, 101, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(buttonPutRT, javax.swing.GroupLayout.PREFERRED_SIZE, 101, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, pnLowLevelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                        .addComponent(buttonPutDewar, javax.swing.GroupLayout.PREFERRED_SIZE, 101, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(buttonPutGonio, javax.swing.GroupLayout.PREFERRED_SIZE, 101, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(buttonMoveHome, javax.swing.GroupLayout.PREFERRED_SIZE, 101, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(buttonMoveDewar, javax.swing.GroupLayout.PREFERRED_SIZE, 101, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(buttonMoveScanner)
+                        .addComponent(buttonPutAux, javax.swing.GroupLayout.PREFERRED_SIZE, 101, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(buttonPutRT, javax.swing.GroupLayout.PREFERRED_SIZE, 101, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(buttonMoveGonio, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 101, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(buttonMoveGonioWait, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 114, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(buttonCloseLid, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 114, javax.swing.GroupLayout.PREFERRED_SIZE))
                .addContainerGap())
        );

@@ -693,7 +721,13 @@ public class Commands extends Panel {
                    .addComponent(buttonMoveHeater)
                    .addComponent(buttonMoveScanner))
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(buttonMoveRT)
+                .addGroup(pnLowLevelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(buttonMoveRT)
+                    .addComponent(buttonMoveGonioWait))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(pnLowLevelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(buttonOpenLid)
+                    .addComponent(buttonCloseLid))
                .addContainerGap())
        );

@@ -720,7 +754,7 @@ public class Commands extends Panel {
            .addGroup(pnDatabaseLayout.createSequentialGroup()
                .addContainerGap()
                .addComponent(buttonClearSampleDb)
-                .addGap(18, 18, Short.MAX_VALUE)
+                .addGap(18, 68, Short.MAX_VALUE)
                .addComponent(buttonResetPuckIds)
                .addContainerGap())
        );
@@ -979,8 +1013,21 @@ public class Commands extends Panel {
        onTimer();
    }//GEN-LAST:event_buttonGripperDetectActionPerformed

+    private void buttonMoveGonioWaitActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonMoveGonioWaitActionPerformed
+        execute("move_gonio_wait()");
+    }//GEN-LAST:event_buttonMoveGonioWaitActionPerformed
+
+    private void buttonOpenLidActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonOpenLidActionPerformed
+        execute("open_lid()");
+    }//GEN-LAST:event_buttonOpenLidActionPerformed
+
+    private void buttonCloseLidActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonCloseLidActionPerformed
+        execute("close_lid()");
+    }//GEN-LAST:event_buttonCloseLidActionPerformed
+
    // Variables declaration - do not modify//GEN-BEGIN:variables
    private javax.swing.JButton buttonClearSampleDb;
+    private javax.swing.JButton buttonCloseLid;
    private javax.swing.JButton buttonDry;
    private javax.swing.JButton buttonEnableAll;
    private javax.swing.JButton buttonGetAux;
@@ -994,11 +1041,13 @@ public class Commands extends Panel {
    private javax.swing.JButton buttonMoveCold;
    private javax.swing.JButton buttonMoveDewar;
    private javax.swing.JButton buttonMoveGonio;
+    private javax.swing.JButton buttonMoveGonioWait;
    private javax.swing.JButton buttonMoveHeater;
    private javax.swing.JButton buttonMoveHome;
    private javax.swing.JButton buttonMovePark;
    private javax.swing.JButton buttonMoveRT;
    private javax.swing.JButton buttonMoveScanner;
+    private javax.swing.JButton buttonOpenLid;
    private javax.swing.JButton buttonPutAux;
    private javax.swing.JButton buttonPutDewar;
    private javax.swing.JButton buttonPutGonio;