Browse Source

Move include _Bootscreen.h where needed

Scott Lahteine 8 years ago
parent
commit
277899c175
24 changed files with 6 additions and 72 deletions
  1. 0
    4
      Marlin/Configuration.h
  2. 0
    3
      Marlin/example_configurations/Cartesio/Configuration.h
  3. 1
    1
      Marlin/example_configurations/Cartesio/_Bootscreen.h
  4. 0
    3
      Marlin/example_configurations/Felix/Configuration.h
  5. 0
    3
      Marlin/example_configurations/Felix/DUAL/Configuration.h
  6. 0
    3
      Marlin/example_configurations/Hephestos/Configuration.h
  7. 0
    4
      Marlin/example_configurations/Hephestos_2/Configuration.h
  8. 0
    3
      Marlin/example_configurations/K8200/Configuration.h
  9. 0
    3
      Marlin/example_configurations/K8400/Configuration.h
  10. 0
    3
      Marlin/example_configurations/K8400/Dual-head/Configuration.h
  11. 0
    3
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  12. 0
    3
      Marlin/example_configurations/RigidBot/Configuration.h
  13. 0
    3
      Marlin/example_configurations/SCARA/Configuration.h
  14. 0
    3
      Marlin/example_configurations/TAZ4/Configuration.h
  15. 0
    4
      Marlin/example_configurations/WITBOX/Configuration.h
  16. 0
    3
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  17. 0
    3
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  18. 0
    3
      Marlin/example_configurations/delta/generic/Configuration.h
  19. 0
    3
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  20. 0
    3
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  21. 0
    3
      Marlin/example_configurations/delta/kossel_xl/Configuration.h
  22. 0
    3
      Marlin/example_configurations/makibox/Configuration.h
  23. 0
    4
      Marlin/example_configurations/tvrrug/Round2/Configuration.h
  24. 5
    1
      Marlin/ultralcd_impl_DOGM.h

+ 0
- 4
Marlin/Configuration.h View File

@@ -109,10 +109,6 @@
109 109
 // example configuration folder.
110 110
 //
111 111
 //#define SHOW_CUSTOM_BOOTSCREEN
112
-#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
113
-  #include "_Bootscreen.h"
114
-#endif
115
-
116 112
 // @section machine
117 113
 
118 114
 // SERIAL_PORT selects which serial port should be used for communication with the host.

+ 0
- 3
Marlin/example_configurations/Cartesio/Configuration.h View File

@@ -109,9 +109,6 @@
109 109
 // example configuration folder.
110 110
 //
111 111
 #define SHOW_CUSTOM_BOOTSCREEN
112
-#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
113
-  #include "_Bootscreen.h"
114
-#endif
115 112
 
116 113
 // @section machine
117 114
 

+ 1
- 1
Marlin/example_configurations/Cartesio/_Bootscreen.h View File

@@ -35,7 +35,7 @@
35 35
 #define CUSTOM_BOOTSCREEN_BMPWIDTH  63
36 36
 #define CUSTOM_BOOTSCREEN_BMPHEIGHT 64
37 37
 
