Lots of changes regadring the ExtUI implementation, Filament runout, Start, Stop, Pause and Resume.

2023-05-23 15:22:25 +02:00
parent 4d6715761d
commit 52dc811774
7 changed files with 351 additions and 648 deletions
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -37,9 +37,6 @@
 */
 #define CONFIGURATION_H_VERSION 02010200
 #define ANYCUBIC_TOUCHSCREEN
-#if DISABLED(KNUTWURST_4MAXP2)
-  #define ANYCUBIC_FILAMENT_RUNOUT_SENSOR
-#endif
 #define KNUTWURST_SPECIAL_MENU
 #define KNUTWURST_SPECIAL_MENU_WO_SD
 // #define ANYCUBIC_TFT_DEBUG
--- a/Marlin/src/gcode/feature/pause/M600.cpp
+++ b/Marlin/src/gcode/feature/pause/M600.cpp
@@ -30,13 +30,6 @@
 #include "../../../module/printcounter.h"
 #include "../../../lcd/marlinui.h"

-// PATCH START: Knutwurst
-#ifdef ANYCUBIC_TOUCHSCREEN
-  #include "../../../lcd/extui/knutwurst/anycubic_touchscreen.h"
-  #include "../../../sd/cardreader.h"
-#endif
-// PATCH END: Knutwurst
-
 #if HAS_MULTI_EXTRUDER
  #include "../../../module/tool_change.h"
 #endif
