From 5fdaead6633478946dd2f6eddaaf9636327a486c Mon Sep 17 00:00:00 2001
From: leptun <voinea.dragos.alexandru@gmail.com>
Date: Mon, 29 Jul 2019 15:55:42 +0300
Subject: [PATCH 01/24] Fix language related warnings in LANG_MODE 0

---
 Firmware/language.c   | 6 +++---
 Firmware/ultralcd.cpp | 4 ++++
 Firmware/ultralcd.h   | 3 +++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Firmware/language.c b/Firmware/language.c
index c4b501b97..e43760967 100644
--- a/Firmware/language.c
+++ b/Firmware/language.c
@@ -17,10 +17,10 @@ uint8_t lang_selected = 0;
 
 #if (LANG_MODE == 0) //primary language only
 
-uint8_t lang_select(uint8_t lang) { return 0; }
+uint8_t lang_select(__attribute__((unused)) uint8_t lang) { return 0; }
 uint8_t lang_get_count() { return 1; }
-uint16_t lang_get_code(uint8_t lang) { return LANG_CODE_EN; }
-const char* lang_get_name_by_code(uint16_t code) { return _n("English"); }
+uint16_t lang_get_code(__attribute__((unused)) uint8_t lang) { return LANG_CODE_EN; }
+const char* lang_get_name_by_code(__attribute__((unused)) uint16_t code) { return _n("English"); }
 void lang_reset(void) { }
 uint8_t lang_is_selected(void) { return 1; }
 
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index acb369d95..cac952db8 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -114,7 +114,9 @@ static const char* lcd_display_message_fullscreen_nonBlocking_P(const char *msg,
 
 /* Different menus */
 static void lcd_status_screen();
+#if (LANG_MODE != 0)
 static void lcd_language_menu();
+#endif
 static void lcd_main_menu();
 static void lcd_tune_menu();
 //static void lcd_move_menu();
@@ -4733,6 +4735,7 @@ void lcd_wizard() {
 	}
 }
 
+#if (LANG_MODE != 0)
 void lcd_language()
 {
 	lcd_update_enable(true);
@@ -4752,6 +4755,7 @@ void lcd_language()
 	else
 		lang_select(LANG_ID_PRI);
 }
+#endif
 
 static void wait_preheat()
 {
diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h
index 2c57c9443..62ba75195 100755
--- a/Firmware/ultralcd.h
+++ b/Firmware/ultralcd.h
@@ -6,6 +6,7 @@
 #include "conv2str.h"
 #include "menu.h"
 #include "mesh_bed_calibration.h"
+#include "config.h"
 
 extern void menu_lcd_longpress_func(void);
 extern void menu_lcd_charsetup_func(void);
@@ -208,7 +209,9 @@ void lcd_set_degree();
 void lcd_set_progress();
 #endif
 
+#if (LANG_MODE != 0)
 void lcd_language();
+#endif
 
 void lcd_wizard();
 bool lcd_autoDepleteEnabled();

From 4e58a112e8935b5bf685e37a7cf2922b6171c6c9 Mon Sep 17 00:00:00 2001
From: rhounsell <53660397+rhounsell@users.noreply.github.com>
Date: Thu, 8 Aug 2019 15:45:59 -0400
Subject: [PATCH 02/24] Fix for Toshiba FlashAir (or other) SD card
 initialization - add clock cycles between sending CMD0 and CMD8. Redone for
 MK3 branch)

---
 Firmware/Sd2Card.cpp | 15 +++++++++++++++
 Firmware/Sd2Card.h   |  2 ++
 2 files changed, 17 insertions(+)

diff --git a/Firmware/Sd2Card.cpp b/Firmware/Sd2Card.cpp
index c00c7ef91..cb1959be7 100644
--- a/Firmware/Sd2Card.cpp
+++ b/Firmware/Sd2Card.cpp
@@ -319,6 +319,21 @@ bool Sd2Card::init(uint8_t sckRateID, uint8_t chipSelectPin) {
       goto fail;
     }
   }
+
+  // send 0xFF until 0xFF received to give card some clock cycles
+  SERIAL_ECHOLNRPGM(PSTR("Sending 0xFF"));
+  spiSend(0XFF);
+  while ((status_ = spiRec()) != 0xFF)
+  {
+    spiSend(0XFF);
+    if (((uint16_t)_millis() - t0) > SD_CARD_ERROR_FF_TIMEOUT)
+    {
+      error(SD_CARD_ERROR_CMD8);
+      SERIAL_ECHOLNRPGM(PSTR("No 0xFF received"));
+      goto fail;
+    }
+  }
+
   // check SD version
   if ((cardCommand(CMD8, 0x1AA) & R1_ILLEGAL_COMMAND)) {
     type(SD_CARD_TYPE_SD1);
diff --git a/Firmware/Sd2Card.h b/Firmware/Sd2Card.h
index 537d249c9..f4cc59d76 100644
--- a/Firmware/Sd2Card.h
+++ b/Firmware/Sd2Card.h
@@ -105,6 +105,8 @@ uint8_t const SD_CARD_ERROR_SCK_RATE = 0X18;
 uint8_t const SD_CARD_ERROR_INIT_NOT_CALLED = 0X19;
 /** crc check error */
 uint8_t const SD_CARD_ERROR_CRC = 0X20;
+/** no response to sent 0xFF */
+uint8_t const SD_CARD_ERROR_FF_TIMEOUT = 0X21;
 
 /** Toshiba FlashAir: iSDIO */
 uint8_t const SD_CARD_ERROR_CMD48 = 0x80;

From 32fa8caab873e5b959f9393b825c236a85740347 Mon Sep 17 00:00:00 2001
From: rhounsell <53660397+rhounsell@users.noreply.github.com>
Date: Sun, 11 Aug 2019 17:57:41 -0400
Subject: [PATCH 03/24] reinitialize the timestamp to ensure enough time to
 receive response for 0xFF sent.

---
 Firmware/Sd2Card.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Firmware/Sd2Card.cpp b/Firmware/Sd2Card.cpp
index cb1959be7..449590f17 100644
--- a/Firmware/Sd2Card.cpp
+++ b/Firmware/Sd2Card.cpp
@@ -321,6 +321,7 @@ bool Sd2Card::init(uint8_t sckRateID, uint8_t chipSelectPin) {
   }
 
   // send 0xFF until 0xFF received to give card some clock cycles
+  t0 = (uint16_t)_millis();
   SERIAL_ECHOLNRPGM(PSTR("Sending 0xFF"));
   spiSend(0XFF);
   while ((status_ = spiRec()) != 0xFF)

From 68491c9d4dd195b0764ae47ad12b043003904d33 Mon Sep 17 00:00:00 2001
From: leptun <voinea.dragos.alexandru@gmail.com>
Date: Fri, 11 Oct 2019 19:06:37 +0300
Subject: [PATCH 04/24] First implementation

---
 Firmware/Marlin_main.cpp  |  4 ----
 Firmware/backlight.cpp    | 33 +++++++++++++++++++++++++++++++++
 Firmware/backlight.h      | 13 +++++++++++++
 Firmware/eeprom.h         |  3 ++-
 Firmware/pins_Einsy_1_0.h |  2 +-
 Firmware/ultralcd.cpp     |  5 +++++
 6 files changed, 54 insertions(+), 6 deletions(-)
 create mode 100644 Firmware/backlight.cpp
 create mode 100644 Firmware/backlight.h

diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 45dd118c4..c076c8a0e 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -989,10 +989,6 @@ void setup()
 
 	ultralcd_init();
 
-#if (LCD_BL_PIN != -1) && defined (LCD_BL_PIN)
-	analogWrite(LCD_BL_PIN, 255); //set full brightnes
-#endif //(LCD_BL_PIN != -1) && defined (LCD_BL_PIN)
-
 	spi_init();
 
 	lcd_splash();
diff --git a/Firmware/backlight.cpp b/Firmware/backlight.cpp
new file mode 100644
index 000000000..d63104b59
--- /dev/null
+++ b/Firmware/backlight.cpp
@@ -0,0 +1,33 @@
+//backlight.cpp
+
+#include "backlight.h"
+#include <avr/eeprom.h>
+#include <Arduino.h>
+#include "eeprom.h"
+#include "Marlin.h"
+#include "pins.h"
+#include "fastio.h"
+// #include "Timer.h"
+// #include "Configuration.h"
+
+int16_t backlightLevel = 0;
+int16_t backlightLevel_old = 0;
+// uint16_t backlightCounter = 0;
+
+void backlight_update()
+{
+    if (backlightLevel != backlightLevel_old) //update level
+    {
+        analogWrite(LCD_BL_PIN, backlightLevel);
+        backlightLevel_old = backlightLevel;
+        eeprom_update_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL, backlightLevel);
+    }
+}
+
+void backlight_init()
+{
+    SET_OUTPUT(LCD_BL_PIN);
+    WRITE(LCD_BL_PIN,0);
+    backlightLevel = eeprom_read_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL);
+    backlight_update();
+}
diff --git a/Firmware/backlight.h b/Firmware/backlight.h
new file mode 100644
index 000000000..d31a997ef
--- /dev/null
+++ b/Firmware/backlight.h
@@ -0,0 +1,13 @@
+//backlight.h
+#ifndef _BACKLIGHT_H
+#define _BACKLIGHT_H
+
+#include <inttypes.h>
+
+extern int16_t backlightLevel;
+
+extern void backlight_update();
+extern void backlight_init();
+
+
+#endif //_BACKLIGHT_H
diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h
index 197c18c25..a8bab5230 100644
--- a/Firmware/eeprom.h
+++ b/Firmware/eeprom.h
@@ -201,9 +201,10 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP
 #define EEPROM_SHEETS_BASE (EEPROM_CHECK_GCODE - EEPROM_SHEETS_SIZEOF) // Sheets
 static Sheets * const EEPROM_Sheets_base = (Sheets*)(EEPROM_SHEETS_BASE);
 
