Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007

Copyright (c) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Copyright (c) 2007 Free Software Foundation, Inc. <https://www.fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.

Expand Down Expand Up @@ -673,5 +673,4 @@ into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<https://www.gnu.org/philosophy/why-not-lgpl.html>.

<https://www.gnu.org/licenses/why-not-lgpl.html>.
1 change: 1 addition & 0 deletions Marlin/src/HAL/DUE/HAL.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/

/**
Expand Down
1 change: 1 addition & 0 deletions Marlin/src/HAL/ESP32/ota.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/

#ifdef ARDUINO_ARCH_ESP32
Expand Down
10 changes: 5 additions & 5 deletions Marlin/src/HAL/STM32/SoftwareSerial.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
*
* Multi-instance software serial library for Arduino/Wiring
* -- Interrupt-driven receive and other improvements by ladyada
* (https://ladyada.net)
* <https://ladyada.net>
* -- Tuning, circular buffer, derivation from class Print/Stream,
* multi-instance support, porting to 8MHz processors,
* various optimizations, PROGMEM delay tables, inverse logic and
* direct port writing by Mikal Hart (http://www.arduiniana.org)
* -- Pin change interrupt macros by Paul Stoffregen (https://www.pjrc.com)
* -- 20MHz processor support by Garrett Mace (http://www.macetech.com)
* -- ATmega1280/2560 support by Brett Hagman (https://www.roguerobotics.com/)
* direct port writing by Mikal Hart <http://www.arduiniana.org>
* -- Pin change interrupt macros by Paul Stoffregen <https://www.pjrc.com>
* -- 20MHz processor support by Garrett Mace <http://www.macetech.com>
* -- ATmega1280/2560 support by Brett Hagman <https://www.roguerobotics.com>
* -- STM32 support by Armin van der Togt
*
* This library is free software; you can redistribute it and/or
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/shared/backtrace/unwarmbytab.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
* file, You can obtain one at https://www.mozilla.org/en-US/MPL/2.0/
*
* This library was modified, some bugs fixed, stack address validated
* and adapted to be used in Marlin 3D printer firmware as backtracer
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/core/serial.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ void print_bin(uint16_t val) {
extern const char SP_X_STR[], SP_Y_STR[], SP_Z_STR[];

void print_xyz(const float &x, const float &y, const float &z, PGM_P const prefix/*=nullptr*/, PGM_P const suffix/*=nullptr*/) {
serialprintPGM(prefix);
if (prefix) serialprintPGM(prefix);
SERIAL_ECHOPAIR_P(SP_X_STR, x, SP_Y_STR, y, SP_Z_STR, z);
if (suffix) serialprintPGM(suffix); else SERIAL_EOL();
}
2 changes: 1 addition & 1 deletion Marlin/src/feature/dac/dac_mcp4728.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* https://ww1.microchip.com/downloads/en/DeviceDoc/22187a.pdf
*
* For discussion and feedback, please go to:
* https://arduino.cc/forum/index.php/topic,51842.0.html
* https://forum.arduino.cc/index.php/topic,51842.0.html
*/

#include "../../inc/MarlinConfig.h"
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/motion/G5.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

