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

🎨 Misc. code cleanup

Browse Source
This commit is contained in:
Scott Lahteine
2021-05-11 10:47:32 -05:00
committed by Scott Lahteine
parent 5afb5e03b0
commit 02e131b5fd
8 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/module/delta.cpp
View File

@ -271,7 +271,7 @@ void home_delta() {
// Do this here all at once for Delta, because
// XYZ isn't ABC. Applying this per-tower would
// give the impression that they are the same.
LOOP_XYZ(i) set_axis_is_at_home((AxisEnum)i);
LOOP_ABC(i) set_axis_is_at_home((AxisEnum)i);
sync_plan_position();

8
Marlin/src/module/settings.cpp
View File

@ -1072,7 +1072,7 @@ void MarlinSettings::postprocess() {
{
_FIELD_TEST(tmc_stepper_current);
tmc_stepper_current_t tmc_stepper_current = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
tmc_stepper_current_t tmc_stepper_current{0};
#if HAS_TRINAMIC_CONFIG
#if AXIS_IS_TMC(X)
@ -1134,7 +1134,7 @@ void MarlinSettings::postprocess() {
_FIELD_TEST(tmc_hybrid_threshold);
#if ENABLED(HYBRID_THRESHOLD)
tmc_hybrid_threshold_t tmc_hybrid_threshold = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
tmc_hybrid_threshold_t tmc_hybrid_threshold{0};
#if AXIS_HAS_STEALTHCHOP(X)
tmc_hybrid_threshold.X = stepperX.get_pwm_thrs();
#endif
@ -1538,7 +1538,7 @@ void MarlinSettings::postprocess() {
EEPROM_READ(dummyf);
#endif
#else
for (uint8_t q = 4; q--;) EEPROM_READ(dummyf);
for (uint8_t q = XYZE; q--;) EEPROM_READ(dummyf);
#endif
EEPROM_READ(TERN(CLASSIC_JERK, dummyf, planner.junction_deviation_mm));
@ -2256,7 +2256,7 @@ void MarlinSettings::postprocess() {
const xyz_float_t &backlash_distance_mm = backlash.distance_mm;
const uint8_t &backlash_correction = backlash.correction;
#else
float backlash_distance_mm[XYZ];
xyz_float_t backlash_distance_mm;
uint8_t backlash_correction;
#endif
#if ENABLED(BACKLASH_GCODE) && defined(BACKLASH_SMOOTHING_MM)

2
Marlin/src/module/stepper.h
View File

@ -250,7 +250,7 @@ class Stepper {
#ifndef PWM_MOTOR_CURRENT
#define PWM_MOTOR_CURRENT DEFAULT_PWM_MOTOR_CURRENT
#endif
#define MOTOR_CURRENT_COUNT 3
#define MOTOR_CURRENT_COUNT XYZ
#elif HAS_MOTOR_CURRENT_SPI
static constexpr uint32_t digipot_count[] = DIGIPOT_MOTOR_CURRENT;
#define MOTOR_CURRENT_COUNT COUNT(Stepper::digipot_count)

5
Marlin/src/module/tool_change.cpp
View File

@ -113,10 +113,7 @@
void move_extruder_servo(const uint8_t e) {
planner.synchronize();
#if EXTRUDERS & 1
if (e < EXTRUDERS - 1)
#endif
{
if ((EXTRUDERS & 1) && e < EXTRUDERS - 1) {
MOVE_SERVO(_SERVO_NR(e), servo_angles[_SERVO_NR(e)][e & 1]);
safe_delay(500);
}