FluidNC usability fixes (#2135)

Made a couple of usability changes to the FluidNC implementation: * When stopping a running GCode program it will no longer fully reset the controller * When initializing and it starts in Alarm or Hold state it will now do a quick check if it is finite and requires a reset * Made the command text area active on alarms to be able to reconfigure the controller * Made the console window focusable again to be able to copy text * Made the file browser openable on alarm state
winder · Jan 21, 2023 · f49b390 · f49b390
1 parent 1687b2a
commit f49b390
Show file tree

Hide file tree

Showing 12 changed files with 406 additions and 175 deletions.
diff --git a/ugs-core/src/com/willwinder/universalgcodesender/GrblController.java b/ugs-core/src/com/willwinder/universalgcodesender/GrblController.java
@@ -34,6 +34,7 @@ This file is part of Universal Gcode Sender (UGS).
 import com.willwinder.universalgcodesender.types.GcodeCommand;
 import com.willwinder.universalgcodesender.types.GrblFeedbackMessage;
 import com.willwinder.universalgcodesender.types.GrblSettingMessage;
+import com.willwinder.universalgcodesender.utils.ControllerUtils;
 import com.willwinder.universalgcodesender.utils.GrblLookups;
 import org.apache.commons.lang3.StringUtils;
 
@@ -378,33 +379,7 @@ public CommunicatorState getCommunicatorState() {
             return super.getCommunicatorState();
         }
 
-        ControllerState state = this.controllerStatus == null ? ControllerState.DISCONNECTED : this.controllerStatus.getState();
-        switch(state) {
-            case JOG:
-            case RUN:
-                return CommunicatorState.COMM_SENDING;
-            case HOLD:
-            case DOOR:
-                return CommunicatorState.COMM_SENDING_PAUSED;
-            case IDLE:
-                if (isStreaming()){
-                    return CommunicatorState.COMM_SENDING_PAUSED;
-                } else {
-                    return CommunicatorState.COMM_IDLE;
-                }
-            case ALARM:
-                return CommunicatorState.COMM_IDLE;
-            case CHECK:
-                if (isStreaming() && comm.isPaused()) {
-                    return CommunicatorState.COMM_SENDING_PAUSED;
-                } else if (isStreaming() && !comm.isPaused()) {
-                    return CommunicatorState.COMM_SENDING;
-                } else {
-                    return COMM_CHECK;
-                }
-            default:
-                return CommunicatorState.COMM_IDLE;
-        }
+        return ControllerUtils.getCommunicatorState(controllerStatus.getState(), this, comm);
     }
 
     /**

diff --git a/ugs-core/src/com/willwinder/universalgcodesender/SmoothieController.java b/ugs-core/src/com/willwinder/universalgcodesender/SmoothieController.java
@@ -30,6 +30,7 @@ This file is part of Universal Gcode Sender (UGS).
 import com.willwinder.universalgcodesender.listeners.MessageType;
 import com.willwinder.universalgcodesender.model.*;
 import com.willwinder.universalgcodesender.types.GcodeCommand;
+import com.willwinder.universalgcodesender.utils.ControllerUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import static com.willwinder.universalgcodesender.model.CommunicatorState.*;
@@ -274,32 +275,7 @@ public void killAlarmLock() throws Exception {
 
     @Override
     public CommunicatorState getCommunicatorState() {
-        ControllerState state = controllerStatus.getState();
-        switch(state) {
-            case JOG:
-            case RUN:
-                return COMM_SENDING;
-            case HOLD:
-            case DOOR:
-                return COMM_SENDING_PAUSED;
-            case IDLE:
-                if (isStreaming()){
-                    return COMM_SENDING_PAUSED;
-                } else {
-                    return COMM_IDLE;
-                }
-            case CHECK:
-                if (isStreaming() && comm.isPaused()) {
-                    return COMM_SENDING_PAUSED;
-                } else if (isStreaming() && !comm.isPaused()) {
-                    return COMM_SENDING;
-                } else {
-                    return COMM_CHECK;
-                }
-            case ALARM:
-            default:
-                return COMM_IDLE;
-        }
+        return ControllerUtils.getCommunicatorState(controllerStatus.getState(), this, comm);
     }
 
     @Override

diff --git a/ugs-core/src/com/willwinder/universalgcodesender/TinyGController.java b/ugs-core/src/com/willwinder/universalgcodesender/TinyGController.java
@@ -34,6 +34,7 @@ This file is part of Universal Gcode Sender (UGS).
 import com.willwinder.universalgcodesender.model.*;
 import com.willwinder.universalgcodesender.types.GcodeCommand;
 import com.willwinder.universalgcodesender.types.TinyGGcodeCommand;
+import com.willwinder.universalgcodesender.utils.ControllerUtils;
 
 import java.util.List;
 import java.util.Optional;
@@ -42,8 +43,6 @@ This file is part of Universal Gcode Sender (UGS).
 
 import static com.willwinder.universalgcodesender.model.CommunicatorState.COMM_CHECK;
 import static com.willwinder.universalgcodesender.model.CommunicatorState.COMM_IDLE;
-import static com.willwinder.universalgcodesender.model.CommunicatorState.COMM_SENDING;
-import static com.willwinder.universalgcodesender.model.CommunicatorState.COMM_SENDING_PAUSED;
 
 /**
  * TinyG Control layer, coordinates all aspects of control.
@@ -430,32 +429,7 @@ public CommunicatorState getCommunicatorState() {
     }
 
     protected CommunicatorState getControlState(ControllerState controllerState) {
-        switch (controllerState) {
-            case JOG:
-            case RUN:
-                return COMM_SENDING;
-            case HOLD:
-            case DOOR:
-                return COMM_SENDING_PAUSED;
-            case IDLE:
-                if (isStreaming()) {
-                    return COMM_SENDING_PAUSED;
-                } else {
-                    return COMM_IDLE;
-                }
-            case ALARM:
-                return COMM_IDLE;
-            case CHECK:
-                if (isStreaming() && comm.isPaused()) {
-                    return COMM_SENDING_PAUSED;
-                } else if (isStreaming() && !comm.isPaused()) {
-                    return COMM_SENDING;
-                } else {
-                    return COMM_CHECK;
-                }
-            default:
-                return COMM_IDLE;
-        }
+        return ControllerUtils.getCommunicatorState(controllerState, this, comm);
     }
 
     @Override