Browse Source

Misc cleanup, whitespace

Scott Lahteine 5 years ago
parent
commit
43d3463d5d

+ 1
- 1
Marlin/src/feature/baricuda.cpp View File

20
  *
20
  *
21
  */
21
  */
22
 
22
 
23
-#include "../inc/MarlinConfig.h"
23
+#include "../inc/MarlinConfigPre.h"
24
 
24
 
25
 #if ENABLED(BARICUDA)
25
 #if ENABLED(BARICUDA)
26
 
26
 

+ 3
- 3
Marlin/src/module/stepper.cpp View File

2460
 
2460
 
2461
   #define BABYSTEP_AXIS(AXIS, INVERT, DIR) {            \
2461
   #define BABYSTEP_AXIS(AXIS, INVERT, DIR) {            \
2462
       const uint8_t old_dir = _READ_DIR(AXIS);          \
2462
       const uint8_t old_dir = _READ_DIR(AXIS);          \
2463
-      _ENABLE_AXIS(AXIS);                                    \
2464
-      DELAY_NS(MINIMUM_STEPPER_PRE_DIR_DELAY);              \
2463
+      _ENABLE_AXIS(AXIS);                               \
2464
+      DELAY_NS(MINIMUM_STEPPER_PRE_DIR_DELAY);          \
2465
       _APPLY_DIR(AXIS, _INVERT_DIR(AXIS)^DIR^INVERT);   \
2465
       _APPLY_DIR(AXIS, _INVERT_DIR(AXIS)^DIR^INVERT);   \
2466
-      DELAY_NS(MINIMUM_STEPPER_POST_DIR_DELAY);              \
2466
+      DELAY_NS(MINIMUM_STEPPER_POST_DIR_DELAY);         \
2467
       _SAVE_START;                                      \
2467
       _SAVE_START;                                      \
2468
       _APPLY_STEP(AXIS)(!_INVERT_STEP_PIN(AXIS), true); \
2468
       _APPLY_STEP(AXIS)(!_INVERT_STEP_PIN(AXIS), true); \
2469
       _PULSE_WAIT;                                      \
2469
       _PULSE_WAIT;                                      \

+ 2
- 3
Marlin/src/module/temperature.cpp View File

2608
 
2608
 
2609
       #if ENABLED(FAN_SOFT_PWM)
2609
       #if ENABLED(FAN_SOFT_PWM)
2610
         #define _FAN_PWM(N) do{ \
2610
         #define _FAN_PWM(N) do{ \
2611
-          uint8_t &spcf = soft_pwm_count_fan[N]; \
2612
-          spcf = (spcf & pwm_mask) + (soft_pwm_amount_fan[N] >> 1); \
2613
-          WRITE_FAN(N, spcf > pwm_mask ? HIGH : LOW); \
2611
+          const uint8_t spcf = (soft_pwm_count_fan[N] & pwm_mask) + (soft_pwm_amount_fan[N] >> 1); \
2612
+          WRITE_FAN(N, (spcf > pwm_mask)); \
2614
         }while(0)
2613
         }while(0)
2615
         #if HAS_FAN0
2614
         #if HAS_FAN0
2616
           _FAN_PWM(0);
2615
           _FAN_PWM(0);

+ 3
- 3
Marlin/src/pins/sam/pins_CNCONTROLS_15D.h View File

52
 // Analog Inputs
52
 // Analog Inputs
53
 //
53
 //
54
 #define TEMP_0_PIN          1
54
 #define TEMP_0_PIN          1
55
-#define TEMP_1_PIN          2  
56
-#define TEMP_BED_PIN        4   
55
+#define TEMP_1_PIN          2
56
+#define TEMP_BED_PIN        4
57
 
57
 
58
 #ifndef TEMP_CHAMBER_PIN
58
 #ifndef TEMP_CHAMBER_PIN
59
-  #define TEMP_CHAMBER_PIN  5   
59
+  #define TEMP_CHAMBER_PIN  5
60
 #endif
60
 #endif
61
 
61
 
62
 //
62
 //

+ 1
- 1
Marlin/src/sd/SdVolume.cpp View File

292
         if (cacheBuffer_.fat32[i] == 0) free++;
292
         if (cacheBuffer_.fat32[i] == 0) free++;
293
     }
293
     }
294
     #ifdef ESP32
294
     #ifdef ESP32
295
-      // Needed to reset the idle task watchdog timer on ESP32 as reading the complete FAT may easily 
295
+      // Needed to reset the idle task watchdog timer on ESP32 as reading the complete FAT may easily
296
       // block for 10+ seconds. yield() is insufficient since it blocks lower prio tasks (e.g., idle).
296
       // block for 10+ seconds. yield() is insufficient since it blocks lower prio tasks (e.g., idle).
297
       static millis_t nextTaskTime = 0;
297
       static millis_t nextTaskTime = 0;
298
       const millis_t ms = millis();
298
       const millis_t ms = millis();

Loading…
Cancel
Save