From 198b138c9180cd9c5f8431e5dc3758cb924c31c5 Mon Sep 17 00:00:00 2001 From: Marcio Teixeira Date: Tue, 21 Nov 2017 13:18:54 -0700 Subject: [PATCH] Fix for build error on models without LCDs. --- Marlin/Conditionals_LulzBot.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Marlin/Conditionals_LulzBot.h b/Marlin/Conditionals_LulzBot.h index d98466f0a..965efaefc 100644 --- a/Marlin/Conditionals_LulzBot.h +++ b/Marlin/Conditionals_LulzBot.h @@ -13,7 +13,7 @@ * got disabled. */ -#define LULZBOT_FW_VERSION ".43" // Change this with each update +#define LULZBOT_FW_VERSION ".44" // Change this with each update #if ( \ !defined(LULZBOT_Gladiola_Mini) && \ @@ -1767,13 +1767,15 @@ #define LULZBOT_HIDE_EXTRA_FAN_CONFIG_IN_LCD #define LULZBOT_SCROLL_LONG_FILE_NAMES #define LULZBOT_REORDERED_MENUS - #define LULZBOT_STRINGIFY(msg) msg - #define LULZBOT_ENHANCED_TEMP_ERROR_MSG(msg, e) \ - /* Marlin requires PSTR in order to display on the LCD display, this uses a */ \ - /* preprocessor trick to append the heater name depending on the value of e */ \ - ((e == -1) ? PSTR(LULZBOT_STRINGIFY(msg) " BED") : ((e == 0) ? PSTR(LULZBOT_STRINGIFY(msg) " E0") : PSTR(LULZBOT_STRINGIFY(msg) " E1")) ) #endif +/* Marlin requires static PSTRs to display on the LCD display, because of this */ +/* we have to use a preprocessor trick to append the heater name on temp errors */ +/* such that an appropriate PSTR is selected depending on the value of e */ +#define LULZBOT_STRINGIFY(msg) msg +#define LULZBOT_ENHANCED_TEMP_ERROR_MSG(msg, e) \ + ((e == -1) ? PSTR(LULZBOT_STRINGIFY(msg) " BED") : ((e == 0) ? PSTR(LULZBOT_STRINGIFY(msg) " E0") : PSTR(LULZBOT_STRINGIFY(msg) " E1")) ) + /***************************** CUSTOM SPLASH SCREEN *****************************/ #define LULZBOT_CUSTOM_BOOTSCREEN() \