Skip to content
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.

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

Already on GitHub? Sign in to your account

Various fixes: missed code uses, other updates #27711

Open
wants to merge 18 commits into
base: bugfix-2.1.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
137f0f8
various fixes, spacing, typos
classicrocker883 Feb 24, 2025
e1bd0fc
small fixes
classicrocker883 Feb 24, 2025
ac812e3
fix "error" is not a known attribute of module "urllib"
classicrocker883 Feb 24, 2025
47de47d
fix runs-on ubuntu error
classicrocker883 Feb 24, 2025
e8b7dff
fix more errors, update comment syntax / spacing
classicrocker883 Feb 25, 2025
01b40a8
Update g29_auto.py
classicrocker883 Feb 27, 2025
9641281
Merge https://github.com/MarlinFirmware/Marlin into bugfix-2.1.x-Febr…
classicrocker883 Mar 1, 2025
bc3a50e
Merge branch 'bugfix-2.1.x' into bugfix-2.1.x-February2
classicrocker883 Mar 3, 2025
8a56fec
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Mar 7, 2025
03db008
Merge branch 'bugfix-2.1.x' into bugfix-2.1.x-February2
classicrocker883 Mar 13, 2025
5b03f6c
update g29_auto
classicrocker883 Mar 14, 2025
81f96c2
Merge branch 'bugfix-2.1.x' into bugfix-2.1.x-February2
classicrocker883 Mar 16, 2025
3fbdc04
Revert formatting, move to other PR, add fixes
classicrocker883 Mar 16, 2025
111ae41
Merge branch 'bugfix-2.1.x' into bugfix-2.1.x-February2
classicrocker883 Mar 17, 2025
3466ae0
from even more input shaping followup
classicrocker883 Mar 17, 2025
a0249e6
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Mar 18, 2025
9653a51
Revert, moved to other PR
classicrocker883 Mar 18, 2025
9881ac2
Merge https://github.com/MarlinFirmware/Marlin into bugfix-2.1.x-Febr…
classicrocker883 Mar 19, 2025
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
10 changes: 7 additions & 3 deletions Marlin/src/core/utility.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,15 @@ constexpr uint8_t ui8_to_percent(const uint8_t i) { return (int(i) * 100 + 127)
const xyze_char_t axis_codes LOGICAL_AXIS_ARRAY('E', 'X', 'Y', 'Z', AXIS4_NAME, AXIS5_NAME, AXIS6_NAME, AXIS7_NAME, AXIS8_NAME, AXIS9_NAME);
#if NUM_AXES <= XYZ && !HAS_EXTRUDERS
#define AXIS_CHAR(A) ((char)('X' + A))
#define IAXIS_CHAR AXIS_CHAR
#if ANY(HAS_MOTOR_CURRENT_SPI, HAS_MOTOR_CURRENT_I2C, HAS_MOTOR_CURRENT_DAC)
#define IAXIS_CHAR AXIS_CHAR
#endif
#else
const xyze_char_t iaxis_codes LOGICAL_AXIS_ARRAY('E', 'X', 'Y', 'Z', 'I', 'J', 'K', 'U', 'V', 'W');
#if ANY(HAS_MOTOR_CURRENT_SPI, HAS_MOTOR_CURRENT_I2C, HAS_MOTOR_CURRENT_DAC)
const xyze_char_t iaxis_codes LOGICAL_AXIS_ARRAY('E', 'X', 'Y', 'Z', 'I', 'J', 'K', 'U', 'V', 'W');
#define IAXIS_CHAR(A) iaxis_codes[A]
#endif
#define AXIS_CHAR(A) axis_codes[A]
#define IAXIS_CHAR(A) iaxis_codes[A]
#endif

#if ENABLED(MARLIN_DEV_MODE)
Expand Down
1 change: 0 additions & 1 deletion Marlin/src/inc/Conditionals-2-LCD.h
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,6 @@
* (calling advance_status_scroll, status_and_len for a scrolling status message)
*/
#define HAS_DISPLAY 1
#define HAS_UI_UPDATE 1
#define HAS_STATUS_MESSAGE 1
#endif

Expand Down
1 change: 1 addition & 0 deletions Marlin/src/lcd/e3v2/proui/dwinui.h
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@
#define ICON_SetPreheat10 ICON_SetCustomPreheat
#define ICON_ShapingX ICON_MoveX
#define ICON_ShapingY ICON_MoveY
#define ICON_ShapingZ ICON_MoveZ
#define ICON_Sound ICON_Cool
#define ICON_TMCSet ICON_PrintSize
#define ICON_TMCXSet ICON_MoveX
Expand Down
28 changes: 12 additions & 16 deletions Marlin/src/lcd/marlinui.h
Original file line number Diff line number Diff line change
Expand Up @@ -208,14 +208,6 @@ class MarlinUI {

static void init();

static void reinit_lcd() { TERN_(REINIT_NOISY_LCD, init_lcd()); }

#if HAS_WIRED_LCD
static bool detected();
#else
static bool detected() { return true; }
#endif

#if HAS_MULTI_LANGUAGE
static uint8_t language;
static void set_language(const uint8_t lang);
Expand Down Expand Up @@ -482,8 +474,8 @@ class MarlinUI {
* @param cstr A C-string to set as the status.
*/
static void set_status_no_expire_P(PGM_P const pstr) { set_status_P(pstr, true); }
static void set_status_no_expire(const char * const cstr) { set_status(cstr, true); }
static void set_status_no_expire(FSTR_P const fstr) { set_status(fstr, true); }
static void set_status_no_expire(const char * const cstr) { set_status(cstr, true); }
static void set_status_no_expire(FSTR_P const fstr) { set_status(fstr, true); }

/**
* @brief Set a status with a format string and parameters.
Expand All @@ -495,16 +487,16 @@ class MarlinUI {
template<typename... Args>
static void status_printf(int8_t level, FSTR_P const ffmt, Args... more) { status_printf_P(level, FTOP(ffmt), more...); }

// Periodic or as-needed display update
static void update() IF_DISABLED(HAS_UI_UPDATE, {});

// Tell the screen to redraw on the next call
FORCE_INLINE static void refresh() {
TERN_(HAS_WIRED_LCD, refresh(LCDVIEW_CLEAR_CALL_REDRAW));
}

#if HAS_DISPLAY

// Periodic or as-needed display update
static void update();

static void init_lcd();

// Erase the LCD contents. Do the lowest-level thing required to clear the LCD.
Expand Down Expand Up @@ -598,6 +590,10 @@ class MarlinUI {

static void status_screen();

#else

static void quick_feedback(const bool=true) {}

#endif // HAS_WIRED_LCD

#if HAS_MARLINUI_U8GLIB
Expand All @@ -623,16 +619,16 @@ class MarlinUI {

#else // No LCD

static void update() {}
static void init_lcd() {}
static void clear_lcd() {}
static void clear_for_drawing() {}
static void kill_screen(FSTR_P const, FSTR_P const) {}

#endif

#if !HAS_WIRED_LCD
static void quick_feedback(const bool=true) {}
#endif
static bool detected() IF_DISABLED(HAS_WIRED_LCD, { return true; });
static void reinit_lcd() { TERN_(REINIT_NOISY_LCD, init_lcd()); }

static void completion_feedback(const bool good=true);

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/module/temperature.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4286,7 +4286,7 @@ void Temperature::isr() {
// Update lcd buttons 488 times per second
//
static bool do_buttons;
if ((do_buttons ^= true)) ui.update_buttons();
if (FLIP(do_buttons)) ui.update_buttons();

/**
* One sensor is sampled on every other call of the ISR.
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/sd/SdBaseFile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -643,9 +643,9 @@ bool SdBaseFile::open(SdBaseFile * const dirFile, const uint8_t dname[11]
emptyIndex = 0,
reqEntriesNum = useLFN ? getLFNEntriesNum((char*)dlname) + 1 : 1,
lfnNameLength = useLFN ? strlen((char*)dlname) : 0,
lfnName[LONG_FILENAME_LENGTH],
lfnSequenceNumber = 0,
lfnChecksum = 0;
uint8_t lfnName[LONG_FILENAME_LENGTH];
#endif

// Rewind this dir
Expand Down
5 changes: 3 additions & 2 deletions Marlin/src/sd/cardreader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ IF_DISABLED(NO_SD_AUTOSTART, uint8_t CardReader::autofile_index); // = 0

// private:

MediaFile CardReader::root, CardReader::workDir, CardReader::workDirParents[MAX_DIR_DEPTH];
MediaFile CardReader::root, CardReader::workDir;
MediaFile CardReader::workDirParents[MAX_DIR_DEPTH];
uint8_t CardReader::workDirDepth;
int16_t CardReader::nrItems = -1;

Expand Down Expand Up @@ -123,7 +124,7 @@ int16_t CardReader::nrItems = -1;
#if ENABLED(SDSORT_DYNAMIC_RAM)
uint8_t *CardReader::isDir;
#elif ENABLED(SDSORT_CACHE_NAMES) || DISABLED(SDSORT_USES_STACK)
uint8_t CardReader::isDir[(SDSORT_LIMIT+7)>>3];
uint8_t CardReader::isDir[(SDSORT_LIMIT + 7) >> 3];
#endif
#define IS_DIR(n) TEST(isDir[(n) >> 3], (n) & 0x07)
#endif
Expand Down
3 changes: 2 additions & 1 deletion Marlin/src/sd/cardreader.h
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,8 @@ class CardReader {
//
// Working directory and parents
//
static MediaFile root, workDir, workDirParents[MAX_DIR_DEPTH];
static MediaFile root, workDir;
static MediaFile workDirParents[MAX_DIR_DEPTH];
static uint8_t workDirDepth;
static int16_t nrItems; // Cache the total count

Expand Down
Empty file modified buildroot/share/scripts/languageUtil.py
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion buildroot/tests/STM32F103RE_creality
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ opt_enable DWIN_LCD_PROUI INDIVIDUAL_AXIS_HOMING_SUBMENU SET_PROGRESS_MANUALLY S
SOUND_MENU_ITEM PRINTCOUNTER NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE FILAMENT_RUNOUT_SENSOR \
BLTOUCH Z_SAFE_HOMING AUTO_BED_LEVELING_UBL MESH_EDIT_MENU LCD_BED_TRAMMING \
LIMITED_MAX_FR_EDITING LIMITED_MAX_ACCEL_EDITING LIMITED_JERK_EDITING BAUD_RATE_GCODE \
CASE_LIGHT_ENABLE CASE_LIGHT_MENU CASE_LIGHT_NO_BRIGHTNESS
CASE_LIGHT_ENABLE CASE_LIGHT_MENU CASE_LIGHT_NO_BRIGHTNESS INPUT_SHAPING_X INPUT_SHAPING_Y INPUT_SHAPING_Z
opt_set PREHEAT_3_LABEL '"CUSTOM"' PREHEAT_3_TEMP_HOTEND 240 PREHEAT_3_TEMP_BED 60 PREHEAT_3_FAN_SPEED 128 BOOTSCREEN_TIMEOUT 1100 CASE_LIGHT_PIN 4
exec_test $1 $2 "Ender-3 S1 - ProUI (PIDTEMP)" "$3"

Expand Down