Skip to content

Commit

Permalink
Fixing compile errors
Browse files Browse the repository at this point in the history
  • Loading branch information
smiksky committed Dec 31, 2023
1 parent bfbf69f commit 2455a37
Show file tree
Hide file tree
Showing 3 changed files with 203 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Marlin/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -1791,7 +1791,7 @@
// SD Card Sorting options
#if ENABLED(SDCARD_SORT_ALPHA)
#define SDSORT_REVERSE false // Default to sorting file names in reverse order.
#define SDSORT_LIMIT 512 // Maximum number of sorted items (10-256). Costs 27 bytes each.
#define SDSORT_LIMIT 256 // Maximum number of sorted items (10-256). Costs 27 bytes each.
#define SDSORT_FOLDERS -1 // -1=above 0=none 1=below
#define SDSORT_GCODE true // Enable G-code M34 to set sorting behaviors: M34 S<-1|0|1> F<-1|0|1>
#define SDSORT_USES_RAM true // Pre-allocate a static array for faster pre-sorting.
Expand Down Expand Up @@ -2287,7 +2287,7 @@
#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
#define BABYSTEP_GFX_OVERLAY // Enable graphical overlay on Z-offset editor
#endif
#endif

Expand Down Expand Up @@ -2697,7 +2697,7 @@
* Only some STM32 MCUs are currently supported.
* Note: This has no effect on emulated USB serial ports.
*/
#define SERIAL_DMA
//#define SERIAL_DMA

/**
* Set the number of proportional font spaces required to fill up a typical character space.
Expand Down
112 changes: 112 additions & 0 deletions Marlin/_Bootscreen.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2020 MarlinFirmware [https:/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 <https://www.gnu.org/licenses/>.
*
*/
#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_TIMEOUT 2000

/**
* Made with Marlin Bitmap Converter
* https://marlinfw.org/tools/u8glib/converter.html
*
* This bitmap from the file 'Boot 2.png'
*/
#pragma once

#define CUSTOM_BOOTSCREEN_BMPWIDTH 128

