Followup to Ender config

This commit is contained in:
Scott Lahteine
2018-01-15 05:41:47 -06:00
parent d25487dfb9
commit 69c993092b
44 changed files with 173 additions and 5 deletions

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -114,13 +114,14 @@
#define STATUS_SCREENWIDTH 115 // Width in pixels #define STATUS_SCREENWIDTH 115 // Width in pixels
#define STATUS_SCREENHEIGHT 19 // Height in pixels #define STATUS_SCREENHEIGHT 19 // Height in pixels
#ifdef CUSTOM_STATUS_SCREEN_FILE #if ENABLED(CUSTOM_STATUS_SCREEN_IMAGE)
#undef STATUS_SCREENWIDTH #undef STATUS_SCREENWIDTH
// This file must define STATUS_SCREENWIDTH and status_screen{0,1}_bmp. // This file must define STATUS_SCREENWIDTH and status_screen{0,1}_bmp.
// It can also define STATUS_SCREEN_X, STATUS_SCREEN_{BED,FAN}_TEXT_X and // It can also define STATUS_SCREEN_X, STATUS_SCREEN_{BED,FAN}_TEXT_X and
// STATUS_SCREEN_HOTEND_TEXT_X(i) to modify draw locations. // STATUS_SCREEN_HOTEND_TEXT_X(i) to modify draw locations.
#include CUSTOM_STATUS_SCREEN_FILE #include "_Statusscreen.h"
#elif HAS_TEMP_BED #elif HAS_TEMP_BED
#if HOTENDS == 0 #if HOTENDS == 0
const unsigned char status_screen0_bmp[] PROGMEM = { const unsigned char status_screen0_bmp[] PROGMEM = {

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -90,6 +90,10 @@
// example configuration folder. // example configuration folder.
// //
#define SHOW_CUSTOM_BOOTSCREEN #define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
#define SHOW_CUSTOM_BOOTSCREEN #define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
#define SHOW_CUSTOM_BOOTSCREEN #define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -92,9 +92,8 @@
// //
#define SHOW_CUSTOM_BOOTSCREEN #define SHOW_CUSTOM_BOOTSCREEN
// Set this to a file name (relative the ultralcd_impl_DOGM.h file) to read a // Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
// customized status screen bitmap. #define CUSTOM_STATUS_SCREEN_IMAGE
#define CUSTOM_STATUS_SCREEN_FILE "_Statusscreen.h"
// @section machine // @section machine

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -96,6 +96,10 @@
// example configuration folder. // example configuration folder.
// //
#define SHOW_CUSTOM_BOOTSCREEN #define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -121,6 +121,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -107,6 +107,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -107,6 +107,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -95,6 +95,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
#define SHOW_CUSTOM_BOOTSCREEN #define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**

View File

@@ -91,6 +91,10 @@
// example configuration folder. // example configuration folder.
// //
//#define SHOW_CUSTOM_BOOTSCREEN //#define SHOW_CUSTOM_BOOTSCREEN
// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen.
//#define CUSTOM_STATUS_SCREEN_IMAGE
// @section machine // @section machine
/** /**