src/main/java/ch/psi/mxsc/MainPanel.java

@@ -42,14 +42,14 @@ public class MainPanel extends Panel {
     /**
      * Creates new form Panel
      */
+    Boolean manualMode;
+    Boolean roomTemperature;
 
     public MainPanel() {
         initComponents();
         getContext().getPluginManager().addDynamicClass(PuckDetection.class);
         Controller.createInstance(this);
         basePlatePanel.setMode(BasePlatePanel.Mode.single);
-        labelRoomTemperature.setVisible(false);
-        labeManualMode.setVisible(false);
         setExpertMode(false);
         setDefaultDetail();
         
@@ -108,21 +108,6 @@ public class MainPanel extends Panel {
             });
             updateLevel(((Device) getDevice("dewar_level")).take());
 
-            ((Device) getDevice("filling_dewar")).addListener(new DeviceAdapter() {
-                @Override
-                public void onValueChanged(Device device, Object value, Object former) {
-                    updateFillingDeware(value);
-                }
-            });
-            updateFillingDeware(((Device) getDevice("filling_dewar")).take());
-
-            ((Device) getDevice("ln2_main_power")).addListener(new DeviceAdapter() {
-                @Override
-                public void onValueChanged(Device device, Object value, Object former) {
-                    updateFillingControl(value);
-                }
-            });
-            updateFillingControl(((Device) getDevice("ln2_main_power")).take());
 
             ((Device) getDevice("air_pressure_ok")).addListener(new DeviceAdapter() {
                 @Override   
@@ -159,7 +144,7 @@ public class MainPanel extends Panel {
             this.getLogger().log(Level.SEVERE, null, ex);
         }
         Controller.getInstance().updatePuckTypes();
-        startTimer(10000, 1000);
+        startTimer(10000, 10);
         updateCameraView();
         refreshSamplesTable();
 
@@ -175,15 +160,29 @@ public class MainPanel extends Panel {
     protected void onTimer() {
         devicesPanel.update();
         try {
-            labelRoomTemperature.setVisible(Controller.getInstance().isRoomTemp());
+            roomTemperature = Controller.getInstance().isRoomTemp();
+            ledRoomTemperature.setColor( roomTemperature ? Color.YELLOW : Color.GREEN);
+            labelRoomTemperature.setText(roomTemperature ? "Room Temperature" : "Cryo Operation");
+            try {
+                ledHeaterOk.setColor(roomTemperature ? Color.GREEN :( ((Double)panelHeaterTemp.getDevice().take())<20.0 ? Color.RED : Color.GREEN));
+            } catch (Exception ex) {
+                   ledHeaterOk.setColor(Color.BLACK);
+               }        
         } catch (Exception ex) {
-            labelRoomTemperature.setVisible(false);
+            roomTemperature = null;
+            ledRoomTemperature.setColor(Color.BLACK);
+            labelRoomTemperature.setText("Room Temperature");
         }
         try {
-            labeManualMode.setVisible(Controller.getInstance().isManualMode());
+            manualMode = Controller.getInstance().isManualMode();
+            ledManualMode.setColor( manualMode ? Color.YELLOW : Color.GREEN);
+            labelManualMode.setText(manualMode ? "Manual Mode" : "Remote Mode");                   
         } catch (Exception ex) {
-            labeManualMode.setVisible(false);
+            manualMode = null;
+            ledManualMode.setColor( Color.BLACK);
+            labelManualMode.setText("Unknown Robot Mode");
         }
+        updatePsysSafety(((Device) getDevice("feedback_psys_safety")).take());
     }
     
     
@@ -206,26 +205,6 @@ public class MainPanel extends Panel {
         }
     }
 
-    void updateFillingDeware(Object value) {
-        if ((value == null) || !(value instanceof Boolean)) {
-            ledFillingDewar.setColor(Color.BLACK);
-        } else if ((Boolean) value) {
-            ledFillingDewar.setColor(Color.GREEN);
-        } else {
-            ledFillingDewar.setColor(Color.BLACK);
-        }
-    }
-
-    void updateFillingControl(Object value) {
-        if ((value == null) || !(value instanceof Boolean)) {
-            ledFillingControl.setColor(Color.BLACK);
-        } else if ((Boolean) value) {
-            ledFillingControl.setColor(Color.GREEN);
-        } else {
-            ledFillingControl.setColor(Color.BLACK);
-        }
-    }
-
     void updateAirPressure(Object value) {
         if ((value == null) || !(value instanceof Boolean)) {
             ledAirPressure.setColor(Color.BLACK);
@@ -259,6 +238,8 @@ public class MainPanel extends Panel {
     void updatePsysSafety(Object value) {
         if ((value == null) || !(value instanceof Boolean)) {
             ledPsysSafety.setColor(Color.BLACK);
+        } else if ( Boolean.TRUE.equals(manualMode)){
+           ledPsysSafety.setColor(Color.YELLOW);
         } else if ((Boolean) value) {
             ledPsysSafety.setColor(Color.GREEN);
         } else {
@@ -354,7 +335,6 @@ public class MainPanel extends Panel {
         buttonCalibrateImage.setVisible(expert);
         buttonCalibrateCover.setVisible(expert);
         devicesPanel.setActive(expert);
-        buttonRelease.setVisible(expert);
         panelViewType.setVisible(expert);
         panelDetection.setVisible(expert);
         buttonDetectCover.setVisible(expert);
@@ -517,15 +497,6 @@ public class MainPanel extends Panel {
         led6 = new ch.psi.pshell.swing.Led();
         jLabel8 = new javax.swing.JLabel();
         jLabel9 = new javax.swing.JLabel();
-        panelLN2Control = new javax.swing.JPanel();
-        ledFillingControl = new ch.psi.pshell.swing.Led();
-        ledFillingDewar = new ch.psi.pshell.swing.Led();
-        jLabel4 = new javax.swing.JLabel();
-        jLabel5 = new javax.swing.JLabel();
-        deviceValuePanel1 = new ch.psi.pshell.swing.DeviceValuePanel();
-        jLabel14 = new javax.swing.JLabel();
-        labelRoomTemperature = new javax.swing.JLabel();
-        filler2 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 30), new java.awt.Dimension(0, 30), new java.awt.Dimension(32767, 30));
         panelSystemStatus = new javax.swing.JPanel();
         ledAirPressure = new ch.psi.pshell.swing.Led();
         jLabel24 = new javax.swing.JLabel();
@@ -536,8 +507,14 @@ public class MainPanel extends Panel {
         jLabell21 = new javax.swing.JLabel();
         ledPsysSafety = new ch.psi.pshell.swing.Led();
         buttonRelease = new javax.swing.JButton();
-        labeManualMode = new javax.swing.JLabel();
         filler1 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 30), new java.awt.Dimension(0, 30), new java.awt.Dimension(32767, 30));
+        ledRoomTemperature = new ch.psi.pshell.swing.Led();
+        labelRoomTemperature = new javax.swing.JLabel();
+        ledManualMode = new ch.psi.pshell.swing.Led();
+        labelManualMode = new javax.swing.JLabel();
+        ledHeaterOk = new ch.psi.pshell.swing.Led();
+        jLabel29 = new javax.swing.JLabel();
+        panelHeaterTemp = new ch.psi.pshell.swing.DeviceValuePanel();
         panelDatamatrix = new javax.swing.JPanel();
         jLabel11 = new javax.swing.JLabel();
         jLabel13 = new javax.swing.JLabel();
@@ -565,7 +542,8 @@ public class MainPanel extends Panel {
         jScrollPane3 = new javax.swing.JScrollPane();
         tablePucks = new javax.swing.JTable();
 
-        setPreferredSize(new java.awt.Dimension(1030, 625));
+        setPreferredSize(new java.awt.Dimension(1030, 530));
+        setRequestFocusEnabled(false);
 
         basePlatePanel.setBorder(javax.swing.BorderFactory.createTitledBorder("Dewar"));
 
@@ -768,7 +746,7 @@ public class MainPanel extends Panel {
                 .addGroup(basePlatePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addComponent(panelDetection, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(panelLegend, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 237, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 251, Short.MAX_VALUE)
                 .addGroup(basePlatePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addComponent(panelHexiposi, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(panelViewType, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
@@ -858,7 +836,7 @@ public class MainPanel extends Panel {
             .addGroup(panelLN2LevelLayout.createSequentialGroup()
                 .addContainerGap()
                 .addComponent(jPanel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addContainerGap())
+                .addGap(0, 0, 0))
         );
         panelLN2LevelLayout.setVerticalGroup(
             panelLN2LevelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -902,77 +880,7 @@ public class MainPanel extends Panel {
                 .addGroup(panelBeamlineStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(led6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(jLabel9))
-                .addContainerGap(26, Short.MAX_VALUE))
-        );
-
-        panelLN2Control.setBorder(javax.swing.BorderFactory.createTitledBorder("LN2 Control"));
-
-        jLabel4.setText("Control Active");
-
-        jLabel5.setText("Currently Filling");
-
-        deviceValuePanel1.setBorder(javax.swing.BorderFactory.createEtchedBorder());
-        deviceValuePanel1.setDeviceName("rim_heater_temp");
-
-        jLabel14.setText("Temperature:");
-
-        labelRoomTemperature.setForeground(java.awt.Color.orange);
-        labelRoomTemperature.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
-        labelRoomTemperature.setText("Room Temperature");
-
-        javax.swing.GroupLayout panelLN2ControlLayout = new javax.swing.GroupLayout(panelLN2Control);
-        panelLN2Control.setLayout(panelLN2ControlLayout);
-        panelLN2ControlLayout.setHorizontalGroup(
-            panelLN2ControlLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(panelLN2ControlLayout.createSequentialGroup()
-                .addContainerGap()
-                .addGroup(panelLN2ControlLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addGroup(panelLN2ControlLayout.createSequentialGroup()
-                        .addGroup(panelLN2ControlLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addGroup(panelLN2ControlLayout.createSequentialGroup()
-                                .addComponent(ledFillingDewar, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                .addComponent(jLabel5))
-                            .addGroup(panelLN2ControlLayout.createSequentialGroup()
-                                .addComponent(ledFillingControl, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                .addComponent(jLabel4)))
-                        .addGap(56, 72, Short.MAX_VALUE))
-                    .addGroup(panelLN2ControlLayout.createSequentialGroup()
-                        .addComponent(filler2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        .addGroup(panelLN2ControlLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addGroup(panelLN2ControlLayout.createSequentialGroup()
-                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                                .addComponent(jLabel14)
-                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                .addComponent(deviceValuePanel1, javax.swing.GroupLayout.PREFERRED_SIZE, 50, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                .addContainerGap())
-                            .addGroup(panelLN2ControlLayout.createSequentialGroup()
-                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                .addComponent(labelRoomTemperature, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))))
-        );
-        panelLN2ControlLayout.setVerticalGroup(
-            panelLN2ControlLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(panelLN2ControlLayout.createSequentialGroup()
-                .addGap(4, 4, 4)
-                .addGroup(panelLN2ControlLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(ledFillingControl, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(jLabel4))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(panelLN2ControlLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(ledFillingDewar, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(jLabel5))
-                .addGroup(panelLN2ControlLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addGroup(panelLN2ControlLayout.createSequentialGroup()
-                        .addGroup(panelLN2ControlLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
-                            .addComponent(jLabel14)
-                            .addComponent(deviceValuePanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addComponent(labelRoomTemperature, javax.swing.GroupLayout.PREFERRED_SIZE, 14, javax.swing.GroupLayout.PREFERRED_SIZE))
-                    .addGroup(panelLN2ControlLayout.createSequentialGroup()
-                        .addGap(4, 4, 4)
-                        .addComponent(filler2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
-                .addGap(4, 4, 4))
+                .addContainerGap(25, Short.MAX_VALUE))
         );
 
         panelSystemStatus.setBorder(javax.swing.BorderFactory.createTitledBorder("System Status"));
@@ -992,9 +900,14 @@ public class MainPanel extends Panel {
             }
         });
 
-        labeManualMode.setForeground(java.awt.Color.orange);
-        labeManualMode.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
-        labeManualMode.setText("Manual Mode");
+        labelRoomTemperature.setText("Room Temperature");
+
+        labelManualMode.setText("Manual Mode");
+
+        jLabel29.setText("Heater Ok");
+
+        panelHeaterTemp.setBorder(javax.swing.BorderFactory.createEtchedBorder());
+        panelHeaterTemp.setDeviceName("rim_heater_temp");
 
         javax.swing.GroupLayout panelSystemStatusLayout = new javax.swing.GroupLayout(panelSystemStatus);
         panelSystemStatus.setLayout(panelSystemStatusLayout);
@@ -1004,31 +917,50 @@ public class MainPanel extends Panel {
                 .addGap(10, 10, 10)
                 .addGroup(panelSystemStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addComponent(ledAirPressure, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(ledHeaterOk, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(ledN2Pressure, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(ledLocalSafety, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(ledPsysSafety, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(ledRoomTemperature, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(ledPsysSafety, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(ledManualMode, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(panelSystemStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addComponent(jLabel24)
                     .addComponent(jLabel25)
+                    .addGroup(panelSystemStatusLayout.createSequentialGroup()
+                        .addComponent(jLabel29)
+                        .addGap(18, 18, Short.MAX_VALUE)
+                        .addComponent(panelHeaterTemp, javax.swing.GroupLayout.PREFERRED_SIZE, 50, javax.swing.GroupLayout.PREFERRED_SIZE))
                     .addComponent(jLabel26)
-                    .addComponent(jLabell21))
+                    .addComponent(jLabell21)
+                    .addComponent(labelRoomTemperature)
+                    .addComponent(labelManualMode))
                 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
             .addGroup(panelSystemStatusLayout.createSequentialGroup()
                 .addComponent(filler1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(panelSystemStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(labeManualMode, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .addGroup(panelSystemStatusLayout.createSequentialGroup()
-                        .addGap(0, 0, Short.MAX_VALUE)
-                        .addComponent(buttonRelease)
-                        .addGap(0, 0, Short.MAX_VALUE)))
-                .addContainerGap())
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                .addComponent(buttonRelease)
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
         panelSystemStatusLayout.setVerticalGroup(
             panelSystemStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(panelSystemStatusLayout.createSequentialGroup()
-                .addGap(4, 4, 4)
+                .addContainerGap()
+                .addGroup(panelSystemStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addGroup(panelSystemStatusLayout.createSequentialGroup()
+                        .addGroup(panelSystemStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                            .addComponent(ledManualMode, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(labelManualMode))
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addGroup(panelSystemStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                            .addComponent(ledRoomTemperature, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(labelRoomTemperature))
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addGroup(panelSystemStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                            .addComponent(ledHeaterOk, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(jLabel29)))
+                    .addComponent(panelHeaterTemp, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(panelSystemStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(ledAirPressure, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(jLabel24))
@@ -1044,13 +976,12 @@ public class MainPanel extends Panel {
                 .addGroup(panelSystemStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(ledPsysSafety, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(jLabell21))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                 .addGroup(panelSystemStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(panelSystemStatusLayout.createSequentialGroup()
                         .addComponent(buttonRelease)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .addComponent(labeManualMode))
-                    .addComponent(filler1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                        .addGap(0, 0, Short.MAX_VALUE))
+                    .addComponent(filler1, javax.swing.GroupLayout.DEFAULT_SIZE, 35, Short.MAX_VALUE))
                 .addGap(4, 4, 4))
         );
 
@@ -1110,13 +1041,11 @@ public class MainPanel extends Panel {
             panelStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addComponent(panelBeamlineStatus, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
             .addComponent(panelDatamatrix, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-            .addComponent(panelLN2Control, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
             .addComponent(panelSystemStatus, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
         );
         panelStatusLayout.setVerticalGroup(
             panelStatusLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(panelStatusLayout.createSequentialGroup()
-                .addComponent(panelLN2Control, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                 .addGap(0, 0, 0)
                 .addComponent(panelSystemStatus, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                 .addGap(0, 0, 0)
@@ -1302,7 +1231,7 @@ public class MainPanel extends Panel {
             panelRightLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(panelRightLayout.createSequentialGroup()
                 .addGap(0, 0, 0)
-                .addComponent(panelDetail, javax.swing.GroupLayout.DEFAULT_SIZE, 147, Short.MAX_VALUE)
+                .addComponent(panelDetail, javax.swing.GroupLayout.DEFAULT_SIZE, 96, Short.MAX_VALUE)
                 .addGap(0, 0, 0)
                 .addComponent(panelDevices, javax.swing.GroupLayout.PREFERRED_SIZE, 274, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addGap(0, 0, 0)
@@ -1337,6 +1266,9 @@ public class MainPanel extends Panel {
                 .addGap(0, 0, 0))
         );
 
+        panelBottom.setPreferredSize(new java.awt.Dimension(810, 150));
+        panelBottom.setRequestFocusEnabled(false);
+
         jPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder("Samples"));
 
         tableSamples.setModel(new javax.swing.table.DefaultTableModel(
@@ -1363,7 +1295,7 @@ public class MainPanel extends Panel {
             jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(jPanel1Layout.createSequentialGroup()
                 .addGap(0, 0, 0)
-                .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 112, Short.MAX_VALUE)
+                .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 68, Short.MAX_VALUE)
                 .addGap(0, 0, 0))
         );
 
@@ -1463,14 +1395,14 @@ public class MainPanel extends Panel {
         layout.setHorizontalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addComponent(panelTop, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-            .addComponent(panelBottom, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+            .addComponent(panelBottom, javax.swing.GroupLayout.DEFAULT_SIZE, 1030, Short.MAX_VALUE)
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
                 .addComponent(panelTop, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                 .addGap(0, 0, 0)
-                .addComponent(panelBottom, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                .addComponent(panelBottom, javax.swing.GroupLayout.DEFAULT_SIZE, 91, Short.MAX_VALUE)
                 .addGap(1, 1, 1))
         );
     }// </editor-fold>//GEN-END:initComponents
@@ -1531,10 +1463,6 @@ public class MainPanel extends Panel {
         }
     }//GEN-LAST:event_buttonClearDetActionPerformed
 
-    private void buttonReleaseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonReleaseActionPerformed
-        execute("release_safety()", true);
-    }//GEN-LAST:event_buttonReleaseActionPerformed
-
             
     private void checkExpertActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_checkExpertActionPerformed
         setExpertMode(checkExpert.isSelected());
@@ -1592,6 +1520,10 @@ public class MainPanel extends Panel {
         this.showSettingsEditor(false);
     }//GEN-LAST:event_buttonConfigActionPerformed
 
+    private void buttonReleaseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonReleaseActionPerformed
+        execute("release_safety()", true);
+    }//GEN-LAST:event_buttonReleaseActionPerformed
+
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
     ch.psi.mxsc.BasePlatePanel basePlatePanel;
@@ -1609,15 +1541,12 @@ public class MainPanel extends Panel {
     private javax.swing.JButton buttonRecovery;
     private javax.swing.JButton buttonRelease;
     private javax.swing.JCheckBox checkExpert;
-    private ch.psi.pshell.swing.DeviceValuePanel deviceValuePanel1;
     private ch.psi.mxsc.DevicesPanel devicesPanel;
     private javax.swing.Box.Filler filler1;
-    private javax.swing.Box.Filler filler2;
     private ch.psi.mxsc.HexiposiPanel hexiposiPanel;
     private javax.swing.JLabel jLabel1;
     private javax.swing.JLabel jLabel11;
     private javax.swing.JLabel jLabel13;
-    private javax.swing.JLabel jLabel14;
     private javax.swing.JLabel jLabel15;
     private javax.swing.JLabel jLabel16;
     private javax.swing.JLabel jLabel19;
@@ -1627,9 +1556,8 @@ public class MainPanel extends Panel {
     private javax.swing.JLabel jLabel24;
     private javax.swing.JLabel jLabel25;
     private javax.swing.JLabel jLabel26;
+    private javax.swing.JLabel jLabel29;
     private javax.swing.JLabel jLabel3;
-    private javax.swing.JLabel jLabel4;
-    private javax.swing.JLabel jLabel5;
     private javax.swing.JLabel jLabel8;
     private javax.swing.JLabel jLabel9;
     private javax.swing.JLabel jLabell21;
@@ -1641,21 +1569,22 @@ public class MainPanel extends Panel {
     private javax.swing.JSeparator jSeparator1;
     private javax.swing.JSeparator jSeparator2;
     private javax.swing.JSeparator jSeparator3;
-    private javax.swing.JLabel labeManualMode;
+    private javax.swing.JLabel labelManualMode;
     private javax.swing.JLabel labelRoomTemperature;
     private ch.psi.pshell.swing.Led led5;
     private ch.psi.pshell.swing.Led led6;
     private ch.psi.pshell.swing.Led ledAirPressure;
-    private ch.psi.pshell.swing.Led ledFillingControl;
-    private ch.psi.pshell.swing.Led ledFillingDewar;
+    private ch.psi.pshell.swing.Led ledHeaterOk;
     private ch.psi.pshell.swing.Led ledLidControlActive1;
     private ch.psi.pshell.swing.Led ledLidControlActive2;
     private ch.psi.pshell.swing.Led ledLidControlActive3;
     private ch.psi.pshell.swing.Led ledLidControlActive4;
     private ch.psi.pshell.swing.Led ledLidControlActive5;
     private ch.psi.pshell.swing.Led ledLocalSafety;
+    private ch.psi.pshell.swing.Led ledManualMode;
     private ch.psi.pshell.swing.Led ledN2Pressure;
     private ch.psi.pshell.swing.Led ledPsysSafety;
+    private ch.psi.pshell.swing.Led ledRoomTemperature;
     private javax.swing.JPanel panelBeamlineStatus;
     private javax.swing.JPanel panelBottom;
     private javax.swing.JPanel panelDatamatrix;
@@ -1664,8 +1593,8 @@ public class MainPanel extends Panel {
     private javax.swing.JPanel panelDevices;
     private javax.swing.JPanel panelDisplayMode;
     private javax.swing.JPanel panelExpert;
+    private ch.psi.pshell.swing.DeviceValuePanel panelHeaterTemp;
     private javax.swing.JPanel panelHexiposi;
-    private javax.swing.JPanel panelLN2Control;
     private javax.swing.JPanel panelLN2Level;
     private javax.swing.JPanel panelLegend;
     private javax.swing.JPanel panelRight;