From 616dd5e11a0c56047006777e089d382a82cf0a54 Mon Sep 17 00:00:00 2001
From: Viktor Hollmann <vho@volny.cz>
Date: Sat, 18 Nov 2023 01:32:09 +0100
Subject: [PATCH 01/11] Enabling Host Action Commands

---
 Marlin/Configuration_adv.h | 2 +-
 Marlin/Version.h           | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 28447f135a..9da54ff14a 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -3788,7 +3788,7 @@
  * Host Prompt Support enables Marlin to use the host for user prompts so
  * filament runout and other processes can be managed from the host side.
  */
-//#define HOST_ACTION_COMMANDS
+#define HOST_ACTION_COMMANDS
 #if ENABLED(HOST_ACTION_COMMANDS)
   //#define HOST_PROMPT_SUPPORT
   //#define HOST_START_MENU_ITEM  // Add a menu item that tells the host to start
diff --git a/Marlin/Version.h b/Marlin/Version.h
index 2a5f451c79..23ee5d79b8 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -28,25 +28,25 @@
 /**
  * Marlin release version identifier
  */
-//#define SHORT_BUILD_VERSION "2.0.9.1"
+#define SHORT_BUILD_VERSION "2.0.9.1"
 
 /**
  * Verbose version identifier which should contain a reference to the location
  * from where the binary was downloaded or the source code was compiled.
  */
-//#define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION
+#define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION
 
 /**
  * The STRING_DISTRIBUTION_DATE represents when the binary file was built,
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-06-27"
+#define STRING_DISTRIBUTION_DATE "2023-11-18"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
  */
-//#define MACHINE_NAME "3D Printer"
+#define MACHINE_NAME "Snapmaker J1s VH_v0.0.1"
 
 /**
  * The SOURCE_CODE_URL is the location where users will find the Marlin Source

From ce0d0add286cf9bd55f5902ebf9cf512a8050509 Mon Sep 17 00:00:00 2001
From: Viktor <vho@volny.cz>
Date: Sat, 16 Mar 2024 10:16:18 +0100
Subject: [PATCH 02/11] Config changes

---
 Marlin/Configuration.h     | 8 ++++----
 Marlin/Configuration_adv.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 548665543e..b0465778b7 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -571,15 +571,15 @@
 #if ENABLED(PIDTEMP)
   //#define PID_EDIT_MENU         // Add PID editing to the "Advanced Settings" menu. (~700 bytes of PROGMEM)
   //#define PID_AUTOTUNE_MENU     // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of PROGMEM)
-  #define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders)
+  //#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders)
                                   // Set/get with gcode: M301 E[extruder number, 0-2]
 
   #if ENABLED(PID_PARAMS_PER_HOTEND)
     // Specify between 1 and HOTENDS values per array.
     // If fewer than EXTRUDER values are provided, the last element will be repeated.
-    #define DEFAULT_Kp_LIST {  18.3,  18.3 }
-    #define DEFAULT_Ki_LIST {  1.09,  1.09 }
-    #define DEFAULT_Kd_LIST { 76.75, 76.75 }
+    #define DEFAULT_Kp_LIST {  22.20,  22.20 }
+    #define DEFAULT_Ki_LIST {   1.08,   1.08 }
+    #define DEFAULT_Kd_LIST { 114.00, 114.00 }
   #else
     // #define DEFAULT_Kp 14.18
     // #define DEFAULT_Ki 0.80
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 9da54ff14a..28447f135a 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -3788,7 +3788,7 @@
  * Host Prompt Support enables Marlin to use the host for user prompts so
  * filament runout and other processes can be managed from the host side.
  */
-#define HOST_ACTION_COMMANDS
+//#define HOST_ACTION_COMMANDS
 #if ENABLED(HOST_ACTION_COMMANDS)
   //#define HOST_PROMPT_SUPPORT
   //#define HOST_START_MENU_ITEM  // Add a menu item that tells the host to start

From f972f87467629465ab1327a5356a6078d526cd6e Mon Sep 17 00:00:00 2001
From: Viktor <vho@volny.cz>
Date: Sat, 16 Mar 2024 13:13:17 +0100
Subject: [PATCH 03/11] Pokus #2