@@ -78,29 +71,6 @@
 *  Default values are used for omitted arguments.
 */
 void GcodeSuite::M600() {
-  // PATCH START: Knutwurst
-  #ifdef ANYCUBIC_TOUCHSCREEN
-    #ifdef SDSUPPORT
-      if (card.isPrinting()) { // are we printing from sd?
-        if (AnycubicTouchscreen.ai3m_pause_state < 2) {
-          AnycubicTouchscreen.ai3m_pause_state = 2;
-          #ifdef ANYCUBIC_TFT_DEBUG
-            SERIAL_ECHOPGM(" DEBUG: M600 - AI3M Pause State set to: ", AnycubicTouchscreen.ai3m_pause_state);
-            SERIAL_EOL();
-          #endif
-        }
-        #ifdef ANYCUBIC_TFT_DEBUG
-          SERIAL_ECHOLNPGM("DEBUG: Enter M600 TFTstate routine");
-        #endif
-        AnycubicTouchscreen.TFTstate = ANYCUBIC_TFT_STATE_SDPAUSE_REQ; // enter correct display state to show resume button
-        #ifdef ANYCUBIC_TFT_DEBUG
-          SERIAL_ECHOLNPGM("DEBUG: Set TFTstate to SDPAUSE_REQ");
-        #endif
-      }
-    #endif
-  #endif
-  // PATCH END: Knutwurst
-
  #if ENABLED(MIXING_EXTRUDER)
    const int8_t eindex = get_target_e_stepper_from_command();
    if (eindex < 0) return;
--- a/Marlin/src/gcode/temp/M104_M109.cpp
+++ b/Marlin/src/gcode/temp/M104_M109.cpp
@@ -38,10 +38,6 @@

 #include "../../MarlinCore.h" // for startOrResumeJob, etc.

-#ifdef ANYCUBIC_TOUCHSCREEN
-  #include "../../lcd/extui/knutwurst/anycubic_touchscreen.h"
-#endif
-
 #if ENABLED(PRINTJOB_TIMER_AUTOSTART)
  #include "../../module/printcounter.h"
  #if ENABLED(CANCEL_OBJECTS)
@@ -133,10 +129,6 @@ void GcodeSuite::M104_M109(const bool isM109) {
      thermalManager.set_heating_message(target_extruder, !isM109 && got_temp);
  }

-  #ifdef ANYCUBIC_TOUCHSCREEN
-    AnycubicTouchscreen.HeatingStart();
-  #endif
-
  TERN_(AUTOTEMP, planner.autotemp_M104_M109());

  if (isM109 && got_temp)
@@ -144,11 +136,6 @@ void GcodeSuite::M104_M109(const bool isM109) {

  // flush the serial buffer after heating to prevent lockup by m105
  SERIAL_FLUSH();
-
-  #ifdef ANYCUBIC_TOUCHSCREEN
-    AnycubicTouchscreen.CommandScan();
-    AnycubicTouchscreen.BedHeatingDone();
-  #endif
 }

 #endif // EXTRUDERS
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -41,10 +41,10 @@
 * here we define this default string as the date where the latest release
 * version was tagged.
 */
- #define CUSTOM_BUILD_VERSION "1.5.0-b3"
+ #define CUSTOM_BUILD_VERSION "1.5.0-b4"

 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2023-01-03"
+  #define STRING_DISTRIBUTION_DATE "2023-05-22"
 #endif

 /**
--- a/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.cpp
+++ b/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.cpp
--- a/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.h
+++ b/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.h
@@ -28,10 +28,6 @@
 #include "../../../inc/MarlinConfigPre.h"
 #include "../../../module/probe.h"

-
-enum axis_t     : uint8_t { X, Y, Z, X2, Y2, Z2, Z3, Z4 };
-enum extruder_t : uint8_t { E0, E1, E2, E3, E4, E5, E6, E7 };
-void setAxisPosition_mm(const float, const axis_t, const feedRate_t=0);
 void initializeGrid();

 char *itostr2(const uint8_t &x);
@@ -47,9 +43,9 @@ char *itostr2(const uint8_t &x);
 #define MAX_PRINTABLE_FILENAME_LEN 26

 #if ENABLED(KNUTWURST_CHIRON)
-  #define FILAMENT_RUNOUT_PIN 33
+  #define FIL_RUNOUT_PIN 33
 #else
-  #define FILAMENT_RUNOUT_PIN 19
+  #define FIL_RUNOUT_PIN 19
 #endif

 #define ANYCUBIC_TFT_STATE_IDLE 0
@@ -60,6 +56,25 @@ char *itostr2(const uint8_t &x);
 #define ANYCUBIC_TFT_STATE_SDSTOP_REQ 5
 #define ANYCUBIC_TFT_STATE_SDOUTAGE 99

+enum AnycubicMediaPrintState {
+  AMPRINTSTATE_NOT_PRINTING,
+  AMPRINTSTATE_PRINTING,
+  AMPRINTSTATE_PAUSE_REQUESTED,
+  AMPRINTSTATE_PAUSED,
+  AMPRINTSTATE_STOP_REQUESTED
+};
+
+enum AnycubicMediaPauseState {
+  AMPAUSESTATE_NOT_PAUSED,
+  AMPAUSESTATE_PARKING,
+  AMPAUSESTATE_PARKED,
+  AMPAUSESTATE_FILAMENT_OUT,
+  AMPAUSESTATE_FILAMENT_PURGING,
+  AMPAUSESTATE_HEATER_TIMEOUT,
+  AMPAUSESTATE_REHEATING,
+  AMPAUSESTATE_REHEAT_FINISHED
+};
+
 #if DISABLED(KNUTWURST_DGUS2_TFT)
  #define SM_DIR_UP_L           "/.."
  #define SM_DIR_UP_S           ".."
@@ -245,37 +260,24 @@ char *itostr2(const uint8_t &x);
 class AnycubicTouchscreenClass {
 public:
 AnycubicTouchscreenClass();
+
 void Setup();
 void CommandScan();
-void BedHeatingStart();
-void BedHeatingDone();
-void HeatingDone();
-void HeatingStart();
 void FilamentRunout();
+void DoFilamentRunoutCheck();
 void UserConfirmRequired(const char *);
 void SDCardStateChange(bool);
 void SDCardError();
 void KillTFT();
+static void OnPrintTimerStarted();
+static void OnPrintTimerPaused();
+static void OnPrintTimerStopped();
 #if BOTH(ANYCUBIC_TFT_DEBUG, KNUTWURST_DGUS2_TFT)
  void Command(const char * const command);
 #endif
 #if ENABLED(KNUTWURST_TFT_LEVELING)
  void LevelingDone();
 #endif
-char TFTstate = ANYCUBIC_TFT_STATE_IDLE;
-
-/**
-     * Anycubic TFT pause states:
-     *
-     * 0 - printing / stopped
-     * 1 - regular pause
-     * 2 - M600 pause
-     * 3 - filament runout pause
-     * 4 - nozzle timeout on regular pause   // OBSOLETE
-     * 5 - nozzle timeout on M600            // OBSOLETE
-     * 6 - nozzle timeout on filament runout // OBSOLETE
-     */
-uint8_t ai3m_pause_state = 0;

 private:
 char TFTcmdbuffer[TFTBUFSIZE][TFT_MAX_CMD_SIZE];
@@ -297,6 +299,9 @@ int currentFlowRate       = 0;
 bool PrintdoneAndPowerOFF = true;
 bool powerOFFflag         = 0;

+static AnycubicMediaPrintState mediaPrintingState;
+static AnycubicMediaPauseState mediaPauseState;
+
 #if defined(POWER_OUTAGE_TEST)
  struct OutageDataStruct {
    char OutageDataVersion;
@@ -322,12 +327,12 @@ void CheckSDCardChange();
 void CheckHeaterError();
 void HandleSpecialMenu();
 void FilamentChangePause();
-void FilamentChangeResume();
+void ResumePrint();
 void ReheatNozzle();
 void ParkAfterStop();

-char currentTouchscreenSelection[64];
-char currentFileOrDirectory[64];
+char currentTouchscreenSelection[30];
+char currentFileOrDirectory[30];
 String flowRateBuffer;
 String zOffsetBuffer;
 uint16_t MyFileNrCnt          = 0;
@@ -340,13 +345,6 @@ uint8_t BLTouchMenu = false;
 uint8_t LevelMenu   = false;
 uint8_t CaseLight   = true;

-#if ENABLED(ANYCUBIC_FILAMENT_RUNOUT_SENSOR)
-  char FilamentTestStatus     = false;
-  char FilamentTestLastStatus = false;
-  bool FilamentSetMillis      = true;
-  int FilamentRunoutCounter   = 0;
-#endif
-
 #if ENABLED(KNUTWURST_MEGA_P_LASER)
  typedef struct {
    unsigned char bfType[2];
--- a/Marlin/src/lcd/extui/knutwurst/knutwurst_extui.cpp
+++ b/Marlin/src/lcd/extui/knutwurst/knutwurst_extui.cpp
@@ -43,9 +43,9 @@ namespace ExtUI {
  void onPlayTone(const uint16_t frequency, const uint16_t duration) {
    TERN_(SPEAKER, ::tone(BEEPER_PIN, frequency, duration));
  }
-  void onPrintTimerStarted()  { }
-  void onPrintTimerPaused()   { }
-  void onPrintTimerStopped()  { }
+  void onPrintTimerStarted()  { AnycubicTouchscreen.OnPrintTimerStarted(); }
+  void onPrintTimerPaused()   { AnycubicTouchscreen.OnPrintTimerPaused(); }
+  void onPrintTimerStopped()  { AnycubicTouchscreen.OnPrintTimerStopped(); }
  void onFilamentRunout(const extruder_t extruder)   { AnycubicTouchscreen.FilamentRunout(); }
  void onUserConfirmRequired(const char * const msg) { AnycubicTouchscreen.UserConfirmRequired(msg); }
  void onStatusChanged(const char * const msg) {}