Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/2.0.x' into P3Steel-Testing
Browse files Browse the repository at this point in the history
  • Loading branch information
effgarces committed Jul 25, 2020
2 parents dd57745 + 8b637e4 commit 7648242
Show file tree
Hide file tree
Showing 76 changed files with 91 additions and 92 deletions.
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github: [thinkyhead]
patreon: thinkyhead
custom: ["http://www.thinkyhead.com/donate-to-marlin"]
custom: ["https://www.thinkyhead.com/donate-to-marlin"]
13 changes: 6 additions & 7 deletions .github/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,15 @@ This project and everyone participating in it is governed by the [Marlin Code of
We have a Message Board and a Facebook group where our knowledgable user community can provide helpful advice if you have questions.

* [Marlin RepRap forum](http://forums.reprap.org/list.php?415)
* [Marlin RepRap forum](https://reprap.org/forum/list.php?415)
* [MarlinFirmware on Facebook](https://www.facebook.com/groups/1049718498464482/)

If chat is more your speed, you can join the MarlinFirmware Slack team:
If chat is more your speed, you can join the MarlinFirmware Discord server:

* Join the Marlin Slack Team
* To obtain group access, please [send a request](http://www.thinkyhead.com/contact/9) to @thinkyhead.
* Even though Slack is a chat service, sometimes it takes several hours for community members to respond — please be patient!
* Use the `#general` channel for general questions or discussion about Marlin.
* Other channels exist for certain topics. Check the channel list.
* Use the link https://discord.gg/n5NJ59y to join up as a General User.
* Even though our Discord is pretty active, it may take a while for community members to respond — please be patient!
* Use the `#general` channel for general questions or discussion about Marlin.
* Other channels exist for certain topics or are limited to Patrons. Check the channel list.

## How Can I Contribute?

Expand Down
2 changes: 1 addition & 1 deletion Marlin/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@
//===========================================================================
//============================= PID Settings ================================
//===========================================================================
// PID Tuning Guide here: http://reprap.org/wiki/PID_Tuning
// PID Tuning Guide here: https://reprap.org/wiki/PID_Tuning

// Comment the following line to disable PID and enable bang-bang.
#define PIDTEMP
Expand Down
2 changes: 1 addition & 1 deletion Marlin/Marlin.ino
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Configuration
Getting Help
- http://forums.reprap.org/list.php?415
- https://reprap.org/forum/list.php?415
The Marlin Discussion Forum is a great place to get help from other Marlin
users who may have experienced similar issues to your own.
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/AVR/fastio.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
*
* Now you can simply SET_OUTPUT(PIN); WRITE(PIN, HIGH); WRITE(PIN, LOW);
*
* Why double up on these macros? see http://gcc.gnu.org/onlinedocs/cpp/Stringification.html
* Why double up on these macros? see https://gcc.gnu.org/onlinedocs/cpp/Stringification.html
*/

#define _READ(IO) TEST(DIO ## IO ## _RPORT, DIO ## IO ## _PIN)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/Tone.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

/**
* Description: Tone function for Arduino Due and compatible (SAM3X8E)
* Derived from http://forum.arduino.cc/index.php?topic=136500.msg2903012#msg2903012
* Derived from https://forum.arduino.cc/index.php?topic=136500.msg2903012#msg2903012
*/

#ifdef ARDUINO_ARCH_SAM
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/fastio.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
*
* Now you can simply SET_OUTPUT(STEP); WRITE(STEP, HIGH); WRITE(STEP, LOW);
*
* Why double up on these macros? see http://gcc.gnu.org/onlinedocs/cpp/Stringification.html
* Why double up on these macros? see https://gcc.gnu.org/onlinedocs/cpp/Stringification.html
*/

// Read a pin
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/arduino_due_x.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#pragma once

/**
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/

/**
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/compiler.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
*/
/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/

#ifndef UTILS_COMPILER_H
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/conf_access.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
*/
/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/

#ifndef _CONF_ACCESS_H_
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/conf_clock.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
*/
/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/

#ifndef CONF_CLOCK_H_INCLUDED
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/conf_usb.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
*/
/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/

#ifndef _CONF_USB_H_
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/ctrl_access.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
*
******************************************************************************/
/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/

#ifdef ARDUINO_ARCH_SAM
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/ctrl_access.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
*
******************************************************************************/
/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/


Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/genclk.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
*/
/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/

#ifndef CHIP_GENCLK_H_INCLUDED
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/mrepeat.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
*/
/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/

#ifndef _MREPEAT_H_
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/osc.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
*/
/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/

#ifndef CHIP_OSC_H_INCLUDED
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/pll.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
*/
/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/

#ifndef CHIP_PLL_H_INCLUDED
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/preprocessor.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
*/
/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/

#ifndef _PREPROCESSOR_H_
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/sbc_protocol.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
*
*/
/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/
#ifndef _SBC_PROTOCOL_H_
#define _SBC_PROTOCOL_H_
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/sd_mmc_spi_mem.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
*
******************************************************************************/
/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/


Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/spc_protocol.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
*/

/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/
#ifndef _SPC_PROTOCOL_H_
#define _SPC_PROTOCOL_H_
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/stringz.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
*/
/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/

#ifndef _STRINGZ_H_
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/sysclk.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
*/
/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/

#ifdef ARDUINO_ARCH_SAM
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/sysclk.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
*/
/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/

#ifndef CHIP_SYSCLK_H_INCLUDED
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/tpaste.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
*/
/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/

#ifndef _TPASTE_H_
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/udc.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
*/
/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/

#ifdef ARDUINO_ARCH_SAM
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/udc.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
*/
/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/

#ifndef _UDC_H_
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/udc_desc.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
*/
/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/

#ifndef _UDC_DESC_H_
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/udd.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
*/
/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/

#ifndef _UDD_H_
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/udi.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
*/
/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/

#ifndef _UDI_H_
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/udi_cdc.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
*/
/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/

#ifdef ARDUINO_ARCH_SAM
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/HAL/DUE/usb/udi_cdc.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
*/
/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/

#ifndef _UDI_CDC_H_
Expand Down Expand Up @@ -701,7 +701,7 @@ iram_size_t udi_cdc_multi_write_buf(uint8_t port, const void* buf, iram_size_t s
* another "Composite Device" module, like "USB HID Mouse (Composite Device)".
*
* Also, you can refer to application note
* <A href="http://www.atmel.com/dyn/resources/prod_documents/doc8445.pdf">
* <A href="https://www.atmel.com/dyn/resources/prod_documents/doc8445.pdf">
* AVR4902 ASF - USB Composite Device</A>.
*
* \section udi_cdc_use_case_composite_setup Setup steps
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/udi_cdc_conf.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
*/
/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/

#ifndef _UDI_CDC_CONF_H_
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/udi_cdc_desc.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
*/
/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/

#ifdef ARDUINO_ARCH_SAM
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/udi_composite_desc.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
*/
/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/

#ifdef ARDUINO_ARCH_SAM
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/udi_msc.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
*/
/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/

#ifdef ARDUINO_ARCH_SAM
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/HAL/DUE/usb/udi_msc.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
*/
/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/

#ifndef _UDI_MSC_H_
Expand Down Expand Up @@ -290,7 +290,7 @@ bool udi_msc_trans_block(bool b_read, uint8_t * block, iram_size_t block_size,
* another "Composite Device" module, like "USB HID Mouse (Composite Device)".
*
* Also, you can refer to application note
* <A href="http://www.atmel.com/dyn/resources/prod_documents/doc8445.pdf">
* <A href="https://www.atmel.com/dyn/resources/prod_documents/doc8445.pdf">
* AVR4902 ASF - USB Composite Device</A>.
*
* \section udi_msc_use_case_composite_setup Setup steps
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/uotghs_device_due.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
*/

/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/

#ifdef ARDUINO_ARCH_SAM
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/uotghs_device_due.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
*/
/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/

#ifndef UOTGHS_DEVICE_DUE_H_INCLUDED
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/DUE/usb/uotghs_otg.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*
*/
/*
* Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
* Support and FAQ: visit <a href="https://www.atmel.com/design-support/">Atmel Support</a>
*/

#ifndef UOTGHS_OTG_H_INCLUDED
Expand Down
Loading

0 comments on commit 7648242

Please sign in to comment.