const unsigned char custom_start_bmp[] PROGMEM = {
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00111111,B11111111,B11111110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B11000000,B00000111,B00000000,B00000000,B00000001,B11000000,
B00000000,B11000000,B00000000,B00000010,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B11100000,B00000111,B00000000,B00000000,B00000001,B11000000,
B00000001,B00000000,B00000000,B00000100,B00000000,B00000000,B00000000,B11111000,B00000000,B00000001,B11100000,B00001111,B00000000,B00000000,B00000001,B11000000,
B00000010,B00000000,B00000000,B00001000,B00000000,B00000000,B00000001,B11111100,B00000000,B00000001,B11110000,B00001111,B00000000,B00000000,B00000001,B11000000,
B00000010,B00000000,B00000000,B00001000,B00000000,B00000000,B00000001,B00001110,B00000000,B00000001,B11110000,B00011111,B00000000,B00000000,B00000001,B11000000,
B00000100,B00000000,B00000000,B00010000,B00000000,B00000011,B11000000,B00001110,B00111001,B11100001,B11111000,B00011111,B00000111,B10000000,B00111001,B11000000,
B00000100,B00000111,B11111111,B11100000,B00000000,B00000111,B11110000,B00001110,B00111011,B11110001,B11111000,B00111111,B00001111,B11000000,B11111101,B11000000,
B00000100,B00001000,B10101010,B00000000,B00000000,B00001110,B01110000,B11111100,B00111100,B00111001,B11111000,B00111111,B00011100,B11100000,B11100011,B11000000,
B00000100,B00001000,B11010110,B00000000,B00000000,B00011100,B00111000,B11111110,B00111100,B00111101,B11011100,B01110111,B00111000,B01110001,B11000001,B11000000,
B00000100,B00000111,B10101011,B11110000,B00000000,B00011100,B01111000,B00001111,B00111000,B00011101,B11011100,B01110111,B00111000,B01110001,B11000001,B11000000,
B00000100,B00000000,B11010110,B00001000,B00000000,B00011111,B11111000,B00000111,B00111000,B00011101,B11001110,B01100111,B00111000,B01110001,B11000001,B11000000,
B00000010,B00000000,B10101010,B00000100,B00000000,B00011111,B11000000,B00000111,B00111000,B00011101,B11001110,B11100111,B00111000,B01110001,B11000001,B11000000,
B00000001,B00000000,B11010110,B00000010,B00000000,B00011100,B00000000,B00000111,B00111100,B00111101,B11000111,B11000111,B00111000,B01110001,B11000001,B11000000,
B00000000,B10000000,B10101010,B00000010,B00000000,B00001110,B00011011,B00001111,B00111100,B00111001,B11000111,B11000111,B00011100,B11100000,B11100011,B11000000,
B00000000,B01100000,B11010110,B00000010,B00000000,B00000111,B11111011,B11111110,B00111011,B11110001,B11000111,B10000111,B00001111,B11000000,B11111111,B11000000,
B00000000,B00011111,B10101011,B10000001,B00000000,B00000011,B11100001,B11111100,B00111001,B11100001,B11000011,B10000111,B00000111,B10000000,B00111001,B11000000,
B00000000,B00000000,B11010110,B01000001,B00000000,B00000000,B00000000,B00000000,B00111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B10101010,B01000001,B00000000,B00011111,B11111111,B11111111,B10111011,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11000000,
B00000000,B00111111,B11111111,B10000001,B00000000,B00000000,B00000000,B00000000,B00111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B01000000,B00000000,B00000010,B00000000,B00000000,B00000000,B00000000,B00111000,B00000000,B00000000,B00000000,B00000100,B00000010,B00000000,B00000000,
B00000000,B10000000,B00000000,B00000010,B00000000,B00000000,B00000000,B00000000,B00000001,B11100111,B00000000,B11100000,B00000000,B00000010,B00000000,B00000000,
B00000000,B10000000,B00000000,B00000010,B00000000,B00000000,B00000000,B00000000,B00000000,B00100100,B10000000,B10010111,B10011100,B11110111,B10001100,B01111000,
B00000001,B00000000,B00000000,B00000100,B00000000,B00000000,B00000000,B00000000,B00000000,B11000100,B10000000,B10010100,B10000100,B10010010,B00010010,B01001000,
B00000010,B00000000,B00000000,B00001000,B00000000,B00000000,B00000000,B00000000,B00000000,B00100100,B10000000,B11100100,B00000100,B10010010,B00011110,B01000000,
B00000010,B00000000,B00000000,B00010000,B00000000,B00000000,B00000000,B00000000,B00000000,B00100100,B10000000,B10000100,B00000100,B10010010,B00010000,B01000000,
B00000111,B11111111,B11111111,B11111111,B11111100,B00000000,B00000000,B00000000,B00000001,B11000111,B00000000,B10000100,B00011110,B10010001,B10001110,B01000000,
B00000000,B00000000,B11010101,B01010101,B01011000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B10101010,B10101010,B10101000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B11010101,B01010101,B01010000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B10101010,B10101010,B10110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B11010101,B01010101,B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B11111111,B11111111,B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00001000,B00000010,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11000000,B00000000,B00000000,
B00000000,B00001100,B00000110,B00000000,B00000000,B00000000,B00000000,B00000100,B01000000,B00000000,B00000000,B00000000,B00000000,B01000000,B00000000,B00000000,
B00000000,B00011100,B00100111,B00000000,B00000000,B00000000,B00000000,B00000100,B01000000,B00000000,B00000000,B00000000,B00000001,B00100000,B00000000,B00000000,
B00000000,B00101001,B01000010,B00000000,B00000000,B00000000,B00000000,B00000010,B01000000,B00000000,B00000000,B00000000,B00000001,B00100000,B00000000,B00000000,
B00000000,B00101011,B01101010,B10000000,B00000000,B00000001,B00011111,B11111111,B11100101,B00000000,B00000000,B00000000,B00000001,B00100000,B00000000,B00000000,
B00000000,B00011100,B01000111,B00000000,B00000000,B00000001,B00101111,B10011111,B11110000,B10000000,B00000000,B00000000,B00000000,B01000000,B00000000,B00000000,
B00000000,B00001000,B11110010,B00000000,B00000000,B00000000,B01111111,B11111111,B11110000,B00000000,B00000000,B00000000,B00000011,B10000000,B00000000,B00000000,
B00000000,B00001000,B01000010,B00000000,B00000000,B00000000,B00001100,B00011111,B11111000,B10000000,B00000000,B00000000,B00000000,B00000011,B11000000,B00000000,
B00000000,B00000101,B01010100,B00000000,B00000000,B00000000,B00000000,B01111111,B11101110,B00110000,B00000000,B00000000,B00001101,B00000011,B11110000,B00000000,
B00000000,B00000111,B01001100,B00000000,B00000000,B00000000,B00000001,B11111111,B11111111,B11110000,B00000000,B00000000,B00001111,B11100100,B00011000,B00000000,
B00000000,B00000010,B01001000,B00000000,B00000000,B00000000,B00000000,B00000100,B11111111,B11110000,B00000000,B00000000,B00111111,B11011101,B10001100,B00000000,
B00000000,B00000010,B01001000,B00000000,B00000000,B00000000,B00000000,B00000001,B11111110,B01110000,B00000000,B00000000,B00111000,B11111100,B10010100,B00000000,
B00000000,B00000010,B01001000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111110,B00110000,B00000000,B00000000,B00111111,B11111011,B10010000,B00000000,
B00000000,B00000010,B01001000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001110,B00110000,B00000000,B00000000,B00111000,B01111100,B10010100,B00000000,
B00000000,B00000011,B01101000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000110,B00010000,B00000000,B00000000,B00010111,B01101011,B11101000,B00000000,
B00000000,B00001100,B11010110,B00000000,B00000000,B00000000,B00000000,B00000000,B00100011,B00000000,B00000000,B00000000,B00001111,B10001111,B11111000,B00000000,
B00000000,B00000011,B10101000,B00000000,B00000000,B00000000,B00000000,B00000001,B10010011,B00000000,B00000000,B00000000,B00000111,B10000111,B11110000,B00000000,
B00000000,B00000000,B00010000,B00000000,B00000000,B00000000,B00000000,B00000000,B00111000,B00000000,B00000000,B00000000,B00000000,B00000011,B01000000,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,
B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000
};

