MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

whitespace

Browse Source
This commit is contained in:
Scott Lahteine 2019-09-04 21:40:40 -05:00
parent 060b360be3
commit 7496e1cd67
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/gcode/motion/G2_G3.cpp
View File

@ -221,7 +221,7 @@ void plan_arc(
#endif #endif
apply_motion_limits(raw); apply_motion_limits(raw);
#if HAS_LEVELING && !PLANNER_LEVELING #if HAS_LEVELING && !PLANNER_LEVELING
planner.apply_leveling(raw); planner.apply_leveling(raw);
#endif #endif

4
Marlin/src/libs/heatshrink/LICENSE
View File

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

4
Marlin/src/module/stepper/TMC26X.h
View File

@ -32,9 +32,9 @@
#include <SPI.h> #include <SPI.h>
#if defined(STM32GENERIC) && defined(STM32F7) #if defined(STM32GENERIC) && defined(STM32F7)
#include "../../HAL/HAL_STM32_F4_F7/STM32F7/TMC2660.h" #include "../../HAL/HAL_STM32_F4_F7/STM32F7/TMC2660.h"
#else #else
#include <TMC26XStepper.h> #include <TMC26XStepper.h>
#endif #endif
void tmc26x_init_to_defaults(); void tmc26x_init_to_defaults();

2
Marlin/src/pins/stm32/pins_FYSETC_AIO_II.h
View File

@ -37,7 +37,7 @@
// //
// Flash EEPROM Emulation // Flash EEPROM Emulation
// //
#define FLASH_EEPROM_EMULATION #define FLASH_EEPROM_EMULATION
#define EEPROM_PAGE_SIZE uint16(0x800) // 2KB #define EEPROM_PAGE_SIZE uint16(0x800) // 2KB
#define EEPROM_START_ADDRESS uint32(0x8000000 + 256 * 1024 - 2 * EEPROM_PAGE_SIZE) #define EEPROM_START_ADDRESS uint32(0x8000000 + 256 * 1024 - 2 * EEPROM_PAGE_SIZE)

4
config/examples/Malyan/M200/README.md
View File

@ -1,6 +1,6 @@
### Malyan M200 Build Instructions ### 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. guide you through the configuration and compilation.
1. Install the Arduino IDE from your favorite source (arduino.cc, windows store, app store) 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`. 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.) 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. 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. 19. Test the endstops and homing directions, run M303 PID autotune, and verify all features are working correctly.
Welcome to Marlin 2.x... Welcome to Marlin 2.x...