Browse Source

Read from backup TMC StealthChop state (#19364)

ManuelMcLure 3 years ago
parent
commit
c04d5624da
No account linked to committer's email address
2 changed files with 35 additions and 32 deletions
  1. 3
    0
      Marlin/src/feature/tmc_util.h
  2. 32
    32
      Marlin/src/module/settings.cpp

+ 3
- 0
Marlin/src/feature/tmc_util.h View File

105
     #if HAS_STEALTHCHOP
105
     #if HAS_STEALTHCHOP
106
       inline void refresh_stepping_mode() { this->en_pwm_mode(this->stored.stealthChop_enabled); }
106
       inline void refresh_stepping_mode() { this->en_pwm_mode(this->stored.stealthChop_enabled); }
107
       inline bool get_stealthChop_status() { return this->en_pwm_mode(); }
107
       inline bool get_stealthChop_status() { return this->en_pwm_mode(); }
108
+      inline bool get_stored_stealthChop_status() { return this->stored.stealthChop_enabled; }
108
     #endif
109
     #endif
109
 
110
 
110
     #if ENABLED(HYBRID_THRESHOLD)
111
     #if ENABLED(HYBRID_THRESHOLD)
171
     #if HAS_STEALTHCHOP
172
     #if HAS_STEALTHCHOP
172
       inline void refresh_stepping_mode() { en_spreadCycle(!this->stored.stealthChop_enabled); }
173
       inline void refresh_stepping_mode() { en_spreadCycle(!this->stored.stealthChop_enabled); }
173
       inline bool get_stealthChop_status() { return !this->en_spreadCycle(); }
174
       inline bool get_stealthChop_status() { return !this->en_spreadCycle(); }
175
+      inline bool get_stored_stealthChop_status() { return this->stored.stealthChop_enabled; }
174
     #endif
176
     #endif
175
 
177
 
176
     #if ENABLED(HYBRID_THRESHOLD)
178
     #if ENABLED(HYBRID_THRESHOLD)
216
     #if HAS_STEALTHCHOP
218
     #if HAS_STEALTHCHOP
217
       inline void refresh_stepping_mode() { en_spreadCycle(!this->stored.stealthChop_enabled); }
219
       inline void refresh_stepping_mode() { en_spreadCycle(!this->stored.stealthChop_enabled); }
218
       inline bool get_stealthChop_status() { return !this->en_spreadCycle(); }
220
       inline bool get_stealthChop_status() { return !this->en_spreadCycle(); }
221
+      inline bool get_stored_stealthChop_status() { return this->stored.stealthChop_enabled; }
219
     #endif
222
     #endif
220
 
223
 
221
     #if ENABLED(HYBRID_THRESHOLD)
224
     #if ENABLED(HYBRID_THRESHOLD)

+ 32
- 32
Marlin/src/module/settings.cpp View File

1191
 
1191
 
1192
       #if HAS_STEALTHCHOP
1192
       #if HAS_STEALTHCHOP
1193
         #if AXIS_HAS_STEALTHCHOP(X)
1193
         #if AXIS_HAS_STEALTHCHOP(X)
1194
-          tmc_stealth_enabled.X = stepperX.get_stealthChop_status();
1194
+          tmc_stealth_enabled.X = stepperX.get_stored_stealthChop_status();
1195
         #endif
1195
         #endif
1196
         #if AXIS_HAS_STEALTHCHOP(Y)
1196
         #if AXIS_HAS_STEALTHCHOP(Y)
1197
-          tmc_stealth_enabled.Y = stepperY.get_stealthChop_status();
1197
+          tmc_stealth_enabled.Y = stepperY.get_stored_stealthChop_status();
1198
         #endif
1198
         #endif
1199
         #if AXIS_HAS_STEALTHCHOP(Z)
1199
         #if AXIS_HAS_STEALTHCHOP(Z)
1200
-          tmc_stealth_enabled.Z = stepperZ.get_stealthChop_status();
1200
+          tmc_stealth_enabled.Z = stepperZ.get_stored_stealthChop_status();
1201
         #endif
1201
         #endif
1202
         #if AXIS_HAS_STEALTHCHOP(X2)
1202
         #if AXIS_HAS_STEALTHCHOP(X2)
1203
-          tmc_stealth_enabled.X2 = stepperX2.get_stealthChop_status();
1203
+          tmc_stealth_enabled.X2 = stepperX2.get_stored_stealthChop_status();
1204
         #endif
1204
         #endif
1205
         #if AXIS_HAS_STEALTHCHOP(Y2)
1205
         #if AXIS_HAS_STEALTHCHOP(Y2)
1206
-          tmc_stealth_enabled.Y2 = stepperY2.get_stealthChop_status();
1206
+          tmc_stealth_enabled.Y2 = stepperY2.get_stored_stealthChop_status();
1207
         #endif
1207
         #endif
1208
         #if AXIS_HAS_STEALTHCHOP(Z2)
1208
         #if AXIS_HAS_STEALTHCHOP(Z2)
1209
-          tmc_stealth_enabled.Z2 = stepperZ2.get_stealthChop_status();
1209
+          tmc_stealth_enabled.Z2 = stepperZ2.get_stored_stealthChop_status();
1210
         #endif
1210
         #endif
1211
         #if AXIS_HAS_STEALTHCHOP(Z3)
1211
         #if AXIS_HAS_STEALTHCHOP(Z3)
1212
-          tmc_stealth_enabled.Z3 = stepperZ3.get_stealthChop_status();
1212
+          tmc_stealth_enabled.Z3 = stepperZ3.get_stored_stealthChop_status();
1213
         #endif
1213
         #endif
1214
         #if AXIS_HAS_STEALTHCHOP(Z4)
1214
         #if AXIS_HAS_STEALTHCHOP(Z4)
1215
-          tmc_stealth_enabled.Z4 = stepperZ4.get_stealthChop_status();
1215
+          tmc_stealth_enabled.Z4 = stepperZ4.get_stored_stealthChop_status();
1216
         #endif
1216
         #endif
1217
         #if MAX_EXTRUDERS
1217
         #if MAX_EXTRUDERS
1218
           #if AXIS_HAS_STEALTHCHOP(E0)
1218
           #if AXIS_HAS_STEALTHCHOP(E0)
1219
-            tmc_stealth_enabled.E0 = stepperE0.get_stealthChop_status();
1219
+            tmc_stealth_enabled.E0 = stepperE0.get_stored_stealthChop_status();
1220
           #endif
1220
           #endif
1221
           #if MAX_EXTRUDERS > 1
1221
           #if MAX_EXTRUDERS > 1
1222
             #if AXIS_HAS_STEALTHCHOP(E1)
1222
             #if AXIS_HAS_STEALTHCHOP(E1)
1223
-              tmc_stealth_enabled.E1 = stepperE1.get_stealthChop_status();
1223
+              tmc_stealth_enabled.E1 = stepperE1.get_stored_stealthChop_status();
1224
             #endif
1224
             #endif
1225
             #if MAX_EXTRUDERS > 2
1225
             #if MAX_EXTRUDERS > 2
1226
               #if AXIS_HAS_STEALTHCHOP(E2)
1226
               #if AXIS_HAS_STEALTHCHOP(E2)
1227
-                tmc_stealth_enabled.E2 = stepperE2.get_stealthChop_status();
1227
+                tmc_stealth_enabled.E2 = stepperE2.get_stored_stealthChop_status();
1228
               #endif
1228
               #endif
1229
               #if MAX_EXTRUDERS > 3
1229
               #if MAX_EXTRUDERS > 3
1230
                 #if AXIS_HAS_STEALTHCHOP(E3)
1230
                 #if AXIS_HAS_STEALTHCHOP(E3)
1231
-                  tmc_stealth_enabled.E3 = stepperE3.get_stealthChop_status();
1231
+                  tmc_stealth_enabled.E3 = stepperE3.get_stored_stealthChop_status();
1232
                 #endif
1232
                 #endif
1233
                 #if MAX_EXTRUDERS > 4
1233
                 #if MAX_EXTRUDERS > 4
1234
                   #if AXIS_HAS_STEALTHCHOP(E4)
1234
                   #if AXIS_HAS_STEALTHCHOP(E4)
1235
-                    tmc_stealth_enabled.E4 = stepperE4.get_stealthChop_status();
1235
+                    tmc_stealth_enabled.E4 = stepperE4.get_stored_stealthChop_status();
1236
                   #endif
1236
                   #endif
1237
                   #if MAX_EXTRUDERS > 5
1237
                   #if MAX_EXTRUDERS > 5
1238
                     #if AXIS_HAS_STEALTHCHOP(E5)
1238
                     #if AXIS_HAS_STEALTHCHOP(E5)
1239
-                      tmc_stealth_enabled.E5 = stepperE5.get_stealthChop_status();
1239
+                      tmc_stealth_enabled.E5 = stepperE5.get_stored_stealthChop_status();
1240
                     #endif
1240
                     #endif
1241
                     #if MAX_EXTRUDERS > 6
1241
                     #if MAX_EXTRUDERS > 6
1242
                       #if AXIS_HAS_STEALTHCHOP(E6)
1242
                       #if AXIS_HAS_STEALTHCHOP(E6)
1243
-                        tmc_stealth_enabled.E6 = stepperE6.get_stealthChop_status();
1243
+                        tmc_stealth_enabled.E6 = stepperE6.get_stored_stealthChop_status();
1244
                       #endif
1244
                       #endif
1245
                       #if MAX_EXTRUDERS > 7
1245
                       #if MAX_EXTRUDERS > 7
1246
                         #if AXIS_HAS_STEALTHCHOP(E7)
1246
                         #if AXIS_HAS_STEALTHCHOP(E7)
1247
-                          tmc_stealth_enabled.E7 = stepperE7.get_stealthChop_status();
1247
+                          tmc_stealth_enabled.E7 = stepperE7.get_stored_stealthChop_status();
1248
                         #endif
1248
                         #endif
1249
                       #endif // MAX_EXTRUDERS > 7
1249
                       #endif // MAX_EXTRUDERS > 7
1250
                     #endif // MAX_EXTRUDERS > 6
1250
                     #endif // MAX_EXTRUDERS > 6
3595
       #if HAS_STEALTHCHOP
3595
       #if HAS_STEALTHCHOP
3596
         CONFIG_ECHO_HEADING("Driver stepping mode:");
3596
         CONFIG_ECHO_HEADING("Driver stepping mode:");
3597
         #if AXIS_HAS_STEALTHCHOP(X)
3597
         #if AXIS_HAS_STEALTHCHOP(X)
3598
-          const bool chop_x = stepperX.get_stealthChop_status();
3598
+          const bool chop_x = stepperX.get_stored_stealthChop_status();
3599
         #else
3599
         #else
3600
           constexpr bool chop_x = false;
3600
           constexpr bool chop_x = false;
3601
         #endif
3601
         #endif
3602
         #if AXIS_HAS_STEALTHCHOP(Y)
3602
         #if AXIS_HAS_STEALTHCHOP(Y)
3603
-          const bool chop_y = stepperY.get_stealthChop_status();
3603
+          const bool chop_y = stepperY.get_stored_stealthChop_status();
3604
         #else
3604
         #else
3605
           constexpr bool chop_y = false;
3605
           constexpr bool chop_y = false;
3606
         #endif
3606
         #endif
3607
         #if AXIS_HAS_STEALTHCHOP(Z)
3607
         #if AXIS_HAS_STEALTHCHOP(Z)
3608
-          const bool chop_z = stepperZ.get_stealthChop_status();
3608
+          const bool chop_z = stepperZ.get_stored_stealthChop_status();
3609
         #else
3609
         #else
3610
           constexpr bool chop_z = false;
3610
           constexpr bool chop_z = false;
3611
         #endif
3611
         #endif
3619
         }
