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

Clean up whitespace

Browse source
This commit is contained in:
Scott Lahteine 2020-04-28 04:31:59 -05:00
parent 5f7a75979f
commit 2c959123e5
44 changed files with 7 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Marlin/src/HAL/AVR/HAL.cpp
View file

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef __AVR__ #ifdef __AVR__
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"

1
Marlin/src/HAL/AVR/watchdog.cpp
View file

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef __AVR__ #ifdef __AVR__
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"

1
Marlin/src/HAL/DUE/DebugMonitor.cpp
View file

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef ARDUINO_ARCH_SAM #ifdef ARDUINO_ARCH_SAM
#include "../../core/macros.h" #include "../../core/macros.h"

1
Marlin/src/HAL/DUE/watchdog.cpp
View file

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef ARDUINO_ARCH_SAM #ifdef ARDUINO_ARCH_SAM
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"

1
Marlin/src/HAL/ESP32/HAL.cpp
View file

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP32
#include "HAL.h" #include "HAL.h"

1
Marlin/src/HAL/ESP32/HAL_SPI.cpp
View file

@ -20,7 +20,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP32
#include "HAL.h" #include "HAL.h"

1
Marlin/src/HAL/ESP32/eeprom.cpp
View file

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP32
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"

1
Marlin/src/HAL/ESP32/spiffs.cpp
View file

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP32
#include "../../inc/MarlinConfigPre.h" #include "../../inc/MarlinConfigPre.h"

1
Marlin/src/HAL/ESP32/timers.cpp
View file

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP32
#include <stdio.h> #include <stdio.h>

1
Marlin/src/HAL/ESP32/watchdog.cpp
View file

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP32
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"

1
Marlin/src/HAL/ESP32/web.cpp
View file

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP32
#include "../../inc/MarlinConfigPre.h" #include "../../inc/MarlinConfigPre.h"

1
Marlin/src/HAL/ESP32/wifi.cpp
View file

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP32
#include "../../core/serial.h" #include "../../core/serial.h"

1
Marlin/src/HAL/LINUX/HAL.cpp
View file

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef __PLAT_LINUX__ #ifdef __PLAT_LINUX__
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"

1
Marlin/src/HAL/LINUX/arduino.cpp
View file

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef __PLAT_LINUX__ #ifdef __PLAT_LINUX__
#include <iostream> #include <iostream>

1
Marlin/src/HAL/LINUX/eeprom.cpp
View file

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef __PLAT_LINUX__ #ifdef __PLAT_LINUX__
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"

1
Marlin/src/HAL/LINUX/hardware/Clock.cpp
View file

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef __PLAT_LINUX__ #ifdef __PLAT_LINUX__
#include "../../../inc/MarlinConfig.h" #include "../../../inc/MarlinConfig.h"

1
Marlin/src/HAL/LINUX/hardware/Gpio.cpp
View file

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef __PLAT_LINUX__ #ifdef __PLAT_LINUX__
#include "Gpio.h" #include "Gpio.h"

1
Marlin/src/HAL/LINUX/hardware/Heater.cpp
View file

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef __PLAT_LINUX__ #ifdef __PLAT_LINUX__
#include "Clock.h" #include "Clock.h"

1
Marlin/src/HAL/LINUX/hardware/IOLoggerCSV.cpp
View file

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef __PLAT_LINUX__ #ifdef __PLAT_LINUX__
#include "IOLoggerCSV.h" #include "IOLoggerCSV.h"

1
Marlin/src/HAL/LINUX/hardware/LinearAxis.cpp
View file

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef __PLAT_LINUX__ #ifdef __PLAT_LINUX__
#include <random> #include <random>

1
Marlin/src/HAL/LINUX/hardware/Timer.cpp
View file

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef __PLAT_LINUX__ #ifdef __PLAT_LINUX__
#include "Timer.h" #include "Timer.h"

1
Marlin/src/HAL/LINUX/include/pinmapping.cpp
View file

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef __PLAT_LINUX__ #ifdef __PLAT_LINUX__
#include <pinmapping.h> #include <pinmapping.h>

