Keep "astyled" elements in stepper.*
This commit is contained in:
@@ -408,14 +408,14 @@ inline void update_endstops() {
|
||||
#else // !Z_DUAL_ENDSTOPS
|
||||
|
||||
UPDATE_ENDSTOP(Z, MIN);
|
||||
|
||||
#endif // !Z_DUAL_ENDSTOPS
|
||||
#endif // Z_MIN_PIN
|
||||
|
||||
#if ENABLED(Z_MIN_PROBE_ENDSTOP)
|
||||
UPDATE_ENDSTOP(Z, MIN_PROBE);
|
||||
|
||||
if (TEST_ENDSTOP(Z_MIN_PROBE))
|
||||
{
|
||||
if (TEST_ENDSTOP(Z_MIN_PROBE)) {
|
||||
endstops_trigsteps[Z_AXIS] = count_position[Z_AXIS];
|
||||
endstop_hit_bits |= BIT(Z_MIN_PROBE);
|
||||
}
|
||||
@@ -704,7 +704,9 @@ ISR(TIMER1_COMPA_vect) {
|
||||
timer = calc_timer(acc_step_rate);
|
||||
OCR1A = timer;
|
||||
acceleration_time += timer;
|
||||
|
||||
#if ENABLED(ADVANCE)
|
||||
|
||||
for (int8_t i = 0; i < step_loops; i++) {
|
||||
advance += advance_rate;
|
||||
}
|
||||
@@ -713,7 +715,7 @@ ISR(TIMER1_COMPA_vect) {
|
||||
e_steps[current_block->active_extruder] += ((advance >> 8) - old_advance);
|
||||
old_advance = advance >> 8;
|
||||
|
||||
#endif
|
||||
#endif //ADVANCE
|
||||
}
|
||||
else if (step_events_completed > (unsigned long)current_block->decelerate_after) {
|
||||
MultiU24X32toH16(step_rate, deceleration_time, current_block->acceleration_rate);
|
||||
@@ -763,8 +765,7 @@ ISR(TIMER1_COMPA_vect) {
|
||||
unsigned char old_OCR0A;
|
||||
// Timer interrupt for E. e_steps is set in the main routine;
|
||||
// Timer 0 is shared with millies
|
||||
ISR(TIMER0_COMPA_vect)
|
||||
{
|
||||
ISR(TIMER0_COMPA_vect) {
|
||||
old_OCR0A += 52; // ~10kHz interrupt (250000 / 26 = 9615kHz)
|
||||
OCR0A = old_OCR0A;
|
||||
// Set E direction (Depends on E direction + advance)
|
||||
@@ -827,7 +828,6 @@ ISR(TIMER1_COMPA_vect) {
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
}
|
||||
}
|
||||
#endif // ADVANCE
|
||||
@@ -1034,7 +1034,6 @@ void st_init() {
|
||||
// output mode = 00 (disconnected)
|
||||
TCCR1A &= ~(3 << COM1A0);
|
||||
TCCR1A &= ~(3 << COM1B0);
|
||||
|
||||
// Set the timer pre-scaler
|
||||
// Generally we use a divider of 8, resulting in a 2MHz timer
|
||||
// frequency on a 16MHz MCU. If you are going to change this, be
|
||||
|
Reference in New Issue
Block a user