Update - small fixes

remove watchdog, fixes 3% print progress #229
improve auto_confirm on Draw_PrintDone
add Version.h to _configs
arrange BUTTON_PRESSED

Author: classicrocker883

Marlin/src/lcd/buttons.h

@@ -156,8 +156,6 @@
   #define EN_D 0
 #endif
 
-#define BUTTON_PRESSED(BN) (_BUTTON_PRESSED_##BN)
-
 #if BUTTON_EXISTS(EN1)
   #define _BUTTON_PRESSED_EN1 _BUTTON_PRESSED(EN1)
 #else
@@ -204,6 +202,8 @@
   #define _BUTTON_PRESSED_BACK false
 #endif
 
+#define BUTTON_PRESSED(BN) (_BUTTON_PRESSED_##BN)
+
 #ifndef BUTTON_CLICK
   #if EN_C > 0
     #define BUTTON_CLICK() (buttons & EN_C)

Marlin/src/lcd/e3v2/proui/dwin.cpp

@@ -623,6 +623,14 @@ void Goto_PrintProcess() {
 }
 
 void Draw_PrintDone() {
+  #if ENABLED(PROUI_ITEM_CONF)
+    if (HMI_data.auto_confirm) {
+      wait_for_user = false;
+      select_page.reset();
+      Goto_Main_Menu();
+      return;
+    }
+  #endif
   TERN_(SET_PROGRESS_PERCENT, ui.set_progress_done();)
   TERN_(SET_REMAINING_TIME, ui.reset_remaining_time();)
   TERN_(SET_INTERACTION_TIME, ui.reset_interaction_time();)

Marlin/src/lcd/e3v2/proui/proui.h

@@ -230,7 +230,7 @@ typedef struct {
   OPTCODE(PROUI_GRID_PNTS, uint8_t grid_max_points = DEF_GRID_MAX_POINTS)
 #if HAS_BED_PROBE
   IF_DISABLED(BD_SENSOR, uint8_t multiple_probing = MULTIPLE_PROBING;)
-  uint16_t zprobefeedslow = DEF_Z_PROBE_FEEDRATE_SLOW ;
+  uint16_t zprobefeedslow = DEF_Z_PROBE_FEEDRATE_SLOW;
 #endif
   OPTCODE(HAS_EXTRUDERS, bool Invert_E0 = DEF_INVERT_E0_DIR)
 #endif

Marlin/src/sd/cardreader.cpp

@@ -1125,7 +1125,6 @@ void CardReader::selectFileByIndex(const int16_t nr) {
   #endif
   workDir.rewind();
   selectByIndex(workDir, nr);
-  hal.watchdog_refresh(); // Prevent watchdog reset in long listings
 }
 
 //

buildroot/bin/restore_configs

@@ -26,6 +26,7 @@ else:
   files_to_checkout = [
     "Marlin/Configuration.h",
     "Marlin/Configuration_adv.h",
+    "Marlin/Version.h",
     "Marlin/config.ini",
     "Marlin/src/pins/*/pins_*.h"
   ]

buildroot/bin/use_example_configs

@@ -18,7 +18,7 @@ import os, subprocess, sys, urllib.request, urllib.error
 from pathlib import Path
 
 DEBUGGING = False
-CONFIG_FILES = ("Configuration.h", "Configuration_adv.h", "_Bootscreen.h", "_Statusscreen.h")
+CONFIG_FILES = ("Configuration.h", "Configuration_adv.h", "Version.h", "_Bootscreen.h", "_Statusscreen.h")
 
 def debug_print(s):
     if DEBUGGING: print(s)

buildroot/share/PlatformIO/scripts/configuration.py

@@ -151,6 +151,7 @@ def fetch_example(url):
     for fn in (
         "Configuration.h",
         "Configuration_adv.h",
+        "Version.h",
         "_Bootscreen.h",
         "_Statusscreen.h"
     ):