Browse Source

Fix SLOW_PWM_HEATERS, issues already patched in 2.0.x

Scott Lahteine 6 years ago
parent
commit
44edffa0a9
3 changed files with 5 additions and 6 deletions
  1. 1
    2
      Marlin/Marlin_main.cpp
  2. 1
    1
      Marlin/SdBaseFile.cpp
  3. 3
    3
      Marlin/temperature.cpp

+ 1
- 2
Marlin/Marlin_main.cpp View File

@@ -10965,7 +10965,7 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
10965 10965
 
10966 10966
           #if ENABLED(PARKING_EXTRUDER) // Dual Parking extruder
10967 10967
             const float z_diff = hotend_offset[Z_AXIS][active_extruder] - hotend_offset[Z_AXIS][tmp_extruder];
10968
-            float z_raise = 0;
10968
+            float z_raise = PARKING_EXTRUDER_SECURITY_RAISE;
10969 10969
             if (!no_move) {
10970 10970
 
10971 10971
               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
10988 10988
                 SERIAL_ECHOLNPGM("Starting Autopark");
10989 10989
                 if (DEBUGGING(LEVELING)) DEBUG_POS("current position:", current_position);
10990 10990
               #endif
10991
-              z_raise = PARKING_EXTRUDER_SECURITY_RAISE;
10992 10991
               current_position[Z_AXIS] += z_raise;
10993 10992
               #if ENABLED(DEBUG_LEVELING_FEATURE)
10994 10993
                 SERIAL_ECHOLNPGM("(1) Raise Z-Axis ");

+ 1
- 1
Marlin/SdBaseFile.cpp View File

@@ -1384,7 +1384,7 @@ bool SdBaseFile::rmdir() {
1384 1384
  * the value zero, false, is returned for failure.
1385 1385
  */
1386 1386
 bool SdBaseFile::rmRfStar() {
1387
-  uint16_t index;
1387
+  uint32_t index;
1388 1388
   SdBaseFile f;
1389 1389
   rewind();
1390 1390
   while (curPosition_ < fileSize_) {

+ 3
- 3
Marlin/temperature.cpp View File

@@ -1813,8 +1813,8 @@ void Temperature::isr() {
1813 1813
 
1814 1814
     // Macros for Slow PWM timer logic
1815 1815
     #define _SLOW_PWM_ROUTINE(NR, src) \
1816
-      soft_pwm_ ##NR = src; \
1817
-      if (soft_pwm_ ##NR > 0) { \
1816
+      soft_pwm_count_ ##NR = src; \
1817
+      if (soft_pwm_count_ ##NR > 0) { \
1818 1818
         if (state_timer_heater_ ##NR == 0) { \
1819 1819
           if (state_heater_ ##NR == 0) state_timer_heater_ ##NR = MIN_STATE_TIME; \
1820 1820
           state_heater_ ##NR = 1; \
@@ -1831,7 +1831,7 @@ void Temperature::isr() {
1831 1831
     #define SLOW_PWM_ROUTINE(n) _SLOW_PWM_ROUTINE(n, soft_pwm_amount[n])
1832 1832
 
1833 1833
     #define PWM_OFF_ROUTINE(NR) \
1834
-      if (soft_pwm_ ##NR < slow_pwm_count) { \
1834
+      if (soft_pwm_count_ ##NR < slow_pwm_count) { \
1835 1835
         if (state_timer_heater_ ##NR == 0) { \
1836 1836
           if (state_heater_ ##NR == 1) state_timer_heater_ ##NR = MIN_STATE_TIME; \
1837 1837
           state_heater_ ##NR = 0; \

Loading…
Cancel
Save