From 7496e1cd6745fe72fc6c12e0792575bb7ffefad4 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 4 Sep 2019 21:40:40 -0500 Subject: [PATCH] whitespace --- Marlin/src/gcode/motion/G2_G3.cpp | 2 +- Marlin/src/libs/heatshrink/LICENSE | 4 ++-- Marlin/src/module/stepper/TMC26X.h | 4 ++-- Marlin/src/pins/stm32/pins_FYSETC_AIO_II.h | 2 +- config/examples/Malyan/M200/README.md | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Marlin/src/gcode/motion/G2_G3.cpp b/Marlin/src/gcode/motion/G2_G3.cpp index 700ab82119..9f85d65d5e 100644 --- a/Marlin/src/gcode/motion/G2_G3.cpp +++ b/Marlin/src/gcode/motion/G2_G3.cpp @@ -221,7 +221,7 @@ void plan_arc( #endif apply_motion_limits(raw); - + #if HAS_LEVELING && !PLANNER_LEVELING planner.apply_leveling(raw); #endif diff --git a/Marlin/src/libs/heatshrink/LICENSE b/Marlin/src/libs/heatshrink/LICENSE index 6b6963415e..a40fc72b91 100644 --- a/Marlin/src/libs/heatshrink/LICENSE +++ b/Marlin/src/libs/heatshrink/LICENSE @@ -1,10 +1,10 @@ Copyright (c) 2013-2015, Scott Vokes All rights reserved. - + Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. - + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR diff --git a/Marlin/src/module/stepper/TMC26X.h b/Marlin/src/module/stepper/TMC26X.h index d195a50c03..a1c2704823 100644 --- a/Marlin/src/module/stepper/TMC26X.h +++ b/Marlin/src/module/stepper/TMC26X.h @@ -32,9 +32,9 @@ #include #if defined(STM32GENERIC) && defined(STM32F7) - #include "../../HAL/HAL_STM32_F4_F7/STM32F7/TMC2660.h" + #include "../../HAL/HAL_STM32_F4_F7/STM32F7/TMC2660.h" #else - #include + #include #endif void tmc26x_init_to_defaults(); diff --git a/Marlin/src/pins/stm32/pins_FYSETC_AIO_II.h b/Marlin/src/pins/stm32/pins_FYSETC_AIO_II.h index 51372398da..d55bdcc150 100644 --- a/Marlin/src/pins/stm32/pins_FYSETC_AIO_II.h +++ b/Marlin/src/pins/stm32/pins_FYSETC_AIO_II.h @@ -37,7 +37,7 @@ // // Flash EEPROM Emulation -// +// #define FLASH_EEPROM_EMULATION #define EEPROM_PAGE_SIZE uint16(0x800) // 2KB #define EEPROM_START_ADDRESS uint32(0x8000000 + 256 * 1024 - 2 * EEPROM_PAGE_SIZE) diff --git a/config/examples/Malyan/M200/README.md b/config/examples/Malyan/M200/README.md index 84490786e1..8129650dc7 100644 --- a/config/examples/Malyan/M200/README.md +++ b/config/examples/Malyan/M200/README.md @@ -1,6 +1,6 @@ ### Malyan M200 Build Instructions -Malyan M200 series firmware currently builds using the Arduino IDE. These instructions should +Malyan M200 series firmware currently builds using the Arduino IDE. These instructions should guide you through the configuration and compilation. 1. Install the Arduino IDE from your favorite source (arduino.cc, windows store, app store) @@ -27,7 +27,7 @@ guide you through the configuration and compilation. The file `Marlin.ino.bin` is your firmware binary. M200 (v1-3) and M300 printers require flashing via SD card. Use the SD card that came with the printer if possible. The bootloader is very picky about SD cards. Copy `Marlin.ino.bin` to your SD card under three names: `firmware.bin`, `update.bin`, and `fcupdate.flg`. 16. Insert the SD card into your printer. Make sure the X and Y axes are centered in the middle of the bed. (When X and Y endstops are closed this signals a UI upgrade to the bootloader.) 17. Power-cycle the printer. The first flash may take longer. Don't be surprised if the .99 version number doesn't show up until after the UI has launched the default screen. -18. Remove the SD card and delete the `fcupdate.flg` file from the card to prevent an accidental re-flash. +18. Remove the SD card and delete the `fcupdate.flg` file from the card to prevent an accidental re-flash. 19. Test the endstops and homing directions, run M303 PID autotune, and verify all features are working correctly. Welcome to Marlin 2.x...