Browse Source

whitespace

Scott Lahteine 4 years ago
parent
commit
7496e1cd67

+ 1
- 1
Marlin/src/gcode/motion/G2_G3.cpp View File

221
   #endif
221
   #endif
222
 
222
 
223
   apply_motion_limits(raw);
223
   apply_motion_limits(raw);
224
-  
224
+
225
   #if HAS_LEVELING && !PLANNER_LEVELING
225
   #if HAS_LEVELING && !PLANNER_LEVELING
226
     planner.apply_leveling(raw);
226
     planner.apply_leveling(raw);
227
   #endif
227
   #endif

+ 2
- 2
Marlin/src/libs/heatshrink/LICENSE View File

1
 Copyright (c) 2013-2015, Scott Vokes <vokes.s@gmail.com>
1
 Copyright (c) 2013-2015, Scott Vokes <vokes.s@gmail.com>
2
 All rights reserved.
2
 All rights reserved.
3
- 
3
+
4
 Permission to use, copy, modify, and/or distribute this software for any
4
 Permission to use, copy, modify, and/or distribute this software for any
5
 purpose with or without fee is hereby granted, provided that the above
5
 purpose with or without fee is hereby granted, provided that the above
6
 copyright notice and this permission notice appear in all copies.
6
 copyright notice and this permission notice appear in all copies.
7
- 
7
+
8
 THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
8
 THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9
 WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
9
 WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10
 MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
10
 MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

+ 2
- 2
Marlin/src/module/stepper/TMC26X.h View File

32
 
32
 
33
 #include <SPI.h>
33
 #include <SPI.h>
34
 #if defined(STM32GENERIC) && defined(STM32F7)
34
 #if defined(STM32GENERIC) && defined(STM32F7)
35
- #include "../../HAL/HAL_STM32_F4_F7/STM32F7/TMC2660.h"
35
+  #include "../../HAL/HAL_STM32_F4_F7/STM32F7/TMC2660.h"
36
 #else
36
 #else
37
- #include <TMC26XStepper.h>
37
+  #include <TMC26XStepper.h>
38
 #endif
38
 #endif
39
 
39
 
40
 void tmc26x_init_to_defaults();
40
 void tmc26x_init_to_defaults();

+ 1
- 1
Marlin/src/pins/stm32/pins_FYSETC_AIO_II.h View File

37
 
37
 
38
 //
38
 //
39
 // Flash EEPROM Emulation
39
 // Flash EEPROM Emulation
40
-// 
40
+//
41
 #define FLASH_EEPROM_EMULATION
41
 #define FLASH_EEPROM_EMULATION
42
 #define EEPROM_PAGE_SIZE     uint16(0x800) // 2KB
42
 #define EEPROM_PAGE_SIZE     uint16(0x800) // 2KB
43
 #define EEPROM_START_ADDRESS uint32(0x8000000 + 256 * 1024 - 2 * EEPROM_PAGE_SIZE)
43
 #define EEPROM_START_ADDRESS uint32(0x8000000 + 256 * 1024 - 2 * EEPROM_PAGE_SIZE)

+ 2
- 2
config/examples/Malyan/M200/README.md View File

1
 ### Malyan M200 Build Instructions
1
 ### Malyan M200 Build Instructions
2
 
2
 
3
-Malyan M200 series firmware currently builds using the Arduino IDE. These instructions should 
3
+Malyan M200 series firmware currently builds using the Arduino IDE. These instructions should
4
 guide you through the configuration and compilation.
4
 guide you through the configuration and compilation.
5
 
5
 
6
 1. Install the Arduino IDE from your favorite source (arduino.cc, windows store, app store)
6
 1. Install the Arduino IDE from your favorite source (arduino.cc, windows store, app store)
27
   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`.
27
   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`.
28
 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.)
28
 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.)
29
 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.
29
 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.
30
-18. Remove the SD card and delete the `fcupdate.flg` file from the card to prevent an accidental re-flash. 
30
+18. Remove the SD card and delete the `fcupdate.flg` file from the card to prevent an accidental re-flash.
31
 19. Test the endstops and homing directions, run M303 PID autotune, and verify all features are working correctly.
31
 19. Test the endstops and homing directions, run M303 PID autotune, and verify all features are working correctly.
32
 
32
 
33
 Welcome to Marlin 2.x...
33
 Welcome to Marlin 2.x...

Loading…
Cancel
Save