andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Clean up whitespace

vanilla_fb_2.0.x
Scott Lahteine 4 years ago
parent
5f7a75979f
commit
2c959123e5
44 changed files with 7 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      Marlin/src/HAL/AVR/HAL.cpp
  2. 1
      Marlin/src/HAL/AVR/watchdog.cpp
  3. 1
      Marlin/src/HAL/DUE/DebugMonitor.cpp
  4. 1
      Marlin/src/HAL/DUE/watchdog.cpp
  5. 1
      Marlin/src/HAL/ESP32/HAL.cpp
  6. 1
      Marlin/src/HAL/ESP32/HAL_SPI.cpp
  7. 1
      Marlin/src/HAL/ESP32/eeprom.cpp
  8. 1
      Marlin/src/HAL/ESP32/spiffs.cpp
  9. 1
      Marlin/src/HAL/ESP32/timers.cpp
  10. 1
      Marlin/src/HAL/ESP32/watchdog.cpp
  11. 1
      Marlin/src/HAL/ESP32/web.cpp
  12. 1
      Marlin/src/HAL/ESP32/wifi.cpp
  13. 1
      Marlin/src/HAL/LINUX/HAL.cpp
  14. 1
      Marlin/src/HAL/LINUX/arduino.cpp
  15. 1
      Marlin/src/HAL/LINUX/eeprom.cpp
  16. 1
      Marlin/src/HAL/LINUX/hardware/Clock.cpp
  17. 1
      Marlin/src/HAL/LINUX/hardware/Gpio.cpp
  18. 1
      Marlin/src/HAL/LINUX/hardware/Heater.cpp
  19. 1
      Marlin/src/HAL/LINUX/hardware/IOLoggerCSV.cpp
  20. 1
      Marlin/src/HAL/LINUX/hardware/LinearAxis.cpp
  21. 1
      Marlin/src/HAL/LINUX/hardware/Timer.cpp
  22. 1
      Marlin/src/HAL/LINUX/include/pinmapping.cpp
  23. 1
      Marlin/src/HAL/LINUX/main.cpp
  24. 1
      Marlin/src/HAL/LINUX/timers.cpp
  25. 1
      Marlin/src/HAL/LINUX/watchdog.cpp
  26. 1
      Marlin/src/HAL/LPC1768/DebugMonitor.cpp
  27. 1
      Marlin/src/HAL/LPC1768/HAL.cpp
  28. 1
      Marlin/src/HAL/LPC1768/MarlinSerial.cpp
  29. 1
      Marlin/src/HAL/LPC1768/fast_pwm.cpp
  30. 1
      Marlin/src/HAL/LPC1768/usb_serial.cpp
  31. 1
      Marlin/src/HAL/LPC1768/watchdog.cpp
  32. 1
      Marlin/src/HAL/SAMD51/HAL.cpp
  33. 1
      Marlin/src/HAL/SAMD51/MarlinSerial_AGCM4.cpp
  34. 1
      Marlin/src/HAL/SAMD51/eeprom_flash.cpp
  35. 1
      Marlin/src/HAL/SAMD51/timers.cpp
  36. 1
      Marlin/src/HAL/SAMD51/watchdog.cpp
  37. 1
      Marlin/src/HAL/STM32F1/Servo.cpp
  38. 1
      Marlin/src/HAL/STM32F1/eeprom_wired.cpp
  39. 1
      Marlin/src/HAL/STM32F1/sdio.cpp
  40. 1
      Marlin/src/HAL/TEENSY31_32/watchdog.cpp
  41. 8
      Marlin/src/feature/mmu2/mmu2.cpp
  42. 2
      Marlin/src/feature/tmc_util.h
  43. 4
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/pin_mappings.h
  44. 1
      Marlin/src/module/planner.cpp

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/>.
*
*/
#ifdef __AVR__
#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/>.
*
*/
#ifdef __AVR__
#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/>.
*
*/
#ifdef ARDUINO_ARCH_SAM
#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/>.
*
*/
#ifdef ARDUINO_ARCH_SAM
#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/>.
*
*/
#ifdef ARDUINO_ARCH_ESP32
#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/>.
*
*/
#ifdef ARDUINO_ARCH_ESP32
#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/>.
*
*/
#ifdef ARDUINO_ARCH_ESP32
#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/>.
*
*/
#ifdef ARDUINO_ARCH_ESP32
#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/>.
*
*/
#ifdef ARDUINO_ARCH_ESP32
#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/>.
*
*/
#ifdef ARDUINO_ARCH_ESP32
#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/>.
*
*/
#ifdef ARDUINO_ARCH_ESP32
#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/>.
*
*/
#ifdef ARDUINO_ARCH_ESP32
#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/>.
*
*/
#ifdef __PLAT_LINUX__
#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/>.
*
*/
#ifdef __PLAT_LINUX__
#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/>.
*
*/
#ifdef __PLAT_LINUX__
#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/>.
*
*/
#ifdef __PLAT_LINUX__
#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/>.
*
*/
#ifdef __PLAT_LINUX__
#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/>.
*
*/
#ifdef __PLAT_LINUX__
#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/>.
*
*/
#ifdef __PLAT_LINUX__
#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/>.
*
*/
#ifdef __PLAT_LINUX__
#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/>.
*
*/
#ifdef __PLAT_LINUX__
#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/>.
*
*/
#ifdef __PLAT_LINUX__
#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/>.
*
*/
#ifdef __PLAT_LINUX__
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/>.
*
*/
#ifdef __PLAT_LINUX__
#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/>.
*
*/
#ifdef __PLAT_LINUX__
#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/>.
*
*/
#ifdef TARGET_LPC1768
#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/>.
*
*/
#ifdef TARGET_LPC1768
#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/>.
*
*/
#ifdef TARGET_LPC1768
#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/>.
*
*/
#ifdef TARGET_LPC1768
#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/>.
*
*/
#ifdef TARGET_LPC1768
#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/>.
*
*/
#ifdef TARGET_LPC1768
#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/>.
*
*/
#ifdef __SAMD51__
#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/>.
*
*/
#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/>.
*
*/
#ifdef __SAMD51__
#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/>.
*
*/
#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/>.
*
*/
#ifdef __SAMD51__
#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/>.
*
*/
#ifdef __STM32F1__
#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/>.
*
*/
#ifdef __STM32F1__
#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/>.
*
*/
#ifdef ARDUINO_ARCH_STM32F1
#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/>.
*
*/
#ifdef __MK20DX256__
#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"));
state = 2; // wait for response
}
TERN_(PRUSA_MMU2_S_MODE, check_filament());
break;
@ -672,13 +672,13 @@ void MMU2::filament_runout() {
if (runout && !mmu2s_triggered) {
DEBUG_ECHOLNPGM("MMU <= 'A'");
tx_str_P(PSTR("A\n"));
}
}
mmu2s_triggered = runout;
}
bool MMU2::can_load() {
execute_extruder_sequence((const E_Step *)can_load_sequence, COUNT(can_load_sequence));
int filament_detected_count = 0;
const int steps = MMU2_CAN_LOAD_RETRACT / MMU2_CAN_LOAD_INCREMENT;
DEBUG_ECHOLNPGM("MMU can_load:");
@ -689,7 +689,7 @@ void MMU2::filament_runout() {
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.");
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);
}
inline uint16_t get_microstep_counter() { return TMC::MSCNT(); }
#if HAS_STEALTHCHOP
inline void refresh_stepping_mode() { this->en_pwm_mode(this->stored.stealthChop_enabled); }
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
#ifndef __MARLIN_FIRMWARE__
#error "This pin mapping requires Marlin."
#endif
#endif
#define CLCD_SPI_BUS 2
#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)
void Planner::autotemp_update() {
#if ENABLED(AUTOTEMP_PROPORTIONAL)
const int16_t target = thermalManager.degTargetHotend(active_extruder);
autotemp_min = target + AUTOTEMP_MIN_P;

Write Preview
Loading…
Cancel
Save