3619
         }
3620
 
3620
 
3621
         #if AXIS_HAS_STEALTHCHOP(X2)
3621
         #if AXIS_HAS_STEALTHCHOP(X2)
3622
-          const bool chop_x2 = stepperX2.get_stealthChop_status();
3622
+          const bool chop_x2 = stepperX2.get_stored_stealthChop_status();
3623
         #else
3623
         #else
3624
           constexpr bool chop_x2 = false;
3624
           constexpr bool chop_x2 = false;
3625
         #endif
3625
         #endif
3626
         #if AXIS_HAS_STEALTHCHOP(Y2)
3626
         #if AXIS_HAS_STEALTHCHOP(Y2)
3627
-          const bool chop_y2 = stepperY2.get_stealthChop_status();
3627
+          const bool chop_y2 = stepperY2.get_stored_stealthChop_status();
3628
         #else
3628
         #else
3629
           constexpr bool chop_y2 = false;
3629
           constexpr bool chop_y2 = false;
3630
         #endif
3630
         #endif
3631
         #if AXIS_HAS_STEALTHCHOP(Z2)
3631
         #if AXIS_HAS_STEALTHCHOP(Z2)
3632
-          const bool chop_z2 = stepperZ2.get_stealthChop_status();
3632
+          const bool chop_z2 = stepperZ2.get_stored_stealthChop_status();
3633
         #else
