From 3e7fe7fbada2c612e21ed83eda21ac4dd9b1d074 Mon Sep 17 00:00:00 2001
From: Bodengriller <50927649+Bodengriller@users.noreply.github.com>
Date: Thu, 5 Mar 2020 22:04:38 +0100
Subject: [PATCH 01/14] =?UTF-8?q?Einige=20=C3=84nderungen=20->=20Siehe=20K?=
=?UTF-8?q?ommentare?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Wie besprochen - ich hoffe ich habe nichts vergessen
---
Marlin/Configuration.h | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index ce80dd864f5b..6d4f6ef0c6a0 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -71,7 +71,7 @@
// @section info
// Author info of this build printed to the host during boot and M115
-#define STRING_CONFIG_H_AUTHOR "(pinguinpfleger, ASWX1-FW-MOD)" // Who made the changes.
+#define STRING_CONFIG_H_AUTHOR "(pinguinpfleger&FoodFighter, ASWX1-FW-MOD)" // Who made the changes.
#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes)
/**
@@ -134,7 +134,7 @@
#endif
// Name displayed in the LCD "Ready" message and Info menu
-#define CUSTOM_MACHINE_NAME "Sidewinder X1"
+//#define CUSTOM_MACHINE_NAME "Sidewinder X1"
// Printer's unique ID, used by some programs to differentiate between machines.
// Choose your own or use a service like http://www.uuidgenerator.net/version4
@@ -488,7 +488,8 @@
#define DEFAULT_Kp 10.85
#define DEFAULT_Ki 0.75
#define DEFAULT_Kd 39.12
- // Sidewinder X1 bei 190° C
+
+ // Sidewinder X1 bei 190° C
// #define DEFAULT_Kp 11.01
// #define DEFAULT_Ki 0.76
// #define DEFAULT_Kd 39.91
@@ -539,7 +540,6 @@
//#define PID_BED_DEBUG // Sends debug data to the serial port.
// Sidewinder X1 bei 60 Grad
- // M304 P83.48 I8.15 D213.72
#define DEFAULT_bedKp 83.48
#define DEFAULT_bedKi 8.15
#define DEFAULT_bedKd 213.72
@@ -790,8 +790,8 @@
*/
//#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
- #define DEFAULT_XJERK 8.0
- #define DEFAULT_YJERK 8.0
+ #define DEFAULT_XJERK 10.0
+ #define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.3
//#define TRAVEL_EXTRA_XYJERK 0.0 // Additional jerk allowance for all travel moves
@@ -812,7 +812,7 @@
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
- #define JUNCTION_DEVIATION_MM 0.032 // (mm) Distance from real junction edge
+ #define JUNCTION_DEVIATION_MM 0.013 // (mm) Distance from real junction edge
#endif
/**
@@ -878,7 +878,7 @@
* A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
* (e.g., an inductive probe or a nozzle-based probe-switch.)
*/
-//#define FIX_MOUNTED_PROBE // ASWX1-FW-MOD: Added For BABYSTEPPING
+#define FIX_MOUNTED_PROBE // ASWX1-FW-MOD: activated to store BABYSTEPPING
/**
* Use the nozzle as the probe, as with a conductive
@@ -1096,10 +1096,10 @@
// The size of the print bed
#define X_BED_SIZE 300
-#define Y_BED_SIZE 310
+#define Y_BED_SIZE 300
// Travel limits (mm) after homing, corresponding to endstop positions.
-#define X_MIN_POS -2
+#define X_MIN_POS 0
#define Y_MIN_POS -5
#define Z_MIN_POS 0
#define X_MAX_POS X_BED_SIZE
@@ -1367,8 +1367,8 @@
#endif
// Homing speeds (mm/m)
-#define HOMING_FEEDRATE_XY (80*60)
-#define HOMING_FEEDRATE_Z (20*60)
+#define HOMING_FEEDRATE_XY (60*60)
+#define HOMING_FEEDRATE_Z (10*60)
// Validate that endstops are triggered on homing moves
#define VALIDATE_HOMING_ENDSTOPS
From 886636023d607a9de29da273c22a8575b54555c7 Mon Sep 17 00:00:00 2001
From: Bodengriller <50927649+Bodengriller@users.noreply.github.com>
Date: Thu, 5 Mar 2020 22:05:38 +0100
Subject: [PATCH 02/14] =?UTF-8?q?Einige=20=C3=84nderungen=20-=20wie=20besp?=
=?UTF-8?q?rochen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
ich hoffe ich habe auch hier nichts vergessen.
---
Marlin/Configuration_adv.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 5a22bb4026da..dbe2ecbe43d2 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1464,7 +1464,7 @@
#if ENABLED(DOUBLECLICK_FOR_Z_BABYSTEPPING)
#define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds.
// Note: Extra time may be added to mitigate controller latency.
- #define BABYSTEP_ALWAYS_AVAILABLE // Allow babystepping at all times (not just during movement).
+ //#define BABYSTEP_ALWAYS_AVAILABLE // Allow babystepping at all times (not just during movement).
//#define MOVE_Z_WHEN_IDLE // Jump to the move Z menu on doubleclick when printer is idle.
#if ENABLED(MOVE_Z_WHEN_IDLE)
#define MOVE_Z_IDLE_MULTIPLICATOR 1 // Multiply 1mm by this factor for the move step size.
@@ -1473,7 +1473,7 @@
//#define BABYSTEP_DISPLAY_TOTAL // Display total babysteps since last G28
- //#define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping
+ #define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
//#define BABYSTEP_HOTEND_Z_OFFSET // For multiple hotends, babystep relative Z offsets
//#define BABYSTEP_ZPROBE_GFX_OVERLAY // Enable graphical overlay on Z-offset editor
From 1c7707ebb29e47f0c13469af8a37ebc8380eb4c0 Mon Sep 17 00:00:00 2001
From: Bodengriller <50927649+Bodengriller@users.noreply.github.com>
Date: Thu, 5 Mar 2020 22:06:07 +0100
Subject: [PATCH 03/14] Delete _Bootscreen.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
nicht mehr benötigt
---
Marlin/_Bootscreen.h | 93 --------------------------------------------
1 file changed, 93 deletions(-)
delete mode 100644 Marlin/_Bootscreen.h
diff --git a/Marlin/_Bootscreen.h b/Marlin/_Bootscreen.h
deleted file mode 100644
index e35e7629d1a6..000000000000
--- a/Marlin/_Bootscreen.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- *
- * Based on Sprinter and grbl.
- * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-#pragma once
-
-/**
- * Made with Marlin Bitmap Converter
- * http://marlinfw.org/tools/u8glib/converter.html
- *
- * This bitmap from the file 'EVNOVO-Artillery-Logo.jpg'
- */
-#define CUSTOM_BOOTSCREEN_BMPWIDTH 54
-
-const unsigned char custom_start_bmp[] PROGMEM = {
- B00000000,B00000000,B01100000,B00000000,B00011000,B00000000,B00000000,
- B00000000,B00000001,B11100000,B00000000,B00011110,B00000000,B00000000,
- B00000000,B00000111,B11100000,B00000000,B00011111,B10000000,B00000000,
- B00000000,B00001111,B11100000,B00000000,B00011111,B11100000,B00000000,
- B00000000,B00111111,B11100000,B00000000,B00011111,B11110000,B00000000,
- B00000000,B11111111,B11000000,B00000000,B00001111,B11111100,B00000000,
- B00000011,B11111111,B00000000,B00000000,B00000011,B11111111,B00000000,
- B00000111,B11111100,B00000000,B00000000,B00000000,B11111111,B10000000,
- B00011111,B11111000,B00000000,B00000000,B00000000,B01111111,B11100000,
- B01111111,B11100000,B00000000,B00000000,B00000000,B00011111,B11111000,
- B11111111,B10000000,B00000000,B00000000,B00000000,B00000111,B11111100,
- B11111110,B00000000,B00000000,B00000000,B00000000,B00000001,B11111100,
- B11111100,B00000000,B00000000,B00000000,B00000000,B00000000,B11111100,
- B11111000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111100,
- B11111000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111100,
- B11111000,B00000011,B00000000,B00000000,B00000011,B00000000,B01111100,
- B11111000,B00000011,B11000000,B00000000,B00001111,B00000000,B01111100,
- B11111000,B00000011,B11110000,B00000000,B00111111,B00000000,B01111100,
- B11111000,B00000011,B11111100,B00000000,B11111111,B00000000,B01111100,
- B11111000,B00000011,B11111110,B00000001,B11111111,B00000000,B01111100,
- B11111000,B00000001,B11111111,B00000011,B11111110,B00000000,B01111100,
- B11111000,B00000000,B11111111,B00000011,B11111100,B00000000,B01111100,
- B11111000,B00000000,B00111111,B00000011,B11110000,B00000000,B01111100,
- B11111000,B00000000,B00011111,B00000011,B11100000,B00000000,B01111100,
- B11111000,B00000000,B00011111,B00000011,B11100000,B00000000,B01111100,
- B11111000,B00000000,B00011111,B00000011,B11100000,B00000000,B01111100,
- B11111000,B00000000,B00011111,B00000011,B11100000,B00000000,B01111100,
- B11111000,B00000000,B00011111,B00000011,B11100000,B00000000,B01111100,
- B11111000,B00000000,B00011111,B00000011,B11100000,B00000000,B01111100,
- B11111000,B00000000,B00011111,B00000011,B11100000,B00000000,B01111100,
- B11111000,B00000000,B00011111,B00000011,B11100000,B00000000,B01111100,
- B11111000,B00000000,B00011111,B00000011,B11100000,B00000000,B01111100,
- B11111000,B00000000,B00011111,B00000011,B11100000,B00000000,B01111100,
- B11111000,B00000000,B00011111,B00000011,B11100000,B00000000,B01111100,
- B11111000,B00000000,B00011111,B00000011,B11100000,B00000000,B01111100,
- B11111000,B00000000,B00011111,B00000011,B11100000,B00000000,B01111100,
- B11111000,B00000000,B00011111,B00000011,B11100000,B00000000,B01111100,
- B11111000,B00000000,B00111111,B00000011,B11110000,B00000000,B01111100,
- B11111000,B00000000,B11111111,B00000011,B11111100,B00000000,B01111100,
- B11111000,B00000001,B11111111,B00000011,B11111110,B00000000,B01111100,
- B11111000,B00000011,B11111110,B00000001,B11111111,B00000000,B01111100,
- B11111000,B00000011,B11111100,B00000000,B11111111,B00000000,B01111100,
- B11111000,B00000011,B11110000,B00000000,B00111111,B00000000,B01111100,
- B11111000,B00000011,B11000000,B00000000,B00001111,B00000000,B01111100,
- B11111000,B00000011,B00000000,B00000000,B00000011,B00000000,B01111100,
- B11111000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111100,
- B11111000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111100,
- B11111100,B00000000,B00000000,B00000000,B00000000,B00000000,B11111100,
- B11111110,B00000000,B00000000,B00000000,B00000000,B00000001,B11111100,
- B11111111,B10000000,B00000000,B00000000,B00000000,B00000111,B11111100,
- B01111111,B11100000,B00000000,B00000000,B00000000,B00011111,B11111000,
- B00011111,B11111000,B00000000,B00000000,B00000000,B01111111,B11100000,
- B00000111,B11111100,B00000000,B00000000,B00000000,B11111111,B10000000,
- B00000011,B11111111,B00000000,B00000000,B00000011,B11111111,B00000000,
- B00000000,B11111111,B11000000,B00000000,B00001111,B11111100,B00000000,
- B00000000,B00111111,B11100000,B00000000,B00011111,B11110000,B00000000,
- B00000000,B00011111,B11100000,B00000000,B00011111,B11000000,B00000000,
- B00000000,B00000111,B11100000,B00000000,B00011111,B10000000,B00000000,
- B00000000,B00000001,B11100000,B00000000,B00011110,B00000000,B00000000,
- B00000000,B00000000,B01100000,B00000000,B00011000,B00000000,B00000000
-};
From 02e128da5deedf4fde7102712a491edd576ebc75 Mon Sep 17 00:00:00 2001
From: Bodengriller <50927649+Bodengriller@users.noreply.github.com>
Date: Thu, 5 Mar 2020 22:07:43 +0100
Subject: [PATCH 04/14] Fehlerroutine Auskommentiert
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Das ist nötig um einen Fehler beim Kompilieren zu unterbinden, der entsteht, wenn eine Probe aktiviert, Z_SAFE_HOMING aber deaktiviert ist.
Es ist gewollt, dass Babystepps speicherbar sind -> dafür muss der Z-Offset aktiviert werden -> dafür wiederum eine Probe.
Z_SAFE_HOMING bewirkt aber, dass man Z nur noch nach X und Y homen kann und dies irgendwo an einer bestimmten Position im Bett passiert.
Das ist sehr sinnvoll, wenn man einen Probe-Sensor montiert hat.
Wir wollen allerdings nur den Z-Offset missbrauchen, darum muss diese Sicherheitsfunktion weichen, weil sie bei uns nicht das gewünschte Ergebnis bringt.
---
Marlin/src/inc/SanityCheck.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index f340e758abef..e5e0a32b4379 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1228,7 +1228,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#endif
#if HOMING_Z_WITH_PROBE && IS_CARTESIAN && DISABLED(Z_SAFE_HOMING)
- #error "Z_SAFE_HOMING is recommended when homing with a probe. Enable it or comment out this line to continue."
+ //#error "Z_SAFE_HOMING is recommended when homing with a probe. Enable it or comment out this line to continue."
#endif
#else
From 234e7330e7c5f4246d88a1d75a440ee1fe7c1944 Mon Sep 17 00:00:00 2001
From: Bodengriller <50927649+Bodengriller@users.noreply.github.com>
Date: Thu, 5 Mar 2020 22:17:56 +0100
Subject: [PATCH 05/14] Update Version.h
---
Marlin/Version.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Marlin/Version.h b/Marlin/Version.h
index 6fda316d5dc0..fa2a5cfab58e 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -34,19 +34,19 @@
* 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 " ASWX1-FW-MOD-v1.0"
+#define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION "ASWX1-FW-MOD-v1.2"
/**
* 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 "2020-01-31"
+//#define STRING_DISTRIBUTION_DATE "2020-03-05"
/**
* Defines a generic printer name to be output to the LCD after booting Marlin.
*/
-//#define MACHINE_NAME "3D Printer"
+//#define MACHINE_NAME "Sidewinder X1"
/**
* The SOURCE_CODE_URL is the location where users will find the Marlin Source
From 5e6c4d43a41abfa99b875381f14e87ce23fc1942 Mon Sep 17 00:00:00 2001
From: Bodengriller <50927649+Bodengriller@users.noreply.github.com>
Date: Thu, 5 Mar 2020 22:22:04 +0100
Subject: [PATCH 06/14] Update README.md
---
README.md | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index ba65d99e7b5a..38406592a312 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,10 @@ and on Marlin [Artillery Sidewinder X1 config](https://github.com/MarlinFirmware
There is also an [optimized firmware for Artillery Sidewinder X1 touch display](https://github.com/pinguinpfleger/ASWX1-TFTFW-MOD) which you can install too but it is optionally.
## Releases
- 29.02.2020 [ASWX1-FW-MOD-v1.0](https://github.com/pinguinpfleger/ASWX1-FW-MOD/releases/tag/ASWX1-FW-MOD-v1.0) - [ASWX1-FW-MOD-v1.0.zip](https://github.com/pinguinpfleger/ASWX1-FW-MOD/releases/download/ASWX1-FW-MOD-v1.0/ASWX1-FW-MOD-v1.0.zip) based on Marlin 2.0.4.4
+**05.03.2020** [ASWX1-FW-MOD-v1.2](https://github.com/pinguinpfleger/ASWX1-FW-MOD/releases/tag/ASWX1-FW-MOD-v1.2) - [ASWX1-FW-MOD-v1.1.zip](https://github.com/pinguinpfleger/ASWX1-FW-MOD/releases/download/ASWX1-FW-MOD-v1.0/ASWX1-FW-MOD-v1.2.zip) based on Marlin 2.0.4.4
+*Maintained some basic changes (e.g. the possibility to store babystepping)*
+
+**29.02.2020** [ASWX1-FW-MOD-v1.0](https://github.com/pinguinpfleger/ASWX1-FW-MOD/releases/tag/ASWX1-FW-MOD-v1.0) - [ASWX1-FW-MOD-v1.0.zip](https://github.com/pinguinpfleger/ASWX1-FW-MOD/releases/download/ASWX1-FW-MOD-v1.0/ASWX1-FW-MOD-v1.0.zip) based on Marlin 2.0.4.4
## Improvements
From c714561b6e78018757d59a49106841762f6b3406 Mon Sep 17 00:00:00 2001
From: Bodengriller <50927649+Bodengriller@users.noreply.github.com>
Date: Sat, 7 Mar 2020 08:57:43 +0100
Subject: [PATCH 07/14] Update README.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Der Link zu 3D-Nexus hat sich scheinbar geändert - oder er war falsch.
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 38406592a312..c8ebab732a73 100644
--- a/README.md
+++ b/README.md
@@ -100,7 +100,7 @@ https://github.com/pinguinpfleger/ASWX1-TFTFW-MOD
## Links
### Slicer Machine & Profile Settings
-https://3d-nexus.com/file-archives/category/8-artillery-evnovo
+https://3d-nexus.com/resources/file-archives/category/8-artillery-evnovo
### Youtube
RICS 3D Marlin 2 https://www.youtube.com/watch?v=JlgykMHhMzw
From 6cf0b2a3d704235252c1de2f87ed23e067680334 Mon Sep 17 00:00:00 2001
From: Kai Hauser
Date: Sat, 7 Mar 2020 15:51:53 +0100
Subject: [PATCH 08/14] Update Version.h
---
Marlin/Version.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Marlin/Version.h b/Marlin/Version.h
index fa2a5cfab58e..c0496101e959 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -34,14 +34,14 @@
* 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 "ASWX1-FW-MOD-v1.2"
+#define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION "ASWX1-FW-MOD-v1.1"
/**
* 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 "2020-03-05"
+#define STRING_DISTRIBUTION_DATE "2020-03-07"
/**
* Defines a generic printer name to be output to the LCD after booting Marlin.
From b0bcbd2f73418159adc51e653ce52721ea94e622 Mon Sep 17 00:00:00 2001
From: Kai Hauser
Date: Sat, 7 Mar 2020 15:54:29 +0100
Subject: [PATCH 09/14] Update Configuration.h
---
Marlin/Configuration.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 6d4f6ef0c6a0..fd84e52a31ff 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -790,8 +790,8 @@
*/
//#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
- #define DEFAULT_XJERK 10.0
- #define DEFAULT_YJERK 10.0
+ #define DEFAULT_XJERK 8.0
+ #define DEFAULT_YJERK 8.0
#define DEFAULT_ZJERK 0.3
//#define TRAVEL_EXTRA_XYJERK 0.0 // Additional jerk allowance for all travel moves
From b9f716d0f13bcc20e05d6dafe3eb530e67039365 Mon Sep 17 00:00:00 2001
From: Kai Hauser
Date: Sat, 7 Mar 2020 15:56:50 +0100
Subject: [PATCH 10/14] Update Configuration_adv.h
---
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 dbe2ecbe43d2..c23e22af07b8 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1464,7 +1464,7 @@
#if ENABLED(DOUBLECLICK_FOR_Z_BABYSTEPPING)
#define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds.
// Note: Extra time may be added to mitigate controller latency.
- //#define BABYSTEP_ALWAYS_AVAILABLE // Allow babystepping at all times (not just during movement).
+ #define BABYSTEP_ALWAYS_AVAILABLE // Allow babystepping at all times (not just during movement).
//#define MOVE_Z_WHEN_IDLE // Jump to the move Z menu on doubleclick when printer is idle.
#if ENABLED(MOVE_Z_WHEN_IDLE)
#define MOVE_Z_IDLE_MULTIPLICATOR 1 // Multiply 1mm by this factor for the move step size.
From c66ac9be0fabe4267fcdfd54b2a3702adb39bc56 Mon Sep 17 00:00:00 2001
From: Kai Hauser
Date: Sat, 7 Mar 2020 16:14:56 +0100
Subject: [PATCH 11/14] Update SanityCheck.h
---
Marlin/src/inc/SanityCheck.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index e5e0a32b4379..5aa4034dd723 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -1228,7 +1228,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#endif
#if HOMING_Z_WITH_PROBE && IS_CARTESIAN && DISABLED(Z_SAFE_HOMING)
- //#error "Z_SAFE_HOMING is recommended when homing with a probe. Enable it or comment out this line to continue."
+ //#error "Z_SAFE_HOMING is recommended when homing with a probe. Enable it or comment out this line to continue." // ASWX1-FW-MOD: deactivated due to BABYSTEPPING store Hack
#endif
#else
From b5351c8b37705af840dee7802b22f6e51e98605d Mon Sep 17 00:00:00 2001
From: Kai Hauser
Date: Sat, 7 Mar 2020 16:24:28 +0100
Subject: [PATCH 12/14] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index c8ebab732a73..d7daf572a9bc 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ and on Marlin [Artillery Sidewinder X1 config](https://github.com/MarlinFirmware
There is also an [optimized firmware for Artillery Sidewinder X1 touch display](https://github.com/pinguinpfleger/ASWX1-TFTFW-MOD) which you can install too but it is optionally.
## Releases
-**05.03.2020** [ASWX1-FW-MOD-v1.2](https://github.com/pinguinpfleger/ASWX1-FW-MOD/releases/tag/ASWX1-FW-MOD-v1.2) - [ASWX1-FW-MOD-v1.1.zip](https://github.com/pinguinpfleger/ASWX1-FW-MOD/releases/download/ASWX1-FW-MOD-v1.0/ASWX1-FW-MOD-v1.2.zip) based on Marlin 2.0.4.4
+**05.03.2020** [ASWX1-FW-MOD-v1.1](https://github.com/pinguinpfleger/ASWX1-FW-MOD/releases/tag/ASWX1-FW-MOD-v1.1) - [ASWX1-FW-MOD-v1.1.zip](https://github.com/pinguinpfleger/ASWX1-FW-MOD/releases/download/ASWX1-FW-MOD-v1.0/ASWX1-FW-MOD-v1.2.zip) based on Marlin 2.0.4.4
*Maintained some basic changes (e.g. the possibility to store babystepping)*
**29.02.2020** [ASWX1-FW-MOD-v1.0](https://github.com/pinguinpfleger/ASWX1-FW-MOD/releases/tag/ASWX1-FW-MOD-v1.0) - [ASWX1-FW-MOD-v1.0.zip](https://github.com/pinguinpfleger/ASWX1-FW-MOD/releases/download/ASWX1-FW-MOD-v1.0/ASWX1-FW-MOD-v1.0.zip) based on Marlin 2.0.4.4
From 93b0deab80c04807f7dbc85cfa216622ff0544e4 Mon Sep 17 00:00:00 2001
From: Kai Hauser
Date: Sat, 7 Mar 2020 16:24:53 +0100
Subject: [PATCH 13/14] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index d7daf572a9bc..0e0cd71ed231 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ and on Marlin [Artillery Sidewinder X1 config](https://github.com/MarlinFirmware
There is also an [optimized firmware for Artillery Sidewinder X1 touch display](https://github.com/pinguinpfleger/ASWX1-TFTFW-MOD) which you can install too but it is optionally.
## Releases
-**05.03.2020** [ASWX1-FW-MOD-v1.1](https://github.com/pinguinpfleger/ASWX1-FW-MOD/releases/tag/ASWX1-FW-MOD-v1.1) - [ASWX1-FW-MOD-v1.1.zip](https://github.com/pinguinpfleger/ASWX1-FW-MOD/releases/download/ASWX1-FW-MOD-v1.0/ASWX1-FW-MOD-v1.2.zip) based on Marlin 2.0.4.4
+**07.03.2020** [ASWX1-FW-MOD-v1.1](https://github.com/pinguinpfleger/ASWX1-FW-MOD/releases/tag/ASWX1-FW-MOD-v1.1) - [ASWX1-FW-MOD-v1.1.zip](https://github.com/pinguinpfleger/ASWX1-FW-MOD/releases/download/ASWX1-FW-MOD-v1.0/ASWX1-FW-MOD-v1.2.zip) based on Marlin 2.0.4.4
*Maintained some basic changes (e.g. the possibility to store babystepping)*
**29.02.2020** [ASWX1-FW-MOD-v1.0](https://github.com/pinguinpfleger/ASWX1-FW-MOD/releases/tag/ASWX1-FW-MOD-v1.0) - [ASWX1-FW-MOD-v1.0.zip](https://github.com/pinguinpfleger/ASWX1-FW-MOD/releases/download/ASWX1-FW-MOD-v1.0/ASWX1-FW-MOD-v1.0.zip) based on Marlin 2.0.4.4
From 90b5c9eb6d021052a5807fd357230130f9afbebf Mon Sep 17 00:00:00 2001
From: Kai Hauser
Date: Sat, 7 Mar 2020 16:26:42 +0100
Subject: [PATCH 14/14] Update README.md
---
README.md | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index 0e0cd71ed231..939777e8f398 100644
--- a/README.md
+++ b/README.md
@@ -18,11 +18,11 @@ and on Marlin [Artillery Sidewinder X1 config](https://github.com/MarlinFirmware
There is also an [optimized firmware for Artillery Sidewinder X1 touch display](https://github.com/pinguinpfleger/ASWX1-TFTFW-MOD) which you can install too but it is optionally.
## Releases
-**07.03.2020** [ASWX1-FW-MOD-v1.1](https://github.com/pinguinpfleger/ASWX1-FW-MOD/releases/tag/ASWX1-FW-MOD-v1.1) - [ASWX1-FW-MOD-v1.1.zip](https://github.com/pinguinpfleger/ASWX1-FW-MOD/releases/download/ASWX1-FW-MOD-v1.0/ASWX1-FW-MOD-v1.2.zip) based on Marlin 2.0.4.4
-*Maintained some basic changes (e.g. the possibility to store babystepping)*
-
-**29.02.2020** [ASWX1-FW-MOD-v1.0](https://github.com/pinguinpfleger/ASWX1-FW-MOD/releases/tag/ASWX1-FW-MOD-v1.0) - [ASWX1-FW-MOD-v1.0.zip](https://github.com/pinguinpfleger/ASWX1-FW-MOD/releases/download/ASWX1-FW-MOD-v1.0/ASWX1-FW-MOD-v1.0.zip) based on Marlin 2.0.4.4
+**07.03.2020** [ASWX1-FW-MOD-v1.1](https://github.com/pinguinpfleger/ASWX1-FW-MOD/releases/tag/ASWX1-FW-MOD-v1.1) - [ASWX1-FW-MOD-v1.1.zip](https://github.com/pinguinpfleger/ASWX1-FW-MOD/releases/download/ASWX1-FW-MOD-v1.1/ASWX1-FW-MOD-v1.1.zip) based on Marlin 2.0.4.4
+*Maintained some basic changes (e.g. the possibility to store babystepping)*
+**29.02.2020** [ASWX1-FW-MOD-v1.0](https://github.com/pinguinpfleger/ASWX1-FW-MOD/releases/tag/ASWX1-FW-MOD-v1.0) - [ASWX1-FW-MOD-v1.0.zip](https://github.com/pinguinpfleger/ASWX1-FW-MOD/releases/download/ASWX1-FW-MOD-v1.0/ASWX1-FW-MOD-v1.0.zip) based on Marlin 2.0.4.4
+
## Improvements
1. **Save to EEPROM**