Update marlin

4 years ago · 58ba6b6430
59 changed files with 65 additions and 59 deletions
--- a/Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp
+++ b/Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp
@ -62,7 +62,7 @@
 #include "../shared/Marduino.h"
 #include "../shared/Delay.h"

-#include <U8glib.h>
+#include <U8glib-HAL.h>

 uint8_t u8g_bitData, u8g_bitNotData, u8g_bitClock, u8g_bitNotClock;
 volatile uint8_t *u8g_outData, *u8g_outClock;
--- a/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp
+++ b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_shared_hw_spi.cpp
@ -60,7 +60,7 @@

 #if HAS_MARLINUI_U8GLIB

-#include <U8glib.h>
+#include <U8glib-HAL.h>

 #include "../../../MarlinCore.h"

--- a/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp
+++ b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp
@ -62,7 +62,7 @@
 #include "../../../inc/MarlinConfig.h"
 #include "../../shared/Delay.h"

-#include <U8glib.h>
+#include <U8glib-HAL.h>

 #include "u8g_com_HAL_DUE_sw_spi_shared.h"

--- a/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp
+++ b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp
@ -64,7 +64,7 @@
 #include "../../shared/Marduino.h"
 #include "../../shared/Delay.h"

-#include <U8glib.h>
+#include <U8glib-HAL.h>

 #if ENABLED(FYSETC_MINI_12864)
  #define SPISEND_SW_DUE u8g_spiSend_sw_DUE_mode_3
--- a/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp
+++ b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.cpp
@ -62,7 +62,7 @@
 #include "../../../inc/MarlinConfig.h"
 #include "../../shared/Delay.h"

-#include <U8glib.h>
+#include <U8glib-HAL.h>

 #include "u8g_com_HAL_DUE_sw_spi_shared.h"

--- a/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h
+++ b/Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi_shared.h
@ -23,7 +23,7 @@

 #include "../../../inc/MarlinConfigPre.h"
 #include "../../shared/Marduino.h"
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 void u8g_SetPIOutput_DUE(u8g_t *u8g, uint8_t pin_index);
 void u8g_SetPILevel_DUE(u8g_t *u8g, uint8_t pin_index, uint8_t level);
--- a/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp
+++ b/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_hw_spi.cpp
@ -59,7 +59,7 @@

 #if HAS_MARLINUI_U8GLIB

-#include <U8glib.h>
+#include <U8glib-HAL.h>
 #include "../../shared/HAL_SPI.h"

 #ifndef LCD_SPI_SPEED
--- a/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp
+++ b/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_ssd_hw_i2c.cpp
@ -79,7 +79,7 @@

 #if HAS_MARLINUI_U8GLIB

-#include <U8glib.h>
+#include <U8glib-HAL.h>

 #define I2C_SLA         (0x3C*2)
 //#define I2C_CMD_MODE  0x080
--- a/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp
+++ b/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp
@ -59,7 +59,7 @@

 #if HAS_MARLINUI_U8GLIB

-#include <U8glib.h>
+#include <U8glib-HAL.h>
 #include "../../shared/HAL_SPI.h"
 #include "../../shared/Delay.h"

--- a/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp
+++ b/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp
@ -59,7 +59,7 @@

 #if ENABLED(U8GLIB_ST7920)

-#include <U8glib.h>
+#include <U8glib-HAL.h>
 #include <SoftwareSPI.h>
 #include "../../shared/Delay.h"
 #include "../../shared/HAL_SPI.h"
--- a/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp
+++ b/Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp
@ -71,7 +71,7 @@
 #include <LPC17xx.h>
 #include <gpio.h>