+#define EEPROM_BACKLIGHT_LEVEL (EEPROM_SHEETS_BASE-1) // uint8
 
 //This is supposed to point to last item to allow EEPROM overrun check. Please update when adding new items.
-#define EEPROM_LAST_ITEM EEPROM_SHEETS_BASE
+#define EEPROM_LAST_ITEM EEPROM_BACKLIGHT_LEVEL
 // !!!!!
 // !!!!! this is end of EEPROM section ... all updates MUST BE inserted before this mark !!!!!
 // !!!!!
diff --git a/Firmware/pins_Einsy_1_0.h b/Firmware/pins_Einsy_1_0.h
index 33363388a..005683c01 100755
--- a/Firmware/pins_Einsy_1_0.h
+++ b/Firmware/pins_Einsy_1_0.h
@@ -99,7 +99,7 @@
 
 //#define KILL_PIN            32
 
-//#define LCD_BL_PIN          5   //backlight control pin
+#define LCD_BL_PIN          5   //backlight control pin
 #define BEEPER              84  // Beeper on AUX-4
 #define LCD_PINS_RS         82
 #define LCD_PINS_ENABLE     61 // !!! changed from 18 (EINY03)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index f49528025..bfd7f9b58 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -18,6 +18,7 @@
 
 #include "lcd.h"
 #include "menu.h"
+#include "backlight.h"
 
 #include "util.h"
 #include "mesh_bed_leveling.h"
@@ -5768,6 +5769,8 @@ static void lcd_settings_menu()
 
 	SETTINGS_SD;
 	SETTINGS_SOUND;
+    
+    MENU_ITEM_EDIT_int3_P(_i("Backlight"), &backlightLevel, 0, 255);
 
 	if (farm_mode)
 	{
@@ -8567,6 +8570,7 @@ void ultralcd_init()
         else lcd_autoDeplete = autoDepleteRaw;
 
     }
+    backlight_init();
 	lcd_init();
 	lcd_refresh();
 	lcd_longpress_func = menu_lcd_longpress_func;
@@ -8813,6 +8817,7 @@ void menu_lcd_lcdupdate_func(void)
 		}
 	}
 #endif//CARDINSERTED
+    backlight_update();
 	if (lcd_next_update_millis < _millis())
 	{
 		if (abs(lcd_encoder_diff) >= ENCODER_PULSES_PER_STEP)

From b2a1dc67869baa20ad840291078af6ec0112d1d1 Mon Sep 17 00:00:00 2001
From: leptun <voinea.dragos.alexandru@gmail.com>
Date: Fri, 11 Oct 2019 19:23:38 +0300
Subject: [PATCH 05/24] Compile fix for firmware without LCD_BL_PIN

---
 Firmware/backlight.cpp |  4 ++++
 Firmware/ultralcd.cpp  | 11 ++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Firmware/backlight.cpp b/Firmware/backlight.cpp
index d63104b59..067fc1336 100644
--- a/Firmware/backlight.cpp
+++ b/Firmware/backlight.cpp
@@ -10,6 +10,8 @@
 // #include "Timer.h"
 // #include "Configuration.h"
 
+#ifdef LCD_BL_PIN
+
 int16_t backlightLevel = 0;
 int16_t backlightLevel_old = 0;
 // uint16_t backlightCounter = 0;
@@ -31,3 +33,5 @@ void backlight_init()
     backlightLevel = eeprom_read_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL);
     backlight_update();
 }
+
+#endif //LCD_BL_PIN
\ No newline at end of file
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index bfd7f9b58..e58663aef 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -18,7 +18,10 @@
 
 #include "lcd.h"
 #include "menu.h"
+
+#ifdef LCD_BL_PIN
 #include "backlight.h"
+#endif //LCD_BL_PIN
 
 #include "util.h"
 #include "mesh_bed_leveling.h"
@@ -5769,8 +5772,10 @@ static void lcd_settings_menu()
 
 	SETTINGS_SD;
 	SETTINGS_SOUND;
-    
+
+#ifdef LCD_BL_PIN
     MENU_ITEM_EDIT_int3_P(_i("Backlight"), &backlightLevel, 0, 255);
+#endif //LCD_BL_PIN
 
 	if (farm_mode)
 	{
@@ -8570,7 +8575,9 @@ void ultralcd_init()
         else lcd_autoDeplete = autoDepleteRaw;
 
     }
+#ifdef LCD_BL_PIN
     backlight_init();
+#endif //LCD_BL_PIN
 	lcd_init();
 	lcd_refresh();
 	lcd_longpress_func = menu_lcd_longpress_func;
@@ -8817,7 +8824,9 @@ void menu_lcd_lcdupdate_func(void)
 		}
 	}
 #endif//CARDINSERTED
+#ifdef LCD_BL_PIN
     backlight_update();
+#endif //LCD_BL_PIN
 	if (lcd_next_update_millis < _millis())
 	{
 		if (abs(lcd_encoder_diff) >= ENCODER_PULSES_PER_STEP)

From 75f389a71d00a5c83cd10779c4312a9c2735d88d Mon Sep 17 00:00:00 2001
From: leptun <voinea.dragos.alexandru@gmail.com>
Date: Sun, 13 Oct 2019 14:31:43 +0300
Subject: [PATCH 06/24] Auto-Dimming initial

---
 Firmware/backlight.cpp | 37 +++++++++++++++++++++++++++++++------
 Firmware/backlight.h   |  1 +
 Firmware/ultralcd.cpp  |  8 +++++++-
 3 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/Firmware/backlight.cpp b/Firmware/backlight.cpp
index 067fc1336..64a0e0c17 100644
--- a/Firmware/backlight.cpp
+++ b/Firmware/backlight.cpp
@@ -7,22 +7,47 @@
 #include "Marlin.h"
 #include "pins.h"
 #include "fastio.h"
-// #include "Timer.h"
+#include "Timer.h"
 // #include "Configuration.h"
 
 #ifdef LCD_BL_PIN
 
 int16_t backlightLevel = 0;
 int16_t backlightLevel_old = 0;
-// uint16_t backlightCounter = 0;
+unsigned long backlightTimer_period = 10000ul;
+bool backlightIsDimmed = true;
+LongTimer backlightTimer;
+
+static void backlightDim()
+{
+    // if (backlightIsDimmed) return;
+    backlightLevel /= 4; //make the display half as bright.
+    backlightIsDimmed = true;
+}
+
+static void backlightWake()
+{
+    // if (!backlightIsDimmed) return;
+    backlightLevel = eeprom_read_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL);
+    backlightIsDimmed = false;
+}
+
+void backlightTimer_reset() //used for resetting the timer and waking the display
+{
+    backlightTimer.start();
+    if (backlightIsDimmed) backlightWake();
+}
 
 void backlight_update()
 {
-    if (backlightLevel != backlightLevel_old) //update level
+    if (backlightTimer.expired(backlightTimer_period)) backlightDim();
+    
+    if (backlightLevel != backlightLevel_old) //update pwm duty cycle
     {
         analogWrite(LCD_BL_PIN, backlightLevel);
         backlightLevel_old = backlightLevel;
-        eeprom_update_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL, backlightLevel);
+        
+        if (!backlightIsDimmed) eeprom_update_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL, backlightLevel); //update eeprom value
     }
 }
 
@@ -30,8 +55,8 @@ void backlight_init()
 {
     SET_OUTPUT(LCD_BL_PIN);
     WRITE(LCD_BL_PIN,0);
-    backlightLevel = eeprom_read_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL);
-    backlight_update();
+    backlightTimer_reset(); //initializes eeprom data and starts backlightTimer
+    backlight_update(); //actually sets the backlight to the correct level
 }
 
 #endif //LCD_BL_PIN
\ No newline at end of file
diff --git a/Firmware/backlight.h b/Firmware/backlight.h
index d31a997ef..ee656f884 100644
--- a/Firmware/backlight.h
+++ b/Firmware/backlight.h
@@ -8,6 +8,7 @@ extern int16_t backlightLevel;
 
 extern void backlight_update();
 extern void backlight_init();
