Fix abort command is ignored

Author: luc-github

cmake/dev_tools.cmake

@@ -9,7 +9,7 @@
 # 2 = Debug
 # 1 = Error only
 # 0 = Disabled
-set(ESP3D_TFT_LOG_LEVEL 0)
+set(ESP3D_TFT_LOG_LEVEL 2)
 add_compile_options(-DESP3D_TFT_LOG=${ESP3D_TFT_LOG_LEVEL})
 
 # ANSI Color in Logs

main/modules/gcode_host/esp3d_gcode_host_service.cpp

@@ -1229,7 +1229,7 @@ void ESP3DGCodeHostService::_handle_notifications() {
       }
     }
     if (ulTaskNotifyTakeIndexed(_xAbortNotifyIndex, pdTRUE, 0)) {
-      esp3d_log("Received abort notification");
+      esp3d_log_d("Received abort notification");
       if (state != ESP3DGcodeStreamState::undefined) {
         if (!_setStreamRequestState(ESP3DGcodeStreamState::abort)) {
           esp3d_log_e("Failed to abort stream");
@@ -1303,7 +1303,7 @@ void ESP3DGCodeHostService::_handle_stream_states() {
       // check if we have a requested command to process before reading the
       // next
       if (_requested_state != (ESP3DGcodeStreamState::undefined)) {
-        if (_requested_state == ESP3DGcodeStreamState::pause) {
+        if (_requested_state == ESP3DGcodeStreamState::pause || _requested_state == ESP3DGcodeStreamState::abort) {
           // pause the stream
           _setStreamState(_requested_state);
         } else {
@@ -1592,11 +1592,15 @@ void ESP3DGCodeHostService::_handle_stream_states() {
       /////////////////////////////////////////////////////////
       // only valid for main stream
     case ESP3DGcodeStreamState::abort:
+      esp3d_log_d("Received abort notification");
       if (!_setMainStreamState(ESP3DGcodeStreamState::end)) {
         esp3d_log_e("Abort only valid for main stream");
         break;
       }
+      esp3d_log_d("Aborting current stream");
+      
       if (_stop_script.length() > 0) {
+        esp3d_log_d("Adding stop script");
         _add_stream(_stop_script.c_str(), _current_main_stream_ptr->auth_type,
                     true);
       }

main/modules/gcode_host/esp3d_gcode_host_service.h

@@ -122,9 +122,9 @@ class ESP3DGCodeHostService : public ESP3DClient {
 
   TaskHandle_t _xHandle = NULL;
   bool _started = false;
-  const UBaseType_t _xPauseNotifyIndex = 1;
-  const UBaseType_t _xResumeNotifyIndex = 2;
-  const UBaseType_t _xAbortNotifyIndex = 3;
+  const UBaseType_t _xPauseNotifyIndex = 0;
+  const UBaseType_t _xResumeNotifyIndex = 1;
+  const UBaseType_t _xAbortNotifyIndex = 2;
 
   ESP3DClientType _outputClient = ESP3DClientType::no_client;
   bool _awaitingAck = false;