bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Fix stepper use before init. Add Ultimaker2+ Extended clone config (#13284)

Browse Source
This commit is contained in:
Vasily Evseenko
2019-03-03 02:29:02 +03:00
committed by Scott Lahteine
parent edc4e037c4
commit 71773b128d
6 changed files with 4380 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/src/module/stepper.cpp
View File

@ -81,6 +81,10 @@
Stepper stepper; // Singleton
#if HAS_MOTOR_CURRENT_PWM
bool Stepper::initialized; // = false
#endif
#ifdef __AVR__
#include "speed_lookuptable.h"
#endif
@ -2161,6 +2165,9 @@ void Stepper::init() {
| (INVERT_Z_DIR ? _BV(Z_AXIS) : 0);
set_directions();
#if HAS_MOTOR_CURRENT_PWM
initialized = true;
#endif
}
/**
@ -2466,6 +2473,7 @@ void Stepper::report_positions() {
#if HAS_MOTOR_CURRENT_PWM
void Stepper::refresh_motor_power() {
if (!initialized) return;
LOOP_L_N(i, COUNT(motor_current_setting)) {
switch (i) {
#if PIN_EXISTS(MOTOR_CURRENT_PWM_XY) || PIN_EXISTS(MOTOR_CURRENT_PWM_X) || PIN_EXISTS(MOTOR_CURRENT_PWM_Y)
@ -2498,6 +2506,8 @@ void Stepper::report_positions() {
#elif HAS_MOTOR_CURRENT_PWM
if (!initialized) return;
if (WITHIN(driver, 0, COUNT(motor_current_setting) - 1))
motor_current_setting[driver] = current; // update motor_current_setting