diff --git a/Marlin/Conditionals_LulzBot.h b/Marlin/Conditionals_LulzBot.h index e11d910dd..e973aedda 100644 --- a/Marlin/Conditionals_LulzBot.h +++ b/Marlin/Conditionals_LulzBot.h @@ -39,7 +39,7 @@ #error Must specify model and toolhead. Please see "Configuration_LulzBot.h" for directions. #endif -#define LULZBOT_FW_VERSION ".1" +#define LULZBOT_FW_VERSION ".2" // Select options based on printer model @@ -482,6 +482,7 @@ */ #define LULZBOT_HIDE_ACTIVE_NOZZLE_IN_LCD #define LULZBOT_HIDE_PID_CONFIG_IN_LCD + #define LULZBOT_HIDE_EXTRA_FAN_CONFIG_IN_LCD #define LULZBOT_SCROLL_LONG_FILE_NAMES #endif diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 7d3d4d130..92ed93715 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -224,7 +224,7 @@ /** * Part-Cooling Fan Multiplexer - * + * * This feature allows you to digitally multiplex the fan output. * The multiplexer is automatically switched at tool-change. * Set FANMUX[012]_PINs below for up to 2, 4, or 8 multiplexed fans. diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 50ce3fee5..a304cbc92 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -12725,7 +12725,6 @@ void prepare_move_to_destination() { #endif // BEZIER_CURVE_SUPPORT #if ENABLED(USE_CONTROLLER_FAN) - void controllerFan() { static millis_t lastMotorOn = 0, // Last time a motor was turned on nextMotorCheck = 0; // Last time the state was checked diff --git a/Marlin/pins_RAMBO.h b/Marlin/pins_RAMBO.h index 6aec9be8f..d3516cbd6 100644 --- a/Marlin/pins_RAMBO.h +++ b/Marlin/pins_RAMBO.h @@ -162,10 +162,10 @@ #if defined(LULZBOT_EXTRUDER_FAN_ON_PIN_6) #define FAN_PIN 6 - //#define FAN1_PIN 8 + #define FAN1_PIN 8 #else #define FAN_PIN 8 - //#define FAN1_PIN 6 + #define FAN1_PIN 6 #endif #define FAN2_PIN 2 diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index be20602e1..0c66a407d 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -1220,10 +1220,10 @@ void kill_screen(const char* lcd_msg) { #endif MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_1ST_FAN_SPEED, &fanSpeeds[0], 0, 255); #endif - #if HAS_FAN1 + #if HAS_FAN1 && !defined(LULZBOT_HIDE_EXTRA_FAN_CONFIG_IN_LCD) MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED " 2", &fanSpeeds[1], 0, 255); #endif - #if HAS_FAN2 + #if HAS_FAN2 && !defined(LULZBOT_HIDE_EXTRA_FAN_CONFIG_IN_LCD) MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED " 3", &fanSpeeds[2], 0, 255); #endif #endif // FAN_COUNT > 0 @@ -3123,10 +3123,10 @@ void kill_screen(const char* lcd_msg) { #endif MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_1ST_FAN_SPEED, &fanSpeeds[0], 0, 255); #endif - #if HAS_FAN1 + #if HAS_FAN1 && !defined(LULZBOT_HIDE_EXTRA_FAN_CONFIG_IN_LCD) MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED " 2", &fanSpeeds[1], 0, 255); #endif - #if HAS_FAN2 + #if HAS_FAN2 && !defined(LULZBOT_HIDE_EXTRA_FAN_CONFIG_IN_LCD) MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED " 3", &fanSpeeds[2], 0, 255); #endif #endif // FAN_COUNT > 0