diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index ce80dd864f5b..fd84e52a31ff 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 @@ -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 diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 5a22bb4026da..c23e22af07b8 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -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 diff --git a/Marlin/Version.h b/Marlin/Version.h index 6fda316d5dc0..c0496101e959 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.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-01-31" +#define STRING_DISTRIBUTION_DATE "2020-03-07" /** * 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 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 -}; diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index f340e758abef..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 diff --git a/README.md b/README.md index ba65d99e7b5a..939777e8f398 100644 --- a/README.md +++ b/README.md @@ -18,8 +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 - 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** @@ -97,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