From 80c828036d0027fdf83d4e708486643660c20932 Mon Sep 17 00:00:00 2001
From: gac-S_Changer <gac-S_Changer@PC14192.psi.ch>
Date: Thu, 9 Jan 2025 15:15:56 +0100
Subject: [PATCH] Filter disabled pucks from free list

---
 src/main/java/ch/psi/mxsc/Controller.java | 4 ++--
 src/main/java/ch/psi/mxsc/Puck.java       | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ch/psi/mxsc/Controller.java b/src/main/java/ch/psi/mxsc/Controller.java
index f2e1513..5eeca5c 100644
--- a/src/main/java/ch/psi/mxsc/Controller.java
+++ b/src/main/java/ch/psi/mxsc/Controller.java
@@ -411,8 +411,8 @@ public class Controller {
     
     public List<Puck> getFreePucks() {
         List<Puck> ret = new ArrayList<>();
-        for (Puck p : basePlate.getPucks()) {                
-            if (p.getDetection() == Detection.Empty ) {
+        for (Puck p : basePlate.getPucks()) {                            
+            if (!p.isDisabled() && (p.getDetection() == Detection.Empty )) {
                 ret.add(p);
             }
         }
diff --git a/src/main/java/ch/psi/mxsc/Puck.java b/src/main/java/ch/psi/mxsc/Puck.java
index 1c6b5b4..59c989f 100644
--- a/src/main/java/ch/psi/mxsc/Puck.java
+++ b/src/main/java/ch/psi/mxsc/Puck.java
@@ -382,6 +382,7 @@ public class Puck extends DeviceBase {
          return (getSegment() - new Character('A')) * BasePlate.numberOfPucksPerSegments + getNumber() - 1;
     }
 
+    /*
     boolean enabled;
 
     public boolean isEnabled() {
@@ -391,6 +392,7 @@ public class Puck extends DeviceBase {
     public void setEnabled(boolean value) {
         enabled = value;
     }
+*/
 
     public enum Detection {
         Empty,