3633
         #else
3634
           constexpr bool chop_z2 = false;
3634
           constexpr bool chop_z2 = false;
3635
         #endif
3635
         #endif
3643
         }
3643
         }
3644
 
3644
 
3645
         #if AXIS_HAS_STEALTHCHOP(Z3)
3645
         #if AXIS_HAS_STEALTHCHOP(Z3)
3646
-          if (stepperZ3.get_stealthChop_status()) { say_M569(forReplay, PSTR("I2 Z"), true); }
3646
+          if (stepperZ3.get_stored_stealthChop_status()) { say_M569(forReplay, PSTR("I2 Z"), true); }
3647
         #endif
3647
         #endif
3648
 
3648
 
3649
         #if AXIS_HAS_STEALTHCHOP(Z4)
3649
         #if AXIS_HAS_STEALTHCHOP(Z4)
3650
-          if (stepperZ4.get_stealthChop_status()) { say_M569(forReplay, PSTR("I3 Z"), true); }
3650
+          if (stepperZ4.get_stored_stealthChop_status()) { say_M569(forReplay, PSTR("I3 Z"), true); }
3651
         #endif
3651
         #endif
3652
 
3652
 
3653
         #if AXIS_HAS_STEALTHCHOP(E0)
3653
         #if AXIS_HAS_STEALTHCHOP(E0)