+extern void backlightTimer_reset();
 
 
 #endif //_BACKLIGHT_H
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index e58663aef..825ccade6 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -8726,6 +8726,7 @@ uint8_t get_message_level()
 
 void menu_lcd_longpress_func(void)
 {
+	backlightTimer_reset();
     if (homing_flag || mesh_bed_leveling_flag || menu_menu == lcd_babystep_z || menu_menu == lcd_move_z)
     {
         // disable longpress during re-entry, while homing or calibration
@@ -8837,9 +8838,14 @@ void menu_lcd_lcdupdate_func(void)
 			Sound_MakeSound(e_SOUND_TYPE_EncoderMove);
 			lcd_encoder_diff = 0;
 			lcd_timeoutToStatus.start();
+			backlightTimer_reset();
 		}
 
-		if (LCD_CLICKED) lcd_timeoutToStatus.start();
+		if (LCD_CLICKED)
+		{
+			lcd_timeoutToStatus.start();
+			backlightTimer_reset();
+		}
 
 		(*menu_menu)();
 

From 5a662413e6f7d64acca603ac9fbe4e0aa1bf3045 Mon Sep 17 00:00:00 2001
From: leptun <voinea.dragos.alexandru@gmail.com>
Date: Sun, 13 Oct 2019 14:34:04 +0300
Subject: [PATCH 07/24] Fix compile for printer without backlight support

---
 Firmware/ultralcd.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 825ccade6..6fa63c7c7 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -8726,7 +8726,9 @@ uint8_t get_message_level()
 
 void menu_lcd_longpress_func(void)
 {
+#ifdef LCD_BL_PIN
 	backlightTimer_reset();
+#endif //LCD_BL_PIN
     if (homing_flag || mesh_bed_leveling_flag || menu_menu == lcd_babystep_z || menu_menu == lcd_move_z)
     {
         // disable longpress during re-entry, while homing or calibration
@@ -8838,13 +8840,17 @@ void menu_lcd_lcdupdate_func(void)
 			Sound_MakeSound(e_SOUND_TYPE_EncoderMove);
 			lcd_encoder_diff = 0;
 			lcd_timeoutToStatus.start();
+#ifdef LCD_BL_PIN
 			backlightTimer_reset();
+#endif //LCD_BL_PIN
 		}
 
 		if (LCD_CLICKED)
 		{
 			lcd_timeoutToStatus.start();
+#ifdef LCD_BL_PIN
 			backlightTimer_reset();
+#endif //LCD_BL_PIN
 		}
 
 		(*menu_menu)();

From 3b005ae38f424a30965e8ed9dee2e79939607b4c Mon Sep 17 00:00:00 2001
From: leptun <voinea.dragos.alexandru@gmail.com>
Date: Wed, 16 Oct 2019 14:40:45 +0300
Subject: [PATCH 08/24] Backlight detection

---
 Firmware/backlight.cpp | 12 +++++++++++-
 Firmware/backlight.h   |  1 +
 Firmware/ultralcd.cpp  |  5 ++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Firmware/backlight.cpp b/Firmware/backlight.cpp
index 64a0e0c17..72850d2ca 100644
--- a/Firmware/backlight.cpp
+++ b/Firmware/backlight.cpp
@@ -12,6 +12,7 @@
 
 #ifdef LCD_BL_PIN
 
+bool backlightSupport = 0;
 int16_t backlightLevel = 0;
 int16_t backlightLevel_old = 0;
 unsigned long backlightTimer_period = 10000ul;
@@ -21,7 +22,7 @@ LongTimer backlightTimer;
 static void backlightDim()
 {
     // if (backlightIsDimmed) return;
-    backlightLevel /= 4; //make the display half as bright.
+    backlightLevel /= 4; //make the display dimmer.
     backlightIsDimmed = true;
 }
 
@@ -40,6 +41,7 @@ void backlightTimer_reset() //used for resetting the timer and waking the displa
 
 void backlight_update()
 {
+    if (!backlightSupport) return;
     if (backlightTimer.expired(backlightTimer_period)) backlightDim();
     
     if (backlightLevel != backlightLevel_old) //update pwm duty cycle
@@ -53,6 +55,14 @@ void backlight_update()
 
 void backlight_init()
 {
+//check for backlight support on lcd
+    SET_INPUT(LCD_BL_PIN);
+    WRITE(LCD_BL_PIN,HIGH);
+    _delay(10);
+    backlightSupport = !READ(LCD_BL_PIN);
+    if (backlightSupport == 0) return;
+
+//initialize backlight pin
     SET_OUTPUT(LCD_BL_PIN);
     WRITE(LCD_BL_PIN,0);
     backlightTimer_reset(); //initializes eeprom data and starts backlightTimer
diff --git a/Firmware/backlight.h b/Firmware/backlight.h
index ee656f884..84a2a17e6 100644
--- a/Firmware/backlight.h
+++ b/Firmware/backlight.h
@@ -5,6 +5,7 @@
 #include <inttypes.h>
 
 extern int16_t backlightLevel;
+extern bool backlightSupport;
 
 extern void backlight_update();
 extern void backlight_init();
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 6fa63c7c7..715719ca6 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -5774,7 +5774,10 @@ static void lcd_settings_menu()
 	SETTINGS_SOUND;
 
 #ifdef LCD_BL_PIN
-    MENU_ITEM_EDIT_int3_P(_i("Backlight"), &backlightLevel, 0, 255);
+    if (backlightSupport)
+    {
+        MENU_ITEM_EDIT_int3_P(_i("Backlight"), &backlightLevel, 0, 255);
+    }
 #endif //LCD_BL_PIN
 
 	if (farm_mode)

From 25e0d23efe56ea7de0039e32e0c64434d158a98b Mon Sep 17 00:00:00 2001
From: leptun <voinea.dragos.alexandru@gmail.com>
Date: Thu, 17 Oct 2019 13:11:32 +0300
Subject: [PATCH 09/24] Backlight overhaul and UI changes

---
 Firmware/backlight.cpp | 60 ++++++++++++++++++++++--------------------
 Firmware/backlight.h   | 12 ++++++++-
 Firmware/eeprom.h      |  6 +++--
 Firmware/ultralcd.cpp  | 35 +++++++++++++++++++++++-
 4 files changed, 80 insertions(+), 33 deletions(-)

diff --git a/Firmware/backlight.cpp b/Firmware/backlight.cpp
index 72850d2ca..59f08b6fb 100644
--- a/Firmware/backlight.cpp
+++ b/Firmware/backlight.cpp
@@ -8,49 +8,41 @@
 #include "pins.h"
 #include "fastio.h"
 #include "Timer.h"
-// #include "Configuration.h"
 
 #ifdef LCD_BL_PIN
 
-bool backlightSupport = 0;
-int16_t backlightLevel = 0;
-int16_t backlightLevel_old = 0;
+bool backlightSupport = 0; //only if it's true will any of the settings be visible to the user
+int16_t backlightLevel_HIGH = 0;
+int16_t backlightLevel_LOW = 0;
+uint8_t backlightMode = BACKLIGHT_MODE_BRIGHT;
 unsigned long backlightTimer_period = 10000ul;
-bool backlightIsDimmed = true;
 LongTimer backlightTimer;
 
-static void backlightDim()
+void backlight_save() //saves all backlight data to eeprom.
 {
-    // if (backlightIsDimmed) return;
-    backlightLevel /= 4; //make the display dimmer.
-    backlightIsDimmed = true;
+    eeprom_update_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_HIGH, (uint8_t)backlightLevel_HIGH);
+    eeprom_update_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_LOW, (uint8_t)backlightLevel_LOW);
+    eeprom_update_byte((uint8_t *)EEPROM_BACKLIGHT_MODE, backlightMode);
 }
 
-static void backlightWake()
-{
-    // if (!backlightIsDimmed) return;
-    backlightLevel = eeprom_read_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL);
-    backlightIsDimmed = false;
-}
-
-void backlightTimer_reset() //used for resetting the timer and waking the display
+void backlightTimer_reset() //used for resetting the timer and waking the display. Triggered on events such as knob click, rotate and on full screen notifications.
 {
+    if (!backlightSupport) return;
     backlightTimer.start();
-    if (backlightIsDimmed) backlightWake();
 }
 
 void backlight_update()
 {
     if (!backlightSupport) return;
-    if (backlightTimer.expired(backlightTimer_period)) backlightDim();
     
-    if (backlightLevel != backlightLevel_old) //update pwm duty cycle
+    if (backlightMode == BACKLIGHT_MODE_AUTO)
     {
-        analogWrite(LCD_BL_PIN, backlightLevel);
-        backlightLevel_old = backlightLevel;
-        
-        if (!backlightIsDimmed) eeprom_update_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL, backlightLevel); //update eeprom value
+        if (backlightTimer.expired(backlightTimer_period)) analogWrite(LCD_BL_PIN, backlightLevel_LOW);
+        else if (backlightTimer.running()) analogWrite(LCD_BL_PIN, backlightLevel_HIGH);
+        else {/*do nothing*/;} //display is dimmed.
     }
+    else if (backlightMode == BACKLIGHT_MODE_DIM) analogWrite(LCD_BL_PIN, backlightLevel_LOW);
+    else analogWrite(LCD_BL_PIN, backlightLevel_HIGH);
 }
 
 void backlight_init()
@@ -60,13 +52,23 @@ void backlight_init()
     WRITE(LCD_BL_PIN,HIGH);
     _delay(10);
     backlightSupport = !READ(LCD_BL_PIN);
-    if (backlightSupport == 0) return;
+    if (!backlightSupport) return;
 
-//initialize backlight pin
+//initialize backlight
+    backlightMode = eeprom_read_byte((uint8_t *)EEPROM_BACKLIGHT_MODE);
+    if (backlightMode == 0xFF) //set default values
+    {
+        backlightMode = BACKLIGHT_MODE_AUTO;
+        backlightLevel_HIGH = 130;
+        backlightLevel_LOW = 50;
+        backlight_save();
+    }
+    backlightLevel_HIGH = eeprom_read_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_HIGH);
+    backlightLevel_LOW = eeprom_read_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_LOW);
+    
     SET_OUTPUT(LCD_BL_PIN);
-    WRITE(LCD_BL_PIN,0);
-    backlightTimer_reset(); //initializes eeprom data and starts backlightTimer
-    backlight_update(); //actually sets the backlight to the correct level
+    backlightTimer_reset();
+    backlight_update(); //sets brightness
 }
 
 #endif //LCD_BL_PIN
\ No newline at end of file
diff --git a/Firmware/backlight.h b/Firmware/backlight.h
index 84a2a17e6..f3e2ee605 100644
--- a/Firmware/backlight.h
+++ b/Firmware/backlight.h
@@ -4,12 +4,22 @@
 
 #include <inttypes.h>
 
-extern int16_t backlightLevel;
+enum Backlight_Mode
+{
+	BACKLIGHT_MODE_BRIGHT  = 0,
+	BACKLIGHT_MODE_DIM     = 1,
+	BACKLIGHT_MODE_AUTO    = 2,
+};
+
+extern int16_t backlightLevel_HIGH;
+extern int16_t backlightLevel_LOW;
+extern uint8_t backlightMode;
 extern bool backlightSupport;
 
 extern void backlight_update();
 extern void backlight_init();
 extern void backlightTimer_reset();
+extern void backlight_save();
 
 
 #endif //_BACKLIGHT_H
diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h
index a8bab5230..f47a2333e 100644
--- a/Firmware/eeprom.h
+++ b/Firmware/eeprom.h
@@ -201,10 +201,12 @@ static_assert(sizeof(Sheets) == EEPROM_SHEETS_SIZEOF, "Sizeof(Sheets) is not EEP
 #define EEPROM_SHEETS_BASE (EEPROM_CHECK_GCODE - EEPROM_SHEETS_SIZEOF) // Sheets
 static Sheets * const EEPROM_Sheets_base = (Sheets*)(EEPROM_SHEETS_BASE);
 
-#define EEPROM_BACKLIGHT_LEVEL (EEPROM_SHEETS_BASE-1) // uint8
+#define EEPROM_BACKLIGHT_LEVEL_HIGH (EEPROM_SHEETS_BASE-1) // uint8
+#define EEPROM_BACKLIGHT_LEVEL_LOW (EEPROM_BACKLIGHT_LEVEL_HIGH-1) // uint8
+#define EEPROM_BACKLIGHT_MODE (EEPROM_BACKLIGHT_LEVEL_LOW-1) // uint8
 
 //This is supposed to point to last item to allow EEPROM overrun check. Please update when adding new items.
-#define EEPROM_LAST_ITEM EEPROM_BACKLIGHT_LEVEL
+#define EEPROM_LAST_ITEM EEPROM_BACKLIGHT_MODE
 // !!!!!
 // !!!!! this is end of EEPROM section ... all updates MUST BE inserted before this mark !!!!!
 // !!!!!
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 715719ca6..04718cf66 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -56,6 +56,7 @@ char longFilenameOLD[LONG_FILENAME_LENGTH];
 
 static void lcd_sd_updir();
 static void lcd_mesh_bed_leveling_settings();
+static void lcd_backlight_menu();
 
 int8_t ReInitLCD = 0;
 
@@ -5776,7 +5777,7 @@ static void lcd_settings_menu()
 #ifdef LCD_BL_PIN
     if (backlightSupport)
     {
-        MENU_ITEM_EDIT_int3_P(_i("Backlight"), &backlightLevel, 0, 255);
+        MENU_ITEM_SUBMENU_P(_i("Brightness"), lcd_backlight_menu);
     }
 #endif //LCD_BL_PIN
 
@@ -7165,6 +7166,38 @@ static void lcd_mesh_bed_leveling_settings()
 	//SETTINGS_MBL_MODE;
 }
 
+static void backlight_mode_toggle()
+{
+    switch (backlightMode)
+    {
+        case BACKLIGHT_MODE_BRIGHT: backlightMode = BACKLIGHT_MODE_DIM; break;
+        case BACKLIGHT_MODE_DIM: backlightMode = BACKLIGHT_MODE_AUTO; break;
+        case BACKLIGHT_MODE_AUTO: backlightMode = BACKLIGHT_MODE_BRIGHT; break;
+        default: backlightMode = BACKLIGHT_MODE_BRIGHT; break;
+    }
+    backlight_save();
+}
+
+static void lcd_backlight_menu()
+{
+    MENU_BEGIN();
+    ON_MENU_LEAVE(
+        backlight_save();
+    );
+    
+    MENU_ITEM_BACK_P(_T(MSG_BACK));
+    MENU_ITEM_EDIT_int3_P(_i("Level Bright"), &backlightLevel_HIGH, 0, 255);
+    MENU_ITEM_EDIT_int3_P(_i("Level Dimmed"), &backlightLevel_LOW, 0, 255);
+    switch (backlightMode)
+    {
+        case BACKLIGHT_MODE_BRIGHT: MENU_ITEM_FUNCTION_P(_i("Mode   [Always on]"), backlight_mode_toggle); break;
+        case BACKLIGHT_MODE_DIM: MENU_ITEM_FUNCTION_P(_i("Mode  [Always off]"), backlight_mode_toggle); break;
+        default: MENU_ITEM_FUNCTION_P(_i("Mode        [Auto]"), backlight_mode_toggle); break;
+    }
+    
+    MENU_END();
+}
+
 static void lcd_control_temperature_menu()
 {
 #ifdef PIDTEMP

From 812eafd09c43554617c4748c88e43ffedbc6dea3 Mon Sep 17 00:00:00 2001
From: leptun <voinea.dragos.alexandru@gmail.com>
Date: Thu, 17 Oct 2019 13:14:32 +0300
Subject: [PATCH 10/24] Fix compile for miniRambo

---
 Firmware/ultralcd.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 04718cf66..f4a60f7d4 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -7166,6 +7166,7 @@ static void lcd_mesh_bed_leveling_settings()
 	//SETTINGS_MBL_MODE;
 }
 
+#ifdef LCD_BL_PIN
 static void backlight_mode_toggle()
 {
     switch (backlightMode)
@@ -7197,6 +7198,7 @@ static void lcd_backlight_menu()
     
     MENU_END();
 }
+#endif //LCD_BL_PIN
 
 static void lcd_control_temperature_menu()
 {

From 91e94aa0e894be8b9cf2734c72ae9357c92cea10 Mon Sep 17 00:00:00 2001
From: leptun <voinea.dragos.alexandru@gmail.com>
Date: Fri, 18 Oct 2019 10:32:41 +0300
Subject: [PATCH 11/24] Adjustable timeout

---
 Firmware/backlight.cpp | 7 +++++--
 Firmware/backlight.h   | 1 +
 Firmware/eeprom.h      | 3 ++-
 Firmware/ultralcd.cpp  | 9 +++++----
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Firmware/backlight.cpp b/Firmware/backlight.cpp
index 59f08b6fb..5ceef5954 100644
--- a/Firmware/backlight.cpp
+++ b/Firmware/backlight.cpp
@@ -15,7 +15,7 @@ bool backlightSupport = 0; //only if it's true will any of the settings be visib
 int16_t backlightLevel_HIGH = 0;
 int16_t backlightLevel_LOW = 0;
 uint8_t backlightMode = BACKLIGHT_MODE_BRIGHT;
-unsigned long backlightTimer_period = 10000ul;
+int16_t backlightTimer_period = 10;
 LongTimer backlightTimer;
 
 void backlight_save() //saves all backlight data to eeprom.
@@ -23,6 +23,7 @@ void backlight_save() //saves all backlight data to eeprom.
     eeprom_update_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_HIGH, (uint8_t)backlightLevel_HIGH);
     eeprom_update_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_LOW, (uint8_t)backlightLevel_LOW);
     eeprom_update_byte((uint8_t *)EEPROM_BACKLIGHT_MODE, backlightMode);
+    eeprom_update_word((uint16_t *)EEPROM_BACKLIGHT_TIMEOUT, backlightTimer_period);
 }
 
 void backlightTimer_reset() //used for resetting the timer and waking the display. Triggered on events such as knob click, rotate and on full screen notifications.
@@ -37,7 +38,7 @@ void backlight_update()
     
     if (backlightMode == BACKLIGHT_MODE_AUTO)
     {
-        if (backlightTimer.expired(backlightTimer_period)) analogWrite(LCD_BL_PIN, backlightLevel_LOW);
+        if (backlightTimer.expired((uint32_t)backlightTimer_period * 1000ul)) analogWrite(LCD_BL_PIN, backlightLevel_LOW);
         else if (backlightTimer.running()) analogWrite(LCD_BL_PIN, backlightLevel_HIGH);
         else {/*do nothing*/;} //display is dimmed.
     }
@@ -61,10 +62,12 @@ void backlight_init()
         backlightMode = BACKLIGHT_MODE_AUTO;
         backlightLevel_HIGH = 130;
         backlightLevel_LOW = 50;
+        backlightTimer_period = 10; //in seconds
         backlight_save();
     }
     backlightLevel_HIGH = eeprom_read_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_HIGH);
     backlightLevel_LOW = eeprom_read_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_LOW);
+    backlightTimer_period = eeprom_read_word((uint16_t *)EEPROM_BACKLIGHT_TIMEOUT);
     
     SET_OUTPUT(LCD_BL_PIN);
     backlightTimer_reset();
diff --git a/Firmware/backlight.h b/Firmware/backlight.h
index f3e2ee605..fc18dd5e9 100644
--- a/Firmware/backlight.h
+++ b/Firmware/backlight.h
@@ -15,6 +15,7 @@ extern int16_t backlightLevel_HIGH;
 extern int16_t backlightLevel_LOW;
 extern uint8_t backlightMode;
 extern bool backlightSupport;
+extern int16_t backlightTimer_period;
 
 extern void backlight_update();
 extern void backlight_init();
diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h
index f47a2333e..b869ac1c8 100644
--- a/Firmware/eeprom.h
+++ b/Firmware/eeprom.h
@@ -204,9 +204,10 @@ static Sheets * const EEPROM_Sheets_base = (Sheets*)(EEPROM_SHEETS_BASE);
 #define EEPROM_BACKLIGHT_LEVEL_HIGH (EEPROM_SHEETS_BASE-1) // uint8
 #define EEPROM_BACKLIGHT_LEVEL_LOW (EEPROM_BACKLIGHT_LEVEL_HIGH-1) // uint8
 #define EEPROM_BACKLIGHT_MODE (EEPROM_BACKLIGHT_LEVEL_LOW-1) // uint8
+#define EEPROM_BACKLIGHT_TIMEOUT (EEPROM_BACKLIGHT_MODE-2) // uint16
 
 //This is supposed to point to last item to allow EEPROM overrun check. Please update when adding new items.
-#define EEPROM_LAST_ITEM EEPROM_BACKLIGHT_MODE
+#define EEPROM_LAST_ITEM EEPROM_BACKLIGHT_TIMEOUT
 // !!!!!
 // !!!!! this is end of EEPROM section ... all updates MUST BE inserted before this mark !!!!!
 // !!!!!
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index f4a60f7d4..305ba7cb8 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -7187,14 +7187,15 @@ static void lcd_backlight_menu()
     );
     
     MENU_ITEM_BACK_P(_T(MSG_BACK));
