0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix M503 output for M907 motor current (#19777)

Browse source 
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
This commit is contained in:
Sten Uusvali 2020-10-17 14:11:22 -07:00 committed by GitHub
parent 178721a329
commit 6fed11896b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Marlin/src/module/settings.cpp
View file

@ -3719,19 +3719,25 @@ void MarlinSettings::reset() {
CONFIG_ECHO_HEADING("Stepper motor currents:"); CONFIG_ECHO_HEADING("Stepper motor currents:");
CONFIG_ECHO_START(); CONFIG_ECHO_START();
#if HAS_MOTOR_CURRENT_PWM #if HAS_MOTOR_CURRENT_PWM
SERIAL_ECHOLNPAIR_P( SERIAL_ECHOLNPAIR_P( // PWM-based has 3 values:
PSTR(" M907 X"), stepper.motor_current_setting[0] PSTR(" M907 X"), stepper.motor_current_setting[0] // X and Y
, SP_Z_STR, stepper.motor_current_setting[1] , SP_Z_STR, stepper.motor_current_setting[1] // Z
, SP_E_STR, stepper.motor_current_setting[2] , SP_E_STR, stepper.motor_current_setting[2] // E
); );
#elif HAS_MOTOR_CURRENT_SPI #elif HAS_MOTOR_CURRENT_SPI
SERIAL_ECHOPGM(" M907"); SERIAL_ECHOPGM(" M907"); // SPI-based has 5 values:
LOOP_L_N(q, MOTOR_CURRENT_COUNT) { LOOP_XYZE(q) { // X Y Z E (map to X Y Z E0 by default)
SERIAL_CHAR(' '); SERIAL_CHAR(' ', axis_codes[q]);
SERIAL_CHAR(axis_codes[q]);
SERIAL_ECHO(stepper.motor_current_setting[q]); SERIAL_ECHO(stepper.motor_current_setting[q]);
} }
SERIAL_CHAR(' ', 'B'); // B (maps to E1 by default)
SERIAL_ECHOLN(stepper.motor_current_setting[4]);
#endif #endif
#elif HAS_MOTOR_CURRENT_I2C // i2c-based has any number of values
// Values sent over i2c are not stored.
// Indexes map directly to drivers, not axes.
#elif HAS_MOTOR_CURRENT_DAC // DAC-based has 4 values, for X Y Z E
// Values sent over i2c are not stored. Uses indirect mapping.
#endif #endif
/** /**

2
Marlin/src/module/stepper.cpp
View file

@ -2962,7 +2962,7 @@ void Stepper::report_positions() {
#if HAS_MOTOR_CURRENT_SPI || HAS_MOTOR_CURRENT_PWM #if HAS_MOTOR_CURRENT_SPI || HAS_MOTOR_CURRENT_PWM
void Stepper::set_digipot_current(const uint8_t driver, const int16_t current) { void Stepper::set_digipot_current(const uint8_t driver, const int16_t current) {
if (WITHIN(driver, 0, COUNT(motor_current_setting) - 1)) if (WITHIN(driver, 0, MOTOR_CURRENT_COUNT - 1))
motor_current_setting[driver] = current; // update motor_current_setting motor_current_setting[driver] = current; // update motor_current_setting
if (!initialized) return; if (!initialized) return;

2
Marlin/src/pins/rambo/pins_RAMBO.h
View file

@ -112,7 +112,7 @@
#define E1_MS2_PIN 64 #define E1_MS2_PIN 64
#define DIGIPOTSS_PIN 38 #define DIGIPOTSS_PIN 38
#define DIGIPOT_CHANNELS { 4,5,3,0,1 } // X Y Z E0 E1 digipot channels to stepper driver mapping #define DIGIPOT_CHANNELS { 4, 5, 3, 0, 1 } // X Y Z E0 E1 digipot channels to stepper driver mapping
#ifndef DIGIPOT_MOTOR_CURRENT #ifndef DIGIPOT_MOTOR_CURRENT
#define DIGIPOT_MOTOR_CURRENT { 135,135,135,135,135 } // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A) #define DIGIPOT_MOTOR_CURRENT { 135,135,135,135,135 } // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A)
#endif #endif

2
Marlin/src/pins/rambo/pins_SCOOVO_X9H.h
View file

@ -92,7 +92,7 @@
#define E1_MS2_PIN 64 #define E1_MS2_PIN 64
#define DIGIPOTSS_PIN 38 #define DIGIPOTSS_PIN 38
#define DIGIPOT_CHANNELS {4,5,3,0,1} // X Y Z E0 E1 digipot channels to stepper driver mapping #define DIGIPOT_CHANNELS { 4, 5, 3, 0, 1 } // X Y Z E0 E1 digipot channels to stepper driver mapping
// //
// Temperature Sensors // Temperature Sensors

2
Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
View file

@ -85,7 +85,7 @@
// Steppers // Steppers
// //
#define DIGIPOTSS_PIN 22 #define DIGIPOTSS_PIN 22
#define DIGIPOT_CHANNELS { 4, 5, 3, 0, 1 } #define DIGIPOT_CHANNELS { 4, 5, 3, 0, 1 }
// //
// Temperature Sensors // Temperature Sensors