Browse Source

Conditions cleanup

Scott Lahteine 5 years ago
parent
commit
7a5d408bc0

+ 1
- 1
Marlin/src/feature/leds/printer_event_leds.cpp View File

21
  */
21
  */
22
 
22
 
23
 /**
23
 /**
24
- * printer_event_leds.cpp - LED color changing based on printer status
24
+ * feature/leds/printer_event_leds.cpp - LED color changing based on printer status
25
  */
25
  */
26
 
26
 
27
 #include "../../inc/MarlinConfigPre.h"
27
 #include "../../inc/MarlinConfigPre.h"

+ 1
- 1
Marlin/src/feature/leds/printer_event_leds.h View File

22
 #pragma once
22
 #pragma once
23
 
23
 
24
 /**
24
 /**
25
- * printer_event_leds.h - LED color changing based on printer status
25
+ * feature/leds/printer_event_leds.h - LED color changing based on printer status
26
  */
26
  */
27
 
27
 
28
 #include "leds.h"
28
 #include "leds.h"

+ 5
- 0
Marlin/src/inc/Conditionals_adv.h View File

383
 #if ANY(AUTO_BED_LEVELING_UBL, M100_FREE_MEMORY_WATCHER, DEBUG_GCODE_PARSER, TMC_DEBUG, MARLIN_DEV_MODE)
383
 #if ANY(AUTO_BED_LEVELING_UBL, M100_FREE_MEMORY_WATCHER, DEBUG_GCODE_PARSER, TMC_DEBUG, MARLIN_DEV_MODE)
384
   #define NEED_HEX_PRINT 1
384
   #define NEED_HEX_PRINT 1
385
 #endif
385
 #endif
386
+
387
+// Flag whether least_squares_fit.cpp is used
388
+#if ANY(AUTO_BED_LEVELING_UBL, AUTO_BED_LEVELING_LINEAR, Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
389
+  #define NEED_LSF 1
390
+#endif

+ 1
- 1
Marlin/src/inc/Conditionals_post.h View File

1955
 #if PIN_EXISTS(DIGIPOTSS)
1955
 #if PIN_EXISTS(DIGIPOTSS)
1956
   #define HAS_DIGIPOTSS 1
1956
   #define HAS_DIGIPOTSS 1
1957
 #endif
1957
 #endif
1958
-#if  ANY_PIN(MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y, MOTOR_CURRENT_PWM_XY, MOTOR_CURRENT_PWM_Z, MOTOR_CURRENT_PWM_E)
1958
+#if ANY_PIN(MOTOR_CURRENT_PWM_X, MOTOR_CURRENT_PWM_Y, MOTOR_CURRENT_PWM_XY, MOTOR_CURRENT_PWM_Z, MOTOR_CURRENT_PWM_E)
1959
   #define HAS_MOTOR_CURRENT_PWM 1
1959
   #define HAS_MOTOR_CURRENT_PWM 1
1960
 #endif
1960
 #endif
1961
 
1961
 

+ 1
- 1
Marlin/src/lcd/menu/menu_ubl.cpp View File

451
 
451
 
452
     #if IS_KINEMATIC
452
     #if IS_KINEMATIC
453
       // Index of the mesh point upon entry
453
       // Index of the mesh point upon entry
454
-      const uint32_t old_pos_index = grid_index(x_plot, y_plot);
454
+      const int32_t old_pos_index = grid_index(x_plot, y_plot);
455
       // Direction from new (unconstrained) encoder value
455
       // Direction from new (unconstrained) encoder value
456
       const int8_t step_dir = int32_t(ui.encoderPosition) < old_pos_index ? -1 : 1;
456
       const int8_t step_dir = int32_t(ui.encoderPosition) < old_pos_index ? -1 : 1;
457
     #endif
457
     #endif

+ 2
- 2
Marlin/src/libs/least_squares_fit.cpp View File

34
 
34
 
35
 #include "../inc/MarlinConfig.h"
35
 #include "../inc/MarlinConfig.h"
36
 
36
 
37
-#if ANY(AUTO_BED_LEVELING_UBL, AUTO_BED_LEVELING_LINEAR, Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
37
+#if NEED_LSF
38
 
38
 
39
 #include "least_squares_fit.h"
39
 #include "least_squares_fit.h"
40
 
40
 
67
   return 0;
67
   return 0;
68
 }
68
 }
69
 
69
 
70
-#endif // AUTO_BED_LEVELING_UBL || ENABLED(AUTO_BED_LEVELING_LINEAR)
70
+#endif // NEED_LSF

Loading…
Cancel
Save