ソースを参照

Misc cleanup, whitespace

Scott Lahteine 4年前
コミット
43d3463d5d

+ 1
- 1
Marlin/src/feature/baricuda.cpp ファイルの表示

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

+ 3
- 3
Marlin/src/module/stepper.cpp ファイルの表示

@@ -2460,10 +2460,10 @@ void Stepper::report_positions() {
2460 2460
 
2461 2461
   #define BABYSTEP_AXIS(AXIS, INVERT, DIR) {            \
2462 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 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 2467
       _SAVE_START;                                      \
2468 2468
       _APPLY_STEP(AXIS)(!_INVERT_STEP_PIN(AXIS), true); \
2469 2469
       _PULSE_WAIT;                                      \

+ 2
- 3
Marlin/src/module/temperature.cpp ファイルの表示

@@ -2608,9 +2608,8 @@ void Temperature::tick() {
2608 2608
 
2609 2609
       #if ENABLED(FAN_SOFT_PWM)
2610 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 2613
         }while(0)
2615 2614
         #if HAS_FAN0
2616 2615
           _FAN_PWM(0);

+ 3
- 3
Marlin/src/pins/sam/pins_CNCONTROLS_15D.h ファイルの表示

@@ -52,11 +52,11 @@
52 52
 // Analog Inputs
53 53
 //
54 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 58
 #ifndef TEMP_CHAMBER_PIN
59
-  #define TEMP_CHAMBER_PIN  5   
59
+  #define TEMP_CHAMBER_PIN  5
60 60
 #endif
61 61
 
62 62
 //

+ 1
- 1
Marlin/src/sd/SdVolume.cpp ファイルの表示

@@ -292,7 +292,7 @@ int32_t SdVolume::freeClusterCount() {
292 292
         if (cacheBuffer_.fat32[i] == 0) free++;
293 293
     }
294 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 296
       // block for 10+ seconds. yield() is insufficient since it blocks lower prio tasks (e.g., idle).
297 297
       static millis_t nextTaskTime = 0;
298 298
       const millis_t ms = millis();

読み込み中…
キャンセル
保存