-    MENU_ITEM_EDIT_int3_P(_i("Level Bright"), &backlightLevel_HIGH, 0, 255);
-    MENU_ITEM_EDIT_int3_P(_i("Level Dimmed"), &backlightLevel_LOW, 0, 255);
+    MENU_ITEM_EDIT_int3_P(_i("Level Bright"), &backlightLevel_HIGH, backlightLevel_LOW, 255);
+    MENU_ITEM_EDIT_int3_P(_i("Level Dimmed"), &backlightLevel_LOW, 0, backlightLevel_HIGH);
     switch (backlightMode)
     {
-        case BACKLIGHT_MODE_BRIGHT: MENU_ITEM_FUNCTION_P(_i("Mode   [Always on]"), backlight_mode_toggle); break;
-        case BACKLIGHT_MODE_DIM: MENU_ITEM_FUNCTION_P(_i("Mode  [Always off]"), backlight_mode_toggle); break;
+        case BACKLIGHT_MODE_BRIGHT: MENU_ITEM_FUNCTION_P(_i("Mode      [Bright]"), backlight_mode_toggle); break;
+        case BACKLIGHT_MODE_DIM: MENU_ITEM_FUNCTION_P(_i("Mode         [Dim]"), backlight_mode_toggle); break;
         default: MENU_ITEM_FUNCTION_P(_i("Mode        [Auto]"), backlight_mode_toggle); break;
     }
+    MENU_ITEM_EDIT_int3_P(_i("Timeout"), &backlightTimer_period, 1, 999);
     
     MENU_END();
 }

From 9fc42526e71c09415d15472df4acaf5f6bec6372 Mon Sep 17 00:00:00 2001
From: leptun <voinea.dragos.alexandru@gmail.com>
Date: Fri, 18 Oct 2019 12:18:43 +0300
Subject: [PATCH 12/24] Backlight always on during calibration

---
 Firmware/Marlin_main.cpp |  3 +++
 Firmware/backlight.cpp   | 15 +++++++++++++++
 Firmware/backlight.h     | 10 ++++++++++
 Firmware/ultralcd.cpp    |  6 +++++-
 4 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index c076c8a0e..ff580eeb9 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -63,6 +63,7 @@
 
 #include "menu.h"
 #include "ultralcd.h"
+#include "backlight.h"
 
 #include "planner.h"
 #include "stepper.h"
@@ -2768,6 +2769,7 @@ bool gcode_M45(bool onlyZ, int8_t verbosity_level)
 	#ifdef TMC2130
 	FORCE_HIGH_POWER_START;
 	#endif // TMC2130
+	FORCE_BL_ON_START;
 	// Only Z calibration?
 	if (!onlyZ)
 	{
@@ -2956,6 +2958,7 @@ bool gcode_M45(bool onlyZ, int8_t verbosity_level)
 #ifdef TMC2130
 	FORCE_HIGH_POWER_END;
 #endif // TMC2130
+	FORCE_BL_ON_END;
 	return final_result;
 }
 
diff --git a/Firmware/backlight.cpp b/Firmware/backlight.cpp
index 5ceef5954..054c510fb 100644
--- a/Firmware/backlight.cpp
+++ b/Firmware/backlight.cpp
@@ -18,6 +18,21 @@ uint8_t backlightMode = BACKLIGHT_MODE_BRIGHT;
 int16_t backlightTimer_period = 10;
 LongTimer backlightTimer;
 
+void force_bl_on(bool section_start)
+{
+    if (section_start)
+    {
+        backlightMode = BACKLIGHT_MODE_BRIGHT;
+        if (backlightLevel_HIGH < 30) backlightLevel_HIGH = 30;
+    }
+    else
+    {
+        backlightMode = eeprom_read_byte((uint8_t *)EEPROM_BACKLIGHT_MODE);
+        backlightLevel_HIGH = eeprom_read_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_HIGH);
+    }
+    backlight_update();
+}
+
 void backlight_save() //saves all backlight data to eeprom.
 {
     eeprom_update_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_HIGH, (uint8_t)backlightLevel_HIGH);
diff --git a/Firmware/backlight.h b/Firmware/backlight.h
index fc18dd5e9..99d777d9a 100644
--- a/Firmware/backlight.h
+++ b/Firmware/backlight.h
@@ -3,6 +3,8 @@
 #define _BACKLIGHT_H
 
 #include <inttypes.h>
+#include "Marlin.h"
+#include "pins.h"
 
 enum Backlight_Mode
 {
@@ -17,6 +19,14 @@ extern uint8_t backlightMode;
 extern bool backlightSupport;
 extern int16_t backlightTimer_period;
 
+#ifdef LCD_BL_PIN
+    #define FORCE_BL_ON_START   force_bl_on(true)
+    #define FORCE_BL_ON_END	    force_bl_on(false)
+#else
+    #define FORCE_BL_ON_START
+    #define FORCE_BL_ON_END
+#endif
+extern void force_bl_on(bool section_start);
 extern void backlight_update();
 extern void backlight_init();
 extern void backlightTimer_reset();
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 305ba7cb8..9d5776c73 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -5019,7 +5019,7 @@ void lcd_wizard(WizState state)
 	// Make sure EEPROM_WIZARD_ACTIVE is true if entering using different entry point
 	// other than WizState::Run - it is useful for debugging wizard.
 	if (state != S::Run) eeprom_update_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1);
-
+	FORCE_BL_ON_START;
 	while (!end) {
 		printf_P(PSTR("Wizard state: %d\n"), state);
 		switch (state) {
@@ -5157,6 +5157,7 @@ void lcd_wizard(WizState state)
 		}
 	}
 
+	FORCE_BL_ON_END;
 	printf_P(_N("Wizard end state: %d\n"), state);
 	switch (state) { //final message
 	case S::Restore: //printer was already calibrated
@@ -7393,6 +7394,7 @@ bool lcd_selftest()
 	#ifdef TMC2130
 	  FORCE_HIGH_POWER_START;
 	#endif // TMC2130
+    FORCE_BL_ON_START;
 	_delay(2000);
 	KEEPALIVE_STATE(IN_HANDLER);
 
@@ -7612,6 +7614,7 @@ bool lcd_selftest()
 	#ifdef TMC2130
 	  FORCE_HIGH_POWER_END;
 	#endif // TMC2130
+    FORCE_BL_ON_END;
 	KEEPALIVE_STATE(NOT_BUSY);
 	return(_result);
 }
@@ -8021,6 +8024,7 @@ static bool lcd_selfcheck_check_heater(bool _isbed)
 static void lcd_selftest_error(TestError testError, const char *_error_1, const char *_error_2)
 {
 	lcd_beeper_quick_feedback();
+    FORCE_BL_ON_END;
 
 	target_temperature[0] = 0;
 	target_temperature_bed = 0;

From 0ed4a23ae724f6758b6d9701b718fc12e46e880b Mon Sep 17 00:00:00 2001
From: leptun <voinea.dragos.alexandru@gmail.com>
Date: Fri, 18 Oct 2019 12:42:55 +0300
Subject: [PATCH 13/24] And another compile fix...

---
 Firmware/Marlin_main.cpp |  8 ++++++--
 Firmware/backlight.h     | 10 +++-------
 Firmware/ultralcd.cpp    | 20 +++++++++++++++-----
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index ff580eeb9..76dca1341 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -2769,7 +2769,9 @@ bool gcode_M45(bool onlyZ, int8_t verbosity_level)
 	#ifdef TMC2130
 	FORCE_HIGH_POWER_START;
 	#endif // TMC2130
-	FORCE_BL_ON_START;
+    #ifdef LCD_BL_PIN
+        FORCE_BL_ON_START;
+    #endif // LCD_BL_PIN
 	// Only Z calibration?
 	if (!onlyZ)
 	{
@@ -2958,7 +2960,9 @@ bool gcode_M45(bool onlyZ, int8_t verbosity_level)
 #ifdef TMC2130
 	FORCE_HIGH_POWER_END;
 #endif // TMC2130
-	FORCE_BL_ON_END;
+    #ifdef LCD_BL_PIN
+        FORCE_BL_ON_END;
+    #endif // LCD_BL_PIN
 	return final_result;
 }
 
diff --git a/Firmware/backlight.h b/Firmware/backlight.h
index 99d777d9a..ef005adf3 100644
--- a/Firmware/backlight.h
+++ b/Firmware/backlight.h
@@ -19,13 +19,9 @@ extern uint8_t backlightMode;
 extern bool backlightSupport;
 extern int16_t backlightTimer_period;
 
-#ifdef LCD_BL_PIN
-    #define FORCE_BL_ON_START   force_bl_on(true)
-    #define FORCE_BL_ON_END	    force_bl_on(false)
-#else
-    #define FORCE_BL_ON_START
-    #define FORCE_BL_ON_END
-#endif
+#define FORCE_BL_ON_START force_bl_on(true)
+#define FORCE_BL_ON_END force_bl_on(false)
+
 extern void force_bl_on(bool section_start);
 extern void backlight_update();
 extern void backlight_init();
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 9d5776c73..acaab10cc 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -5019,7 +5019,9 @@ void lcd_wizard(WizState state)
 	// Make sure EEPROM_WIZARD_ACTIVE is true if entering using different entry point
 	// other than WizState::Run - it is useful for debugging wizard.
 	if (state != S::Run) eeprom_update_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1);
-	FORCE_BL_ON_START;
+    #ifdef LCD_BL_PIN
+        FORCE_BL_ON_START;
+    #endif // LCD_BL_PIN
 	while (!end) {
 		printf_P(PSTR("Wizard state: %d\n"), state);
 		switch (state) {
@@ -5157,7 +5159,9 @@ void lcd_wizard(WizState state)
 		}
 	}
 
-	FORCE_BL_ON_END;
+    #ifdef LCD_BL_PIN
+        FORCE_BL_ON_END;
+    #endif // LCD_BL_PIN
 	printf_P(_N("Wizard end state: %d\n"), state);
 	switch (state) { //final message
 	case S::Restore: //printer was already calibrated
@@ -7394,7 +7398,9 @@ bool lcd_selftest()
 	#ifdef TMC2130
 	  FORCE_HIGH_POWER_START;
 	#endif // TMC2130
-    FORCE_BL_ON_START;
+    #ifdef LCD_BL_PIN
+        FORCE_BL_ON_START;
+    #endif // LCD_BL_PIN
 	_delay(2000);
 	KEEPALIVE_STATE(IN_HANDLER);
 
@@ -7614,7 +7620,9 @@ bool lcd_selftest()
 	#ifdef TMC2130
 	  FORCE_HIGH_POWER_END;
 	#endif // TMC2130
-    FORCE_BL_ON_END;
+    #ifdef LCD_BL_PIN
+        FORCE_BL_ON_END;
+    #endif // LCD_BL_PIN
 	KEEPALIVE_STATE(NOT_BUSY);
 	return(_result);
 }
