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

Misc cleanup, whitespace

Browse source
This commit is contained in:
Scott Lahteine 2020-02-01 03:50:26 -06:00
parent e64b7a3ab2
commit 43d3463d5d
5 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/feature/baricuda.cpp
View file

@ -20,7 +20,7 @@
* *
*/ */
#include "../inc/MarlinConfig.h" #include "../inc/MarlinConfigPre.h"
#if ENABLED(BARICUDA) #if ENABLED(BARICUDA)

6
Marlin/src/module/stepper.cpp
View file

@ -2460,10 +2460,10 @@ void Stepper::report_positions() {
#define BABYSTEP_AXIS(AXIS, INVERT, DIR) { \ #define BABYSTEP_AXIS(AXIS, INVERT, DIR) { \
const uint8_t old_dir = _READ_DIR(AXIS); \ const uint8_t old_dir = _READ_DIR(AXIS); \
_ENABLE_AXIS(AXIS); \ _ENABLE_AXIS(AXIS); \
DELAY_NS(MINIMUM_STEPPER_PRE_DIR_DELAY); \ DELAY_NS(MINIMUM_STEPPER_PRE_DIR_DELAY); \
_APPLY_DIR(AXIS, _INVERT_DIR(AXIS)^DIR^INVERT); \ _APPLY_DIR(AXIS, _INVERT_DIR(AXIS)^DIR^INVERT); \
DELAY_NS(MINIMUM_STEPPER_POST_DIR_DELAY); \ DELAY_NS(MINIMUM_STEPPER_POST_DIR_DELAY); \
_SAVE_START; \ _SAVE_START; \
_APPLY_STEP(AXIS)(!_INVERT_STEP_PIN(AXIS), true); \ _APPLY_STEP(AXIS)(!_INVERT_STEP_PIN(AXIS), true); \
_PULSE_WAIT; \ _PULSE_WAIT; \

5
Marlin/src/module/temperature.cpp
View file

@ -2608,9 +2608,8 @@ void Temperature::tick() {
#if ENABLED(FAN_SOFT_PWM) #if ENABLED(FAN_SOFT_PWM)
#define _FAN_PWM(N) do{ \ #define _FAN_PWM(N) do{ \
uint8_t &spcf = soft_pwm_count_fan[N]; \ const uint8_t spcf = (soft_pwm_count_fan[N] & pwm_mask) + (soft_pwm_amount_fan[N] >> 1); \
spcf = (spcf & pwm_mask) + (soft_pwm_amount_fan[N] >> 1); \ WRITE_FAN(N, (spcf > pwm_mask)); \
WRITE_FAN(N, spcf > pwm_mask ? HIGH : LOW); \
}while(0) }while(0)
#if HAS_FAN0 #if HAS_FAN0
_FAN_PWM(0); _FAN_PWM(0);

6
Marlin/src/pins/sam/pins_CNCONTROLS_15D.h
View file

@ -52,11 +52,11 @@
// Analog Inputs // Analog Inputs
// //
#define TEMP_0_PIN 1 #define TEMP_0_PIN 1
#define TEMP_1_PIN 2 #define TEMP_1_PIN 2
#define TEMP_BED_PIN 4 #define TEMP_BED_PIN 4
#ifndef TEMP_CHAMBER_PIN #ifndef TEMP_CHAMBER_PIN
#define TEMP_CHAMBER_PIN 5 #define TEMP_CHAMBER_PIN 5
#endif #endif
// //

2
Marlin/src/sd/SdVolume.cpp
View file

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