pshell/MXSC
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Puck detetion mode - during loading only

Browse Source
This commit is contained in:
gac-S_Changer
2025-08-21 11:27:10 +02:00
parent 45cb47eb71
commit 114c800ac2
9 changed files with 159 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/ch/psi/mxsc/MainPanel.java
View File

@@ -504,12 +504,8 @@ public class MainPanel extends Panel {
Controller.getInstance().onTimer();
if (getState() == State.Ready) {
Boolean puckLoading = Controller.getInstance().isPuckLoading();
if (puckLoading==null){
setStatus("Ready");
} else {
setStatus(puckLoading ? PUCK_LOADING_STATUS : PUCK_UNLOADING_STATUS);
}
boolean puckLoading = Controller.getInstance().isPuckLoading();
setStatus((puckLoading==false) ? "Ready" : PUCK_LOADING_STATUS);
} else {
status = null;
}
@@ -672,7 +668,7 @@ public class MainPanel extends Panel {
}
if (!Boolean.TRUE.equals(value)){
try {
Controller.getInstance().setPuckLoading(null);
Controller.getInstance().setPuckLoading(false);
} catch (Exception ex) {
getLogger().log(Level.WARNING, null, ex);
}
@@ -1141,7 +1137,7 @@ public class MainPanel extends Panel {
Boolean.FALSE.equals(Controller.getInstance().isDoorClosed())){
try{
if ((fmm!=null)){
Controller.getInstance().setPuckLoading(null);
Controller.getInstance().setPuckLoading(false);
} else {
if (doorsHaveOpened){
doorsHaveOpened=false;