@@ -8024,7 +8032,9 @@ static bool lcd_selfcheck_check_heater(bool _isbed)
 static void lcd_selftest_error(TestError testError, const char *_error_1, const char *_error_2)
 {
 	lcd_beeper_quick_feedback();
-    FORCE_BL_ON_END;
+    #ifdef LCD_BL_PIN
+        FORCE_BL_ON_END;
+    #endif // LCD_BL_PIN
 
 	target_temperature[0] = 0;
 	target_temperature_bed = 0;

From d7b12faa95d038ac41f24f2b2ba9521891c21409 Mon Sep 17 00:00:00 2001
From: leptun <voinea.dragos.alexandru@gmail.com>
Date: Sat, 19 Oct 2019 18:45:04 +0300
Subject: [PATCH 14/24] Add "Brightness" to Tune menu

---
 Firmware/ultralcd.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index acaab10cc..f89cac58d 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -7119,7 +7119,12 @@ static void lcd_tune_menu()
           default:
                MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_LOUD),lcd_sound_state_set);
           }
-
+#ifdef LCD_BL_PIN
+    if (backlightSupport)
+    {
+        MENU_ITEM_SUBMENU_P(_i("Brightness"), lcd_backlight_menu);
+    }
+#endif //LCD_BL_PIN
 	MENU_END();
 }
 

From 4943e17bda06bf269a74af5a9d34357c3112f308 Mon Sep 17 00:00:00 2001
From: leptun <voinea.dragos.alexandru@gmail.com>
Date: Sat, 19 Oct 2019 18:45:31 +0300
Subject: [PATCH 15/24] Preserve power during PP by turning off backlight

---
 Firmware/Marlin_main.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 76dca1341..ac3d7d8bd 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -9534,6 +9534,11 @@ void uvlo_()
 	unsigned long time_start = _millis();
 	bool sd_print = card.sdprinting;
     // Conserve power as soon as possible.
+#ifdef LCD_BL_PIN
+    backlightMode = BACKLIGHT_MODE_DIM;
+    backlightLevel_LOW = 0;
+    backlight_update();
+#endif //LCD_BL_PIN
     disable_x();
     disable_y();
     

From 1e09f8c003a2623bd632dc4026bd7e9759598119 Mon Sep 17 00:00:00 2001
From: leptun <voinea.dragos.alexandru@gmail.com>
Date: Wed, 30 Oct 2019 21:11:19 +0200
Subject: [PATCH 16/24] Wake on certain events

EEPROM DIM and BRIGHT values swapped!!!
---
 Firmware/backlight.cpp | 24 ++++++++++++++++++++++--
 Firmware/backlight.h   |  5 +++--
 Firmware/sound.cpp     |  7 +++++++
 Firmware/ultralcd.cpp  |  1 +
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/Firmware/backlight.cpp b/Firmware/backlight.cpp
index 054c510fb..c57995cc0 100644
--- a/Firmware/backlight.cpp
+++ b/Firmware/backlight.cpp
@@ -11,6 +11,8 @@
 
 #ifdef LCD_BL_PIN
 
+#define BL_FLASH_DELAY_MS 25
+
 bool backlightSupport = 0; //only if it's true will any of the settings be visible to the user
 int16_t backlightLevel_HIGH = 0;
 int16_t backlightLevel_LOW = 0;
@@ -33,6 +35,24 @@ void force_bl_on(bool section_start)
     backlight_update();
 }
 
+void backlight_wake(const uint8_t flashNo)
+{
+    if (!backlightSupport) return;
+    
+    if (flashNo)
+    {
+        uint8_t backlightMode_bck = backlightMode;
+        for (uint8_t i = 0; i < (((backlightMode_bck == BACKLIGHT_MODE_AUTO) && !backlightTimer.running()) + (flashNo * 2)); i++)
+        {
+            backlightMode = !backlightMode; //toggles between BACKLIGHT_MODE_BRIGHT and BACKLIGHT_MODE_DIM
+            backlight_update();
+            _delay(BL_FLASH_DELAY_MS);
+        }
+        backlightMode = backlightMode_bck;
+    }
+    backlightTimer_reset();
+}
+
 void backlight_save() //saves all backlight data to eeprom.
 {
     eeprom_update_byte((uint8_t *)EEPROM_BACKLIGHT_LEVEL_HIGH, (uint8_t)backlightLevel_HIGH);
@@ -41,10 +61,11 @@ void backlight_save() //saves all backlight data to eeprom.
     eeprom_update_word((uint16_t *)EEPROM_BACKLIGHT_TIMEOUT, backlightTimer_period);
 }
 
-void backlightTimer_reset() //used for resetting the timer and waking the display. Triggered on events such as knob click, rotate and on full screen notifications.
+void backlightTimer_reset() //used for resetting the timer and waking the display. Triggered on user interactions.
 {
     if (!backlightSupport) return;
     backlightTimer.start();
+    backlight_update();
 }
 
 void backlight_update()
@@ -86,7 +107,6 @@ void backlight_init()
     
     SET_OUTPUT(LCD_BL_PIN);
     backlightTimer_reset();
-    backlight_update(); //sets brightness
 }
 
 #endif //LCD_BL_PIN
\ No newline at end of file
diff --git a/Firmware/backlight.h b/Firmware/backlight.h
index ef005adf3..fce908a39 100644
--- a/Firmware/backlight.h
+++ b/Firmware/backlight.h
@@ -8,8 +8,8 @@
 
 enum Backlight_Mode
 {
-	BACKLIGHT_MODE_BRIGHT  = 0,
-	BACKLIGHT_MODE_DIM     = 1,
+	BACKLIGHT_MODE_DIM     = 0,
+	BACKLIGHT_MODE_BRIGHT  = 1,
 	BACKLIGHT_MODE_AUTO    = 2,
 };
 
@@ -27,6 +27,7 @@ extern void backlight_update();
 extern void backlight_init();
 extern void backlightTimer_reset();
 extern void backlight_save();
+extern void backlight_wake(const uint8_t flashNo = 0);
 
 
 #endif //_BACKLIGHT_H
diff --git a/Firmware/sound.cpp b/Firmware/sound.cpp
index 52d880a04..39d513deb 100644
--- a/Firmware/sound.cpp
+++ b/Firmware/sound.cpp
@@ -5,6 +5,7 @@
 //#include <inttypes.h>
 //#include <avr/eeprom.h>
 //#include "eeprom.h"
+#include "backlight.h"
 
 
 //eSOUND_MODE eSoundMode=e_SOUND_MODE_LOUD;
