diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 7970afff54..bd8fcee686 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -4,7 +4,7 @@ contact_links: url: https://github.com/MarlinFirmware/Configurations/issues/649 about: Request a new Configuration or variant of an existing Configuration here. - name: Marlin Documentation - url: http://marlinfw.org/ + url: https://marlinfw.org/ about: Lots of documentation on installing and using Marlin. - name: MarlinFirmware Facebook group url: https://www.facebook.com/groups/1049718498464482 diff --git a/.github/workflows/check-pr.yml b/.github/workflows/check-pr.yml index 9ef3a31ee0..f264b4c8ac 100644 --- a/.github/workflows/check-pr.yml +++ b/.github/workflows/check-pr.yml @@ -29,4 +29,4 @@ jobs: It may help to set your fork's default branch to `import-2.1.x`. - See [this page](http://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions. + See [this page](https://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions. diff --git a/config/default/Configuration_adv.h b/config/default/Configuration_adv.h index 7a17d7c918..61da0b1319 100644 --- a/config/default/Configuration_adv.h +++ b/config/default/Configuration_adv.h @@ -1325,7 +1325,7 @@ // // LCD Backlight Timeout // -//#define LCD_BACKLIGHT_TIMEOUT_MINS 5 // (minutes) Timeout before turning off the backlight +//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight #if HAS_BED_PROBE && EITHER(HAS_MARLINUI_MENU, HAS_TFT_LVGL_UI) //#define PROBE_OFFSET_WIZARD // Add a Probe Z Offset calibration option to the LCD menu diff --git a/config/examples/Creality/CR-10S/BigTreeTech SKR Pro v1.2/_Bootscreen.h b/config/examples/Creality/CR-10S/BigTreeTech SKR Pro v1.2/_Bootscreen.h index 16ce89f70f..651956fb36 100644 --- a/config/examples/Creality/CR-10S/BigTreeTech SKR Pro v1.2/_Bootscreen.h +++ b/config/examples/Creality/CR-10S/BigTreeTech SKR Pro v1.2/_Bootscreen.h @@ -16,7 +16,7 @@ * 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 . + * along with this program. If not, see . * */ #pragma once @@ -28,7 +28,7 @@ * and enable SHOW_CUSTOM_BOOTSCREEN in Configuration.h. * * Use the Marlin Bitmap Converter to make your own: - * http://marlinfw.org/tools/u8glib/converter.html + * https://marlinfw.org/tools/u8glib/converter.html */ #define CUSTOM_BOOTSCREEN_TIMEOUT 1000 diff --git a/config/examples/Creality/CR-10S/BigTreeTech SKR Pro v1.2/_Statusscreen.h b/config/examples/Creality/CR-10S/BigTreeTech SKR Pro v1.2/_Statusscreen.h index b6613d6dc9..950dbebfd0 100644 --- a/config/examples/Creality/CR-10S/BigTreeTech SKR Pro v1.2/_Statusscreen.h +++ b/config/examples/Creality/CR-10S/BigTreeTech SKR Pro v1.2/_Statusscreen.h @@ -16,7 +16,7 @@ * 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 . + * along with this program. If not, see . * */ #pragma once @@ -28,7 +28,7 @@ * and enable CUSTOM_STATUS_SCREEN_IMAGE in Configuration.h. * * Use the Marlin Bitmap Converter to make your own: - * http://marlinfw.org/tools/u8glib/converter.html + * https://marlinfw.org/tools/u8glib/converter.html */ // diff --git a/config/examples/Creality/CR-30 PrintMill/_Bootscreen.h b/config/examples/Creality/CR-30 PrintMill/_Bootscreen.h index e8bdd049fe..f5423a2ee4 100644 --- a/config/examples/Creality/CR-30 PrintMill/_Bootscreen.h +++ b/config/examples/Creality/CR-30 PrintMill/_Bootscreen.h @@ -16,7 +16,7 @@ * 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 . + * along with this program. If not, see . * */ #pragma once diff --git a/config/examples/Creality/CR-30 PrintMill/_Statusscreen.h b/config/examples/Creality/CR-30 PrintMill/_Statusscreen.h index bd29648e19..e499602d5e 100644 --- a/config/examples/Creality/CR-30 PrintMill/_Statusscreen.h +++ b/config/examples/Creality/CR-30 PrintMill/_Statusscreen.h @@ -16,7 +16,7 @@ * 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 . + * along with this program. If not, see . * */ diff --git a/config/examples/FolgerTech/FT-5 R2/Configuration_adv.h b/config/examples/FolgerTech/FT-5 R2/Configuration_adv.h index ef15d5606d..7a0b50887f 100644 --- a/config/examples/FolgerTech/FT-5 R2/Configuration_adv.h +++ b/config/examples/FolgerTech/FT-5 R2/Configuration_adv.h @@ -1325,7 +1325,7 @@ // // LCD Backlight Timeout // -//#define LCD_BACKLIGHT_TIMEOUT_MINS 5 // (minutes) Timeout before turning off the backlight +//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight #if HAS_BED_PROBE && EITHER(HAS_MARLINUI_MENU, HAS_TFT_LVGL_UI) //#define PROBE_OFFSET_WIZARD // Add a Probe Z Offset calibration option to the LCD menu diff --git a/config/examples/MakerTech3D/Proforge2sDual/Configuration_adv.h b/config/examples/MakerTech3D/Proforge2sDual/Configuration_adv.h index ef15d5606d..7a0b50887f 100644 --- a/config/examples/MakerTech3D/Proforge2sDual/Configuration_adv.h +++ b/config/examples/MakerTech3D/Proforge2sDual/Configuration_adv.h @@ -1325,7 +1325,7 @@ // // LCD Backlight Timeout // -//#define LCD_BACKLIGHT_TIMEOUT_MINS 5 // (minutes) Timeout before turning off the backlight +//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight #if HAS_BED_PROBE && EITHER(HAS_MARLINUI_MENU, HAS_TFT_LVGL_UI) //#define PROBE_OFFSET_WIZARD // Add a Probe Z Offset calibration option to the LCD menu diff --git a/config/examples/Modix/Big60/Configuration.h b/config/examples/Modix/Big60/Configuration.h index 5235241a4e..041a0cf2be 100644 --- a/config/examples/Modix/Big60/Configuration.h +++ b/config/examples/Modix/Big60/Configuration.h @@ -63,7 +63,7 @@ // Author info of this build printed to the host during boot and M115 #define STRING_CONFIG_H_AUTHOR "3DXtech" // Who made the changes. -#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes) +//#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes) /** * *** VENDORS PLEASE READ *** @@ -1250,7 +1250,7 @@ * https://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html */ #if DISABLED(CLASSIC_JERK) - #define JUNCTION_DEVIATION_MM 0.06 // (mm) Distance from real junction edge + #define JUNCTION_DEVIATION_MM 0.06 // (mm) Distance from real junction edge #define JD_HANDLE_SMALL_SEGMENTS // Use curvature estimation instead of just the junction angle // for small segments (< 1mm) with large junction angles (> 135°). #endif @@ -2023,7 +2023,7 @@ #if ENABLED(LCD_BED_LEVELING) #define MESH_EDIT_Z_STEP 0.025 // (mm) Step size while manually probing Z axis. #define LCD_PROBE_Z_RANGE 4 // (mm) Z Range centered on Z_MIN_POS for LCD Z adjustment - #define MESH_EDIT_MENU // Add a menu to edit mesh points + #define MESH_EDIT_MENU // Add a menu to edit mesh points #endif // Add a menu item to move between bed corners for manual bed adjustment diff --git a/config/examples/Sovol/SV-01/BigTreeTech SKR E3 Turbo/Configuration.h b/config/examples/Sovol/SV-01/BigTreeTech SKR E3 Turbo/Configuration.h index 1a5bb779d0..3bdd8c1c6f 100644 --- a/config/examples/Sovol/SV-01/BigTreeTech SKR E3 Turbo/Configuration.h +++ b/config/examples/Sovol/SV-01/BigTreeTech SKR E3 Turbo/Configuration.h @@ -408,7 +408,7 @@ * Specify whether the power supply is active HIGH or active LOW. */ //#define PSU_CONTROL -#define PSU_NAME "MEAN WELL" +#define PSU_NAME "Mean Well" #if ENABLED(PSU_CONTROL) //#define MKS_PWC // Using the MKS PWC add-on diff --git a/config/examples/Sovol/SV-01/BigTreeTech SKR E3 Turbo/Configuration_adv.h b/config/examples/Sovol/SV-01/BigTreeTech SKR E3 Turbo/Configuration_adv.h index 17abc105df..ac7c948734 100644 --- a/config/examples/Sovol/SV-01/BigTreeTech SKR E3 Turbo/Configuration_adv.h +++ b/config/examples/Sovol/SV-01/BigTreeTech SKR E3 Turbo/Configuration_adv.h @@ -1529,7 +1529,7 @@ // Without a POWER_LOSS_PIN the following option helps reduce wear on the SD card, // especially with "vase mode" printing. Set too high and vases cannot be continued. - #define POWER_LOSS_MIN_Z_CHANGE 2 // (mm) Minimum Z change before saving power-loss data + #define POWER_LOSS_MIN_Z_CHANGE 2 // (mm) Minimum Z change before saving power-loss data // Enable if Z homing is needed for proper recovery. 99.9% of the time this should be disabled! //#define POWER_LOSS_RECOVER_ZHOME @@ -3544,7 +3544,6 @@ */ //#define LASER_POWER_TRAP - // // Laser I2C Ammeter (High precision INA226 low/high side module) // diff --git a/config/examples/Sovol/SV-01/BigTreeTech SKR E3 Turbo/_Bootscreen.h b/config/examples/Sovol/SV-01/BigTreeTech SKR E3 Turbo/_Bootscreen.h index 1197c0b5d8..a308ce6aaf 100644 --- a/config/examples/Sovol/SV-01/BigTreeTech SKR E3 Turbo/_Bootscreen.h +++ b/config/examples/Sovol/SV-01/BigTreeTech SKR E3 Turbo/_Bootscreen.h @@ -1,56 +1,57 @@ -/** - * Marlin 3D Printer Firmware - * Copyright (c) 2021 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 - -/** - * Custom Boot Screen bitmap - * - * Place this file in the root with your configuration files - * and enable SHOW_CUSTOM_BOOTSCREEN in Configuration.h. - * - * Use the Marlin Bitmap Converter to make your own: - * https://marlinfw.org/tools/u8glib/converter.html - */ -#define CUSTOM_BOOTSCREEN_BMPWIDTH 112 - -const unsigned char custom_start_bmp[] PROGMEM = { - B00000011,B11100100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B10000000,B00000000,B11110000,B00111111,B11111111,B00000000, - B00000100,B00011100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00011100,B00000111,B10000001,B11000000, - B00001000,B00001100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00001110,B00000111,B10000000,B11100000, - B00010000,B00000100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00001110,B00000111,B10000000,B01110000, - B00010000,B00000100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00001110,B00000111,B10000000,B01110000, - B00011000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000000,B00001110,B00000111,B10000000,B00111000, - B00011100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000000,B00001110,B00000111,B10000000,B00111000, - B00011111,B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000000,B00001100,B00000111,B10000000,B00111000, - B00001111,B11111000,B00000011,B11100001,B11111000,B01111000,B00111110,B00000001,B10000000,B00000000,B00010000,B00000111,B10000000,B00111100, - B00000111,B11111100,B00001100,B00110000,B01110000,B00000000,B11000011,B00000001,B10000000,B00000001,B11110000,B00000111,B10000000,B00111100, - B00000001,B11111110,B00011100,B00011000,B01110000,B00100001,B11000001,B10000001,B10000000,B00000000,B00011100,B00000111,B10000000,B00111100, - B00000000,B00011110,B00011100,B00011100,B00111000,B00000001,B11000001,B11000001,B10000000,B00000000,B00001110,B00000111,B10000000,B00111100, - B00000000,B00000110,B00111100,B00011100,B00111000,B01000011,B11000001,B11000001,B10000000,B00000000,B00000111,B00000111,B10000000,B00111000, - B00000000,B00000010,B00111100,B00011100,B00011100,B00000011,B11000001,B11000001,B10000000,B00000000,B00000111,B00000111,B10000000,B00111000, - B00000000,B00000010,B00111100,B00011100,B00011100,B10000011,B11000001,B11000001,B10000000,B00000000,B00000111,B00000111,B10000000,B00111000, - B00010000,B00000010,B00111100,B00011100,B00001110,B00000011,B11000001,B11000001,B10000000,B00000111,B00000111,B00000111,B10000000,B01110000, - B00010000,B00000010,B00011100,B00011100,B00001111,B00000001,B11000001,B11000001,B10000000,B00000111,B00000111,B00000111,B10000000,B01110000, - B00011000,B00000100,B00011100,B00011000,B00000110,B00000001,B11000001,B10000001,B10000000,B00000110,B00001110,B00000111,B10000000,B11100000, - B00011100,B00001000,B00001100,B00110000,B00000110,B00000000,B11000011,B00000001,B10000000,B00000010,B00001100,B00000111,B10000001,B11000000, - B00010011,B11110000,B00000011,B11100000,B00000000,B00000000,B00111110,B00000111,B11100000,B00000001,B11110000,B00111111,B11111111,B00000000 -}; +/** + * Marlin 3D Printer Firmware + * Copyright (c) 2021 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 + +/** + * Custom Boot Screen bitmap + * + * Place this file in the root with your configuration files + * and enable SHOW_CUSTOM_BOOTSCREEN in Configuration.h. + * + * Use the Marlin Bitmap Converter to make your own: + * https://marlinfw.org/tools/u8glib/converter.html + */ + +#define CUSTOM_BOOTSCREEN_BMPWIDTH 112 + +const unsigned char custom_start_bmp[] PROGMEM = { + B00000011,B11100100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B10000000,B00000000,B11110000,B00111111,B11111111,B00000000, + B00000100,B00011100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00011100,B00000111,B10000001,B11000000, + B00001000,B00001100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00001110,B00000111,B10000000,B11100000, + B00010000,B00000100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00001110,B00000111,B10000000,B01110000, + B00010000,B00000100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00001110,B00000111,B10000000,B01110000, + B00011000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000000,B00001110,B00000111,B10000000,B00111000, + B00011100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000000,B00001110,B00000111,B10000000,B00111000, + B00011111,B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000000,B00001100,B00000111,B10000000,B00111000, + B00001111,B11111000,B00000011,B11100001,B11111000,B01111000,B00111110,B00000001,B10000000,B00000000,B00010000,B00000111,B10000000,B00111100, + B00000111,B11111100,B00001100,B00110000,B01110000,B00000000,B11000011,B00000001,B10000000,B00000001,B11110000,B00000111,B10000000,B00111100, + B00000001,B11111110,B00011100,B00011000,B01110000,B00100001,B11000001,B10000001,B10000000,B00000000,B00011100,B00000111,B10000000,B00111100, + B00000000,B00011110,B00011100,B00011100,B00111000,B00000001,B11000001,B11000001,B10000000,B00000000,B00001110,B00000111,B10000000,B00111100, + B00000000,B00000110,B00111100,B00011100,B00111000,B01000011,B11000001,B11000001,B10000000,B00000000,B00000111,B00000111,B10000000,B00111000, + B00000000,B00000010,B00111100,B00011100,B00011100,B00000011,B11000001,B11000001,B10000000,B00000000,B00000111,B00000111,B10000000,B00111000, + B00000000,B00000010,B00111100,B00011100,B00011100,B10000011,B11000001,B11000001,B10000000,B00000000,B00000111,B00000111,B10000000,B00111000, + B00010000,B00000010,B00111100,B00011100,B00001110,B00000011,B11000001,B11000001,B10000000,B00000111,B00000111,B00000111,B10000000,B01110000, + B00010000,B00000010,B00011100,B00011100,B00001111,B00000001,B11000001,B11000001,B10000000,B00000111,B00000111,B00000111,B10000000,B01110000, + B00011000,B00000100,B00011100,B00011000,B00000110,B00000001,B11000001,B10000001,B10000000,B00000110,B00001110,B00000111,B10000000,B11100000, + B00011100,B00001000,B00001100,B00110000,B00000110,B00000000,B11000011,B00000001,B10000000,B00000010,B00001100,B00000111,B10000001,B11000000, + B00010011,B11110000,B00000011,B11100000,B00000000,B00000000,B00111110,B00000111,B11100000,B00000001,B11110000,B00111111,B11111111,B00000000 +}; diff --git a/config/examples/Sovol/SV-01/BigTreeTech SKR E3 Turbo/_Statusscreen.h b/config/examples/Sovol/SV-01/BigTreeTech SKR E3 Turbo/_Statusscreen.h index 3f8883e8ee..41d894f7b0 100644 --- a/config/examples/Sovol/SV-01/BigTreeTech SKR E3 Turbo/_Statusscreen.h +++ b/config/examples/Sovol/SV-01/BigTreeTech SKR E3 Turbo/_Statusscreen.h @@ -1,50 +1,50 @@ -/** - * Marlin 3D Printer Firmware - * Copyright (c) 2021 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 - -/** - * Custom Status Screen bitmap - * - * Place this file in the root with your configuration files - * and enable CUSTOM_STATUS_SCREEN_IMAGE in Configuration.h. - * - * Use the Marlin Bitmap Converter to make your own: - * https://marlinfw.org/tools/u8glib/converter.html - */ - -#define STATUS_LOGO_Y 8 -#define STATUS_LOGO_WIDTH 32 - -const unsigned char status_logo_bmp[] PROGMEM = { - B00011110,B11110111,B10011100,B00000100, - B00111111,B01100011,B00111110,B00001100, - B01100011,B01100011,B01100011,B00111100, - B01100000,B01100011,B01100011,B00001100, - B01100000,B01100011,B01100011,B00001100, - B00111100,B01100011,B01100011,B00001100, - B00011110,B00110110,B01100011,B00001100, - B00000011,B00110110,B01100011,B00001100, - B00000011,B00110110,B01100011,B00001100, - B01100011,B00011100,B01100011,B00001100, - B01111110,B00011100,B00111110,B00111111, - B00111100,B00001000,B00011100,B00111111 -}; +/** + * Marlin 3D Printer Firmware + * Copyright (c) 2021 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 + +/** + * Custom Status Screen bitmap + * + * Place this file in the root with your configuration files + * and enable CUSTOM_STATUS_SCREEN_IMAGE in Configuration.h. + * + * Use the Marlin Bitmap Converter to make your own: + * https://marlinfw.org/tools/u8glib/converter.html + */ + +#define STATUS_LOGO_Y 8 +#define STATUS_LOGO_WIDTH 32 + +const unsigned char status_logo_bmp[] PROGMEM = { + B00011110,B11110111,B10011100,B00000100, + B00111111,B01100011,B00111110,B00001100, + B01100011,B01100011,B01100011,B00111100, + B01100000,B01100011,B01100011,B00001100, + B01100000,B01100011,B01100011,B00001100, + B00111100,B01100011,B01100011,B00001100, + B00011110,B00110110,B01100011,B00001100, + B00000011,B00110110,B01100011,B00001100, + B00000011,B00110110,B01100011,B00001100, + B01100011,B00011100,B01100011,B00001100, + B01111110,B00011100,B00111110,B00111111, + B00111100,B00001000,B00011100,B00111111 +}; diff --git a/config/examples/Sovol/SV-01/BigTreeTech SKR Mini E3 2.0/Configuration.h b/config/examples/Sovol/SV-01/BigTreeTech SKR Mini E3 2.0/Configuration.h index 508f75c2c8..6af14e55c8 100644 --- a/config/examples/Sovol/SV-01/BigTreeTech SKR Mini E3 2.0/Configuration.h +++ b/config/examples/Sovol/SV-01/BigTreeTech SKR Mini E3 2.0/Configuration.h @@ -404,7 +404,7 @@ * Specify whether the power supply is active HIGH or active LOW. */ //#define PSU_CONTROL -#define PSU_NAME "MEAN WELL" +#define PSU_NAME "Mean Well" #if ENABLED(PSU_CONTROL) //#define MKS_PWC // Using the MKS PWC add-on diff --git a/config/examples/Sovol/SV-01/BigTreeTech SKR Mini E3 2.0/Configuration_adv.h b/config/examples/Sovol/SV-01/BigTreeTech SKR Mini E3 2.0/Configuration_adv.h index 097bd8c29b..a091f0bdd0 100644 --- a/config/examples/Sovol/SV-01/BigTreeTech SKR Mini E3 2.0/Configuration_adv.h +++ b/config/examples/Sovol/SV-01/BigTreeTech SKR Mini E3 2.0/Configuration_adv.h @@ -1529,7 +1529,7 @@ // Without a POWER_LOSS_PIN the following option helps reduce wear on the SD card, // especially with "vase mode" printing. Set too high and vases cannot be continued. - #define POWER_LOSS_MIN_Z_CHANGE 2 // (mm) Minimum Z change before saving power-loss data + #define POWER_LOSS_MIN_Z_CHANGE 2 // (mm) Minimum Z change before saving power-loss data // Enable if Z homing is needed for proper recovery. 99.9% of the time this should be disabled! //#define POWER_LOSS_RECOVER_ZHOME @@ -3544,7 +3544,6 @@ */ //#define LASER_POWER_TRAP - // // Laser I2C Ammeter (High precision INA226 low/high side module) // @@ -3762,7 +3761,7 @@ //#define M114_REALTIME // Real current position based on forward kinematics //#define M114_LEGACY // M114 used to synchronize on every call. Enable if needed. -#define REPORT_FAN_CHANGE // Report the new fan speed when changed by M106 (and others) +#define REPORT_FAN_CHANGE // Report the new fan speed when changed by M106 (and others) // @section gcode diff --git a/config/examples/Sovol/SV-01/BigTreeTech SKR Mini E3 2.0/_Bootscreen.h b/config/examples/Sovol/SV-01/BigTreeTech SKR Mini E3 2.0/_Bootscreen.h index 1197c0b5d8..e41a2de75c 100644 --- a/config/examples/Sovol/SV-01/BigTreeTech SKR Mini E3 2.0/_Bootscreen.h +++ b/config/examples/Sovol/SV-01/BigTreeTech SKR Mini E3 2.0/_Bootscreen.h @@ -1,56 +1,56 @@ -/** - * Marlin 3D Printer Firmware - * Copyright (c) 2021 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 - -/** - * Custom Boot Screen bitmap - * - * Place this file in the root with your configuration files - * and enable SHOW_CUSTOM_BOOTSCREEN in Configuration.h. - * - * Use the Marlin Bitmap Converter to make your own: - * https://marlinfw.org/tools/u8glib/converter.html - */ -#define CUSTOM_BOOTSCREEN_BMPWIDTH 112 - -const unsigned char custom_start_bmp[] PROGMEM = { - B00000011,B11100100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B10000000,B00000000,B11110000,B00111111,B11111111,B00000000, - B00000100,B00011100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00011100,B00000111,B10000001,B11000000, - B00001000,B00001100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00001110,B00000111,B10000000,B11100000, - B00010000,B00000100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00001110,B00000111,B10000000,B01110000, - B00010000,B00000100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00001110,B00000111,B10000000,B01110000, - B00011000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000000,B00001110,B00000111,B10000000,B00111000, - B00011100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000000,B00001110,B00000111,B10000000,B00111000, - B00011111,B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000000,B00001100,B00000111,B10000000,B00111000, - B00001111,B11111000,B00000011,B11100001,B11111000,B01111000,B00111110,B00000001,B10000000,B00000000,B00010000,B00000111,B10000000,B00111100, - B00000111,B11111100,B00001100,B00110000,B01110000,B00000000,B11000011,B00000001,B10000000,B00000001,B11110000,B00000111,B10000000,B00111100, - B00000001,B11111110,B00011100,B00011000,B01110000,B00100001,B11000001,B10000001,B10000000,B00000000,B00011100,B00000111,B10000000,B00111100, - B00000000,B00011110,B00011100,B00011100,B00111000,B00000001,B11000001,B11000001,B10000000,B00000000,B00001110,B00000111,B10000000,B00111100, - B00000000,B00000110,B00111100,B00011100,B00111000,B01000011,B11000001,B11000001,B10000000,B00000000,B00000111,B00000111,B10000000,B00111000, - B00000000,B00000010,B00111100,B00011100,B00011100,B00000011,B11000001,B11000001,B10000000,B00000000,B00000111,B00000111,B10000000,B00111000, - B00000000,B00000010,B00111100,B00011100,B00011100,B10000011,B11000001,B11000001,B10000000,B00000000,B00000111,B00000111,B10000000,B00111000, - B00010000,B00000010,B00111100,B00011100,B00001110,B00000011,B11000001,B11000001,B10000000,B00000111,B00000111,B00000111,B10000000,B01110000, - B00010000,B00000010,B00011100,B00011100,B00001111,B00000001,B11000001,B11000001,B10000000,B00000111,B00000111,B00000111,B10000000,B01110000, - B00011000,B00000100,B00011100,B00011000,B00000110,B00000001,B11000001,B10000001,B10000000,B00000110,B00001110,B00000111,B10000000,B11100000, - B00011100,B00001000,B00001100,B00110000,B00000110,B00000000,B11000011,B00000001,B10000000,B00000010,B00001100,B00000111,B10000001,B11000000, - B00010011,B11110000,B00000011,B11100000,B00000000,B00000000,B00111110,B00000111,B11100000,B00000001,B11110000,B00111111,B11111111,B00000000 -}; +/** + * Marlin 3D Printer Firmware + * Copyright (c) 2021 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 + +/** + * Custom Boot Screen bitmap + * + * Place this file in the root with your configuration files + * and enable SHOW_CUSTOM_BOOTSCREEN in Configuration.h. + * + * Use the Marlin Bitmap Converter to make your own: + * https://marlinfw.org/tools/u8glib/converter.html + */ +#define CUSTOM_BOOTSCREEN_BMPWIDTH 112 + +const unsigned char custom_start_bmp[] PROGMEM = { + B00000011,B11100100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B10000000,B00000000,B11110000,B00111111,B11111111,B00000000, + B00000100,B00011100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00011100,B00000111,B10000001,B11000000, + B00001000,B00001100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00001110,B00000111,B10000000,B11100000, + B00010000,B00000100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00001110,B00000111,B10000000,B01110000, + B00010000,B00000100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00001110,B00000111,B10000000,B01110000, + B00011000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000000,B00001110,B00000111,B10000000,B00111000, + B00011100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000000,B00001110,B00000111,B10000000,B00111000, + B00011111,B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000000,B00001100,B00000111,B10000000,B00111000, + B00001111,B11111000,B00000011,B11100001,B11111000,B01111000,B00111110,B00000001,B10000000,B00000000,B00010000,B00000111,B10000000,B00111100, + B00000111,B11111100,B00001100,B00110000,B01110000,B00000000,B11000011,B00000001,B10000000,B00000001,B11110000,B00000111,B10000000,B00111100, + B00000001,B11111110,B00011100,B00011000,B01110000,B00100001,B11000001,B10000001,B10000000,B00000000,B00011100,B00000111,B10000000,B00111100, + B00000000,B00011110,B00011100,B00011100,B00111000,B00000001,B11000001,B11000001,B10000000,B00000000,B00001110,B00000111,B10000000,B00111100, + B00000000,B00000110,B00111100,B00011100,B00111000,B01000011,B11000001,B11000001,B10000000,B00000000,B00000111,B00000111,B10000000,B00111000, + B00000000,B00000010,B00111100,B00011100,B00011100,B00000011,B11000001,B11000001,B10000000,B00000000,B00000111,B00000111,B10000000,B00111000, + B00000000,B00000010,B00111100,B00011100,B00011100,B10000011,B11000001,B11000001,B10000000,B00000000,B00000111,B00000111,B10000000,B00111000, + B00010000,B00000010,B00111100,B00011100,B00001110,B00000011,B11000001,B11000001,B10000000,B00000111,B00000111,B00000111,B10000000,B01110000, + B00010000,B00000010,B00011100,B00011100,B00001111,B00000001,B11000001,B11000001,B10000000,B00000111,B00000111,B00000111,B10000000,B01110000, + B00011000,B00000100,B00011100,B00011000,B00000110,B00000001,B11000001,B10000001,B10000000,B00000110,B00001110,B00000111,B10000000,B11100000, + B00011100,B00001000,B00001100,B00110000,B00000110,B00000000,B11000011,B00000001,B10000000,B00000010,B00001100,B00000111,B10000001,B11000000, + B00010011,B11110000,B00000011,B11100000,B00000000,B00000000,B00111110,B00000111,B11100000,B00000001,B11110000,B00111111,B11111111,B00000000 +}; diff --git a/config/examples/Sovol/SV-01/BigTreeTech SKR Mini E3 2.0/_Statusscreen.h b/config/examples/Sovol/SV-01/BigTreeTech SKR Mini E3 2.0/_Statusscreen.h index 3f8883e8ee..41d894f7b0 100644 --- a/config/examples/Sovol/SV-01/BigTreeTech SKR Mini E3 2.0/_Statusscreen.h +++ b/config/examples/Sovol/SV-01/BigTreeTech SKR Mini E3 2.0/_Statusscreen.h @@ -1,50 +1,50 @@ -/** - * Marlin 3D Printer Firmware - * Copyright (c) 2021 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 - -/** - * Custom Status Screen bitmap - * - * Place this file in the root with your configuration files - * and enable CUSTOM_STATUS_SCREEN_IMAGE in Configuration.h. - * - * Use the Marlin Bitmap Converter to make your own: - * https://marlinfw.org/tools/u8glib/converter.html - */ - -#define STATUS_LOGO_Y 8 -#define STATUS_LOGO_WIDTH 32 - -const unsigned char status_logo_bmp[] PROGMEM = { - B00011110,B11110111,B10011100,B00000100, - B00111111,B01100011,B00111110,B00001100, - B01100011,B01100011,B01100011,B00111100, - B01100000,B01100011,B01100011,B00001100, - B01100000,B01100011,B01100011,B00001100, - B00111100,B01100011,B01100011,B00001100, - B00011110,B00110110,B01100011,B00001100, - B00000011,B00110110,B01100011,B00001100, - B00000011,B00110110,B01100011,B00001100, - B01100011,B00011100,B01100011,B00001100, - B01111110,B00011100,B00111110,B00111111, - B00111100,B00001000,B00011100,B00111111 -}; +/** + * Marlin 3D Printer Firmware + * Copyright (c) 2021 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 + +/** + * Custom Status Screen bitmap + * + * Place this file in the root with your configuration files + * and enable CUSTOM_STATUS_SCREEN_IMAGE in Configuration.h. + * + * Use the Marlin Bitmap Converter to make your own: + * https://marlinfw.org/tools/u8glib/converter.html + */ + +#define STATUS_LOGO_Y 8 +#define STATUS_LOGO_WIDTH 32 + +const unsigned char status_logo_bmp[] PROGMEM = { + B00011110,B11110111,B10011100,B00000100, + B00111111,B01100011,B00111110,B00001100, + B01100011,B01100011,B01100011,B00111100, + B01100000,B01100011,B01100011,B00001100, + B01100000,B01100011,B01100011,B00001100, + B00111100,B01100011,B01100011,B00001100, + B00011110,B00110110,B01100011,B00001100, + B00000011,B00110110,B01100011,B00001100, + B00000011,B00110110,B01100011,B00001100, + B01100011,B00011100,B01100011,B00001100, + B01111110,B00011100,B00111110,B00111111, + B00111100,B00001000,B00011100,B00111111 +}; diff --git a/config/examples/Sovol/SV-01/BigTreeTech SKR Mini E3 3.0/Configuration.h b/config/examples/Sovol/SV-01/BigTreeTech SKR Mini E3 3.0/Configuration.h index f201bd3491..e7986a5ea1 100644 --- a/config/examples/Sovol/SV-01/BigTreeTech SKR Mini E3 3.0/Configuration.h +++ b/config/examples/Sovol/SV-01/BigTreeTech SKR Mini E3 3.0/Configuration.h @@ -406,7 +406,7 @@ * Specify whether the power supply is active HIGH or active LOW. */ //#define PSU_CONTROL -#define PSU_NAME "MEAN WELL" +#define PSU_NAME "Mean Well" #if ENABLED(PSU_CONTROL) //#define MKS_PWC // Using the MKS PWC add-on @@ -809,8 +809,8 @@ #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max. - #define PID_EDIT_MENU // Add PID editing to the "Advanced Settings" menu. (~700 bytes of flash) - #define PID_AUTOTUNE_MENU // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of flash) + #define PID_EDIT_MENU // Add PID editing to the "Advanced Settings" menu. (~700 bytes of flash) + #define PID_AUTOTUNE_MENU // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of flash) #endif // @section safety @@ -1252,7 +1252,7 @@ * https://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html */ #if DISABLED(CLASSIC_JERK) - #define JUNCTION_DEVIATION_MM 0.08 // (mm) Distance from real junction edge + #define JUNCTION_DEVIATION_MM 0.08 // (mm) Distance from real junction edge #define JD_HANDLE_SMALL_SEGMENTS // Use curvature estimation instead of just the junction angle // for small segments (< 1mm) with large junction angles (> 135°). #endif @@ -1569,7 +1569,7 @@ * 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 7 // Z Clearance for Deploy/Stow +#define Z_CLEARANCE_DEPLOY_PROBE 7 // Z Clearance for Deploy/Stow #define Z_CLEARANCE_BETWEEN_PROBES 3 // Z Clearance between probe points #define Z_CLEARANCE_MULTI_PROBE 3 // Z Clearance between multiple probes //#define Z_AFTER_PROBING 5 // Z position after probing is done diff --git a/config/examples/Sovol/SV-01/BigTreeTech SKR Mini E3 3.0/_Statusscreen.h b/config/examples/Sovol/SV-01/BigTreeTech SKR Mini E3 3.0/_Statusscreen.h index 347e327f9c..0a5f20022a 100644 --- a/config/examples/Sovol/SV-01/BigTreeTech SKR Mini E3 3.0/_Statusscreen.h +++ b/config/examples/Sovol/SV-01/BigTreeTech SKR Mini E3 3.0/_Statusscreen.h @@ -16,9 +16,10 @@ * 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 . + * along with this program. If not, see . * */ +#pragma once /** * Custom Status Screen bitmap @@ -27,11 +28,9 @@ * and enable CUSTOM_STATUS_SCREEN_IMAGE in Configuration.h. * * Use the Marlin Bitmap Converter to make your own: - * http://marlinfw.org/tools/u8glib/converter.html + * https://marlinfw.org/tools/u8glib/converter.html */ -#pragma once - #define STATUS_LOGO_WIDTH 32 const unsigned char status_logo_bmp[] PROGMEM = { @@ -65,4 +64,3 @@ const unsigned char status_logo_bmp[] PROGMEM = { B00000000,B00011111,B11000000,B00000000, B00000000,B00000000,B00000000,B00000000 }; - diff --git a/config/examples/Sovol/SV-01/CrealityV22/Configuration_adv.h b/config/examples/Sovol/SV-01/CrealityV22/Configuration_adv.h index 085e51ef2b..0d43ed7bcd 100644 --- a/config/examples/Sovol/SV-01/CrealityV22/Configuration_adv.h +++ b/config/examples/Sovol/SV-01/CrealityV22/Configuration_adv.h @@ -2110,6 +2110,8 @@ #endif /** + * Probing Margins + * * Override PROBING_MARGIN for each side of the build plate * Useful to get probe points to exact positions on targets or * to allow leveling to avoid plate clamps on only specific @@ -3472,7 +3474,8 @@ * Each tool uses different value ranges for speed / power control. * These parameters are used to convert between tool power units and PWM. * - * Set these required parameters for your controller + * Speed/Power = (PWMDC / 255 * 100 - SPEED_POWER_INTERCEPT) / SPEED_POWER_SLOPE + * PWMDC = (spdpwr - SPEED_POWER_MIN) / (SPEED_POWER_MAX - SPEED_POWER_MIN) / SPEED_POWER_SLOPE */ #if ENABLED(SPINDLE_LASER_USE_PWM) #define SPEED_POWER_INTERCEPT 0 // (%) 0-100 i.e., Minimum power percentage @@ -3541,7 +3544,6 @@ */ //#define LASER_POWER_TRAP - // // Laser I2C Ammeter (High precision INA226 low/high side module) // diff --git a/config/examples/Sovol/SV-01/CrealityV22/_Bootscreen.h b/config/examples/Sovol/SV-01/CrealityV22/_Bootscreen.h index 985ce31e32..ab644f06d4 100644 --- a/config/examples/Sovol/SV-01/CrealityV22/_Bootscreen.h +++ b/config/examples/Sovol/SV-01/CrealityV22/_Bootscreen.h @@ -1,56 +1,54 @@ -/** - * 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 - -/** - * Custom Boot Screen bitmap - * - * Place this file in the root with your configuration files - * and enable SHOW_CUSTOM_BOOTSCREEN in Configuration.h. - * - * Use the Marlin Bitmap Converter to make your own: - * https://marlinfw.org/tools/u8glib/converter.html - */ -#define CUSTOM_BOOTSCREEN_BMPWIDTH 112 - -const unsigned char custom_start_bmp[] PROGMEM = { - B00000011,B11100100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B10000000,B00000000,B11110000,B00111111,B11111111,B00000000, - B00000100,B00011100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00011100,B00000111,B10000001,B11000000, - B00001000,B00001100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00001110,B00000111,B10000000,B11100000, - B00010000,B00000100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00001110,B00000111,B10000000,B01110000, - B00010000,B00000100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00001110,B00000111,B10000000,B01110000, - B00011000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000000,B00001110,B00000111,B10000000,B00111000, - B00011100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000000,B00001110,B00000111,B10000000,B00111000, - B00011111,B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000000,B00001100,B00000111,B10000000,B00111000, - B00001111,B11111000,B00000011,B11100001,B11111000,B01111000,B00111110,B00000001,B10000000,B00000000,B00010000,B00000111,B10000000,B00111100, - B00000111,B11111100,B00001100,B00110000,B01110000,B00000000,B11000011,B00000001,B10000000,B00000001,B11110000,B00000111,B10000000,B00111100, - B00000001,B11111110,B00011100,B00011000,B01110000,B00100001,B11000001,B10000001,B10000000,B00000000,B00011100,B00000111,B10000000,B00111100, - B00000000,B00011110,B00011100,B00011100,B00111000,B00000001,B11000001,B11000001,B10000000,B00000000,B00001110,B00000111,B10000000,B00111100, - B00000000,B00000110,B00111100,B00011100,B00111000,B01000011,B11000001,B11000001,B10000000,B00000000,B00000111,B00000111,B10000000,B00111000, - B00000000,B00000010,B00111100,B00011100,B00011100,B00000011,B11000001,B11000001,B10000000,B00000000,B00000111,B00000111,B10000000,B00111000, - B00000000,B00000010,B00111100,B00011100,B00011100,B10000011,B11000001,B11000001,B10000000,B00000000,B00000111,B00000111,B10000000,B00111000, - B00010000,B00000010,B00111100,B00011100,B00001110,B00000011,B11000001,B11000001,B10000000,B00000111,B00000111,B00000111,B10000000,B01110000, - B00010000,B00000010,B00011100,B00011100,B00001111,B00000001,B11000001,B11000001,B10000000,B00000111,B00000111,B00000111,B10000000,B01110000, - B00011000,B00000100,B00011100,B00011000,B00000110,B00000001,B11000001,B10000001,B10000000,B00000110,B00001110,B00000111,B10000000,B11100000, - B00011100,B00001000,B00001100,B00110000,B00000110,B00000000,B11000011,B00000001,B10000000,B00000010,B00001100,B00000111,B10000001,B11000000, - B00010011,B11110000,B00000011,B11100000,B00000000,B00000000,B00111110,B00000111,B11100000,B00000001,B11110000,B00111111,B11111111,B00000000 -}; +/** + * 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 + * https://marlinfw.org/tools/u8glib/converter.html + * + * This bitmap from the file 'sovol.png' + */ + +#define CUSTOM_BOOTSCREEN_BMPWIDTH 112 + +const unsigned char custom_start_bmp[] PROGMEM = { + B00000011,B11100100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B10000000,B00000000,B11110000,B00111111,B11111111,B00000000, + B00000100,B00011100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00011100,B00000111,B10000001,B11000000, + B00001000,B00001100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00001110,B00000111,B10000000,B11100000, + B00010000,B00000100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00001110,B00000111,B10000000,B01110000, + B00010000,B00000100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00001110,B00000111,B10000000,B01110000, + B00011000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000000,B00001110,B00000111,B10000000,B00111000, + B00011100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000000,B00001110,B00000111,B10000000,B00111000, + B00011111,B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000000,B00001100,B00000111,B10000000,B00111000, + B00001111,B11111000,B00000011,B11100001,B11111000,B01111000,B00111110,B00000001,B10000000,B00000000,B00010000,B00000111,B10000000,B00111100, + B00000111,B11111100,B00001100,B00110000,B01110000,B00000000,B11000011,B00000001,B10000000,B00000001,B11110000,B00000111,B10000000,B00111100, + B00000001,B11111110,B00011100,B00011000,B01110000,B00100001,B11000001,B10000001,B10000000,B00000000,B00011100,B00000111,B10000000,B00111100, + B00000000,B00011110,B00011100,B00011100,B00111000,B00000001,B11000001,B11000001,B10000000,B00000000,B00001110,B00000111,B10000000,B00111100, + B00000000,B00000110,B00111100,B00011100,B00111000,B01000011,B11000001,B11000001,B10000000,B00000000,B00000111,B00000111,B10000000,B00111000, + B00000000,B00000010,B00111100,B00011100,B00011100,B00000011,B11000001,B11000001,B10000000,B00000000,B00000111,B00000111,B10000000,B00111000, + B00000000,B00000010,B00111100,B00011100,B00011100,B10000011,B11000001,B11000001,B10000000,B00000000,B00000111,B00000111,B10000000,B00111000, + B00010000,B00000010,B00111100,B00011100,B00001110,B00000011,B11000001,B11000001,B10000000,B00000111,B00000111,B00000111,B10000000,B01110000, + B00010000,B00000010,B00011100,B00011100,B00001111,B00000001,B11000001,B11000001,B10000000,B00000111,B00000111,B00000111,B10000000,B01110000, + B00011000,B00000100,B00011100,B00011000,B00000110,B00000001,B11000001,B10000001,B10000000,B00000110,B00001110,B00000111,B10000000,B11100000, + B00011100,B00001000,B00001100,B00110000,B00000110,B00000000,B11000011,B00000001,B10000000,B00000010,B00001100,B00000111,B10000001,B11000000, + B00010011,B11110000,B00000011,B11100000,B00000000,B00000000,B00111110,B00000111,B11100000,B00000001,B11110000,B00111111,B11111111,B00000000 +}; diff --git a/config/examples/Sovol/SV-01/CrealityV22/_Statusscreen.h b/config/examples/Sovol/SV-01/CrealityV22/_Statusscreen.h index ecbf43f7d0..fe52963e68 100644 --- a/config/examples/Sovol/SV-01/CrealityV22/_Statusscreen.h +++ b/config/examples/Sovol/SV-01/CrealityV22/_Statusscreen.h @@ -1,50 +1,49 @@ -/** - * 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 - -/** - * Custom Status Screen bitmap - * - * Place this file in the root with your configuration files - * and enable CUSTOM_STATUS_SCREEN_IMAGE in Configuration.h. - * - * Use the Marlin Bitmap Converter to make your own: - * https://marlinfw.org/tools/u8glib/converter.html - */ - -#define STATUS_LOGO_Y 8 -#define STATUS_LOGO_WIDTH 32 - -const unsigned char status_logo_bmp[] PROGMEM = { - B00011110,B11110111,B10011100,B00000100, - B00111111,B01100011,B00111110,B00001100, - B01100011,B01100011,B01100011,B00111100, - B01100000,B01100011,B01100011,B00001100, - B01100000,B01100011,B01100011,B00001100, - B00111100,B01100011,B01100011,B00001100, - B00011110,B00110110,B01100011,B00001100, - B00000011,B00110110,B01100011,B00001100, - B00000011,B00110110,B01100011,B00001100, - B01100011,B00011100,B01100011,B00001100, - B01111110,B00011100,B00111110,B00111111, - B00111100,B00001000,B00011100,B00111111 -}; +/** + * 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 + +/** + * Custom Status Screen bitmap + * + * Place this file in the root with your configuration files + * and enable CUSTOM_STATUS_SCREEN_IMAGE in Configuration.h. + * + * Use the Marlin Bitmap Converter to make your own: + * https://marlinfw.org/tools/u8glib/converter.html + */ + +#define STATUS_LOGO_WIDTH 32 + +const unsigned char status_logo_bmp[] PROGMEM = { + B00011110,B11110111,B10011100,B00000100, + B00111111,B01100011,B00111110,B00001100, + B01100011,B01100011,B01100011,B00111100, + B01100000,B01100011,B01100011,B00001100, + B01100000,B01100011,B01100011,B00001100, + B00111100,B01100011,B01100011,B00001100, + B00011110,B00110110,B01100011,B00001100, + B00000011,B00110110,B01100011,B00001100, + B00000011,B00110110,B01100011,B00001100, + B01100011,B00011100,B01100011,B00001100, + B01111110,B00011100,B00111110,B00111111, + B00111100,B00001000,B00011100,B00111111 +}; diff --git a/config/examples/Sovol/SV-01/CrealityV221/Configuration.h b/config/examples/Sovol/SV-01/CrealityV221/Configuration.h index 15a7fb0cd3..1c039e6739 100644 --- a/config/examples/Sovol/SV-01/CrealityV221/Configuration.h +++ b/config/examples/Sovol/SV-01/CrealityV221/Configuration.h @@ -137,7 +137,7 @@ //#define BLUETOOTH // Name displayed in the LCD "Ready" message and Info menu -#define CUSTOM_MACHINE_NAME "SOVOL SV01" +#define CUSTOM_MACHINE_NAME "Sovol SV01" // 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 @@ -404,7 +404,7 @@ * Specify whether the power supply is active HIGH or active LOW. */ //#define PSU_CONTROL -#define PSU_NAME "MEAN WELL" +#define PSU_NAME "Mean Well" #if ENABLED(PSU_CONTROL) //#define MKS_PWC // Using the MKS PWC add-on diff --git a/config/examples/Sovol/SV-01/CrealityV221/_Bootscreen.h b/config/examples/Sovol/SV-01/CrealityV221/_Bootscreen.h index 1197c0b5d8..e41a2de75c 100644 --- a/config/examples/Sovol/SV-01/CrealityV221/_Bootscreen.h +++ b/config/examples/Sovol/SV-01/CrealityV221/_Bootscreen.h @@ -1,56 +1,56 @@ -/** - * Marlin 3D Printer Firmware - * Copyright (c) 2021 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 - -/** - * Custom Boot Screen bitmap - * - * Place this file in the root with your configuration files - * and enable SHOW_CUSTOM_BOOTSCREEN in Configuration.h. - * - * Use the Marlin Bitmap Converter to make your own: - * https://marlinfw.org/tools/u8glib/converter.html - */ -#define CUSTOM_BOOTSCREEN_BMPWIDTH 112 - -const unsigned char custom_start_bmp[] PROGMEM = { - B00000011,B11100100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B10000000,B00000000,B11110000,B00111111,B11111111,B00000000, - B00000100,B00011100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00011100,B00000111,B10000001,B11000000, - B00001000,B00001100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00001110,B00000111,B10000000,B11100000, - B00010000,B00000100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00001110,B00000111,B10000000,B01110000, - B00010000,B00000100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00001110,B00000111,B10000000,B01110000, - B00011000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000000,B00001110,B00000111,B10000000,B00111000, - B00011100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000000,B00001110,B00000111,B10000000,B00111000, - B00011111,B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000000,B00001100,B00000111,B10000000,B00111000, - B00001111,B11111000,B00000011,B11100001,B11111000,B01111000,B00111110,B00000001,B10000000,B00000000,B00010000,B00000111,B10000000,B00111100, - B00000111,B11111100,B00001100,B00110000,B01110000,B00000000,B11000011,B00000001,B10000000,B00000001,B11110000,B00000111,B10000000,B00111100, - B00000001,B11111110,B00011100,B00011000,B01110000,B00100001,B11000001,B10000001,B10000000,B00000000,B00011100,B00000111,B10000000,B00111100, - B00000000,B00011110,B00011100,B00011100,B00111000,B00000001,B11000001,B11000001,B10000000,B00000000,B00001110,B00000111,B10000000,B00111100, - B00000000,B00000110,B00111100,B00011100,B00111000,B01000011,B11000001,B11000001,B10000000,B00000000,B00000111,B00000111,B10000000,B00111000, - B00000000,B00000010,B00111100,B00011100,B00011100,B00000011,B11000001,B11000001,B10000000,B00000000,B00000111,B00000111,B10000000,B00111000, - B00000000,B00000010,B00111100,B00011100,B00011100,B10000011,B11000001,B11000001,B10000000,B00000000,B00000111,B00000111,B10000000,B00111000, - B00010000,B00000010,B00111100,B00011100,B00001110,B00000011,B11000001,B11000001,B10000000,B00000111,B00000111,B00000111,B10000000,B01110000, - B00010000,B00000010,B00011100,B00011100,B00001111,B00000001,B11000001,B11000001,B10000000,B00000111,B00000111,B00000111,B10000000,B01110000, - B00011000,B00000100,B00011100,B00011000,B00000110,B00000001,B11000001,B10000001,B10000000,B00000110,B00001110,B00000111,B10000000,B11100000, - B00011100,B00001000,B00001100,B00110000,B00000110,B00000000,B11000011,B00000001,B10000000,B00000010,B00001100,B00000111,B10000001,B11000000, - B00010011,B11110000,B00000011,B11100000,B00000000,B00000000,B00111110,B00000111,B11100000,B00000001,B11110000,B00111111,B11111111,B00000000 -}; +/** + * Marlin 3D Printer Firmware + * Copyright (c) 2021 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 + +/** + * Custom Boot Screen bitmap + * + * Place this file in the root with your configuration files + * and enable SHOW_CUSTOM_BOOTSCREEN in Configuration.h. + * + * Use the Marlin Bitmap Converter to make your own: + * https://marlinfw.org/tools/u8glib/converter.html + */ +#define CUSTOM_BOOTSCREEN_BMPWIDTH 112 + +const unsigned char custom_start_bmp[] PROGMEM = { + B00000011,B11100100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B10000000,B00000000,B11110000,B00111111,B11111111,B00000000, + B00000100,B00011100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00011100,B00000111,B10000001,B11000000, + B00001000,B00001100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00001110,B00000111,B10000000,B11100000, + B00010000,B00000100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00001110,B00000111,B10000000,B01110000, + B00010000,B00000100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000011,B00001110,B00000111,B10000000,B01110000, + B00011000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000000,B00001110,B00000111,B10000000,B00111000, + B00011100,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000000,B00001110,B00000111,B10000000,B00111000, + B00011111,B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000000,B00000000,B00001100,B00000111,B10000000,B00111000, + B00001111,B11111000,B00000011,B11100001,B11111000,B01111000,B00111110,B00000001,B10000000,B00000000,B00010000,B00000111,B10000000,B00111100, + B00000111,B11111100,B00001100,B00110000,B01110000,B00000000,B11000011,B00000001,B10000000,B00000001,B11110000,B00000111,B10000000,B00111100, + B00000001,B11111110,B00011100,B00011000,B01110000,B00100001,B11000001,B10000001,B10000000,B00000000,B00011100,B00000111,B10000000,B00111100, + B00000000,B00011110,B00011100,B00011100,B00111000,B00000001,B11000001,B11000001,B10000000,B00000000,B00001110,B00000111,B10000000,B00111100, + B00000000,B00000110,B00111100,B00011100,B00111000,B01000011,B11000001,B11000001,B10000000,B00000000,B00000111,B00000111,B10000000,B00111000, + B00000000,B00000010,B00111100,B00011100,B00011100,B00000011,B11000001,B11000001,B10000000,B00000000,B00000111,B00000111,B10000000,B00111000, + B00000000,B00000010,B00111100,B00011100,B00011100,B10000011,B11000001,B11000001,B10000000,B00000000,B00000111,B00000111,B10000000,B00111000, + B00010000,B00000010,B00111100,B00011100,B00001110,B00000011,B11000001,B11000001,B10000000,B00000111,B00000111,B00000111,B10000000,B01110000, + B00010000,B00000010,B00011100,B00011100,B00001111,B00000001,B11000001,B11000001,B10000000,B00000111,B00000111,B00000111,B10000000,B01110000, + B00011000,B00000100,B00011100,B00011000,B00000110,B00000001,B11000001,B10000001,B10000000,B00000110,B00001110,B00000111,B10000000,B11100000, + B00011100,B00001000,B00001100,B00110000,B00000110,B00000000,B11000011,B00000001,B10000000,B00000010,B00001100,B00000111,B10000001,B11000000, + B00010011,B11110000,B00000011,B11100000,B00000000,B00000000,B00111110,B00000111,B11100000,B00000001,B11110000,B00111111,B11111111,B00000000 +}; diff --git a/config/examples/Sovol/SV-01/CrealityV221/_Statusscreen.h b/config/examples/Sovol/SV-01/CrealityV221/_Statusscreen.h index 3f8883e8ee..41d894f7b0 100644 --- a/config/examples/Sovol/SV-01/CrealityV221/_Statusscreen.h +++ b/config/examples/Sovol/SV-01/CrealityV221/_Statusscreen.h @@ -1,50 +1,50 @@ -/** - * Marlin 3D Printer Firmware - * Copyright (c) 2021 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 - -/** - * Custom Status Screen bitmap - * - * Place this file in the root with your configuration files - * and enable CUSTOM_STATUS_SCREEN_IMAGE in Configuration.h. - * - * Use the Marlin Bitmap Converter to make your own: - * https://marlinfw.org/tools/u8glib/converter.html - */ - -#define STATUS_LOGO_Y 8 -#define STATUS_LOGO_WIDTH 32 - -const unsigned char status_logo_bmp[] PROGMEM = { - B00011110,B11110111,B10011100,B00000100, - B00111111,B01100011,B00111110,B00001100, - B01100011,B01100011,B01100011,B00111100, - B01100000,B01100011,B01100011,B00001100, - B01100000,B01100011,B01100011,B00001100, - B00111100,B01100011,B01100011,B00001100, - B00011110,B00110110,B01100011,B00001100, - B00000011,B00110110,B01100011,B00001100, - B00000011,B00110110,B01100011,B00001100, - B01100011,B00011100,B01100011,B00001100, - B01111110,B00011100,B00111110,B00111111, - B00111100,B00001000,B00011100,B00111111 -}; +/** + * Marlin 3D Printer Firmware + * Copyright (c) 2021 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 + +/** + * Custom Status Screen bitmap + * + * Place this file in the root with your configuration files + * and enable CUSTOM_STATUS_SCREEN_IMAGE in Configuration.h. + * + * Use the Marlin Bitmap Converter to make your own: + * https://marlinfw.org/tools/u8glib/converter.html + */ + +#define STATUS_LOGO_Y 8 +#define STATUS_LOGO_WIDTH 32 + +const unsigned char status_logo_bmp[] PROGMEM = { + B00011110,B11110111,B10011100,B00000100, + B00111111,B01100011,B00111110,B00001100, + B01100011,B01100011,B01100011,B00111100, + B01100000,B01100011,B01100011,B00001100, + B01100000,B01100011,B01100011,B00001100, + B00111100,B01100011,B01100011,B00001100, + B00011110,B00110110,B01100011,B00001100, + B00000011,B00110110,B01100011,B00001100, + B00000011,B00110110,B01100011,B00001100, + B01100011,B00011100,B01100011,B00001100, + B01111110,B00011100,B00111110,B00111111, + B00111100,B00001000,B00011100,B00111111 +}; diff --git a/config/examples/Sunlu/S8/Configuration.h b/config/examples/Sunlu/S8/Configuration.h index 44bdf6394f..e79f2b2947 100644 --- a/config/examples/Sunlu/S8/Configuration.h +++ b/config/examples/Sunlu/S8/Configuration.h @@ -63,7 +63,7 @@ // Author info of this build printed to the host during boot and M115 #define STRING_CONFIG_H_AUTHOR "InsanityAutomation" // Who made the changes. -#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes) +//#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes) /** * *** VENDORS PLEASE READ *** @@ -666,7 +666,7 @@ #else #define DEFAULT_Kp 19.0 #define DEFAULT_Ki 1.47 - #define DEFAULT_Kd 61.00 + #define DEFAULT_Kd 61.00 #endif #endif @@ -750,7 +750,7 @@ // 120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) // from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10) #define DEFAULT_bedKp 195.13 - #define DEFAULT_bedKi 29.05 + #define DEFAULT_bedKi 29.05 #define DEFAULT_bedKd 873.85 // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles. @@ -1760,7 +1760,7 @@ #endif #if EITHER(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS) - #define SOFT_ENDSTOPS_MENU_ITEM // Enable/Disable software endstops from the LCD + #define SOFT_ENDSTOPS_MENU_ITEM // Enable/Disable software endstops from the LCD #endif /** @@ -2007,7 +2007,7 @@ //=================================== Mesh ================================== //=========================================================================== - #define MESH_INSET 5 // Set Mesh bounds as an inset region of the bed + #define MESH_INSET 5 // Set Mesh bounds as an inset region of the bed #define GRID_MAX_POINTS_X 5 // Don't use more than 7 points per axis, implementation limited. #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X @@ -2024,7 +2024,7 @@ #if ENABLED(LCD_BED_LEVELING) #define MESH_EDIT_Z_STEP 0.025 // (mm) Step size while manually probing Z axis. #define LCD_PROBE_Z_RANGE 4 // (mm) Z Range centered on Z_MIN_POS for LCD Z adjustment - #define MESH_EDIT_MENU // Add a menu to edit mesh points + #define MESH_EDIT_MENU // Add a menu to edit mesh points #endif // Add a menu item to move between bed corners for manual bed adjustment diff --git a/config/examples/Sunlu/S8/_Bootscreen.h b/config/examples/Sunlu/S8/_Bootscreen.h index 3e1e7c5bdf..d6198d8e5e 100644 --- a/config/examples/Sunlu/S8/_Bootscreen.h +++ b/config/examples/Sunlu/S8/_Bootscreen.h @@ -16,7 +16,7 @@ * 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 . + * along with this program. If not, see . * */ #pragma once diff --git a/config/examples/Two Trees/Sapphire Plus/Sapphire Plus V2.1/Configuration.h b/config/examples/Two Trees/Sapphire Plus/Sapphire Plus V2.1/Configuration.h index 6ddde97755..ecf7beccc6 100644 --- a/config/examples/Two Trees/Sapphire Plus/Sapphire Plus V2.1/Configuration.h +++ b/config/examples/Two Trees/Sapphire Plus/Sapphire Plus V2.1/Configuration.h @@ -2065,18 +2065,18 @@ #endif // Add a menu item to move between bed corners for manual bed adjustment -#define LEVEL_BED_CORNERS +#define LCD_BED_TRAMMING -#if ENABLED(LEVEL_BED_CORNERS) - #define LEVEL_CORNERS_INSET_LFRB { 35, 35, 35, 35 } // (mm) Left, Front, Right, Back insets - #define LEVEL_CORNERS_HEIGHT 0.0 // (mm) Z height of nozzle at leveling points - #define LEVEL_CORNERS_Z_HOP 4.0 // (mm) Z height of nozzle between leveling points - //#define LEVEL_CENTER_TOO // Move to the center after the last corner - //#define LEVEL_CORNERS_USE_PROBE - #if ENABLED(LEVEL_CORNERS_USE_PROBE) - #define LEVEL_CORNERS_PROBE_TOLERANCE 0.1 - #define LEVEL_CORNERS_VERIFY_RAISED // After adjustment triggers the probe, re-probe to verify - //#define LEVEL_CORNERS_AUDIO_FEEDBACK +#if ENABLED(LCD_BED_TRAMMING) + #define BED_TRAMMING_INSET_LFRB { 35, 35, 35, 35 } // (mm) Left, Front, Right, Back insets + #define BED_TRAMMING_HEIGHT 0.0 // (mm) Z height of nozzle at leveling points + #define BED_TRAMMING_Z_HOP 4.0 // (mm) Z height of nozzle between leveling points + //#define BED_TRAMMING_INCLUDE_CENTER // Move to the center after the last corner + //#define BED_TRAMMING_USE_PROBE + #if ENABLED(BED_TRAMMING_USE_PROBE) + #define BED_TRAMMING_PROBE_TOLERANCE 0.1 // (mm) + #define BED_TRAMMING_VERIFY_RAISED // After adjustment triggers the probe, re-probe to verify + //#define BED_TRAMMING_AUDIO_FEEDBACK #endif /** @@ -2096,7 +2096,7 @@ * | 1 2 | | 1 4 | | 1 2 | | 2 | * LF --------- RF LF --------- RF LF --------- RF LF --------- RF */ - #define LEVEL_CORNERS_LEVELING_ORDER { LF, RF, RB, LB } + #define BED_TRAMMING_LEVELING_ORDER { LF, RF, RB, LB } #endif /** diff --git a/config/examples/Two Trees/Sapphire Plus/Sapphire Plus V2.1/Configuration_adv.h b/config/examples/Two Trees/Sapphire Plus/Sapphire Plus V2.1/Configuration_adv.h index 01e3925465..f641c1908e 100644 --- a/config/examples/Two Trees/Sapphire Plus/Sapphire Plus V2.1/Configuration_adv.h +++ b/config/examples/Two Trees/Sapphire Plus/Sapphire Plus V2.1/Configuration_adv.h @@ -3551,7 +3551,6 @@ */ //#define LASER_POWER_TRAP - // // Laser I2C Ammeter (High precision INA226 low/high side module) // diff --git a/config/examples/Ultimaker/Ultimaker 2+/Configuration_adv.h b/config/examples/Ultimaker/Ultimaker 2+/Configuration_adv.h index ff00dc786c..dc3bc3ae30 100644 --- a/config/examples/Ultimaker/Ultimaker 2+/Configuration_adv.h +++ b/config/examples/Ultimaker/Ultimaker 2+/Configuration_adv.h @@ -318,7 +318,7 @@ * and/or decrease WATCH_TEMP_INCREASE. WATCH_TEMP_INCREASE should not be set * below 2. */ - #define WATCH_TEMP_PERIOD 20 // Seconds + #define WATCH_TEMP_PERIOD 40 // Seconds #define WATCH_TEMP_INCREASE 2 // Degrees Celsius #endif diff --git a/config/examples/delta/Velleman/K8800/Configuration.h b/config/examples/delta/Velleman/K8800/Configuration.h index 3dc4c2faee..aee51f0f94 100644 --- a/config/examples/delta/Velleman/K8800/Configuration.h +++ b/config/examples/delta/Velleman/K8800/Configuration.h @@ -20,6 +20,8 @@ * */ #pragma once +#error "Don't build with import-2.1.x configurations!" +#error "Use the 'bugfix...' or 'release...' configurations matching your Marlin version." /** * Velleman Vertex Delta K8800 @@ -924,37 +926,39 @@ #endif // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers). - #define DELTA_PRINTABLE_RADIUS 100.000 // mm + #define DELTA_PRINTABLE_RADIUS 100.0 // (mm) // Horizontal offset from middle of printer to smooth rod center. - #define DELTA_SMOOTH_ROD_OFFSET 157.804 // mm + #define DELTA_SMOOTH_ROD_OFFSET 157.804 // (mm) // Horizontal offset of the universal joints on the end effector. - #define DELTA_EFFECTOR_OFFSET 23.816 // mm + #define DELTA_EFFECTOR_OFFSET 23.816 // (mm) // Horizontal offset of the universal joints on the carriages. - #define DELTA_CARRIAGE_OFFSET 23.777 // mm + #define DELTA_CARRIAGE_OFFSET 23.777 // (mm) + + // Maximum reachable area + #define DELTA_MAX_RADIUS 140.0 // (mm) // Center-to-center distance of the holes in the diagonal push rods. - #define DELTA_DIAGONAL_ROD 207.000 // mm + #define DELTA_DIAGONAL_ROD 207.0 // (mm) - // height from z=0 to home position - #define DELTA_HEIGHT 308.000 // get this value from auto calibrate + // Distance between bed and nozzle Z home position + #define DELTA_HEIGHT 308.00 // (mm) Get this value from G33 auto calibrate - #define DELTA_ENDSTOP_ADJ { 0.0, 0.0, 0.0 } // get these from auto calibrate + #define DELTA_ENDSTOP_ADJ { 0.0, 0.0, 0.0 } // Get these values from G33 auto calibrate // Horizontal distance bridged by diagonal push rods when effector is centered. - #define DELTA_RADIUS (DELTA_SMOOTH_ROD_OFFSET - DELTA_EFFECTOR_OFFSET - DELTA_CARRIAGE_OFFSET) // mm Get this value from auto calibrate + #define DELTA_RADIUS (DELTA_SMOOTH_ROD_OFFSET - DELTA_EFFECTOR_OFFSET - DELTA_CARRIAGE_OFFSET) // (mm) Get this value from G33 auto calibrate // Trim adjustments for individual towers // tower angle corrections for X and Y tower / rotate XYZ so Z tower angle = 0 // measured in degrees anticlockwise looking from above the printer - #define DELTA_TOWER_ANGLE_TRIM { 0.0, 0.0, 0.0 } // get these values from auto calibrate + #define DELTA_TOWER_ANGLE_TRIM { 0.0, 0.0, 0.0 } // Get these values from G33 auto calibrate - // delta radius and diaginal rod adjustments measured in mm + // Delta radius and diagonal rod adjustments (mm) //#define DELTA_RADIUS_TRIM_TOWER { 0.0, 0.0, 0.0 } //#define DELTA_DIAGONAL_ROD_TRIM_TOWER { 0.0, 0.0, 0.0 } - #endif // @section scara @@ -1630,10 +1634,10 @@ //#define WAIT_FOR_BED_HEATER // Wait for bed to heat back up between probes (to improve accuracy) //#define WAIT_FOR_HOTEND // Wait for hotend to heat back up between probes (to improve accuracy & prevent cold extrude) #endif -#define PROBING_FANS_OFF // Turn fans off when probing -// If I read the code correctly, for Deltas, this only turns just the Extuder Steppers off during probing: -#define PROBING_STEPPERS_OFF // Turn all steppers off (unless needed to hold position) when probing (including extruders) -#define DELAY_BEFORE_PROBING 500 // (ms) To prevent vibrations from triggering piezo sensors +#define PROBING_FANS_OFF // Turn fans off when probing +#define PROBING_ESTEPPERS_OFF // Turn all extruder steppers off when probing +//#define PROBING_STEPPERS_OFF // Turn all steppers off (unless needed to hold position) when probing (including extruders) +#define DELAY_BEFORE_PROBING 500 // (ms) To prevent vibrations from triggering piezo sensors // Require minimum nozzle and/or bed temperature for probing //#define PREHEAT_BEFORE_PROBING @@ -2031,7 +2035,6 @@ #define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle #define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500 - // Large prints seem to work much better without this. //#define UBL_Z_RAISE_WHEN_OFF_MESH 2.5 // When the nozzle is off the mesh, this value is used // as the Z-Height correction value. @@ -2252,17 +2255,17 @@ // // Preheat Constants - Up to 10 are supported without changes // -#define PREHEAT_1_LABEL "PLA (180)" +#define PREHEAT_1_LABEL "PLA (200)" #define PREHEAT_1_TEMP_HOTEND 200 #define PREHEAT_1_TEMP_BED 70 #define PREHEAT_1_TEMP_CHAMBER 35 -#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255 +#define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255 -#define PREHEAT_2_LABEL "ABS (230)" +#define PREHEAT_2_LABEL "ABS (250)" #define PREHEAT_2_TEMP_HOTEND 250 #define PREHEAT_2_TEMP_BED 100 #define PREHEAT_2_TEMP_CHAMBER 35 -#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255 +#define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255 // @section motion @@ -2281,11 +2284,11 @@ #if ENABLED(NOZZLE_PARK_FEATURE) // Specify a park position as { X, Y, Z_raise } - #define NOZZLE_PARK_POINT { (0), (0), 50 } - #define NOZZLE_PARK_MOVE 0 // Park motion: 0 = XY Move, 1 = X Only, 2 = Y Only, 3 = X before Y, 4 = Y before X - #define NOZZLE_PARK_Z_RAISE_MIN 50 // (mm) Always raise Z by at least this distance - #define NOZZLE_PARK_XY_FEEDRATE 120 // (mm/s) X and Y axes feedrate (also used for delta Z axis) - #define NOZZLE_PARK_Z_FEEDRATE 120 // (mm/s) Z axis feedrate (not used for delta printers) + #define NOZZLE_PARK_POINT { 0, 0, 50 } + #define NOZZLE_PARK_MOVE 0 // Park motion: 0 = XY Move, 1 = X Only, 2 = Y Only, 3 = X before Y, 4 = Y before X + #define NOZZLE_PARK_Z_RAISE_MIN 50 // (mm) Always raise Z by at least this distance + #define NOZZLE_PARK_XY_FEEDRATE 120 // (mm/s) X and Y axes feedrate (also used for delta Z axis) + #define NOZZLE_PARK_Z_FEEDRATE 120 // (mm/s) Z axis feedrate (not used for delta printers) #endif /**