Move include _Bootscreen.h where needed
This commit is contained in:
parent
83c4653c71
commit
277899c175
|
@ -109,10 +109,6 @@
|
|||
// example configuration folder.
|
||||
//
|
||||
//#define SHOW_CUSTOM_BOOTSCREEN
|
||||
#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
|
||||
#include "_Bootscreen.h"
|
||||
#endif
|
||||
|
||||
// @section machine
|
||||
|
||||
// SERIAL_PORT selects which serial port should be used for communication with the host.
|
||||
|
|
|
@ -109,9 +109,6 @@
|
|||
// example configuration folder.
|
||||
//
|
||||
#define SHOW_CUSTOM_BOOTSCREEN
|
||||
#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
|
||||
#include "_Bootscreen.h"
|
||||
#endif
|
||||
|
||||
// @section machine
|
||||
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
#define CUSTOM_BOOTSCREEN_BMPWIDTH 63
|
||||
#define CUSTOM_BOOTSCREEN_BMPHEIGHT 64
|
||||
|
||||
const unsigned char 81x0i84fkcmoqbu7vte29[512] PROGMEM = {
|
||||
const unsigned char custom_start_bmp[512] PROGMEM = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x07, 0xc0, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,
|
||||
|
|
|
@ -109,9 +109,6 @@
|
|||
// example configuration folder.
|
||||
//
|
||||
//#define SHOW_CUSTOM_BOOTSCREEN
|
||||
#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
|
||||
#include "_bootscreen.h"
|
||||
#endif
|
||||
|
||||
// @section machine
|
||||
|
||||
|
|
|
@ -109,9 +109,6 @@
|
|||
// example configuration folder.
|
||||
//
|
||||
//#define SHOW_CUSTOM_BOOTSCREEN
|
||||
#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
|
||||
#include "_bootscreen.h"
|
||||
#endif
|
||||
|
||||
// @section machine
|
||||
|
||||
|
|
|
@ -109,9 +109,6 @@
|
|||
// example configuration folder.
|
||||
//
|
||||
//#define SHOW_CUSTOM_BOOTSCREEN
|
||||
#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
|
||||
#include "_bootscreen.h"
|
||||
#endif
|
||||
|
||||
// @section machine
|
||||
|
||||
|
|
|
@ -109,10 +109,6 @@
|
|||
// example configuration folder.
|
||||
//
|
||||
#define SHOW_CUSTOM_BOOTSCREEN
|
||||
#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
|
||||
#include "_Bootscreen.h"
|
||||
#endif
|
||||
|
||||
// @section machine
|
||||
|
||||
// SERIAL_PORT selects which serial port should be used for communication with the host.
|
||||
|
|
|
@ -116,9 +116,6 @@
|
|||
// example configuration folder.
|
||||
//
|
||||
//#define SHOW_CUSTOM_BOOTSCREEN
|
||||
#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
|
||||
#include "_bootscreen.h"
|
||||
#endif
|
||||
|
||||
// @section machine
|
||||
|
||||
|
|
|
@ -109,9 +109,6 @@
|
|||
// example configuration folder.
|
||||
//
|
||||
//#define SHOW_CUSTOM_BOOTSCREEN
|
||||
#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
|
||||
#include "_bootscreen.h"
|
||||
#endif
|
||||
|
||||
// @section machine
|
||||
|
||||
|
|
|
@ -109,9 +109,6 @@
|
|||
// example configuration folder.
|
||||
//
|
||||
//#define SHOW_CUSTOM_BOOTSCREEN
|
||||
#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
|
||||
#include "_bootscreen.h"
|
||||
#endif
|
||||
|
||||
// @section machine
|
||||
|
||||
|
|
|
@ -109,9 +109,6 @@
|
|||
// example configuration folder.
|
||||
//
|
||||
//#define SHOW_CUSTOM_BOOTSCREEN
|
||||
#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
|
||||
#include "_bootscreen.h"
|
||||
#endif
|
||||
|
||||
// @section machine
|
||||
|
||||
|
|
|
@ -109,9 +109,6 @@
|
|||
// example configuration folder.
|
||||
//
|
||||
//#define SHOW_CUSTOM_BOOTSCREEN
|
||||
#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
|
||||
#include "_bootscreen.h"
|
||||
#endif
|
||||
|
||||
// @section machine
|
||||
|
||||
|
|
|
@ -134,9 +134,6 @@
|
|||
// example configuration folder.
|
||||
//
|
||||
//#define SHOW_CUSTOM_BOOTSCREEN
|
||||
#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
|
||||
#include "_bootscreen.h"
|
||||
#endif
|
||||
|
||||
// @section machine
|
||||
|
||||
|
|
|
@ -109,9 +109,6 @@
|
|||
// example configuration folder.
|
||||
//
|
||||
//#define SHOW_CUSTOM_BOOTSCREEN
|
||||
#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
|
||||
#include "_bootscreen.h"
|
||||
#endif
|
||||
|
||||
// @section machine
|
||||
|
||||
|
|
|
@ -109,10 +109,6 @@
|
|||
// example configuration folder.
|
||||
//
|
||||
//#define SHOW_CUSTOM_BOOTSCREEN
|
||||
#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
|
||||
#include "_Bootscreen.h"
|
||||
#endif
|
||||
|
||||
// @section machine
|
||||
|
||||
// SERIAL_PORT selects which serial port should be used for communication with the host.
|
||||
|
|
|
@ -109,9 +109,6 @@
|
|||
// example configuration folder.
|
||||
//
|
||||
//#define SHOW_CUSTOM_BOOTSCREEN
|
||||
#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
|
||||
#include "_bootscreen.h"
|
||||
#endif
|
||||
|
||||
// @section machine
|
||||
|
||||
|
|
|
@ -109,9 +109,6 @@
|
|||
// example configuration folder.
|
||||
//
|
||||
//#define SHOW_CUSTOM_BOOTSCREEN
|
||||
#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
|
||||
#include "_bootscreen.h"
|
||||
#endif
|
||||
|
||||
// @section machine
|
||||
|
||||
|
|
|
@ -109,9 +109,6 @@
|
|||
// example configuration folder.
|
||||
//
|
||||
//#define SHOW_CUSTOM_BOOTSCREEN
|
||||
#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
|
||||
#include "_bootscreen.h"
|
||||
#endif
|
||||
|
||||
// @section machine
|
||||
|
||||
|
|
|
@ -109,9 +109,6 @@
|
|||
// example configuration folder.
|
||||
//
|
||||
//#define SHOW_CUSTOM_BOOTSCREEN
|
||||
#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
|
||||
#include "_bootscreen.h"
|
||||
#endif
|
||||
|
||||
// @section machine
|
||||
|
||||
|
|
|
@ -115,9 +115,6 @@
|
|||
// example configuration folder.
|
||||
//
|
||||
//#define SHOW_CUSTOM_BOOTSCREEN
|
||||
#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
|
||||
#include "_bootscreen.h"
|
||||
#endif
|
||||
|
||||
// @section machine
|
||||
|
||||
|
|
|
@ -102,9 +102,6 @@
|
|||
// example configuration folder.
|
||||
//
|
||||
//#define SHOW_CUSTOM_BOOTSCREEN
|
||||
#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
|
||||
#include "_bootscreen.h"
|
||||
#endif
|
||||
|
||||
// @section machine
|
||||
|
||||
|
|
|
@ -109,9 +109,6 @@
|
|||
// example configuration folder.
|
||||
//
|
||||
//#define SHOW_CUSTOM_BOOTSCREEN
|
||||
#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
|
||||
#include "_bootscreen.h"
|
||||
#endif
|
||||
|
||||
// @section machine
|
||||
|
||||
|
|
|
@ -109,10 +109,6 @@
|
|||
// example configuration folder.
|
||||
//
|
||||
//#define SHOW_CUSTOM_BOOTSCREEN
|
||||
#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
|
||||
#include "_Bootscreen.h"
|
||||
#endif
|
||||
|
||||
// @section machine
|
||||
|
||||
// SERIAL_PORT selects which serial port should be used for communication with the host.
|
||||
|
|
|
@ -60,6 +60,10 @@
|
|||
|
||||
#include <U8glib.h>
|
||||
|
||||
#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
|
||||
#include "_Bootscreen.h"
|
||||
#endif
|
||||
|
||||
#if DISABLED(MAPPER_C2C3) && DISABLED(MAPPER_NON) && ENABLED(USE_BIG_EDIT_FONT)
|
||||
#undef USE_BIG_EDIT_FONT
|
||||
#endif
|
||||
|
@ -145,7 +149,7 @@
|
|||
#elif ENABLED(U8GLIB_ST7920)
|
||||
//U8GLIB_ST7920_128X64_RRD u8g(0,0,0);
|
||||
U8GLIB_ST7920_128X64_RRD u8g(0);
|
||||
#elif defined(CARTESIO_UI)
|
||||
#elif ENABLED(CARTESIO_UI)
|
||||
// The CartesioUI display
|
||||
#if DOGLCD_MOSI != -1 && DOGLCD_SCK != -1
|
||||
// using SW-SPI
|
||||
|
|
Loading…
Reference in a new issue