@@ -63,6 +64,7 @@ Sound_SaveMode();
 
 //if critical is true then silend and once mode is ignored
 void Sound_MakeCustom(uint16_t ms,uint16_t tone_,bool critical){
+    backlight_wake(1);
      if (!critical){
           if (eSoundMode != e_SOUND_MODE_SILENT){
                if(!tone_){
@@ -135,6 +137,7 @@ switch(eSoundMode)
 
 static void Sound_DoSound_Blind_Alert(void)
 {
+    backlight_wake(1);
      uint8_t nI;
 
      for(nI=0; nI<20; nI++)
@@ -148,6 +151,7 @@ static void Sound_DoSound_Blind_Alert(void)
 
  static void Sound_DoSound_Encoder_Move(void)
 {
+    backlight_wake();
 uint8_t nI;
 
  for(nI=0;nI<5;nI++)
@@ -161,6 +165,7 @@ uint8_t nI;
 
 static void Sound_DoSound_Echo(void)
 {
+    backlight_wake();
 uint8_t nI;
 
 for(nI=0;nI<10;nI++)
@@ -174,6 +179,7 @@ for(nI=0;nI<10;nI++)
 
 static void Sound_DoSound_Prompt(void)
 {
+    backlight_wake(2);
 WRITE(BEEPER,HIGH);
 _delay_ms(500);
 WRITE(BEEPER,LOW);
@@ -181,6 +187,7 @@ WRITE(BEEPER,LOW);
 
 static void Sound_DoSound_Alert(bool bOnce)
 {
+    backlight_wake();
 uint8_t nI,nMax;
 
 nMax=bOnce?1:3;
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index f89cac58d..0cf8667f8 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -8868,6 +8868,7 @@ void menu_lcd_lcdupdate_func(void)
 		lcd_draw_update = 2;
 		lcd_oldcardstatus = IS_SD_INSERTED;
 		lcd_refresh(); // to maybe revive the LCD if static electricity killed it.
+        backlight_wake();
 		if (lcd_oldcardstatus)
 		{
 			card.initsd();

From c899320590b5b9e41181026076697747ad898a5a Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Thu, 31 Oct 2019 15:08:07 +0100
Subject: [PATCH 17/24] Fix M81 Turn off Power Supply... ... as it should be
 active if PS_ON_PIN is defined and assinged to an actual pin.

---
 Firmware/Marlin_main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index a2cbece56..1cd6d997d 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -6165,7 +6165,6 @@ Sigma_Exit:
           LCD_MESSAGERPGM(_T(WELCOME_MSG));
           lcd_update(0);
         break;
-      #endif
 
       //! ### M81 - Turn off Power Supply
       // --------------------------------------
@@ -6189,6 +6188,7 @@ Sigma_Exit:
         LCD_MESSAGERPGM(CAT4(CUSTOM_MENDEL_NAME,PSTR(" "),MSG_OFF,PSTR(".")));
         lcd_update(0);
 	  break;
+    #endif
 
     //! ### M82 - Set E axis to absolute mode
     // ---------------------------------------

From cd5ff783cfef9f74665c70c2da02d7427985d670 Mon Sep 17 00:00:00 2001
From: leptun <voinea.dragos.alexandru@gmail.com>
Date: Thu, 31 Oct 2019 19:07:20 +0200
Subject: [PATCH 18/24] General fixes and improvements to code

---
 Firmware/Marlin_main.cpp | 14 +++++------
 Firmware/backlight.cpp   | 22 ++++++++++------
 Firmware/backlight.h     |  1 -
 Firmware/sound.cpp       |  2 +-
 Firmware/ultralcd.cpp    | 54 +++++++++++++++-------------------------
 5 files changed, 43 insertions(+), 50 deletions(-)

diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index ac3d7d8bd..ea6c9aa2f 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -2769,10 +2769,10 @@ bool gcode_M45(bool onlyZ, int8_t verbosity_level)
 	#ifdef TMC2130
 	FORCE_HIGH_POWER_START;
 	#endif // TMC2130
-    #ifdef LCD_BL_PIN
-        FORCE_BL_ON_START;
-    #endif // LCD_BL_PIN
-	// Only Z calibration?
+    
+    FORCE_BL_ON_START;
+	
+    // Only Z calibration?
 	if (!onlyZ)
 	{
 		setTargetBed(0);
@@ -2960,9 +2960,9 @@ bool gcode_M45(bool onlyZ, int8_t verbosity_level)
 #ifdef TMC2130
 	FORCE_HIGH_POWER_END;
 #endif // TMC2130
-    #ifdef LCD_BL_PIN
-        FORCE_BL_ON_END;
-    #endif // LCD_BL_PIN
+    
+    FORCE_BL_ON_END;
+    
 	return final_result;
 }
 
diff --git a/Firmware/backlight.cpp b/Firmware/backlight.cpp
index c57995cc0..6500837e5 100644
--- a/Firmware/backlight.cpp
+++ b/Firmware/backlight.cpp
@@ -20,6 +20,13 @@ uint8_t backlightMode = BACKLIGHT_MODE_BRIGHT;
 int16_t backlightTimer_period = 10;
 LongTimer backlightTimer;
 
+static void backlightTimer_reset() //used for resetting the timer and waking the display. Triggered on user interactions.
+{
+    if (!backlightSupport) return;
+    backlightTimer.start();
+    backlight_update();
+}
+
 void force_bl_on(bool section_start)
 {
     if (section_start)
@@ -61,13 +68,6 @@ void backlight_save() //saves all backlight data to eeprom.
     eeprom_update_word((uint16_t *)EEPROM_BACKLIGHT_TIMEOUT, backlightTimer_period);
 }
 
-void backlightTimer_reset() //used for resetting the timer and waking the display. Triggered on user interactions.
-{
-    if (!backlightSupport) return;
-    backlightTimer.start();
-    backlight_update();
-}
-
 void backlight_update()
 {
     if (!backlightSupport) return;
@@ -109,4 +109,12 @@ void backlight_init()
     backlightTimer_reset();
 }
 
+#else //LCD_BL_PIN
+
+void force_bl_on(__attribute__((unused)) bool section_start) {}
+void backlight_update() {}
+void backlight_init() {}
+void backlight_save() {}
+void backlight_wake(__attribute__((unused)) const uint8_t flashNo) {}
+
 #endif //LCD_BL_PIN
\ No newline at end of file
diff --git a/Firmware/backlight.h b/Firmware/backlight.h
index fce908a39..d9fdd0ad1 100644
--- a/Firmware/backlight.h
+++ b/Firmware/backlight.h
@@ -25,7 +25,6 @@ extern int16_t backlightTimer_period;
 extern void force_bl_on(bool section_start);
 extern void backlight_update();
 extern void backlight_init();
-extern void backlightTimer_reset();
 extern void backlight_save();
 extern void backlight_wake(const uint8_t flashNo = 0);
 
diff --git a/Firmware/sound.cpp b/Firmware/sound.cpp
index 39d513deb..bf10271e5 100644
--- a/Firmware/sound.cpp
+++ b/Firmware/sound.cpp
@@ -64,7 +64,7 @@ Sound_SaveMode();
 
 //if critical is true then silend and once mode is ignored
 void Sound_MakeCustom(uint16_t ms,uint16_t tone_,bool critical){
-    backlight_wake(1);
+    backlight_wake();
      if (!critical){
           if (eSoundMode != e_SOUND_MODE_SILENT){
                if(!tone_){
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 0cf8667f8..b9b03f684 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -19,9 +19,7 @@
 #include "lcd.h"
 #include "menu.h"
 
-#ifdef LCD_BL_PIN
 #include "backlight.h"
-#endif //LCD_BL_PIN
 
 #include "util.h"
 #include "mesh_bed_leveling.h"
@@ -5019,10 +5017,10 @@ void lcd_wizard(WizState state)
 	// Make sure EEPROM_WIZARD_ACTIVE is true if entering using different entry point
 	// other than WizState::Run - it is useful for debugging wizard.
 	if (state != S::Run) eeprom_update_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1);
-    #ifdef LCD_BL_PIN
-        FORCE_BL_ON_START;
-    #endif // LCD_BL_PIN
-	while (!end) {
+    
+    FORCE_BL_ON_START;
+	
+    while (!end) {
 		printf_P(PSTR("Wizard state: %d\n"), state);
 		switch (state) {
 		case S::Run: //Run wizard?
@@ -5158,10 +5156,9 @@ void lcd_wizard(WizState state)
 		default: break;
 		}
 	}
-
-    #ifdef LCD_BL_PIN
-        FORCE_BL_ON_END;
-    #endif // LCD_BL_PIN
+    
+    FORCE_BL_ON_END;
+    
 	printf_P(_N("Wizard end state: %d\n"), state);
 	switch (state) { //final message
 	case S::Restore: //printer was already calibrated
@@ -7403,9 +7400,9 @@ bool lcd_selftest()
 	#ifdef TMC2130
 	  FORCE_HIGH_POWER_START;
 	#endif // TMC2130
-    #ifdef LCD_BL_PIN
-        FORCE_BL_ON_START;
-    #endif // LCD_BL_PIN
+    
+    FORCE_BL_ON_START;
+    
 	_delay(2000);
 	KEEPALIVE_STATE(IN_HANDLER);
 
@@ -7625,10 +7622,10 @@ bool lcd_selftest()
 	#ifdef TMC2130
 	  FORCE_HIGH_POWER_END;
 	#endif // TMC2130
-    #ifdef LCD_BL_PIN
-        FORCE_BL_ON_END;
-    #endif // LCD_BL_PIN
-	KEEPALIVE_STATE(NOT_BUSY);
+    
+    FORCE_BL_ON_END;
+	
+    KEEPALIVE_STATE(NOT_BUSY);
 	return(_result);
 }
 
@@ -8037,10 +8034,9 @@ static bool lcd_selfcheck_check_heater(bool _isbed)
 static void lcd_selftest_error(TestError testError, const char *_error_1, const char *_error_2)
 {
 	lcd_beeper_quick_feedback();
-    #ifdef LCD_BL_PIN
-        FORCE_BL_ON_END;
-    #endif // LCD_BL_PIN
-
+    
+    FORCE_BL_ON_END;
+    
 	target_temperature[0] = 0;
 	target_temperature_bed = 0;
 	manage_heater();
@@ -8633,9 +8629,7 @@ void ultralcd_init()
         else lcd_autoDeplete = autoDepleteRaw;
 
     }
-#ifdef LCD_BL_PIN
     backlight_init();
-#endif //LCD_BL_PIN
 	lcd_init();
 	lcd_refresh();
 	lcd_longpress_func = menu_lcd_longpress_func;
@@ -8784,9 +8778,7 @@ uint8_t get_message_level()
 
 void menu_lcd_longpress_func(void)
 {
-#ifdef LCD_BL_PIN
-	backlightTimer_reset();
-#endif //LCD_BL_PIN
+	backlight_wake();
     if (homing_flag || mesh_bed_leveling_flag || menu_menu == lcd_babystep_z || menu_menu == lcd_move_z)
     {
         // disable longpress during re-entry, while homing or calibration
@@ -8886,9 +8878,7 @@ void menu_lcd_lcdupdate_func(void)
 		}
 	}
 #endif//CARDINSERTED
-#ifdef LCD_BL_PIN
     backlight_update();
-#endif //LCD_BL_PIN
 	if (lcd_next_update_millis < _millis())
 	{
 		if (abs(lcd_encoder_diff) >= ENCODER_PULSES_PER_STEP)
@@ -8899,17 +8889,13 @@ void menu_lcd_lcdupdate_func(void)
 			Sound_MakeSound(e_SOUND_TYPE_EncoderMove);
 			lcd_encoder_diff = 0;
 			lcd_timeoutToStatus.start();
-#ifdef LCD_BL_PIN
-			backlightTimer_reset();
-#endif //LCD_BL_PIN
+			backlight_wake();
 		}
 
 		if (LCD_CLICKED)
 		{
 			lcd_timeoutToStatus.start();
-#ifdef LCD_BL_PIN
-			backlightTimer_reset();
-#endif //LCD_BL_PIN
+			backlight_wake();
 		}
 
 		(*menu_menu)();

From 459385708ebbb93206d0335451e8eb5acdca8484 Mon Sep 17 00:00:00 2001
From: leptun <voinea.dragos.alexandru@gmail.com>
Date: Sat, 2 Nov 2019 13:15:13 +0200
Subject: [PATCH 19/24] Fix MMU needs user attention Statistics error

---
 Firmware/mmu.cpp | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp
index d8ae497ba..89c43645e 100755
--- a/Firmware/mmu.cpp
+++ b/Firmware/mmu.cpp
@@ -1572,18 +1572,7 @@ void mmu_continue_loading(bool blocking)
             break;
         case Ls::Unload:
             stop_and_save_print_to_ram(0, 0);
-
-            //lift z
-            current_position[Z_AXIS] += Z_PAUSE_LIFT;
-            if (current_position[Z_AXIS] > Z_MAX_POS) current_position[Z_AXIS] = Z_MAX_POS;
-            plan_buffer_line_curposXYZE(15, active_extruder);
-            st_synchronize();
-
-            //Move XY to side
-            current_position[X_AXIS] = X_PAUSE_POS;
-            current_position[Y_AXIS] = Y_PAUSE_POS;
-            plan_buffer_line_curposXYZE(50, active_extruder);
-            st_synchronize();
+            long_pause();
 
             mmu_command(MmuCmd::U0);
             manage_response(false, true, MMU_UNLOAD_MOVE);

From 2e0034d915b073d11807eb815e63a7c4374cd9c7 Mon Sep 17 00:00:00 2001
From: Alex Voinea <voinea.dragos.alexandru@gmail.com>
Date: Sun, 17 Nov 2019 09:53:14 +0200
Subject: [PATCH 20/24] Update Toggles and Translations

---
 Firmware/messages.c   |  7 +++++++
 Firmware/messages.h   |  7 +++++++
 Firmware/ultralcd.cpp | 17 ++++++-----------
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/Firmware/messages.c b/Firmware/messages.c
index f38c29390..9d878f6ec 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -128,6 +128,13 @@ const char MSG_SOUND_BLIND[] PROGMEM_I1 = ISTR("Assist"); ////
 const char MSG_MESH[] PROGMEM_I1 = ISTR("Mesh"); ////
 const char MSG_Z_PROBE_NR[] PROGMEM_I1 = ISTR("Z-probe nr."); ////
 const char MSG_MAGNETS_COMP[] PROGMEM_I1 = ISTR("Magnets comp."); ////
+const char MSG_BRIGHTNESS[] PROGMEM_I1 = ISTR("Brightness"); ////
+const char MSG_BL_HIGH[] PROGMEM_I1 = ISTR("Level Bright"); ////
+const char MSG_BL_LOW[] PROGMEM_I1 = ISTR("Level Dimmed"); ////
+const char MSG_TIMEOUT[] PROGMEM_I1 = ISTR("Timeout"); ////
+const char MSG_BRIGHT[] PROGMEM_I1 = ISTR("Bright"); ////
+const char MSG_DIM[] PROGMEM_I1 = ISTR("Dim"); ////
+const char MSG_AUTO[] PROGMEM_I1 = ISTR("Auto"); ////
 
 //not internationalized messages
 const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; ////
diff --git a/Firmware/messages.h b/Firmware/messages.h
index 30671533c..4de5c7cfd 100644
--- a/Firmware/messages.h
+++ b/Firmware/messages.h
@@ -128,6 +128,13 @@ extern const char MSG_SOUND_BLIND[];
 extern const char MSG_MESH[];
 extern const char MSG_Z_PROBE_NR[];
 extern const char MSG_MAGNETS_COMP[];
+extern const char MSG_BRIGHTNESS[];
+extern const char MSG_BL_HIGH[];
+extern const char MSG_BL_LOW[];
+extern const char MSG_TIMEOUT[];
+extern const char MSG_BRIGHT[];
+extern const char MSG_DIM[];
+extern const char MSG_AUTO[];
 
 //not internationalized messages
 extern const char MSG_BROWNOUT_RESET[];
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 1c2be1acf..0a721cfd2 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -5787,7 +5787,7 @@ static void lcd_settings_menu()
 #ifdef LCD_BL_PIN
     if (backlightSupport)
     {
-        MENU_ITEM_SUBMENU_P(_i("Brightness"), lcd_backlight_menu);
+        MENU_ITEM_SUBMENU_P(_T(MSG_BRIGHTNESS), lcd_backlight_menu);
     }
 #endif //LCD_BL_PIN
 
@@ -7113,7 +7113,7 @@ static void lcd_tune_menu()
 #ifdef LCD_BL_PIN
     if (backlightSupport)
     {
-        MENU_ITEM_SUBMENU_P(_i("Brightness"), lcd_backlight_menu);
+        MENU_ITEM_SUBMENU_P(_T(MSG_BRIGHTNESS), lcd_backlight_menu);
     }
 #endif //LCD_BL_PIN
 	MENU_END();
@@ -7186,15 +7186,10 @@ static void lcd_backlight_menu()
     );
     
     MENU_ITEM_BACK_P(_T(MSG_BACK));
-    MENU_ITEM_EDIT_int3_P(_i("Level Bright"), &backlightLevel_HIGH, backlightLevel_LOW, 255);
-    MENU_ITEM_EDIT_int3_P(_i("Level Dimmed"), &backlightLevel_LOW, 0, backlightLevel_HIGH);
-    switch (backlightMode)
-    {
-        case BACKLIGHT_MODE_BRIGHT: MENU_ITEM_FUNCTION_P(_i("Mode      [Bright]"), backlight_mode_toggle); break;
-        case BACKLIGHT_MODE_DIM: MENU_ITEM_FUNCTION_P(_i("Mode         [Dim]"), backlight_mode_toggle); break;
-        default: MENU_ITEM_FUNCTION_P(_i("Mode        [Auto]"), backlight_mode_toggle); break;
-    }
-    MENU_ITEM_EDIT_int3_P(_i("Timeout"), &backlightTimer_period, 1, 999);
+    MENU_ITEM_EDIT_int3_P(_T(MSG_BL_HIGH), &backlightLevel_HIGH, backlightLevel_LOW, 255);
+    MENU_ITEM_EDIT_int3_P(_T(MSG_BL_LOW), &backlightLevel_LOW, 0, backlightLevel_HIGH);
+	MENU_ITEM_TOGGLE_P(_T(MSG_MODE), ((backlightMode==BACKLIGHT_MODE_BRIGHT) ? _T(MSG_BRIGHT) : ((backlightMode==BACKLIGHT_MODE_DIM) ? _T(MSG_DIM) : _T(MSG_AUTO))), backlight_mode_toggle);
+    MENU_ITEM_EDIT_int3_P(_T(MSG_TIMEOUT), &backlightTimer_period, 1, 999);
     
     MENU_END();
 }

From 982c4cbf7b3b27ccabf181d07c30e62d944b113e Mon Sep 17 00:00:00 2001
From: vintagepc <53943260+vintagepc@users.noreply.github.com>
Date: Thu, 21 Nov 2019 18:51:02 -0500
Subject: [PATCH 21/24] Candidate fix for homing fail hard reset

---
 Firmware/tmc2130.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp
index 42359ba84..f64457b5e 100755
--- a/Firmware/tmc2130.cpp
+++ b/Firmware/tmc2130.cpp
@@ -807,15 +807,15 @@ void tmc2130_goto_step(uint8_t axis, uint8_t step, uint8_t dir, uint16_t delay_u
 	{
 		dir = tmc2130_get_inv(axis)?0:1;
 		int steps = (int)step - (int)(mscnt >> shift);
-		if (steps < 0)
-		{
-			dir ^= 1;
-			steps = -steps;
-		}
 		if (steps > static_cast<int>(cnt / 2))
 		{
 			dir ^= 1;
-			steps = cnt - steps;
+			steps = cnt - steps; // This can create a negative step value
+		}
+        if (steps < 0)
+		{
+			dir ^= 1;
+			steps = -steps;
 		}
 		cnt = steps;
 	}

From 92482f03abde99bb7634a507fee60b0f0d1b7771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20B=C4=9Bl?= <35807926+mkbel@users.noreply.github.com>
Date: Wed, 27 Nov 2019 17:23:16 +0100
Subject: [PATCH 22/24] Update README.md

Add link for doxygen generated documentation.
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 782ed6f7d..6b0edf0a0 100644
--- a/README.md
+++ b/README.md
@@ -178,6 +178,7 @@ Example:
 
 # 4. Documentation
 run [doxygen](http://www.doxygen.nl/) in Firmware folder
+or visit https://prusa3d.github.io/Prusa-Firmware-Doc/index.html for doxygen generated output
 
 # 5. FAQ
 Q:I built firmware using Arduino and I see "?" instead of numbers in printer user interface.

From 05a1debf3d9a89043b0c0a941cdab9dd204aaa97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20B=C4=9Bl?= <35807926+mkbel@users.noreply.github.com>
Date: Wed, 27 Nov 2019 17:27:11 +0100
Subject: [PATCH 23/24] Update README.md

/index.html becomes unnecessary after several seconds online.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6b0edf0a0..9c50509a1 100644
--- a/README.md
+++ b/README.md
@@ -178,7 +178,7 @@ Example:
 
 # 4. Documentation
 run [doxygen](http://www.doxygen.nl/) in Firmware folder
-or visit https://prusa3d.github.io/Prusa-Firmware-Doc/index.html for doxygen generated output
+or visit https://prusa3d.github.io/Prusa-Firmware-Doc for doxygen generated output
 
 # 5. FAQ
 Q:I built firmware using Arduino and I see "?" instead of numbers in printer user interface.

From 348bbbffb01fcdfe37602dd0fd0fd852fea66a68 Mon Sep 17 00:00:00 2001
From: Yuri D'Elia <wavexx@thregr.org>
Date: Sun, 15 Dec 2019 22:22:44 +0100
Subject: [PATCH 24/24] Do not allow to resume a print twice while waiting for
 the hotend

Clear isPrintPaused just prior to restore_print_from_ram_and_continue.
---
 Firmware/ultralcd.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index b23cc2236..e517b3269 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -6752,10 +6752,10 @@ void lcd_resume_print()
 
     if (fan_error_selftest()) return; //abort if error persists
 
+    isPrintPaused = false;
     restore_print_from_ram_and_continue(0.0);
     pause_time += (_millis() - start_pause_print); //accumulate time when print is paused for correct statistics calculation
     refresh_cmd_timeout();
-    isPrintPaused = false;
     SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_RESUMED); //resume octoprint
 }
 
@@ -6907,7 +6907,7 @@ static void lcd_main_menu()
 			{
 				MENU_ITEM_FUNCTION_P(_i("Pause print"), lcd_pause_print);////MSG_PAUSE_PRINT
 			}
-			else
+			else if(isPrintPaused)
 			{
 				#ifdef FANCHECK
 					if((fan_check_error == EFCE_FIXED) || (fan_check_error == EFCE_OK))