Skip to content

[pull] bugfix-2.1.x from MarlinFirmware:bugfix-2.1.x #768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Jul 1, 2026
Merged

[pull] bugfix-2.1.x from MarlinFirmware:bugfix-2.1.x #768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ae2d99
馃悰 Fix VIKI LCD LEDs (#28474)
ellensp Jun 30, 2026
c01acfe
[cron] Bump distribution date (2026-07-01)
thinkyhead Jul 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Marlin/Version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
* here we define this default string as the date where the latest release
* version was tagged.
*/
//#define STRING_DISTRIBUTION_DATE "2026-06-30"
//#define STRING_DISTRIBUTION_DATE "2026-07-01"

/**
* The protocol for communication to the host. Protocol indicates communication
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/inc/Version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
* version was tagged.
*/
#ifndef STRING_DISTRIBUTION_DATE
#define STRING_DISTRIBUTION_DATE "2026-06-30"
#define STRING_DISTRIBUTION_DATE "2026-07-01"
#endif

/**
Expand Down
6 changes: 3 additions & 3 deletions Marlin/src/lcd/HD44780/marlinui_HD44780.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ void MarlinUI::init_lcd() {
#elif ENABLED(LCD_I2C_TYPE_MCP23017)
lcd.setMCPType(LTI_TYPE_MCP23017);
lcd.begin(LCD_WIDTH, LCD_HEIGHT);
update_indicators();
update_indicators(true); // Force turning off the LEDs at startup

#elif ENABLED(LCD_I2C_TYPE_MCP23008)
lcd.setMCPType(LTI_TYPE_MCP23008);
Expand Down Expand Up @@ -1386,7 +1386,7 @@ void MarlinUI::draw_status_screen() {

#if ENABLED(LCD_HAS_STATUS_INDICATORS)

void MarlinUI::update_indicators() {
void MarlinUI::update_indicators(const bool forceUpdate) {
// Set the LEDS - referred to as backlights by the LiquidTWI2 library
static uint8_t ledsprev = 0;
uint8_t leds = 0;
Expand All @@ -1408,7 +1408,7 @@ void MarlinUI::draw_status_screen() {

if (TERN0(HAS_MULTI_HOTEND, thermalManager.degTargetHotend(1) > 0)) leds |= LED_C;

if (leds != ledsprev) {
if (leds != ledsprev || forceUpdate) {
lcd.setBacklight(leds);
ledsprev = leds;
}
Expand Down
6 changes: 5 additions & 1 deletion Marlin/src/lcd/marlinui.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@
#include "dwin/marlinui/marlinui_dwin.h" // for LCD_WIDTH
#endif

#if ENABLED(LCD_I2C_TYPE_MCP23017)
#include "HD44780/marlinui_HD44780.h" // Needed for LCD_HAS_STATUS_INDICATORS
#endif

typedef bool (*statusResetFunc_t)();

#if HAS_WIRED_LCD
Expand Down Expand Up @@ -249,7 +253,7 @@ class MarlinUI {
}

#if ENABLED(LCD_HAS_STATUS_INDICATORS)
static void update_indicators();
static void update_indicators(const bool forceUpdate=false);
#endif

#if ALL(HAS_MARLINUI_MENU, TOUCH_SCREEN_CALIBRATION)
Expand Down
Loading