mirror of
https://github.com/MarlinFirmware/Marlin.git
synced 2025-03-01 04:17:02 +00:00
Fix SLOW_PWM_HEATERS, issues already patched in 2.0.x
This commit is contained in:
parent
20b57f9d38
commit
44edffa0a9
3 changed files with 5 additions and 6 deletions
|
@ -10965,7 +10965,7 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
|
||||||
|
|
||||||
#if ENABLED(PARKING_EXTRUDER) // Dual Parking extruder
|
#if ENABLED(PARKING_EXTRUDER) // Dual Parking extruder
|
||||||
const float z_diff = hotend_offset[Z_AXIS][active_extruder] - hotend_offset[Z_AXIS][tmp_extruder];
|
const float z_diff = hotend_offset[Z_AXIS][active_extruder] - hotend_offset[Z_AXIS][tmp_extruder];
|
||||||
float z_raise = 0;
|
float z_raise = PARKING_EXTRUDER_SECURITY_RAISE;
|
||||||
if (!no_move) {
|
if (!no_move) {
|
||||||
|
|
||||||
const float parkingposx[] = PARKING_EXTRUDER_PARKING_X,
|
const float parkingposx[] = PARKING_EXTRUDER_PARKING_X,
|
||||||
|
@ -10988,7 +10988,6 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
|
||||||
SERIAL_ECHOLNPGM("Starting Autopark");
|
SERIAL_ECHOLNPGM("Starting Autopark");
|
||||||
if (DEBUGGING(LEVELING)) DEBUG_POS("current position:", current_position);
|
if (DEBUGGING(LEVELING)) DEBUG_POS("current position:", current_position);
|
||||||
#endif
|
#endif
|
||||||
z_raise = PARKING_EXTRUDER_SECURITY_RAISE;
|
|
||||||
current_position[Z_AXIS] += z_raise;
|
current_position[Z_AXIS] += z_raise;
|
||||||
#if ENABLED(DEBUG_LEVELING_FEATURE)
|
#if ENABLED(DEBUG_LEVELING_FEATURE)
|
||||||
SERIAL_ECHOLNPGM("(1) Raise Z-Axis ");
|
SERIAL_ECHOLNPGM("(1) Raise Z-Axis ");
|
||||||
|
|
|
@ -1384,7 +1384,7 @@ bool SdBaseFile::rmdir() {
|
||||||
* the value zero, false, is returned for failure.
|
* the value zero, false, is returned for failure.
|
||||||
*/
|
*/
|
||||||
bool SdBaseFile::rmRfStar() {
|
bool SdBaseFile::rmRfStar() {
|
||||||
uint16_t index;
|
uint32_t index;
|
||||||
SdBaseFile f;
|
SdBaseFile f;
|
||||||
rewind();
|
rewind();
|
||||||
while (curPosition_ < fileSize_) {
|
while (curPosition_ < fileSize_) {
|
||||||
|
|
|
@ -1813,8 +1813,8 @@ void Temperature::isr() {
|
||||||
|
|
||||||
// Macros for Slow PWM timer logic
|
// Macros for Slow PWM timer logic
|
||||||
#define _SLOW_PWM_ROUTINE(NR, src) \
|
#define _SLOW_PWM_ROUTINE(NR, src) \
|
||||||
soft_pwm_ ##NR = src; \
|
soft_pwm_count_ ##NR = src; \
|
||||||
if (soft_pwm_ ##NR > 0) { \
|
if (soft_pwm_count_ ##NR > 0) { \
|
||||||
if (state_timer_heater_ ##NR == 0) { \
|
if (state_timer_heater_ ##NR == 0) { \
|
||||||
if (state_heater_ ##NR == 0) state_timer_heater_ ##NR = MIN_STATE_TIME; \
|
if (state_heater_ ##NR == 0) state_timer_heater_ ##NR = MIN_STATE_TIME; \
|
||||||
state_heater_ ##NR = 1; \
|
state_heater_ ##NR = 1; \
|
||||||
|
@ -1831,7 +1831,7 @@ void Temperature::isr() {
|
||||||
#define SLOW_PWM_ROUTINE(n) _SLOW_PWM_ROUTINE(n, soft_pwm_amount[n])
|
#define SLOW_PWM_ROUTINE(n) _SLOW_PWM_ROUTINE(n, soft_pwm_amount[n])
|
||||||
|
|
||||||
#define PWM_OFF_ROUTINE(NR) \
|
#define PWM_OFF_ROUTINE(NR) \
|
||||||
if (soft_pwm_ ##NR < slow_pwm_count) { \
|
if (soft_pwm_count_ ##NR < slow_pwm_count) { \
|
||||||
if (state_timer_heater_ ##NR == 0) { \
|
if (state_timer_heater_ ##NR == 0) { \
|
||||||
if (state_heater_ ##NR == 1) state_timer_heater_ ##NR = MIN_STATE_TIME; \
|
if (state_heater_ ##NR == 1) state_timer_heater_ ##NR = MIN_STATE_TIME; \
|
||||||
state_heater_ ##NR = 0; \
|
state_heater_ ##NR = 0; \
|
||||||
|
|
Loading…
Reference in a new issue