1
Marlin/src/HAL/LINUX/main.cpp
View file

@ -17,7 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef __PLAT_LINUX__ #ifdef __PLAT_LINUX__
extern void setup(); extern void setup();

1
Marlin/src/HAL/LINUX/timers.cpp
View file

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef __PLAT_LINUX__ #ifdef __PLAT_LINUX__
#include "hardware/Timer.h" #include "hardware/Timer.h"

1
Marlin/src/HAL/LINUX/watchdog.cpp
View file

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef __PLAT_LINUX__ #ifdef __PLAT_LINUX__
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"

1
Marlin/src/HAL/LPC1768/DebugMonitor.cpp
View file

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef TARGET_LPC1768 #ifdef TARGET_LPC1768
#include "../../core/macros.h" #include "../../core/macros.h"

1
Marlin/src/HAL/LPC1768/HAL.cpp
View file

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef TARGET_LPC1768 #ifdef TARGET_LPC1768
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"

1
Marlin/src/HAL/LPC1768/MarlinSerial.cpp
View file

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef TARGET_LPC1768 #ifdef TARGET_LPC1768
#include "../../inc/MarlinConfigPre.h" #include "../../inc/MarlinConfigPre.h"

1
Marlin/src/HAL/LPC1768/fast_pwm.cpp
View file

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef TARGET_LPC1768 #ifdef TARGET_LPC1768
#include "../../inc/MarlinConfigPre.h" #include "../../inc/MarlinConfigPre.h"

1
Marlin/src/HAL/LPC1768/usb_serial.cpp
View file

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef TARGET_LPC1768 #ifdef TARGET_LPC1768
#include "../../inc/MarlinConfigPre.h" #include "../../inc/MarlinConfigPre.h"

1
Marlin/src/HAL/LPC1768/watchdog.cpp
View file

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef TARGET_LPC1768 #ifdef TARGET_LPC1768
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"

1
Marlin/src/HAL/SAMD51/HAL.cpp
View file

@ -18,7 +18,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef __SAMD51__ #ifdef __SAMD51__
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"

1
Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.cpp
View file

@ -18,7 +18,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef ADAFRUIT_GRAND_CENTRAL_M4 #ifdef ADAFRUIT_GRAND_CENTRAL_M4
/** /**

1
Marlin/src/HAL/SAMD51/eeprom_flash.cpp
View file

@ -18,7 +18,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef __SAMD51__ #ifdef __SAMD51__
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"

1
Marlin/src/HAL/SAMD51/timers.cpp
View file

@ -18,7 +18,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef __SAMD51__ #ifdef __SAMD51__
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------

1
Marlin/src/HAL/SAMD51/watchdog.cpp
View file

@ -18,7 +18,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef __SAMD51__ #ifdef __SAMD51__
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"

1
Marlin/src/HAL/STM32F1/Servo.cpp
View file

@ -20,7 +20,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef __STM32F1__ #ifdef __STM32F1__
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"

1
Marlin/src/HAL/STM32F1/eeprom_wired.cpp
View file

@ -17,7 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef __STM32F1__ #ifdef __STM32F1__
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"

1
Marlin/src/HAL/STM32F1/sdio.cpp
View file

@ -20,7 +20,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef ARDUINO_ARCH_STM32F1 #ifdef ARDUINO_ARCH_STM32F1
#include <libmaple/stm32.h> #include <libmaple/stm32.h>

1
Marlin/src/HAL/TEENSY31_32/watchdog.cpp
View file

@ -19,7 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
*/ */
#ifdef __MK20DX256__ #ifdef __MK20DX256__
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"

8
Marlin/src/feature/mmu2/mmu2.cpp
View file

