diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 65528ebf1..dd804936c 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -97,7 +97,7 @@ // Author info of this build printed to the host during boot and M115 #define STRING_CONFIG_H_AUTHOR "Lulzbot" // Who made the changes. #define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes) -#define LULZBOT_FW_VERSION "2.0.9.0" (no quotes) +#define LULZBOT_FW_VERSION "2.0.9.0" /** * *** VENDORS PLEASE READ *** @@ -1159,13 +1159,9 @@ #define I_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. #define J_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. #define K_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. -#define X_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. -#define Y_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. -#define Z_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. #define I_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. #define J_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. #define K_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. -#define Z_MIN_PROBE_ENDSTOP_INVERTING false // Set to true to invert the logic of the probe. /** * Stepper Drivers @@ -1623,8 +1619,8 @@ * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. */ -#define Z_CLEARANCE_DEPLOY_PROBE 5 // Z Clearance for Deploy/Stow -#define Z_CLEARANCE_BETWEEN_PROBES 4 // Z Clearance between probe points +#define LULZBOT_Z_CLEARANCE_DEPLOY_PROBE 5 +#define LULZBOT_Z_CLEARANCE_BETWEEN_PROBES 4 #define Z_CLEARANCE_DEPLOY_PROBE LULZBOT_Z_CLEARANCE_DEPLOY_PROBE // Z Clearance for Deploy/Stow #define Z_CLEARANCE_BETWEEN_PROBES LULZBOT_Z_CLEARANCE_BETWEEN_PROBES // Z Clearance between probe points @@ -1957,7 +1953,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. */ -#if ANY(TAZPro, TAZProXT, MiniV2) +#if ANY(TAZPro, TAZProXT) #define FILAMENT_RUNOUT_SENSOR #endif #if ENABLED(FILAMENT_RUNOUT_SENSOR) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 7e6158be7..1d4523c6c 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1018,8 +1018,8 @@ // Define values for backlash distance and correction. // If BACKLASH_GCODE is enabled these values are the defaults. #if ANY(TAZPro, TAZProXT) - #define BACKLASH_DISTANCE_MM {0.252, 0.183, 0.075}: (mm) - #define BACKLASH_CORRECTION 1.0: 0.0 = no correction; 1.0 = full correction + #define BACKLASH_DISTANCE_MM {0.252, 0.183, 0.075} // (mm) + #define BACKLASH_CORRECTION 1.0 // 0.0 = no correction; 1.0 = full correction #else #define BACKLASH_DISTANCE_MM { 0, 0, 0 } // (mm) #define BACKLASH_CORRECTION 0.0 // 0.0 = no correction; 1.0 = full correction @@ -1193,7 +1193,7 @@ #if ENABLED(TAZ6) #define DIGIPOT_MOTOR_CURRENT { 175,175,200,135,135 } // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A) #elif ENABLED(Workhorse) - #define DIGIPOT_MOTOR_CURRENT {175, 175, 180, 177, 177}: Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A) + #define DIGIPOT_MOTOR_CURRENT {175, 175, 180, 177, 177} // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A) #endif //#define DAC_MOTOR_CURRENT_DEFAULT { 70, 80, 90, 80 } // Default drive percent - X, Y, Z, E axis @@ -1417,7 +1417,7 @@ * an option on the LCD screen to continue the print from the last-known * point in the file. */ - #if DISABLED (Z_AXIS_WILL_FALL) for sidekicks because with no power the Z will fall into print + #if DISABLED (Z_AXIS_WILL_FALL) //for sidekicks because with no power the Z will fall into print #define POWER_LOSS_RECOVERY #endif #if ENABLED(POWER_LOSS_RECOVERY) diff --git a/Marlin/_Bootscreen.h b/Marlin/_Bootscreen.h new file mode 100644 index 000000000..765faa8ce --- /dev/null +++ b/Marlin/_Bootscreen.h @@ -0,0 +1,103 @@ +/** + * Marlin 3D Printer Firmware + * Copyright (C) 2016 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 . + * + */ + +/** + * Custom Bitmap for splashscreen + * + * You may use one of the following tools to generate the C++ bitmap array from + * a black and white image: + * + * - http://www.marlinfw.org/tools/u8glib/converter.html + * - http://www.digole.com/tools/PicturetoC_Hex_converter.php + */ +#include + +#define CUSTOM_BOOTSCREEN_TIMEOUT 2500 +#define CUSTOM_BOOTSCREEN_BMPWIDTH 60 +#define CUSTOM_BOOTSCREEN_BMPHEIGHT 64 + +const unsigned char custom_start_bmp[574] PROGMEM = { +0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, +0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, +0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, +0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, +0x0, 0x0, 0x0, 0xc, 0x0, 0x0, 0x0, 0x0, +0x0, 0x0, 0x0, 0xc, 0x0, 0x0, 0x0, 0x0, +0x0, 0x0, 0x0, 0x12, 0x0, 0x0, 0x0, 0x0, +0x0, 0x0, 0x0, 0x23, 0x0, 0x0, 0x0, 0x0, +0x0, 0x0, 0x0, 0x21, 0x0, 0x0, 0x0, 0x0, +0x0, 0x0, 0x0, 0x4c, 0x80, 0x0, 0x0, 0x0, +0x0, 0x0, 0x0, 0x5e, 0x80, 0x0, 0x0, 0x0, +0x0, 0x0, 0x0, 0x92, 0x40, 0x0, 0x0, 0x0, +0x0, 0x0, 0x0, 0xa1, 0x40, 0x0, 0x0, 0x0, +0x0, 0x0, 0x1, 0x21, 0x20, 0x0, 0x0, 0x0, +0x0, 0x0, 0x2, 0x7f, 0x90, 0x0, 0x0, 0x0, +0x0, 0x0, 0x2, 0x0, 0x10, 0x0, 0x0, 0x0, +0x0, 0x0, 0x7, 0xff, 0xf8, 0x0, 0x0, 0x0, +0x0, 0x0, 0x4, 0x0, 0x8, 0x0, 0x0, 0x0, +0x0, 0x0, 0x8, 0x0, 0x4, 0x0, 0x0, 0x0, +0x0, 0x0, 0x8, 0x0, 0x6, 0x0, 0x0, 0x0, +0x0, 0x0, 0x10, 0x0, 0x2, 0x0, 0x0, 0x0, +0x0, 0x0, 0x30, 0x1e, 0x1, 0x0, 0x0, 0x0, +0x0, 0x0, 0x20, 0x7f, 0x81, 0x0, 0x0, 0x0, +0x0, 0x0, 0x41, 0xff, 0xe0, 0x80, 0x0, 0x0, +0x0, 0x0, 0x43, 0xfc, 0xf0, 0x80, 0x0, 0x0, +0x0, 0x0, 0x87, 0x3b, 0x78, 0x40, 0x0, 0x0, +0x0, 0x1, 0x8e, 0xdb, 0xfc, 0x60, 0x0, 0x0, +0x0, 0x1, 0xf, 0xeb, 0xcc, 0x20, 0x0, 0x0, +0x0, 0x2, 0x1f, 0xed, 0xb6, 0x10, 0x0, 0x0, +0x0, 0x2, 0x1f, 0xde, 0xb6, 0x10, 0x0, 0x0, +0x0, 0x4, 0x39, 0xcd, 0x7f, 0x8, 0x0, 0x0, +0x0, 0x4, 0x36, 0xe0, 0xff, 0x8, 0x0, 0x0, +0x0, 0x8, 0x7e, 0xc0, 0xbb, 0x84, 0x0, 0x0, +0x0, 0x18, 0x7f, 0x0, 0x5d, 0x86, 0x0, 0x0, +0x0, 0x10, 0x7f, 0xc0, 0xed, 0x82, 0x0, 0x0, +0x0, 0x20, 0x3c, 0xc0, 0x73, 0x1, 0x0, 0x0, +0x0, 0x20, 0x3b, 0x33, 0x7f, 0x1, 0x0, 0x0, +0x0, 0x70, 0x1b, 0xe7, 0x7e, 0x3, 0x80, 0x0, +0x0, 0xc8, 0x1d, 0xee, 0xde, 0x4, 0xc0, 0x0, +0x0, 0x88, 0xf, 0xde, 0xdc, 0x4, 0x40, 0x0, +0x1, 0x24, 0xf, 0xdf, 0x3c, 0x9, 0x20, 0x0, +0x1, 0x26, 0x7, 0xdb, 0xf8, 0x19, 0x20, 0x0, +0x2, 0x72, 0x3, 0xe7, 0xf0, 0x13, 0x90, 0x0, +0x2, 0x51, 0x1, 0xff, 0xe0, 0x22, 0x90, 0x0, +0x4, 0x89, 0x0, 0x7f, 0x80, 0x24, 0x48, 0x0, +0x9, 0x4, 0x80, 0x1e, 0x0, 0x48, 0x24, 0x0, +0xb, 0xfe, 0x40, 0x0, 0x0, 0xdf, 0xf4, 0x0, +0x10, 0x0, 0x40, 0x0, 0x0, 0x80, 0x2, 0x0, +0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x0, +0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, +0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, +0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, +0x10, 0x22, 0x10, 0x3c, 0x3c, 0xe, 0x1f, 0x0, +0x10, 0x22, 0x10, 0x4, 0x22, 0x11, 0x4, 0x0, +0x10, 0x22, 0x10, 0x8, 0x22, 0x11, 0x4, 0x0, +0x10, 0x22, 0x10, 0x8, 0x3c, 0x11, 0x4, 0x0, +0x10, 0x22, 0x10, 0x10, 0x22, 0x11, 0x4, 0x0, +0x10, 0x22, 0x10, 0x20, 0x22, 0x11, 0x4, 0x0, +0x1e, 0x1c, 0x1e, 0x3c, 0x3c, 0xe, 0x4, 0x0, +0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, +0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, +0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, +0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, +0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 +}; diff --git a/platformio.ini b/platformio.ini index 82a595eb9..72800b0af 100644 --- a/platformio.ini +++ b/platformio.ini @@ -49,7 +49,7 @@ build_flags = -g3 -D__MARLIN_FIRMWARE__ -DNDEBUG extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-dependencies.py pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py - pre:buildroot/share/PlatformIO/scripts/preflight-checks.py + ; pre:buildroot/share/PlatformIO/scripts/preflight-checks.py post:buildroot/share/PlatformIO/scripts/common-dependencies-post.py lib_deps = default_src_filter = + - - + @@ -247,7 +247,7 @@ default_src_filter = + - - + - - - - - - + # # Feature Dependencies #