3654
-          if (stepperE0.get_stealthChop_status()) { say_M569(forReplay, PSTR("T0 E"), true); }
3654
+          if (stepperE0.get_stored_stealthChop_status()) { say_M569(forReplay, PSTR("T0 E"), true); }
3655
         #endif
3655
         #endif
3656
         #if AXIS_HAS_STEALTHCHOP(E1)
3656
         #if AXIS_HAS_STEALTHCHOP(E1)
3657
-          if (stepperE1.get_stealthChop_status()) { say_M569(forReplay, PSTR("T1 E"), true); }
3657
+          if (stepperE1.get_stored_stealthChop_status()) { say_M569(forReplay, PSTR("T1 E"), true); }
3658
         #endif
3658
         #endif
3659
         #if AXIS_HAS_STEALTHCHOP(E2)
3659
         #if AXIS_HAS_STEALTHCHOP(E2)
3660
-          if (stepperE2.get_stealthChop_status()) { say_M569(forReplay, PSTR("T2 E"), true); }
3660
+          if (stepperE2.get_stored_stealthChop_status()) { say_M569(forReplay, PSTR("T2 E"), true); }
3661
         #endif
3661
         #endif
3662
         #if AXIS_HAS_STEALTHCHOP(E3)
3662
         #if AXIS_HAS_STEALTHCHOP(E3)
3663
-          if (stepperE3.get_stealthChop_status()) { say_M569(forReplay, PSTR("T3 E"), true); }
3663
+          if (stepperE3.get_stored_stealthChop_status()) { say_M569(forReplay, PSTR("T3 E"), true); }
3664
         #endif
3664
         #endif
3665
         #if AXIS_HAS_STEALTHCHOP(E4)
3665
         #if AXIS_HAS_STEALTHCHOP(E4)
3666
-          if (stepperE4.get_stealthChop_status()) { say_M569(forReplay, PSTR("T4 E"), true); }
3666
+          if (stepperE4.get_stored_stealthChop_status()) { say_M569(forReplay, PSTR("T4 E"), true); }
3667
         #endif
3667
         #endif
3668
         #if AXIS_HAS_STEALTHCHOP(E5)
3668
         #if AXIS_HAS_STEALTHCHOP(E5)
3669
-          if (stepperE5.get_stealthChop_status()) { say_M569(forReplay, PSTR("T5 E"), true); }
3669
+          if (stepperE5.get_stored_stealthChop_status()) { say_M569(forReplay, PSTR("T5 E"), true); }
3670
         #endif
3670
         #endif
3671
         #if AXIS_HAS_STEALTHCHOP(E6)
3671
         #if AXIS_HAS_STEALTHCHOP(E6)
3672
-          if (stepperE6.get_stealthChop_status()) { say_M569(forReplay, PSTR("T6 E"), true); }
3672
+          if (stepperE6.get_stored_stealthChop_status()) { say_M569(forReplay, PSTR("T6 E"), true); }
3673
         #endif
3673
         #endif
3674
         #if AXIS_HAS_STEALTHCHOP(E7)
3674
         #if AXIS_HAS_STEALTHCHOP(E7)
3675
-          if (stepperE7.get_stealthChop_status()) { say_M569(forReplay, PSTR("T7 E"), true); }
3675
+          if (stepperE7.get_stored_stealthChop_status()) { say_M569(forReplay, PSTR("T7 E"), true); }
3676
         #endif
3676
         #endif
3677
 
3677
 
3678
       #endif // HAS_STEALTHCHOP
3678
       #endif // HAS_STEALTHCHOP

Loading…
Cancel
Save