88 changes: 88 additions & 0 deletions Marlin/_Statusscreen.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2020 MarlinFirmware [https:/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 <https://www.gnu.org/licenses/>.
*
*/
#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
*/

//
// Status Screen Logo bitmap
//

/**
* Made with Marlin Bitmap Converter
* https://marlinfw.org/tools/u8glib/converter.html
*
* This bitmap from the file 'Status 2.png'
*/
#pragma once

#define STATUS_LOGO_WIDTH 24

const unsigned char status_logo_bmp[] PROGMEM = {
B00011111,B11111111,B11100000,
B01100000,B00000000,B01000000,
B01000000,B00000000,B01000000,
B10000000,B00000000,B10000000,
B10000111,B11111111,B00000000,
B10001000,B11111000,B00000000,
B10000111,B11011110,B00000000,
B10000000,B10101001,B11000000,
B10000000,B11011000,B01000000,
B01000000,B10101000,B00100000,
B00110000,B11011000,B00100000,
B00001111,B10101110,B00100000,
B00000000,B11011001,B00010000,
B00000000,B10101010,B00010000,
B00011111,B11111100,B00100000,
B00100000,B00000000,B00100000,
B01000000,B00000000,B00100000,
B01000000,B00000001,B11000000,
B11111111,B11111111,B00000000,
B00000000,B10101111,B11111111,
B00000000,B11010101,B01010101,
B00000000,B10101010,B10101010,
B00000000,B11010101,B01010100,
B00000000,B11111111,B11111100
};


//
// Use default bitmaps
//
#define STATUS_HOTEND_ANIM
#define STATUS_BED_ANIM
#define STATUS_HEATERS_XSPACE 20
#if HOTENDS < 2
#define STATUS_HEATERS_X 48
#define STATUS_BED_X 72
#else
#define STATUS_HEATERS_X 40
#define STATUS_BED_X 80
#endif

0 comments on commit 2455a37

Please sign in to comment.