zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Conditions cleanup

Browse source
This commit is contained in:
Scott Lahteine 2020-08-06 04:19:56 -05:00 committed by Scott Lahteine
parent 76eff24718
commit 7d3be90159
6 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/feature/leds/printer_event_leds.cpp
View file

@ -21,7 +21,7 @@
*/ */
/** /**
* printer_event_leds.cpp - LED color changing based on printer status * feature/leds/printer_event_leds.cpp - LED color changing based on printer status
*/ */
#include "../../inc/MarlinConfigPre.h" #include "../../inc/MarlinConfigPre.h"

2
Marlin/src/feature/leds/printer_event_leds.h
View file

@ -22,7 +22,7 @@
#pragma once #pragma once
/** /**
* printer_event_leds.h - LED color changing based on printer status * feature/leds/printer_event_leds.h - LED color changing based on printer status
*/ */
#include "leds.h" #include "leds.h"

5
Marlin/src/inc/Conditionals_adv.h
View file

@ -383,3 +383,8 @@
#if ANY(AUTO_BED_LEVELING_UBL, M100_FREE_MEMORY_WATCHER, DEBUG_GCODE_PARSER, TMC_DEBUG, MARLIN_DEV_MODE) #if ANY(AUTO_BED_LEVELING_UBL, M100_FREE_MEMORY_WATCHER, DEBUG_GCODE_PARSER, TMC_DEBUG, MARLIN_DEV_MODE)
#define NEED_HEX_PRINT 1 #define NEED_HEX_PRINT 1
#endif #endif
// Flag whether least_squares_fit.cpp is used
#if ANY(AUTO_BED_LEVELING_UBL, AUTO_BED_LEVELING_LINEAR, Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
#define NEED_LSF 1
#endif

2
Marlin/src/inc/Conditionals_post.h
View file

@ -1955,7 +1955,7 @@
#if PIN_EXISTS(DIGIPOTSS) #if PIN_EXISTS(DIGIPOTSS)
#define HAS_DIGIPOTSS 1 #define HAS_DIGIPOTSS 1
#endif #endif
#if ANY_PIN(MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y, MOTOR_CURRENT_PWM_XY, MOTOR_CURRENT_PWM_Z, MOTOR_CURRENT_PWM_E) #if ANY_PIN(MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y, MOTOR_CURRENT_PWM_XY, MOTOR_CURRENT_PWM_Z, MOTOR_CURRENT_PWM_E)
#define HAS_MOTOR_CURRENT_PWM 1 #define HAS_MOTOR_CURRENT_PWM 1
#endif #endif

2
Marlin/src/lcd/menu/menu_ubl.cpp
View file

@ -451,7 +451,7 @@ void ubl_map_screen() {
#if IS_KINEMATIC #if IS_KINEMATIC
// Index of the mesh point upon entry // Index of the mesh point upon entry
const uint32_t old_pos_index = grid_index(x_plot, y_plot); const int32_t old_pos_index = grid_index(x_plot, y_plot);
// Direction from new (unconstrained) encoder value // Direction from new (unconstrained) encoder value
const int8_t step_dir = int32_t(ui.encoderPosition) < old_pos_index ? -1 : 1; const int8_t step_dir = int32_t(ui.encoderPosition) < old_pos_index ? -1 : 1;
#endif #endif

4
Marlin/src/libs/least_squares_fit.cpp
View file

@ -34,7 +34,7 @@
#include "../inc/MarlinConfig.h" #include "../inc/MarlinConfig.h"
#if ANY(AUTO_BED_LEVELING_UBL, AUTO_BED_LEVELING_LINEAR, Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS) #if NEED_LSF
#include "least_squares_fit.h" #include "least_squares_fit.h"
@ -67,4 +67,4 @@ int finish_incremental_LSF(struct linear_fit_data *lsf) {
return 0; return 0;
} }
#endif // AUTO_BED_LEVELING_UBL || ENABLED(AUTO_BED_LEVELING_LINEAR) #endif // NEED_LSF