---
 Marlin/Configuration.h     | 10 +++++-----
 Marlin/Configuration_adv.h |  2 +-
 Marlin/Version.h           |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index b0465778b7..3398704d1b 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -143,7 +143,7 @@
 #endif
 
 // Name displayed in the LCD "Ready" message and Info menu
-//#define CUSTOM_MACHINE_NAME "3D Printer"
+#define CUSTOM_MACHINE_NAME "Snapmaker J1 VH"
 
 // Printer's unique ID, used by some programs to differentiate between machines.
 // Choose your own or use a service like https://www.uuidgenerator.net/version4
@@ -683,7 +683,7 @@
 #endif // PIDTEMPCHAMBER
 
 #if ANY(PIDTEMP, PIDTEMPBED, PIDTEMPCHAMBER)
-  #define PID_DEBUG             // Sends debug data to the serial port. Use 'M303 D' to toggle activation.
+  //#define PID_DEBUG             // Sends debug data to the serial port. Use 'M303 D' to toggle activation.
   //#define PID_OPENLOOP          // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX
   //#define SLOW_PWM_HEATERS      // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay
   #define PID_FUNCTIONAL_RANGE 15 // If the temperature difference between the target temperature and the actual temperature
@@ -1297,8 +1297,8 @@
 
 // @section extruder
 
-#define DISABLE_E false             // Disable the extruder when not stepping
-// #define DISABLE_INACTIVE_EXTRUDER   // Keep only the active extruder enabled
+#define DISABLE_E false             // Disable the extruder when not stepping QQQ
+#define DISABLE_INACTIVE_EXTRUDER   // Keep only the active extruder enabled
 
 // @section machine
 
@@ -1424,7 +1424,7 @@
  * RAMPS-based boards use SERVO3_PIN for the first runout sensor.
  * For other boards you may need to define FIL_RUNOUT_PIN, FIL_RUNOUT2_PIN, etc.
  */
-//#define FILAMENT_RUNOUT_SENSOR
+#define FILAMENT_RUNOUT_SENSOR
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
   #define FIL_RUNOUT_ENABLED_DEFAULT true // Enable the sensor on startup. Override with M412 followed by M500.
   #define NUM_RUNOUT_SENSORS   1          // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each.
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 28447f135a..a2f674c1a1 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -736,7 +736,7 @@
   #define DEFAULT_DUPLICATION_X_OFFSET 100
 
   // Default action to execute following M605 mode change commands. Typically G28X to apply new mode.
-  //#define EVENT_GCODE_IDEX_AFTER_MODECHANGE "G28X"
+  #define EVENT_GCODE_IDEX_AFTER_MODECHANGE "G28X"
 #endif
 
 // Activate a solenoid on the active extruder with M380. Disable all with M381.
diff --git a/Marlin/Version.h b/Marlin/Version.h
index 23ee5d79b8..df5b9ed888 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -41,12 +41,12 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-#define STRING_DISTRIBUTION_DATE "2023-11-18"
+#define STRING_DISTRIBUTION_DATE "2024-03-16"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
  */
-#define MACHINE_NAME "Snapmaker J1s VH_v0.0.1"
+#define MACHINE_NAME "Snapmaker J1s VH_v0.0.2"
 
 /**
  * The SOURCE_CODE_URL is the location where users will find the Marlin Source

From 09ab81bfe2c110902af7319710242c6546619a81 Mon Sep 17 00:00:00 2001
From: Viktor <vho@volny.cz>
Date: Sat, 16 Mar 2024 13:55:51 +0100
Subject: [PATCH 04/11] =?UTF-8?q?M605=20S2=20nefunk=C4=8Dn=C3=AD=20M605=20?=
 =?UTF-8?q?S3=20ano?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Marlin/Configuration.h     | 4 ++--
 Marlin/Configuration_adv.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 3398704d1b..595b2f3680 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1298,7 +1298,7 @@
 // @section extruder
 
 #define DISABLE_E false             // Disable the extruder when not stepping QQQ
-#define DISABLE_INACTIVE_EXTRUDER   // Keep only the active extruder enabled
+//#define DISABLE_INACTIVE_EXTRUDER   // Keep only the active extruder enabled
 
 // @section machine
 
@@ -1424,7 +1424,7 @@
  * RAMPS-based boards use SERVO3_PIN for the first runout sensor.
  * For other boards you may need to define FIL_RUNOUT_PIN, FIL_RUNOUT2_PIN, etc.
  */
-#define FILAMENT_RUNOUT_SENSOR
+//#define FILAMENT_RUNOUT_SENSOR
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
   #define FIL_RUNOUT_ENABLED_DEFAULT true // Enable the sensor on startup. Override with M412 followed by M500.
   #define NUM_RUNOUT_SENSORS   1          // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each.
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index a2f674c1a1..056ed8f6c3 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -3788,7 +3788,7 @@
  * Host Prompt Support enables Marlin to use the host for user prompts so
  * filament runout and other processes can be managed from the host side.
  */
-//#define HOST_ACTION_COMMANDS
+#define HOST_ACTION_COMMANDS
 #if ENABLED(HOST_ACTION_COMMANDS)
   //#define HOST_PROMPT_SUPPORT
   //#define HOST_START_MENU_ITEM  // Add a menu item that tells the host to start

From 770a5e8f716e49de470dd15ad552d3c687e8f6da Mon Sep 17 00:00:00 2001
From: Viktor <vho@volny.cz>
Date: Fri, 29 Mar 2024 09:46:54 +0100
Subject: [PATCH 05/11] Comments // 2.1.21d

---
 Marlin/src/gcode/motion/G0_G1.cpp  | 12 ++++++------
 Marlin/src/module/motion.cpp       | 13 ++++++++++---
 snapmaker/module/print_control.cpp |  8 ++++----
 snapmaker/module/print_control.h   |  2 +-
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/Marlin/src/gcode/motion/G0_G1.cpp b/Marlin/src/gcode/motion/G0_G1.cpp
index 66e6cf2836..a70959dd94 100644
--- a/Marlin/src/gcode/motion/G0_G1.cpp
+++ b/Marlin/src/gcode/motion/G0_G1.cpp
@@ -35,10 +35,10 @@
   #include "../../module/stepper.h"
 #endif
 
-#include "../../../snapmaker/module/print_control.h"
+#include "../../../snapmaker/module/print_control.h"// 2.1.21d 
 
 extern xyze_pos_t destination;
-bool x_first_move = false;
+bool x_first_move = false;// 2.1.21d 
 
 #if ENABLED(VARIABLE_G0_FEEDRATE)
   feedRate_t fast_move_feedrate = MMM_TO_MMS(G0_FEEDRATE);
