Pull in new changes

Marlin/Configuration.h

@@ -882,8 +882,9 @@
 // Enable for Polargraph Kinematics
 //#define POLARGRAPH
 #if ENABLED(POLARGRAPH)
- #define POLARGRAPH_MAX_BELT_LEN 1035.0
- #define DEFAULT_SEGMENTS_PER_SECOND 5
+ #define POLARGRAPH_MAX_BELT_LEN 1035.0 // (mm) Belt length at full extension. Override with M665 H.
+ #define DEFAULT_SEGMENTS_PER_SECOND 5 // Move segmentation based on duration
+ #define PEN_UP_DOWN_MENU // Add "Pen Up" and "Pen Down" to the MarlinUI menu
 #endif
 
 // @section delta

Marlin/Configuration_adv.h

@@ -305,9 +305,9 @@
  #define THERMAL_PROTECTION_PERIOD 20 // Seconds
  #define THERMAL_PROTECTION_HYSTERESIS 12 // Degrees Celsius
 
- #define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops
- #if BOTH(ADAPTIVE_FAN_SLOWING, PIDTEMP)
- #define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303
+ //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops
+ #if ENABLED(ADAPTIVE_FAN_SLOWING) && EITHER(MPCTEMP, PIDTEMP)
+ //#define TEMP_TUNING_MAINTAIN_FAN  // Don't slow fan speed during M303 or M306 T
  #endif
 
  /**
@@ -845,20 +845,20 @@
  //#define Z_MULTI_ENDSTOPS // Other Z axes have their own endstops
  #if ENABLED(Z_MULTI_ENDSTOPS)
  #define Z2_USE_ENDSTOP _XMAX_ // Z2 endstop board plug. Don't forget to enable USE_*_PLUG.
- #define Z2_ENDSTOP_ADJUSTMENT 0 // Z2 offset relative to Y endstop
+ #define Z2_ENDSTOP_ADJUSTMENT 0 // Z2 offset relative to Z endstop
  #endif
  #ifdef Z3_DRIVER_TYPE
  //#define INVERT_Z3_VS_Z_DIR // Z3 direction signal is the opposite of Z
  #if ENABLED(Z_MULTI_ENDSTOPS)
  #define Z3_USE_ENDSTOP _YMAX_ // Z3 endstop board plug. Don't forget to enable USE_*_PLUG.
- #define Z3_ENDSTOP_ADJUSTMENT 0 // Z3 offset relative to Y endstop
+ #define Z3_ENDSTOP_ADJUSTMENT 0 // Z3 offset relative to Z endstop
  #endif
  #endif
  #ifdef Z4_DRIVER_TYPE
  //#define INVERT_Z4_VS_Z_DIR // Z4 direction signal is the opposite of Z
  #if ENABLED(Z_MULTI_ENDSTOPS)
  #define Z4_USE_ENDSTOP _ZMAX_ // Z4 endstop board plug. Don't forget to enable USE_*_PLUG.
- #define Z4_ENDSTOP_ADJUSTMENT 0 // Z4 offset relative to Y endstop
+ #define Z4_ENDSTOP_ADJUSTMENT 0 // Z4 offset relative to Z endstop
  #endif
  #endif
 #endif

Marlin/Version.h

@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2023-01-27"
+//#define STRING_DISTRIBUTION_DATE "2023-02-04"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.

Marlin/src/HAL/AVR/fastio.h

@@ -293,11 +293,11 @@ enum ClockSource2 : uint8_t {
 
 #if HAS_MOTOR_CURRENT_PWM
  #if PIN_EXISTS(MOTOR_CURRENT_PWM_XY)
- #define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E || P == MOTOR_CURRENT_PWM_E0 || P == MOTOR_CURRENT_PWM_E1 || P == MOTOR_CURRENT_PWM_Z || P == MOTOR_CURRENT_PWM_XY)
+ #define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E_PIN || P == MOTOR_CURRENT_PWM_E0_PIN || P == MOTOR_CURRENT_PWM_E1_PIN || P == MOTOR_CURRENT_PWM_Z_PIN || P == MOTOR_CURRENT_PWM_XY_PIN)
  #elif PIN_EXISTS(MOTOR_CURRENT_PWM_Z)
- #define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E || P == MOTOR_CURRENT_PWM_E0 || P == MOTOR_CURRENT_PWM_E1 || P == MOTOR_CURRENT_PWM_Z)
+ #define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E_PIN || P == MOTOR_CURRENT_PWM_E0_PIN || P == MOTOR_CURRENT_PWM_E1_PIN || P == MOTOR_CURRENT_PWM_Z_PIN)
  #else
- #define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E || P == MOTOR_CURRENT_PWM_E0 || P == MOTOR_CURRENT_PWM_E1)
+ #define PWM_CHK_MOTOR_CURRENT(P) (P == MOTOR_CURRENT_PWM_E_PIN || P == MOTOR_CURRENT_PWM_E0_PIN || P == MOTOR_CURRENT_PWM_E1_PIN)
  #endif
 #else
  #define PWM_CHK_MOTOR_CURRENT(P) false

Marlin/src/HAL/STM32/eeprom_sdcard.cpp

@@ -48,7 +48,7 @@ static char _ALIGN(4) HAL_eeprom_data[MARLIN_EEPROM_SIZE];
 bool PersistentStore::access_start() {
  if (!card.isMounted()) return false;
 
- SdFile file, root = card.getroot();
+ MediaFile file, root = card.getroot();
  if (!file.open(&root, EEPROM_FILENAME, O_RDONLY))
  return true;
 
@@ -63,7 +63,7 @@ bool PersistentStore::access_start() {
 bool PersistentStore::access_finish() {
  if (!card.isMounted()) return false;
 
- SdFile file, root = card.getroot();
+ MediaFile file, root = card.getroot();
  int bytes_written = 0;
  if (file.open(&root, EEPROM_FILENAME, O_CREAT | O_WRITE | O_TRUNC)) {
  bytes_written = file.write(HAL_eeprom_data, MARLIN_EEPROM_SIZE);

Marlin/src/HAL/STM32F1/eeprom_sdcard.cpp

@@ -47,7 +47,7 @@ static char _ALIGN(4) HAL_eeprom_data[MARLIN_EEPROM_SIZE];
 bool PersistentStore::access_start() {
  if (!card.isMounted()) return false;
 
- SdFile file, root = card.getroot();
+ MediaFile file, root = card.getroot();
  if (!file.open(&root, EEPROM_FILENAME, O_RDONLY))
  return true; // false aborts the save
 
@@ -62,7 +62,7 @@ bool PersistentStore::access_start() {
 bool PersistentStore::access_finish() {
  if (!card.isMounted()) return false;
 
- SdFile file, root = card.getroot();
+ MediaFile file, root = card.getroot();
  int bytes_written = 0;
  if (file.open(&root, EEPROM_FILENAME, O_CREAT | O_WRITE | O_TRUNC)) {
  bytes_written = file.write(HAL_eeprom_data, MARLIN_EEPROM_SIZE);

Marlin/src/core/serial.h

@@ -337,8 +337,8 @@ void serial_offset(const_float_t v, const uint8_t sp=0); // For v==0 draw space
 void print_bin(const uint16_t val);
 void print_pos(NUM_AXIS_ARGS(const_float_t), FSTR_P const prefix=nullptr, FSTR_P const suffix=nullptr);
 
-inline void print_pos(const xyz_pos_t &xyz, FSTR_P const prefix=nullptr, FSTR_P const suffix=nullptr) {
- print_pos(NUM_AXIS_ELEM(xyz), prefix, suffix);
+inline void print_pos(const xyze_pos_t &xyze, FSTR_P const prefix=nullptr, FSTR_P const suffix=nullptr) {
+ print_pos(NUM_AXIS_ELEM(xyze), prefix, suffix);
 }
 
 #define SERIAL_POS(SUFFIX,VAR) do { print_pos(VAR, F(" " STRINGIFY(VAR) "="), F(" : " SUFFIX "\n")); }while(0)