Bladeren bron

patch "step_remaining"

Scott Lahteine 8 jaren geleden
bovenliggende
commit
d6db7a9b03
1 gewijzigde bestanden met toevoegingen van 2 en 3 verwijderingen
  1. 2
    3
      Marlin/stepper.cpp

+ 2
- 3
Marlin/stepper.cpp Bestand weergeven

346
 
346
 
347
 void Stepper::isr() {
347
 void Stepper::isr() {
348
 
348
 
349
-  static uint32_t step_remaining = 0;
350
-
351
   uint16_t ocr_val;
349
   uint16_t ocr_val;
352
 
350
 
353
   #define ENDSTOP_NOMINAL_OCR_VAL 3000    // check endstops every 1.5ms to guarantee two stepper ISRs within 5ms for BLTouch
351
   #define ENDSTOP_NOMINAL_OCR_VAL 3000    // check endstops every 1.5ms to guarantee two stepper ISRs within 5ms for BLTouch
364
   #if ENABLED(ENDSTOP_INTERRUPTS_FEATURE)
362
   #if ENABLED(ENDSTOP_INTERRUPTS_FEATURE)
365
     #define SPLIT(L) _SPLIT(L)
363
     #define SPLIT(L) _SPLIT(L)
366
   #else                 // sample endstops in between step pulses
364
   #else                 // sample endstops in between step pulses
365
+    static uint32_t step_remaining = 0;
367
     #define SPLIT(L) do { \
366
     #define SPLIT(L) do { \
368
       _SPLIT(L); \
367
       _SPLIT(L); \
369
       if (ENDSTOPS_ENABLED && L > ENDSTOP_NOMINAL_OCR_VAL) { \
368
       if (ENDSTOPS_ENABLED && L > ENDSTOP_NOMINAL_OCR_VAL) { \
391
       _ENABLE_ISRs(); // re-enable ISRs
390
       _ENABLE_ISRs(); // re-enable ISRs
392
       return;
391
       return;
393
     }
392
     }
394
-  # endif
393
+  #endif
395
 
394
 
396
   if (cleaning_buffer_counter) {
395
   if (cleaning_buffer_counter) {
397
     --cleaning_buffer_counter;
396
     --cleaning_buffer_counter;

Laden…
Annuleren
Opslaan