Skip to content

M
MarlinKimbra
Commit 033ec4d4 authored by MagoKimbra's avatar MagoKimbra
Browse files
Options

Merge remote-tracking branch 'refs/remotes/origin/master' into dev

parents cb5aff45 d0e26714
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
MK/module/MK_Main.cpp
View file @ 033ec4d4
...@@ -2819,7 +2819,7 @@ void gcode_get_destination() { ...@@ -2819,7 +2819,7 @@ void gcode_get_destination() {
if(code_seen(axis_codes[E_AXIS])) IDLE_OOZING_retract(false); if(code_seen(axis_codes[E_AXIS])) IDLE_OOZING_retract(false);
#endif #endif
for (int i = 0; i < Z_AXIS; i++) { for (int i = 0; i < 3; i++) {
if (code_seen(axis_codes[i])) if (code_seen(axis_codes[i]))
destination[i] = code_value() + (axis_relative_modes[i] || relative_mode ? current_position[i] : -hotend_offset[i][active_extruder]); destination[i] = code_value() + (axis_relative_modes[i] || relative_mode ? current_position[i] : -hotend_offset[i][active_extruder]);
else else
......
MK/module/motion/stepper.cpp
View file @ 033ec4d4
...@@ -1388,7 +1388,7 @@ void digipot_init() { ...@@ -1388,7 +1388,7 @@ void digipot_init() {
#if MB(ALLIGATOR) #if MB(ALLIGATOR)
unsigned int digipot_motor = 0; unsigned int digipot_motor = 0;
for (uint8_t i = 0; i < 3 + DRIVER_EXTRUDERS; i++) { for (uint8_t i = 0; i < 3 + DRIVER_EXTRUDERS; i++) {
digipot_motor = 255 * (motor_current[i] / 2.5); digipot_motor = 255 * motor_current[i] / 3.3;
ExternalDac::setValue(i, digipot_motor); ExternalDac::setValue(i, digipot_motor);
} }
#endif//MB(ALLIGATOR) #endif//MB(ALLIGATOR)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment