From 65e6c47aa8a9dbb0552f97b0539dfb337f5ace20 Mon Sep 17 00:00:00 2001 From: gac-S_Changer Date: Tue, 2 Jul 2019 13:36:46 +0200 Subject: [PATCH] Fixed bug reporting puck detection error --- src/main/java/ch/psi/mxsc/PuckState.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/ch/psi/mxsc/PuckState.java b/src/main/java/ch/psi/mxsc/PuckState.java index 9bd6fc3..06cfed0 100644 --- a/src/main/java/ch/psi/mxsc/PuckState.java +++ b/src/main/java/ch/psi/mxsc/PuckState.java @@ -63,16 +63,20 @@ public class PuckState { case Mechanical: if (this.mecSwitch ==SwitchState.On ) { basePlate.getPucks()[id - 1].detection = Puck.Detection.Present; - } else { + } else if (this.mecSwitch ==SwitchState.Off ) { basePlate.getPucks()[id - 1].detection = Puck.Detection.Empty; + } else { + basePlate.getPucks()[id - 1].detection = Puck.Detection.Error; } break; case Inductive: if (this.indSwitch ==SwitchState.On ) { basePlate.getPucks()[id - 1].detection = Puck.Detection.Present; - } else { + } else if (this.indSwitch ==SwitchState.Off ) { basePlate.getPucks()[id - 1].detection = Puck.Detection.Empty; + } else { + basePlate.getPucks()[id - 1].detection = Puck.Detection.Error; } break;