38
-const unsigned char 81x0i84fkcmoqbu7vte29[512] PROGMEM = {
38
+const unsigned char custom_start_bmp[512] PROGMEM = {
39 39
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
40 40
   0x00, 0x00, 0x00, 0x07, 0xc0, 0x00, 0x00, 0x00,
41 41
   0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x00,

+ 0
- 3
Marlin/example_configurations/Felix/Configuration.h View File

@@ -109,9 +109,6 @@
109 109
 // example configuration folder.
110 110
 //
111 111
 //#define SHOW_CUSTOM_BOOTSCREEN
112
-#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
113
-  #include "_bootscreen.h"
114
-#endif
115 112
 
116 113
 // @section machine
117 114
 

+ 0
- 3
Marlin/example_configurations/Felix/DUAL/Configuration.h View File

@@ -109,9 +109,6 @@
109 109
 // example configuration folder.
110 110
 //
111 111
 //#define SHOW_CUSTOM_BOOTSCREEN
112
-#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
113
-  #include "_bootscreen.h"
114
-#endif
115 112
 
116 113
 // @section machine
117 114
 

+ 0
- 3
Marlin/example_configurations/Hephestos/Configuration.h View File

@@ -109,9 +109,6 @@
109 109
 // example configuration folder.
110 110
 //
111 111
 //#define SHOW_CUSTOM_BOOTSCREEN
112
-#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
113
-  #include "_bootscreen.h"
114
-#endif
115 112
 
116 113
 // @section machine
117 114
 

+ 0
- 4
Marlin/example_configurations/Hephestos_2/Configuration.h View File

@@ -109,10 +109,6 @@
109 109
 // example configuration folder.
110 110
 //
111 111
 #define SHOW_CUSTOM_BOOTSCREEN
112
-#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
113
-  #include "_Bootscreen.h"
114
-#endif
115
-
116 112
 // @section machine
117 113
 
118 114
 // SERIAL_PORT selects which serial port should be used for communication with the host.

+ 0
- 3
Marlin/example_configurations/K8200/Configuration.h View File

@@ -116,9 +116,6 @@
116 116
 // example configuration folder.
117 117
 //
118 118
 //#define SHOW_CUSTOM_BOOTSCREEN
119
-#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
120
-  #include "_bootscreen.h"
121
-#endif
122 119
 
123 120
 // @section machine
124 121
 

+ 0
- 3
Marlin/example_configurations/K8400/Configuration.h View File

@@ -109,9 +109,6 @@
109 109
 // example configuration folder.
110 110
 //
111 111
 //#define SHOW_CUSTOM_BOOTSCREEN
112
-#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
113
-  #include "_bootscreen.h"
114
-#endif
115 112
 
116 113
 // @section machine
117 114
 

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

@@ -109,9 +109,6 @@
109 109
 // example configuration folder.
110 110
 //
111 111
 //#define SHOW_CUSTOM_BOOTSCREEN
112
-#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
113
-  #include "_bootscreen.h"
114
-#endif
115 112
 
116 113
 // @section machine
117 114
 

+ 0
- 3
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h View File

@@ -109,9 +109,6 @@
109 109
 // example configuration folder.
110 110
 //
111 111
 //#define SHOW_CUSTOM_BOOTSCREEN
112
-#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
113
-  #include "_bootscreen.h"
114
-#endif
115 112
 
116 113
 // @section machine
117 114
 

+ 0
- 3
Marlin/example_configurations/RigidBot/Configuration.h View File

@@ -109,9 +109,6 @@
109 109
 // example configuration folder.
110 110
 //
111 111
 //#define SHOW_CUSTOM_BOOTSCREEN
112
-#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
113
-  #include "_bootscreen.h"
114
-#endif
115 112
 
116 113
 // @section machine
117 114
 

+ 0
- 3
Marlin/example_configurations/SCARA/Configuration.h View File

@@ -134,9 +134,6 @@
134 134
 // example configuration folder.
135 135
 //
136 136
 //#define SHOW_CUSTOM_BOOTSCREEN
137
-#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
138
-  #include "_bootscreen.h"
139
-#endif
140 137
 
141 138
 // @section machine
142 139
 

+ 0
- 3
Marlin/example_configurations/TAZ4/Configuration.h View File

@@ -109,9 +109,6 @@
109 109
 // example configuration folder.
110 110
 //
111 111
 //#define SHOW_CUSTOM_BOOTSCREEN
112
-#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
113
-  #include "_bootscreen.h"
114
-#endif
115 112
 
116 113
 // @section machine
117 114
 

+ 0
- 4
Marlin/example_configurations/WITBOX/Configuration.h View File

@@ -109,10 +109,6 @@
109 109
 // example configuration folder.
110 110
 //
111 111
 //#define SHOW_CUSTOM_BOOTSCREEN
112
-#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
113
-  #include "_Bootscreen.h"
114
-#endif
115
-
116 112
 // @section machine
117 113
 
118 114
 // SERIAL_PORT selects which serial port should be used for communication with the host.

+ 0
- 3
Marlin/example_configurations/adafruit/ST7565/Configuration.h View File

@@ -109,9 +109,6 @@
109 109
 // example configuration folder.
110 110
 //
111 111
 //#define SHOW_CUSTOM_BOOTSCREEN
112
-#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
113
-  #include "_bootscreen.h"
114
-#endif
115 112
 
116 113
 // @section machine
117 114
 

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

@@ -109,9 +109,6 @@
109 109
 // example configuration folder.
110 110
 //
111 111
 //#define SHOW_CUSTOM_BOOTSCREEN
112
-#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
113
-  #include "_bootscreen.h"
114
-#endif
115 112
 
116 113
 // @section machine
117 114
 

+ 0
- 3
Marlin/example_configurations/delta/generic/Configuration.h View File

@@ -109,9 +109,6 @@
109 109
 // example configuration folder.
110 110
 //
111 111
 //#define SHOW_CUSTOM_BOOTSCREEN
112
-#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
113
-  #include "_bootscreen.h"
114
-#endif
115 112
 
116 113
 // @section machine
117 114
 

+ 0
- 3
Marlin/example_configurations/delta/kossel_mini/Configuration.h View File

@@ -109,9 +109,6 @@
109 109
 // example configuration folder.
110 110
 //
111 111
 //#define SHOW_CUSTOM_BOOTSCREEN
112
-#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
113
-  #include "_bootscreen.h"
114
-#endif
115 112
 
116 113
 // @section machine
117 114
 

+ 0
- 3
Marlin/example_configurations/delta/kossel_pro/Configuration.h View File

@@ -115,9 +115,6 @@
115 115
 // example configuration folder.
116 116
 //
117 117
 //#define SHOW_CUSTOM_BOOTSCREEN
118
-#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
119
-  #include "_bootscreen.h"
120
-#endif
121 118
 
122 119
 // @section machine
123 120
 

+ 0
- 3
Marlin/example_configurations/delta/kossel_xl/Configuration.h View File

@@ -102,9 +102,6 @@
102 102
 // example configuration folder.
103 103
 //
104 104
 //#define SHOW_CUSTOM_BOOTSCREEN
105
-#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
106
-  #include "_bootscreen.h"
107
-#endif
108 105
 
109 106
 // @section machine
110 107
 

+ 0
- 3
Marlin/example_configurations/makibox/Configuration.h View File

@@ -109,9 +109,6 @@
109 109
 // example configuration folder.
110 110
 //
111 111
 //#define SHOW_CUSTOM_BOOTSCREEN
112
-#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
113
-  #include "_bootscreen.h"
114
-#endif
115 112
 
116 113
 // @section machine
117 114
 

+ 0
- 4
Marlin/example_configurations/tvrrug/Round2/Configuration.h View File

@@ -109,10 +109,6 @@
109 109
 // example configuration folder.
110 110
 //
111 111
 //#define SHOW_CUSTOM_BOOTSCREEN
112
-#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
113
-  #include "_Bootscreen.h"
114
-#endif
115
-
116 112
 // @section machine
117 113
 
118 114
 // SERIAL_PORT selects which serial port should be used for communication with the host.

+ 5
- 1
Marlin/ultralcd_impl_DOGM.h View File

@@ -60,6 +60,10 @@
60 60
 
61 61
 #include <U8glib.h>
62 62
 
63
+#if ENABLED(SHOW_BOOTSCREEN) && ENABLED(SHOW_CUSTOM_BOOTSCREEN)
64
+  #include "_Bootscreen.h"
65
+#endif
66
+
63 67
 #if DISABLED(MAPPER_C2C3) && DISABLED(MAPPER_NON) && ENABLED(USE_BIG_EDIT_FONT)
64 68
   #undef USE_BIG_EDIT_FONT
65 69
 #endif
@@ -145,7 +149,7 @@
145 149
 #elif ENABLED(U8GLIB_ST7920)
146 150
   //U8GLIB_ST7920_128X64_RRD u8g(0,0,0);
147 151
   U8GLIB_ST7920_128X64_RRD u8g(0);
148
-#elif defined(CARTESIO_UI)
152
+#elif ENABLED(CARTESIO_UI)
149 153
   // The CartesioUI display
150 154
   #if DOGLCD_MOSI != -1 && DOGLCD_SCK != -1
151 155
     // using SW-SPI

Loading…
Cancel
Save