melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move include _Bootscreen.h where needed

Browse Source
This commit is contained in:
Scott Lahteine 2016-07-25 23:23:55 -07:00
parent 83c4653c71
commit 277899c175
24 changed files with 6 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/Configuration.h
View File

@ -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.

3
Marlin/example_configurations/Cartesio/Configuration.h
View File

@ -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

2
Marlin/example_configurations/Cartesio/_Bootscreen.h
View File

@ -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,

3
Marlin/example_configurations/Felix/Configuration.h
View File

@ -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

3
Marlin/example_configurations/Felix/DUAL/Configuration.h
View File

@ -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

3
Marlin/example_configurations/Hephestos/Configuration.h
View File

@ -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

4
Marlin/example_configurations/Hephestos_2/Configuration.h
View File

@ -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.

3
Marlin/example_configurations/K8200/Configuration.h
View File

@ -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

3
Marlin/example_configurations/K8400/Configuration.h
View File

@ -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

3
Marlin/example_configurations/K8400/Dual-head/Configuration.h
View File

@ -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

3
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
View File

@ -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

3
Marlin/example_configurations/RigidBot/Configuration.h
View File

@ -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

3
Marlin/example_configurations/SCARA/Configuration.h
View File

@ -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

3
Marlin/example_configurations/TAZ4/Configuration.h
View File

@ -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

4
Marlin/example_configurations/WITBOX/Configuration.h
View File

@ -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.

3
Marlin/example_configurations/adafruit/ST7565/Configuration.h
View File

@ -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

3
Marlin/example_configurations/delta/biv2.5/Configuration.h
View File

@ -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

3
Marlin/example_configurations/delta/generic/Configuration.h
View File

@ -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

3
Marlin/example_configurations/delta/kossel_mini/Configuration.h
View File

@ -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

3
Marlin/example_configurations/delta/kossel_pro/Configuration.h
View File

@ -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

3
Marlin/example_configurations/delta/kossel_xl/Configuration.h
View File

@ -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

3
Marlin/example_configurations/makibox/Configuration.h
View File

@ -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

4
Marlin/example_configurations/tvrrug/Round2/Configuration.h
View File

@ -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.

6
Marlin/ultralcd_impl_DOGM.h
View File

@ -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