diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp index d3c5fbde79..d01da86fb9 100644 --- a/Marlin/src/lcd/e3v2/proui/dwin.cpp +++ b/Marlin/src/lcd/e3v2/proui/dwin.cpp @@ -3121,7 +3121,9 @@ void ApplyMaxAccel() { planner.set_max_acceleration(HMI_value.axis, MenuData.Val void ApplyPhySet() { TERN_(PROUI_EX, ProEx.CheckParkingPos();) TERN_(MESH_BED_LEVELING, bedlevel.initialize();) - update_software_endstops(ALL_AXES_ENUM); + update_software_endstops(X_AXIS); + update_software_endstops(Y_AXIS); + update_software_endstops(Z_AXIS); } void SetData() { ApplyPhySet(); diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h index 5428040eeb..2c98d81a85 100644 --- a/Marlin/src/module/motion.h +++ b/Marlin/src/module/motion.h @@ -130,19 +130,19 @@ extern int16_t feedrate_percentage; inline float pgm_read_any(const float *p) { return TERN(__IMXRT1062__, *p, pgm_read_float(p)); } inline int8_t pgm_read_any(const int8_t *p) { return TERN(__IMXRT1062__, *p, pgm_read_byte(p)); } -/* #if ENABLED(DWIN_LCD_PROUI) +#if ENABLED(DWIN_LCD_PROUI) #define XYZ_DEFS(T, NAME, OPT) \ inline T NAME(const AxisEnum axis) { \ - const XYZval Value = NUM_AXIS_ARRAY(X_##OPT, Y_##OPT, Z_##OPT, I_##OPT, J_##OPT, K_##OPT, U_##OPT, V_##OPT, W_##OPT); \ - return Value[axis]; \ + const XYZval NAME##_P = NUM_AXIS_ARRAY(X_##OPT, Y_##OPT, Z_##OPT, I_##OPT, J_##OPT, K_##OPT, U_##OPT, V_##OPT, W_##OPT); \ + return NAME##_P[axis]; \ } -#else */ +#else #define XYZ_DEFS(T, NAME, OPT) \ inline T NAME(const AxisEnum axis) { \ static const XYZval NAME##_P DEFS_PROGMEM = NUM_AXIS_ARRAY(X_##OPT, Y_##OPT, Z_##OPT, I_##OPT, J_##OPT, K_##OPT, U_##OPT, V_##OPT, W_##OPT); \ return pgm_read_any(&NAME##_P[axis]); \ } -//#endif +#endif XYZ_DEFS(float, base_min_pos, MIN_POS); XYZ_DEFS(float, base_max_pos, MAX_POS); diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini index 5d02d783cb..d5fd753bb4 100644 --- a/ini/stm32f1-maple.ini +++ b/ini/stm32f1-maple.ini @@ -33,7 +33,7 @@ lib_ignore = SPI, FreeRTOS701, FreeRTOS821 lib_deps = ${common.lib_deps} SoftwareSerialM platform_packages = tool-stm32duino - toolchain-gccarmnoneeabi@1.90201.191206 + toolchain-gccarmnoneeabi@1.90301.200702 framework-arduinoststm32-maple@https://github.com/classicrocker883/Arduino_STM32/archive/master.zip extra_scripts = ${common.extra_scripts} pre:buildroot/share/PlatformIO/scripts/fix_framework_weakness.py