-#include <U8glib.h>
+#include <U8glib-HAL.h>

 uint8_t swSpiTransfer_mode_0(uint8_t b, const uint8_t spi_speed, const pin_t sck_pin, const pin_t miso_pin, const pin_t mosi_pin ) {

--- a/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp
+++ b/Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp
@ -22,7 +22,7 @@

 #if BOTH(HAS_MARLINUI_U8GLIB, FORCE_SOFT_SPI)

-#include <U8glib.h>
+#include <U8glib-HAL.h>
 #include "../../shared/HAL_SPI.h"

 #ifndef LCD_SPI_SPEED
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@ -890,11 +890,11 @@ void minkill(const bool steppers_off/*=false*/) {
  #if EITHER(HAS_KILL, SOFT_RESET_ON_KILL)

    // Wait for both KILL and ENC to be released
-    while (TERN0(HAS_KILL, !kill_state()) || TERN0(SOFT_RESET_ON_KILL, !ui.button_pressed()))
+    while (TERN0(HAS_KILL, kill_state()) || TERN0(SOFT_RESET_ON_KILL, ui.button_pressed()))
      watchdog_refresh();

-    // Wait for either KILL or ENC press
-    while (TERN1(HAS_KILL, kill_state()) && TERN1(SOFT_RESET_ON_KILL, ui.button_pressed()))
+    // Wait for either KILL or ENC to be pressed again
+    while (TERN1(HAS_KILL, !kill_state()) && TERN1(SOFT_RESET_ON_KILL, !ui.button_pressed()))
      watchdog_refresh();

    // Reboot the board
--- a/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
+++ b/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
@ -23,7 +23,7 @@

 // Use this file to select the com driver for device drivers that are NOT in the U8G library

-#include <U8glib.h>
+#include <U8glib-HAL.h>

 #ifndef U8G_HAL_LINKS   // Defined by LPC1768/9 environments in platform.ini

--- a/Marlin/src/lcd/dogm/fontdata/fontdata_6x9_marlin.h
+++ b/Marlin/src/lcd/dogm/fontdata/fontdata_6x9_marlin.h
@ -32,7 +32,7 @@
  X Font      ascent = 6 descent=-2
  Max Font    ascent = 7 descent=-2
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 const u8g_fntpgm_uint8_t u8g_font_6x9[2434] U8G_FONT_SECTION(".progmem.u8g_font_6x9") = {
  0x00,0x06,0x09,0x00,0xFE,0x06,0x02,0x0F,0x03,0x84,0x01,0xFF,0xFE,0x07,0xFE,0x06,
  0xFE,0x05,0x07,0x07,0x00,0x00,0x00,0x40,0xF0,0xC8,0x88,0x98,0x78,0x10,0x05,0x07,
--- a/Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h
+++ b/Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h
@ -16,7 +16,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 *
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 #if defined(__AVR__) && ENABLED(NOT_EXTENDED_ISO10646_1_5X7)
  // reduced font (only symbols 1 - 127) - saves about 1278 bytes of FLASH
--- a/Marlin/src/lcd/dogm/fontdata/langdata_an.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_an.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
--- a/Marlin/src/lcd/dogm/fontdata/langdata_bg.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_bg.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 const u8g_fntpgm_uint8_t fontpage_8_144_149[96] U8G_FONT_SECTION("fontpage_8_144_149") = {
  0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x90,0x95,0x00,0x07,0xFF,0x00,
--- a/Marlin/src/lcd/dogm/fontdata/langdata_ca.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_ca.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
--- a/Marlin/src/lcd/dogm/fontdata/langdata_cz.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_cz.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 const u8g_fntpgm_uint8_t fontpage_2_140_141[47] U8G_FONT_SECTION("fontpage_2_140_141") = {
  0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x8C,0x8D,0x00,0x0A,0x00,0x00,
--- a/Marlin/src/lcd/dogm/fontdata/langdata_da.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_da.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
--- a/Marlin/src/lcd/dogm/fontdata/langdata_de.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_de.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
--- a/Marlin/src/lcd/dogm/fontdata/langdata_el.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_el.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 const u8g_fntpgm_uint8_t fontpage_7_136_136[33] U8G_FONT_SECTION("fontpage_7_136_136") = {
  0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x88,0x88,0x00,0x0A,0x00,0x00,
--- a/Marlin/src/lcd/dogm/fontdata/langdata_el_gr.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_el_gr.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 const u8g_fntpgm_uint8_t fontpage_7_136_136[33] U8G_FONT_SECTION("fontpage_7_136_136") = {
  0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x88,0x88,0x00,0x0A,0x00,0x00,
--- a/Marlin/src/lcd/dogm/fontdata/langdata_en.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_en.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
--- a/Marlin/src/lcd/dogm/fontdata/langdata_es.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_es.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
--- a/Marlin/src/lcd/dogm/fontdata/langdata_eu.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_eu.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
--- a/Marlin/src/lcd/dogm/fontdata/langdata_fi.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_fi.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
--- a/Marlin/src/lcd/dogm/fontdata/langdata_fr.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_fr.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
--- a/Marlin/src/lcd/dogm/fontdata/langdata_gl.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_gl.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
--- a/Marlin/src/lcd/dogm/fontdata/langdata_hr.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_hr.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 const u8g_fntpgm_uint8_t fontpage_2_135_135[31] U8G_FONT_SECTION("fontpage_2_135_135") = {
  0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x87,0x87,0x00,0x08,0x00,0x00,
--- a/Marlin/src/lcd/dogm/fontdata/langdata_hu.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_hu.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 const u8g_fntpgm_uint8_t fontpage_2_241_241[31] U8G_FONT_SECTION("fontpage_2_241_241") = {
  0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xF1,0xF1,0x00,0x08,0x00,0x00,
--- a/Marlin/src/lcd/dogm/fontdata/langdata_it.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_it.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
--- a/Marlin/src/lcd/dogm/fontdata/langdata_jp_kana.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_jp_kana.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 const u8g_fntpgm_uint8_t fontpage_97_161_164[65] U8G_FONT_SECTION("fontpage_97_161_164") = {
  0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xA1,0xA4,0x00,0x07,0x00,0x00,
--- a/Marlin/src/lcd/dogm/fontdata/langdata_ko_KR.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_ko_KR.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 const u8g_fntpgm_uint8_t fontpage_344_240_240[34] U8G_FONT_SECTION("fontpage_344_240_240") = {
  0x00,0x0B,0x0D,0x00,0xFD,0x00,0x00,0x00,0x00,0x00,0xF0,0xF0,0x00,0x09,0xFE,0x00,
--- a/Marlin/src/lcd/dogm/fontdata/langdata_nl.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_nl.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
--- a/Marlin/src/lcd/dogm/fontdata/langdata_pl.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_pl.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 const u8g_fntpgm_uint8_t fontpage_2_132_133[45] U8G_FONT_SECTION("fontpage_2_132_133") = {
  0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x84,0x85,0x00,0x07,0xFE,0x00,
--- a/Marlin/src/lcd/dogm/fontdata/langdata_pt.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_pt.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
--- a/Marlin/src/lcd/dogm/fontdata/langdata_pt_br.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_pt_br.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
--- a/Marlin/src/lcd/dogm/fontdata/langdata_ro.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_ro.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
--- a/Marlin/src/lcd/dogm/fontdata/langdata_ru.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_ru.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 const u8g_fntpgm_uint8_t fontpage_8_144_168[348] U8G_FONT_SECTION("fontpage_8_144_168") = {
  0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x90,0xA8,0x00,0x0A,0xFE,0x00,
--- a/Marlin/src/lcd/dogm/fontdata/langdata_sk.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_sk.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 const u8g_fntpgm_uint8_t fontpage_2_140_143[79] U8G_FONT_SECTION("fontpage_2_140_143") = {
  0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x8C,0x8F,0x00,0x0A,0x00,0x00,
--- a/Marlin/src/lcd/dogm/fontdata/langdata_test.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_test.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 const u8g_fntpgm_uint8_t fontpage_8_128_255[1677] U8G_FONT_SECTION("fontpage_8_128_255") = {
  0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x80,0xFF,0x00,0x0A,0xFE,0x00,
--- a/Marlin/src/lcd/dogm/fontdata/langdata_tr.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_tr.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 const u8g_fntpgm_uint8_t fontpage_2_158_159[49] U8G_FONT_SECTION("fontpage_2_158_159") = {
  0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x9E,0x9F,0x00,0x0A,0xFE,0x00,
--- a/Marlin/src/lcd/dogm/fontdata/langdata_uk.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_uk.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 const u8g_fntpgm_uint8_t fontpage_8_134_134[30] U8G_FONT_SECTION("fontpage_8_134_134") = {
  0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x86,0x86,0x00,0x07,0x00,0x00,
--- a/Marlin/src/lcd/dogm/fontdata/langdata_vi.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_vi.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 const u8g_fntpgm_uint8_t fontpage_2_131_131[31] U8G_FONT_SECTION("fontpage_2_131_131") = {
  0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x83,0x83,0x00,0x08,0x00,0x00,
--- a/Marlin/src/lcd/dogm/fontdata/langdata_zh_CN.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_zh_CN.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 const u8g_fntpgm_uint8_t fontpage_64_157_157[26] U8G_FONT_SECTION("fontpage_64_157_157") = {
  0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x9D,0x9D,0x00,0x07,0x00,0x00,
--- a/Marlin/src/lcd/dogm/fontdata/langdata_zh_TW.h
+++ b/Marlin/src/lcd/dogm/fontdata/langdata_zh_TW.h
@ -3,7 +3,7 @@
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 const u8g_fntpgm_uint8_t fontpage_69_191_191[28] U8G_FONT_SECTION("fontpage_69_191_191") = {
  0x00,0x0C,0x0F,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0xBF,0xBF,0x00,0x05,0x00,0x00,
--- a/Marlin/src/lcd/dogm/marlinui_DOGM.h
+++ b/Marlin/src/lcd/dogm/marlinui_DOGM.h
@ -27,7 +27,7 @@

 #include "../../inc/MarlinConfigPre.h"

-#include <U8glib.h>
+#include <U8glib-HAL.h>
 #include "HAL_LCD_class_defines.h"

 //#define ALTERNATIVE_LCD
--- a/Marlin/src/lcd/dogm/u8g_dev_ssd1309_12864.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_ssd1309_12864.cpp
@ -24,7 +24,7 @@
 #if HAS_MARLINUI_U8GLIB

 #include "HAL_LCD_com_defines.h"
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 #define WIDTH 128
 #define HEIGHT 64
--- a/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp
+++ b/Marlin/src/lcd/dogm/u8g_dev_st7565_64128n_HAL.cpp
@ -57,7 +57,7 @@

 #if HAS_MARLINUI_U8GLIB

-#include <U8glib.h>
+#include <U8glib-HAL.h>
 #include "HAL_LCD_com_defines.h"

 #define WIDTH 128
--- a/Marlin/src/lcd/dogm/u8g_fontutf8.h
+++ b/Marlin/src/lcd/dogm/u8g_fontutf8.h
@ -8,7 +8,7 @@
 */
 #pragma once

-#include <U8glib.h>
+#include <U8glib-HAL.h>
 #include "../fontutils.h"

 // the macro to indicate a UTF-8 string
--- a/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.h
+++ b/Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.h
@ -35,7 +35,7 @@
 #define PAGE_HEIGHT 16    // 256 byte framebuffer
 //#define PAGE_HEIGHT 32  // 512 byte framebuffer

-#include <U8glib.h>
+#include <U8glib-HAL.h>

 void ST7920_SWSPI_SND_8BIT(uint8_t val);

--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@ -1203,6 +1203,10 @@ void Temperature::min_temp_error(const heater_id_t heater_id) {
 void Temperature::manage_heater() {
  if (marlin_state == MF_INITIALIZING) return watchdog_refresh(); // If Marlin isn't started, at least reset the watchdog!

+  static bool no_reentry = false;  // Prevent recursion
+  if (no_reentry) return;
+  REMEMBER(mh, no_reentry, true);
+
  #if ENABLED(EMERGENCY_PARSER)
    if (emergency_parser.killed_by_M112) kill(M112_KILL_STR, nullptr, true);

--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/PeripheralPins.c
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/PeripheralPins.c
@ -232,6 +232,7 @@ const PinMap PinMap_PWM[] = {
 const PinMap PinMap_UART_TX[] = {
  //  {PA_0,  UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
  //  {PA_2,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PD_5,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
  {PA_9,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
  {PD_8,  USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
  //  {PB_6,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
@ -248,6 +249,7 @@ const PinMap PinMap_UART_TX[] = {
 const PinMap PinMap_UART_RX[] = {
  //  {PA_1,  UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
  //  {PA_3,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
+  {PD_6,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
  {PA_10, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
  {PD_9,  USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
  //  {PB_7,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_OCTOPUS_V1/variant.h
@ -150,7 +150,7 @@ extern "C" {

 // PWM resolution
 //#define PWM_RESOLUTION          12
-#define PWM_FREQUENCY           20000 // >= 20 Khz => inaudible noise for fans
+#define PWM_FREQUENCY           1000 // >= 20 Khz => inaudible noise for fans
 #define PWM_MAX_DUTY_CYCLE      255

 // SPI Definitions
--- a/buildroot/share/fonts/genallfont.sh
+++ b/buildroot/share/fonts/genallfont.sh
@ -119,7 +119,7 @@ if [ 1 = 1 ]; then
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 *
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>

 #if defined(__AVR__) && ENABLED(NOT_EXTENDED_ISO10646_1_5X7)
  // reduced font (only symbols 1 - 127) - saves about 1278 bytes of FLASH
--- a/buildroot/share/fonts/uxggenpages.sh
+++ b/buildroot/share/fonts/uxggenpages.sh
@ -169,7 +169,7 @@ cat <<EOF >fontutf8-data.h
 * Contents will be REPLACED by future processing!
 * Use genallfont.sh to generate font data for updated languages.
 */
-#include <U8glib.h>
+#include <U8glib-HAL.h>
 $TMPA
 #define FONTDATA_ITEM(page, begin, end, data) { page, begin, end, COUNT(data), data }
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {$TMPB};
--- a/ini/features.ini
+++ b/ini/features.ini
@ -36,7 +36,7 @@ USES_LIQUIDCRYSTAL_I2C                 = marcoschwartz/LiquidCrystal_I2C@1.1.4
 USES_LIQUIDTWI2                        = LiquidTWI2@1.2.7
 HAS_WIRED_LCD                          = src_filter=+<src/lcd/lcdprint.cpp>
 HAS_MARLINUI_HD44780                   = src_filter=+<src/lcd/HD44780>
-HAS_MARLINUI_U8GLIB                    = U8glib-HAL@~0.4.5
+HAS_MARLINUI_U8GLIB                    = U8glib-HAL@~0.5.0
                                         src_filter=+<src/lcd/dogm>
 HAS_(FSMC|SPI|LTDC)_TFT                = src_filter=+<src/HAL/STM32/tft> +<src/HAL/STM32F1/tft> +<src/lcd/tft_io>
 HAS_FSMC_TFT                           = src_filter=+<src/HAL/STM32/tft/tft_fsmc.cpp> +<src/HAL/STM32F1/tft/tft_fsmc.cpp>