/**
* Parameters interpreted according to:
* https://linuxcnc.org/docs/2.6/html/gcode/gcode.html#sec:G5-Cubic-Spline
* https://linuxcnc.org/docs/2.7/html/gcode/g-code.html#gcode:g5
* However I, J omission is not supported at this point; all
* parameters can be omitted and default to zero.
*/
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/inc/SanityCheck.h
Original file line number Diff line number Diff line change
Expand Up @@ -3047,8 +3047,8 @@ static_assert( _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
/**
* Sanity check for WIFI
*/
#if ENABLED(ESP3D_WIFISUPPORT) && DISABLED(ARDUINO_ARCH_ESP32)
#error "ESP3D_WIFISUPPORT requires an ESP32 controller. Use WIFISUPPORT for standalone ESP3D modules."
#if EITHER(ESP3D_WIFISUPPORT, WIFISUPPORT) && DISABLED(ARDUINO_ARCH_ESP32)
#error "ESP3D_WIFISUPPORT or WIFISUPPORT requires an ESP32 controller."
#endif

// Misc. Cleanup
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/inc/Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
* version was tagged.
*/
#ifndef STRING_DISTRIBUTION_DATE
#define STRING_DISTRIBUTION_DATE "2020-07-27"
#define STRING_DISTRIBUTION_DATE "2020-07-28"
#endif

/**
Expand Down
14 changes: 6 additions & 8 deletions Marlin/src/module/delta.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -242,11 +242,9 @@ void home_delta() {

// Disable stealthChop if used. Enable diag1 pin on driver.
#if ENABLED(SENSORLESS_HOMING)
sensorless_t stealth_states {
tmc_enable_stallguard(stepperX),
tmc_enable_stallguard(stepperY),
tmc_enable_stallguard(stepperZ)
};
TERN_(X_SENSORLESS, sensorless_t stealth_states_x = start_sensorless_homing_per_axis(X_AXIS));
TERN_(Y_SENSORLESS, sensorless_t stealth_states_y = start_sensorless_homing_per_axis(Y_AXIS));
TERN_(Z_SENSORLESS, sensorless_t stealth_states_z = start_sensorless_homing_per_axis(Z_AXIS));
#endif

// Move all carriages together linearly until an endstop is hit.
Expand All @@ -256,9 +254,9 @@ void home_delta() {

// Re-enable stealthChop if used. Disable diag1 pin on driver.
#if ENABLED(SENSORLESS_HOMING)
tmc_disable_stallguard(stepperX, stealth_states.x);
tmc_disable_stallguard(stepperY, stealth_states.y);
tmc_disable_stallguard(stepperZ, stealth_states.z);
TERN_(X_SENSORLESS, end_sensorless_homing_per_axis(X_AXIS, stealth_states_x));
TERN_(Y_SENSORLESS, end_sensorless_homing_per_axis(Y_AXIS, stealth_states_y));
TERN_(Z_SENSORLESS, end_sensorless_homing_per_axis(Z_AXIS, stealth_states_z));
#endif

endstops.validate_homing_move();
Expand Down
6 changes: 6 additions & 0 deletions Marlin/src/module/motion.h
Original file line number Diff line number Diff line change
Expand Up @@ -395,3 +395,9 @@ void homeaxis(const AxisEnum axis);
#if HAS_M206_COMMAND
void set_home_offset(const AxisEnum axis, const float v);
#endif

#if USE_SENSORLESS
struct sensorless_t;
sensorless_t start_sensorless_homing_per_axis(const AxisEnum axis);
void end_sensorless_homing_per_axis(const AxisEnum axis, sensorless_t enable_stealth);
#endif
16 changes: 8 additions & 8 deletions buildroot/share/vscode/avrdude.conf
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,9 @@
# VCC pins are not defined for the programmer, a message
# indicating that the device needs a power-cycle is printed out.
# This flag was added to work around a problem with the
# at90s4433/2333's; see the at90s4433 errata at:
# at90s4433/2333's; see the at90s4433 errata page 2 at:
#
# http://www.atmel.com/atmel/acrobat/doc1280.pdf
# https://ww1.microchip.com/downloads/en/AppNotes/doc2574.pdf
#
# INSTRUCTION FORMATS
#
Expand Down Expand Up @@ -416,13 +416,13 @@ programmer

programmer
id = "usbasp";
desc = "USBasp, http://www.fischl.de/usbasp/";
desc = "USBasp, https://www.fischl.de/usbasp/";
type = usbasp;
;

programmer
id = "usbtiny";
desc = "USBtiny simple USB programmer, http://www.ladyada.net/make/usbtinyisp/";
desc = "USBtiny simple USB programmer, https://learn.adafruit.com/usbtinyisp";
type = usbtiny;
;

Expand Down Expand Up @@ -596,7 +596,7 @@ programmer

programmer
id = "bsd";
desc = "Brian Dean's Programmer, http://www.bsdhome.com/avrdude/";
desc = "Brian Dean's Programmer, https://savannah.nongnu.org/projects/avrdude";
type = par;
vcc = 2, 3, 4, 5;
reset = 7;
Expand Down Expand Up @@ -743,7 +743,7 @@ programmer

programmer
id = "atisp";
desc = "AT-ISP V1.1 programming cable for AVR-SDK1 from <http://micro-research.co.th/> micro-research.co.th";
desc = "AT-ISP V1.1 programming cable for AVR-SDK1 from <https://www.micro-research.co.th/> micro-research.co.th";
type = par;
reset = ~6;
sck = ~8;
Expand Down Expand Up @@ -773,7 +773,7 @@ programmer
;

# It is almost same as pony-stk200, except vcc on pin 5 to auto
# disconnect port (download on http://electropol.free.fr)
# disconnect port download on http://www.electropol.fr
programmer
id = "frank-stk200";
desc = "Frank STK200";
Expand All @@ -787,7 +787,7 @@ programmer
;

# The AT98ISP Cable is a simple parallel dongle for AT89 family.
# http://www.atmel.com/dyn/products/tools_card.asp?tool_id=2877
# https://www.microchip.com/wwwAppNotes/AppNotes.aspx?appnote=en592141
programmer
id = "89isp";
desc = "Atmel at89isp cable";
Expand Down
16 changes: 8 additions & 8 deletions buildroot/share/vscode/avrdude_linux.conf
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,9 @@
# VCC pins are not defined for the programmer, a message
# indicating that the device needs a power-cycle is printed out.
# This flag was added to work around a problem with the
# at90s4433/2333's; see the at90s4433 errata at:
# at90s4433/2333's; see the at90s4433 errata page 2 at:
#
# http://www.atmel.com/atmel/acrobat/doc1280.pdf
# https://ww1.microchip.com/downloads/en/AppNotes/doc2574.pdf
#
# INSTRUCTION FORMATS
#
Expand Down Expand Up @@ -416,13 +416,13 @@ programmer

programmer
id = "usbasp";
desc = "USBasp, http://www.fischl.de/usbasp/";
desc = "USBasp, https://www.fischl.de/usbasp/";
type = usbasp;
;

programmer
id = "usbtiny";
desc = "USBtiny simple USB programmer, http://www.ladyada.net/make/usbtinyisp/";
desc = "USBtiny simple USB programmer, https://learn.adafruit.com/usbtinyisp";
type = usbtiny;
;

Expand Down Expand Up @@ -596,7 +596,7 @@ programmer

programmer
id = "bsd";
desc = "Brian Dean's Programmer, http://www.bsdhome.com/avrdude/";
desc = "Brian Dean's Programmer, https://savannah.nongnu.org/projects/avrdude";
type = par;
vcc = 2, 3, 4, 5;
reset = 7;
Expand Down Expand Up @@ -743,7 +743,7 @@ programmer

programmer
id = "atisp";
desc = "AT-ISP V1.1 programming cable for AVR-SDK1 from <http://micro-research.co.th/> micro-research.co.th";
desc = "AT-ISP V1.1 programming cable for AVR-SDK1 from <https://www.micro-research.co.th/> micro-research.co.th";
type = par;
reset = ~6;
sck = ~8;
Expand Down Expand Up @@ -773,7 +773,7 @@ programmer
;

# It is almost same as pony-stk200, except vcc on pin 5 to auto
# disconnect port (download on http://electropol.free.fr)
# disconnect port download on http://www.electropol.fr
programmer
id = "frank-stk200";
desc = "Frank STK200";
Expand All @@ -787,7 +787,7 @@ programmer
;

# The AT98ISP Cable is a simple parallel dongle for AT89 family.
# http://www.atmel.com/dyn/products/tools_card.asp?tool_id=2877
# https://www.microchip.com/wwwAppNotes/AppNotes.aspx?appnote=en592141
programmer
id = "89isp";
desc = "Atmel at89isp cable";
Expand Down
8 changes: 4 additions & 4 deletions buildroot/share/vscode/avrdude_macOS.conf
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,9 @@
# VCC pins are not defined for the programmer, a message
# indicating that the device needs a power-cycle is printed out.
# This flag was added to work around a problem with the
# at90s4433/2333's; see the at90s4433 errata at:
# at90s4433/2333's; see the at90s4433 errata page 2 at:
#
# http://www.atmel.com/atmel/acrobat/doc1280.pdf
# https://ww1.microchip.com/downloads/en/AppNotes/doc2574.pdf
#
# INSTRUCTION FORMATS
#
Expand Down Expand Up @@ -416,13 +416,13 @@ programmer

programmer
id = "usbasp";
desc = "USBasp, http://www.fischl.de/usbasp/";
desc = "USBasp, https://www.fischl.de/usbasp/";
type = usbasp;
;

programmer
id = "usbtiny";
desc = "USBtiny simple USB programmer, http://www.ladyada.net/make/usbtinyisp/";
desc = "USBtiny simple USB programmer, https://learn.adafruit.com/usbtinyisp";
type = usbtiny;
;

Expand Down
4 changes: 2 additions & 2 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# For detailed documentation with EXAMPLES:
#
# https://docs.platformio.org/en/latest/projectconf.html
# https://docs.platformio.org/en/latest/projectconf/index.html
#

# Automatic targets - enable auto-uploading
Expand Down Expand Up @@ -380,7 +380,7 @@ src_filter = ${common.default_src_filter} +<src/HAL/STM32>
platform = ${common_stm32.platform}
build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py
${common.build_flags} -std=gnu++14 -DHAVE_SW_SERIAL
build_unflags = -std=gnu11
build_unflags = -std=gnu11 -std=gnu++11
src_filter = ${common.default_src_filter} +<src/HAL/STM32F1>
lib_ignore = SPI
lib_deps = ${common.lib_deps}
Expand Down