@@ -78,11 +78,11 @@ void GcodeSuite::G0_G1(TERN_(HAS_FAST_MOVES, const bool fast_move/*=false*/)) {
      * @brief only x move then move the extruder
      *
      */
-    float bf_x = destination[X_AXIS];
+    float bf_x = destination[X_AXIS];// 2.1.21d 
     get_destination_from_command();                 // Get X Y Z E F (and set cutter power)
-    if (bf_x != destination[X_AXIS] && print_control.first_start_gcode) {
-      print_control.first_start_gcode = false;
-      x_first_move = true;
+    if (bf_x != destination[X_AXIS] && print_control.first_start_gcode) {// 2.1.21d 
+      print_control.first_start_gcode = false;// 2.1.21d 
+      x_first_move = true;// 2.1.21d 
     }
 
     #ifdef G0_FEEDRATE
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 7e1f1e15de..7244d072db 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1252,7 +1252,7 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
           // Restore planner to parked head (T1) X position
           float pos_now_x = current_position.x;
           // pos_now.x = inactive_extruder_x;
-          // xyze_pos_t head0_pos = current_position;
+          // xyze_pos_t head0_pos = current_position;  // in 2.1.21d is uncommented 
           // Keep the same X or add the duplication X offset
           if (dual_mode == DXC_DUPLICATION_MODE) {
             tool_change(1);
@@ -1358,7 +1358,7 @@ void prepare_line_to_destination() {
 
   #endif // PREVENT_COLD_EXTRUSION || PREVENT_LENGTHY_EXTRUDE
 
-  // extern bool x_first_move;
+  // extern bool x_first_move;  // 2.1.21d >
   // if (x_first_move || dual_x_carriage_mode == DXC_MIRRORED_MODE) {
   //   if (TERN0(DUAL_X_CARRIAGE, dual_x_carriage_unpark())) return;
   // }
@@ -1370,7 +1370,14 @@ void prepare_line_to_destination() {
   }
   else {
     if (TERN0(DUAL_X_CARRIAGE, dual_x_carriage_unpark())) return;
-  }
+  }  // 2.1.21d <
+  
+  /*
+   extern bool x_first_move; // 2.1.21d version
+  if (x_first_move) { 
+ if (TERN0(DUAL_X_CARRIAGE, dual_x_carriage_unpark())) return;
+  }  
+  */ // 2.1.21d 
 
   if (
     #if UBL_SEGMENTED
diff --git a/snapmaker/module/print_control.cpp b/snapmaker/module/print_control.cpp
index 47eac8f4f6..e9f8e65136 100644
--- a/snapmaker/module/print_control.cpp
+++ b/snapmaker/module/print_control.cpp
@@ -319,8 +319,8 @@ ErrCode PrintControl::start() {
     return PRINT_RESULT_START_ERR_E;
   }
 
-  if (homing_needed()) {
-    motion_control.home();
+  if (homing_needed()) { // 2.1.21d
+    motion_control.home(); // 2.1.21d
   }
   if (SYSTEM_STATUE_PRINTING != system_service.get_status()) {
     LOG_I("Work start abort\r\n");
@@ -335,13 +335,13 @@ ErrCode PrintControl::start() {
     duplicate_extruder_x_offset = (dual_x_carriage_mode == DXC_DUPLICATION_MODE) ? \
                                   DUPLICATION_MODE_X_OFFSET : MIRRORED_MODE_X_OFFSET;
     idex_set_mirrored_mode(dual_x_carriage_mode == DXC_MIRRORED_MODE);
-    first_start_gcode = true;
+    first_start_gcode = true; // 2.1.21d >
     extern bool x_first_move;
     if (DXC_DUPLICATION_MODE == dual_x_carriage_mode)
       x_first_move = false;
     else
       x_first_move = true;
-    // motion_control.home_x();
+    // motion_control.home_x(); // 2.1.21d <
   }
 
   power_loss.stash_data.file_position = 0;
diff --git a/snapmaker/module/print_control.h b/snapmaker/module/print_control.h
index 49b6e96a4b..7861250355 100644
--- a/snapmaker/module/print_control.h
+++ b/snapmaker/module/print_control.h
@@ -125,7 +125,7 @@ class PrintControl {
     bool req_set_work_time = false;
     uint32_t work_start_time = 0;
     bool is_calibretion_mode = false;  // calibretion mode not save powerloss data
-    bool first_start_gcode = false;
+    bool first_start_gcode = false; // 2.1.21d
     bool z_home_sg = false;
 };
 

From 4c87221b3e0df8da1dff7f010695053531234296 Mon Sep 17 00:00:00 2001
From: Viktor <vho@volny.cz>
Date: Sat, 30 Mar 2024 07:41:47 +0100
Subject: [PATCH 06/11] Enabled OST_PROMPT_SUPPORT

---
 Marlin/Configuration_adv.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 056ed8f6c3..6349e38dd2 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -3790,7 +3790,7 @@
  */
 #define HOST_ACTION_COMMANDS
 #if ENABLED(HOST_ACTION_COMMANDS)
-  //#define HOST_PROMPT_SUPPORT
+  #define HOST_PROMPT_SUPPORT
   //#define HOST_START_MENU_ITEM  // Add a menu item that tells the host to start
 #endif
 

From 8b9fa376f46749dae5051bef07100fc5d425e6de Mon Sep 17 00:00:00 2001
From: Viktor <vho@volny.cz>
Date: Sat, 30 Mar 2024 20:03:17 +0100
Subject: [PATCH 07/11] ID NoDupli001

---
 snapmaker/module/print_control.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snapmaker/module/print_control.cpp b/snapmaker/module/print_control.cpp
index e9f8e65136..ab67296942 100644
--- a/snapmaker/module/print_control.cpp
+++ b/snapmaker/module/print_control.cpp
@@ -341,7 +341,7 @@ ErrCode PrintControl::start() {
       x_first_move = false;
     else
       x_first_move = true;
-    // motion_control.home_x(); // 2.1.21d <
+     motion_control.home_x(); // 2.1.21d < Uncommented if bug will be patched, ID NoDupli001
   }
 
   power_loss.stash_data.file_position = 0;

From 03ac694e9fd6e552c5efe73fd674fbdbad50fdca Mon Sep 17 00:00:00 2001
From: Viktor <vho@volny.cz>
Date: Sun, 31 Mar 2024 17:53:11 +0200
Subject: [PATCH 08/11] Filament Sensor Status for OctoPrint

---
 Marlin/Configuration_adv.h | 2 +-
 Marlin/src/inc/Version.h   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 056ed8f6c3..6349e38dd2 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -3790,7 +3790,7 @@
  */
 #define HOST_ACTION_COMMANDS
 #if ENABLED(HOST_ACTION_COMMANDS)
-  //#define HOST_PROMPT_SUPPORT
+  #define HOST_PROMPT_SUPPORT
   //#define HOST_START_MENU_ITEM  // Add a menu item that tells the host to start
 #endif
 
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 61c9d4f394..a1d19eb7bc 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -21,7 +21,7 @@
  */
 #pragma once
 
-#define J1_BUILD_VERSION "2.2.13"
+#define J1_BUILD_VERSION "2.2.13-0"
 
 /**
  * Release version. Leave the Marlin version or apply a custom scheme.
@@ -44,7 +44,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2024-01-05"
+  #define STRING_DISTRIBUTION_DATE "2024-03-31"
 #endif
 
 /**
@@ -75,7 +75,7 @@
  * Define a generic printer name to be output to the LCD after booting Marlin.
  */
 #ifndef MACHINE_NAME
-  #define MACHINE_NAME "3D Printer"
+  #define MACHINE_NAME "SM J1s_0"
 #endif
 
 /**

From 7401e41a1004577e01c86eeaef56347979a93eed Mon Sep 17 00:00:00 2001
From: Viktor <vho@volny.cz>
Date: Sun, 31 Mar 2024 18:16:00 +0200
Subject: [PATCH 09/11] Init version for Duplication tests

---
 Marlin/Configuration_adv.h | 2 +-
 Marlin/src/inc/Version.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 6349e38dd2..056ed8f6c3 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -3790,7 +3790,7 @@
  */
 #define HOST_ACTION_COMMANDS
 #if ENABLED(HOST_ACTION_COMMANDS)
-  #define HOST_PROMPT_SUPPORT
+  //#define HOST_PROMPT_SUPPORT
   //#define HOST_START_MENU_ITEM  // Add a menu item that tells the host to start
 #endif
 
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index a1d19eb7bc..7cbd804d7b 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -21,7 +21,7 @@
  */
 #pragma once
 
-#define J1_BUILD_VERSION "2.2.13-0"
+#define J1_BUILD_VERSION "2.2.13-v0"
 
 /**
  * Release version. Leave the Marlin version or apply a custom scheme.

From 6ad56ebc9421b5ef39571cb855439fcb090437df Mon Sep 17 00:00:00 2001
From: Viktor <vho@volny.cz>
Date: Sun, 31 Mar 2024 18:30:09 +0200
Subject: [PATCH 10/11] print_control 2.2.13v1

---
 Marlin/src/inc/Version.h           | 2 +-
 snapmaker/module/print_control.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 7cbd804d7b..87816ec74e 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -21,7 +21,7 @@
  */
 #pragma once
 
-#define J1_BUILD_VERSION "2.2.13-v0"
+#define J1_BUILD_VERSION "2.2.13v1"
 
 /**
  * Release version. Leave the Marlin version or apply a custom scheme.
diff --git a/snapmaker/module/print_control.cpp b/snapmaker/module/print_control.cpp
index ab67296942..03c026cabb 100644
--- a/snapmaker/module/print_control.cpp
+++ b/snapmaker/module/print_control.cpp
@@ -338,10 +338,10 @@ ErrCode PrintControl::start() {
     first_start_gcode = true; // 2.1.21d >
     extern bool x_first_move;
     if (DXC_DUPLICATION_MODE == dual_x_carriage_mode)
-      x_first_move = false;
+      x_first_move = true; // was false, 2.2.13v1
     else
       x_first_move = true;
-     motion_control.home_x(); // 2.1.21d < Uncommented if bug will be patched, ID NoDupli001
+     // motion_control.home_x(); // 2.1.21d < No change
   }
 
   power_loss.stash_data.file_position = 0;

From aad09dd61bd1f121e9d0d8afa9e512546f3c30e8 Mon Sep 17 00:00:00 2001
From: Viktor <vho@volny.cz>
Date: Tue, 2 Apr 2024 21:31:51 +0200
Subject: [PATCH 11/11] Vanilla version of FW 2.2.13

---
 Marlin/Configuration.h             | 16 ++++++++--------
 Marlin/Configuration_adv.h         |  4 ++--
 Marlin/Version.h                   |  8 ++++----
 Marlin/src/gcode/motion/G0_G1.cpp  | 12 ++++++------
 Marlin/src/inc/Version.h           |  6 +++---
 Marlin/src/module/motion.cpp       | 13 +++----------
 snapmaker/module/print_control.cpp | 10 +++++-----
 snapmaker/module/print_control.h   |  2 +-
 8 files changed, 32 insertions(+), 39 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 595b2f3680..548665543e 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -143,7 +143,7 @@
 #endif
 
 // Name displayed in the LCD "Ready" message and Info menu
-#define CUSTOM_MACHINE_NAME "Snapmaker J1 VH"
+//#define CUSTOM_MACHINE_NAME "3D Printer"
 
 // Printer's unique ID, used by some programs to differentiate between machines.
 // Choose your own or use a service like https://www.uuidgenerator.net/version4
@@ -571,15 +571,15 @@
 #if ENABLED(PIDTEMP)
   //#define PID_EDIT_MENU         // Add PID editing to the "Advanced Settings" menu. (~700 bytes of PROGMEM)
   //#define PID_AUTOTUNE_MENU     // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of PROGMEM)
-  //#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders)
+  #define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders)
                                   // Set/get with gcode: M301 E[extruder number, 0-2]
 
   #if ENABLED(PID_PARAMS_PER_HOTEND)
     // Specify between 1 and HOTENDS values per array.
     // If fewer than EXTRUDER values are provided, the last element will be repeated.
-    #define DEFAULT_Kp_LIST {  22.20,  22.20 }
-    #define DEFAULT_Ki_LIST {   1.08,   1.08 }
-    #define DEFAULT_Kd_LIST { 114.00, 114.00 }
+    #define DEFAULT_Kp_LIST {  18.3,  18.3 }
+    #define DEFAULT_Ki_LIST {  1.09,  1.09 }
+    #define DEFAULT_Kd_LIST { 76.75, 76.75 }
   #else
     // #define DEFAULT_Kp 14.18
     // #define DEFAULT_Ki 0.80
@@ -683,7 +683,7 @@
 #endif // PIDTEMPCHAMBER
 
 #if ANY(PIDTEMP, PIDTEMPBED, PIDTEMPCHAMBER)
-  //#define PID_DEBUG             // Sends debug data to the serial port. Use 'M303 D' to toggle activation.
+  #define PID_DEBUG             // Sends debug data to the serial port. Use 'M303 D' to toggle activation.
   //#define PID_OPENLOOP          // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX
   //#define SLOW_PWM_HEATERS      // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay
   #define PID_FUNCTIONAL_RANGE 15 // If the temperature difference between the target temperature and the actual temperature
@@ -1297,8 +1297,8 @@
 
 // @section extruder
 
-#define DISABLE_E false             // Disable the extruder when not stepping QQQ
-//#define DISABLE_INACTIVE_EXTRUDER   // Keep only the active extruder enabled
+#define DISABLE_E false             // Disable the extruder when not stepping
+// #define DISABLE_INACTIVE_EXTRUDER   // Keep only the active extruder enabled
 
 // @section machine
 
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 056ed8f6c3..28447f135a 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -736,7 +736,7 @@
   #define DEFAULT_DUPLICATION_X_OFFSET 100
 
   // Default action to execute following M605 mode change commands. Typically G28X to apply new mode.
-  #define EVENT_GCODE_IDEX_AFTER_MODECHANGE "G28X"
+  //#define EVENT_GCODE_IDEX_AFTER_MODECHANGE "G28X"
 #endif
 
 // Activate a solenoid on the active extruder with M380. Disable all with M381.
@@ -3788,7 +3788,7 @@
  * Host Prompt Support enables Marlin to use the host for user prompts so
  * filament runout and other processes can be managed from the host side.
  */
-#define HOST_ACTION_COMMANDS
+//#define HOST_ACTION_COMMANDS
 #if ENABLED(HOST_ACTION_COMMANDS)
   //#define HOST_PROMPT_SUPPORT
   //#define HOST_START_MENU_ITEM  // Add a menu item that tells the host to start
diff --git a/Marlin/Version.h b/Marlin/Version.h
index df5b9ed888..2a5f451c79 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -28,25 +28,25 @@
 /**
  * Marlin release version identifier
  */
-#define SHORT_BUILD_VERSION "2.0.9.1"
+//#define SHORT_BUILD_VERSION "2.0.9.1"
 
 /**
  * Verbose version identifier which should contain a reference to the location
  * from where the binary was downloaded or the source code was compiled.
  */
-#define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION
+//#define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION
 
 /**
  * The STRING_DISTRIBUTION_DATE represents when the binary file was built,
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-#define STRING_DISTRIBUTION_DATE "2024-03-16"
+//#define STRING_DISTRIBUTION_DATE "2021-06-27"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
  */
-#define MACHINE_NAME "Snapmaker J1s VH_v0.0.2"
+//#define MACHINE_NAME "3D Printer"
 
 /**
  * The SOURCE_CODE_URL is the location where users will find the Marlin Source
diff --git a/Marlin/src/gcode/motion/G0_G1.cpp b/Marlin/src/gcode/motion/G0_G1.cpp
index a70959dd94..66e6cf2836 100644
--- a/Marlin/src/gcode/motion/G0_G1.cpp
+++ b/Marlin/src/gcode/motion/G0_G1.cpp
@@ -35,10 +35,10 @@
   #include "../../module/stepper.h"
 #endif
 
-#include "../../../snapmaker/module/print_control.h"// 2.1.21d 
+#include "../../../snapmaker/module/print_control.h"
 
 extern xyze_pos_t destination;
-bool x_first_move = false;// 2.1.21d 
+bool x_first_move = false;
 
 #if ENABLED(VARIABLE_G0_FEEDRATE)
   feedRate_t fast_move_feedrate = MMM_TO_MMS(G0_FEEDRATE);
@@ -78,11 +78,11 @@ void GcodeSuite::G0_G1(TERN_(HAS_FAST_MOVES, const bool fast_move/*=false*/)) {
      * @brief only x move then move the extruder
      *
      */
-    float bf_x = destination[X_AXIS];// 2.1.21d 
+    float bf_x = destination[X_AXIS];
     get_destination_from_command();                 // Get X Y Z E F (and set cutter power)
-    if (bf_x != destination[X_AXIS] && print_control.first_start_gcode) {// 2.1.21d 
-      print_control.first_start_gcode = false;// 2.1.21d 
-      x_first_move = true;// 2.1.21d 
+    if (bf_x != destination[X_AXIS] && print_control.first_start_gcode) {
+      print_control.first_start_gcode = false;
+      x_first_move = true;
     }
 
     #ifdef G0_FEEDRATE
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 87816ec74e..61c9d4f394 100644
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -21,7 +21,7 @@
  */
 #pragma once
 
-#define J1_BUILD_VERSION "2.2.13v1"
+#define J1_BUILD_VERSION "2.2.13"
 
 /**
  * Release version. Leave the Marlin version or apply a custom scheme.
@@ -44,7 +44,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2024-03-31"
+  #define STRING_DISTRIBUTION_DATE "2024-01-05"
 #endif
 
 /**
@@ -75,7 +75,7 @@
  * Define a generic printer name to be output to the LCD after booting Marlin.
  */
 #ifndef MACHINE_NAME
-  #define MACHINE_NAME "SM J1s_0"
+  #define MACHINE_NAME "3D Printer"
 #endif
 
 /**
diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp
index 7244d072db..7e1f1e15de 100644
--- a/Marlin/src/module/motion.cpp
+++ b/Marlin/src/module/motion.cpp
@@ -1252,7 +1252,7 @@ FORCE_INLINE void segment_idle(millis_t &next_idle_ms) {
           // Restore planner to parked head (T1) X position
           float pos_now_x = current_position.x;
           // pos_now.x = inactive_extruder_x;
-          // xyze_pos_t head0_pos = current_position;  // in 2.1.21d is uncommented 
+          // xyze_pos_t head0_pos = current_position;
           // Keep the same X or add the duplication X offset
           if (dual_mode == DXC_DUPLICATION_MODE) {
             tool_change(1);
@@ -1358,7 +1358,7 @@ void prepare_line_to_destination() {
 
   #endif // PREVENT_COLD_EXTRUSION || PREVENT_LENGTHY_EXTRUDE
 
-  // extern bool x_first_move;  // 2.1.21d >
+  // extern bool x_first_move;
   // if (x_first_move || dual_x_carriage_mode == DXC_MIRRORED_MODE) {
   //   if (TERN0(DUAL_X_CARRIAGE, dual_x_carriage_unpark())) return;
   // }
@@ -1370,14 +1370,7 @@ void prepare_line_to_destination() {
   }
   else {
     if (TERN0(DUAL_X_CARRIAGE, dual_x_carriage_unpark())) return;
-  }  // 2.1.21d <
-  
-  /*
-   extern bool x_first_move; // 2.1.21d version
-  if (x_first_move) { 
- if (TERN0(DUAL_X_CARRIAGE, dual_x_carriage_unpark())) return;
-  }  
-  */ // 2.1.21d 
+  }
 
   if (
     #if UBL_SEGMENTED
diff --git a/snapmaker/module/print_control.cpp b/snapmaker/module/print_control.cpp
index 03c026cabb..47eac8f4f6 100644
--- a/snapmaker/module/print_control.cpp
+++ b/snapmaker/module/print_control.cpp
@@ -319,8 +319,8 @@ ErrCode PrintControl::start() {
     return PRINT_RESULT_START_ERR_E;
   }
 
-  if (homing_needed()) { // 2.1.21d
-    motion_control.home(); // 2.1.21d
+  if (homing_needed()) {
+    motion_control.home();
   }
   if (SYSTEM_STATUE_PRINTING != system_service.get_status()) {
     LOG_I("Work start abort\r\n");
@@ -335,13 +335,13 @@ ErrCode PrintControl::start() {
     duplicate_extruder_x_offset = (dual_x_carriage_mode == DXC_DUPLICATION_MODE) ? \
                                   DUPLICATION_MODE_X_OFFSET : MIRRORED_MODE_X_OFFSET;
     idex_set_mirrored_mode(dual_x_carriage_mode == DXC_MIRRORED_MODE);
-    first_start_gcode = true; // 2.1.21d >
+    first_start_gcode = true;
     extern bool x_first_move;
     if (DXC_DUPLICATION_MODE == dual_x_carriage_mode)
-      x_first_move = true; // was false, 2.2.13v1
+      x_first_move = false;
     else
       x_first_move = true;
-     // motion_control.home_x(); // 2.1.21d < No change
+    // motion_control.home_x();
   }
 
   power_loss.stash_data.file_position = 0;
diff --git a/snapmaker/module/print_control.h b/snapmaker/module/print_control.h
index 7861250355..49b6e96a4b 100644
--- a/snapmaker/module/print_control.h
+++ b/snapmaker/module/print_control.h
@@ -125,7 +125,7 @@ class PrintControl {
     bool req_set_work_time = false;
     uint32_t work_start_time = 0;
     bool is_calibretion_mode = false;  // calibretion mode not save powerloss data
-    bool first_start_gcode = false; // 2.1.21d
+    bool first_start_gcode = false;
     bool z_home_sg = false;
 };