@ -301,7 +301,7 @@ void MMU2::mmu_loop() {
tx_str_P(PSTR("P0\n")); tx_str_P(PSTR("P0\n"));
state = 2; // wait for response state = 2; // wait for response
} }
TERN_(PRUSA_MMU2_S_MODE, check_filament()); TERN_(PRUSA_MMU2_S_MODE, check_filament());
break; break;
@ -672,13 +672,13 @@ void MMU2::filament_runout() {
if (runout && !mmu2s_triggered) { if (runout && !mmu2s_triggered) {
DEBUG_ECHOLNPGM("MMU <= 'A'"); DEBUG_ECHOLNPGM("MMU <= 'A'");
tx_str_P(PSTR("A\n")); tx_str_P(PSTR("A\n"));
} }
mmu2s_triggered = runout; mmu2s_triggered = runout;
} }
bool MMU2::can_load() { bool MMU2::can_load() {
execute_extruder_sequence((const E_Step *)can_load_sequence, COUNT(can_load_sequence)); execute_extruder_sequence((const E_Step *)can_load_sequence, COUNT(can_load_sequence));
int filament_detected_count = 0; int filament_detected_count = 0;
const int steps = MMU2_CAN_LOAD_RETRACT / MMU2_CAN_LOAD_INCREMENT; const int steps = MMU2_CAN_LOAD_RETRACT / MMU2_CAN_LOAD_INCREMENT;
DEBUG_ECHOLNPGM("MMU can_load:"); DEBUG_ECHOLNPGM("MMU can_load:");
@ -689,7 +689,7 @@ void MMU2::filament_runout() {
if (mmu2s_triggered) ++filament_detected_count; if (mmu2s_triggered) ++filament_detected_count;
} }
if (filament_detected_count <= steps - (MMU2_CAN_LOAD_DEVIATION / MMU2_CAN_LOAD_INCREMENT)) { if (filament_detected_count <= steps - (MMU2_CAN_LOAD_DEVIATION / MMU2_CAN_LOAD_INCREMENT)) {
DEBUG_ECHOLNPGM(" failed."); DEBUG_ECHOLNPGM(" failed.");
return false; return false;
} }

2
Marlin/src/feature/tmc_util.h
View file

@ -100,7 +100,7 @@ class TMCMarlin : public TMC, public TMCStorage<AXIS_LETTER, DRIVER_ID> {
TMC::rms_current(mA, mult); TMC::rms_current(mA, mult);
} }
inline uint16_t get_microstep_counter() { return TMC::MSCNT(); } inline uint16_t get_microstep_counter() { return TMC::MSCNT(); }
#if HAS_STEALTHCHOP #if HAS_STEALTHCHOP
inline void refresh_stepping_mode() { this->en_pwm_mode(this->stored.stealthChop_enabled); } inline void refresh_stepping_mode() { this->en_pwm_mode(this->stored.stealthChop_enabled); }
inline bool get_stealthChop_status() { return this->en_pwm_mode(); } inline bool get_stealthChop_status() { return this->en_pwm_mode(); }

4
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h
View file

@ -30,8 +30,8 @@
#ifdef CHEETAH_TFT_PINMAP #ifdef CHEETAH_TFT_PINMAP
#ifndef __MARLIN_FIRMWARE__ #ifndef __MARLIN_FIRMWARE__
#error "This pin mapping requires Marlin." #error "This pin mapping requires Marlin."
#endif #endif
#define CLCD_SPI_BUS 2 #define CLCD_SPI_BUS 2
#define CLCD_MOD_RESET PC9 #define CLCD_MOD_RESET PC9

1
Marlin/src/module/planner.cpp
View file

@ -2862,7 +2862,6 @@ void Planner::set_max_jerk(const AxisEnum axis, float targetValue) {
#if ENABLED(AUTOTEMP) #if ENABLED(AUTOTEMP)
void Planner::autotemp_update() { void Planner::autotemp_update() {
#if ENABLED(AUTOTEMP_PROPORTIONAL) #if ENABLED(AUTOTEMP_PROPORTIONAL)
const int16_t target = thermalManager.degTargetHotend(active_extruder); const int16_t target = thermalManager.degTargetHotend(active_extruder);
autotemp_min = target + AUTOTEMP_MIN_P; autotemp_min = target + AUTOTEMP_MIN_P;