Merge remote-tracking branch 'MarlinFirmware/bugfix-2.0.x' into bugfi…

…x-2.0.x

# Conflicts:
#	Marlin/Configuration.h
#	README.md

.circleci/config.yml

@@ -54,10 +54,9 @@ jobs:
             generate_version ./Marlin/src/inc
             cat ./Marlin/src/inc/_Version.h
             #
-            # Backup pins_RAMPS.h
-            #
-            cp Marlin/src/pins/pins_RAMPS.h Marlin/src/pins/pins_RAMPS.h.backup
+            # Back up pins_RAMPS.h
             #
+            backup_ramps
 
             env_backup
 
@@ -241,14 +240,14 @@ jobs:
             build_marlin_pio ./ ${TEST_PLATFORM}
             restore_configs
             echo testing STM32F1 targets...
-            export TEST_PLATFORM="-e STM32F1"
+            export TEST_PLATFORM="-e STM32F103R"
             restore_configs
-            echo use_example_configs STM32F10
-            use_example_configs STM32F10
+            echo use_example_configs STM32/STM32F103R
+            use_example_configs STM32/STM32F103R
             build_marlin_pio ./ ${TEST_PLATFORM}
             restore_configs
-            echo use_example_configs stm32f103ret6
-            use_example_configs stm32f103ret6
+            echo use_example_configs STM32/stm32f103ret6
+            use_example_configs STM32/stm32f103ret6
             build_marlin_pio ./ ${TEST_PLATFORM}
             restore_configs
 

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: http://www.thinkyhead.com/donate-to-marlin

.github/issue_template.md

@@ -1,8 +1,8 @@
 <!--
 
-Have you read Marlin's Code of Conduct? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/MarlinFirmware/Marlin/blob/master/.github/code_of_conduct.md
+Have you read Marlin's Code of Conduct? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/MarlinFirmware/Marlin/blob/bugfix-2.0.x/.github/code_of_conduct.md
 
-Do you want to ask a question? Are you looking for support? Please don't post here. Instead please use the Marlin Firmware forum at http://forums.reprap.org/list.php?415 or the Marlin Facebook Group https://www.facebook.com/groups/1049718498464482/.
+Do you want to ask a question? Are you looking for support? Please don't post here. Instead please use the Marlin Firmware forum at http://forums.reprap.org/list.php?415 or the Marlin Facebook Group https://www.facebook.com/groups/1049718498464482/ or the Marlin Discord Server https://discord.gg/n5NJ59y.
 
 Before filing an issue be sure to test the 1.1 and/or 2.0 "bugfix" branches to see whether the issue is already addressed.
 

.gitignore

@@ -1,9 +1,9 @@
 #
 # Marlin 3D Printer Firmware
-# Copyright (C) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+# Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
 #
 # Based on Sprinter and grbl.
-# Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+# Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -171,3 +171,13 @@ CMakeListsPrivate.txt
 
 #CLion
 cmake-build-*
+
+#Eclipse
+.project
+.cproject
+.pydevproject
+.settings
+.classpath
+
+#Python
+__pycache__

.travis.yml

@@ -1,39 +1,56 @@
-dist: trusty
-sudo: require
+dist: bionic
+sudo: false
 
 language: python
 python:
-  - "2.7"
+  - "3.7"
 
 notifications:
   email: false
 
-# Cache PlatformIO packages using Travis CI container-based infrastructure
-sudo: false
-cache:
-  pip: true
-  directories:
-  - "~/.platformio"
-
 env:
-  - TEST_PLATFORM="megaatmega2560"
+  # Base Environments
   - TEST_PLATFORM="DUE"
+  - TEST_PLATFORM="esp32"
+  - TEST_PLATFORM="linux_native"
   - TEST_PLATFORM="LPC1768"
   - TEST_PLATFORM="LPC1769"
-  #- TEST_PLATFORM="STM32F1"
+  - TEST_PLATFORM="megaatmega2560"
+  - TEST_PLATFORM="SAMD51_grandcentral_m4"
+  - TEST_PLATFORM="STM32F103R"
+  - TEST_PLATFORM="teensy31"
   - TEST_PLATFORM="teensy35"
-  - TEST_PLATFORM="linux_native"
-  - TEST_PLATFORM="esp32"
 
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - g++-7
+  # Extended AVR Environments
+  - TEST_PLATFORM="fysetc_f6_13"
+  - TEST_PLATFORM="megaatmega1280"
+  - TEST_PLATFORM="rambo"
+  - TEST_PLATFORM="sanguino_atmega1284p"
+  - TEST_PLATFORM="sanguino_atmega644p"
+
+  # Extended STM32 Environments
+  - TEST_PLATFORM="ARMED"
+  - TEST_PLATFORM="BIGTREE_BTT002"
+  - TEST_PLATFORM="BIGTREE_SKR_PRO"
+  - TEST_PLATFORM="STM32F103R_bigtree"
+  - TEST_PLATFORM="jgaurora_a5s_a1"
+  - TEST_PLATFORM="STM32F103V_longer"
+  - TEST_PLATFORM="STM32F407VE_black"
+
+  # Non-working environment tests
+  #- TEST_PLATFORM="at90usb1286_cdc"
+  #- TEST_PLATFORM="at90usb1286_dfu"
+  #- TEST_PLATFORM="malyanm200"
+  #- TEST_PLATFORM="mks_robin"
+  #- TEST_PLATFORM="mks_robin_lite"
+  #- TEST_PLATFORM="mks_robin_mini"
+  #- TEST_PLATFORM="mks_robin_nano"
+  #- TEST_PLATFORM="STM32F103R_bigtree"
+  #- TEST_PLATFORM="STM32F103R_fysetc"
+  #- TEST_PLATFORM="STM32F4"
+  #- TEST_PLATFORM="STM32F7"
 
 before_install:
-  - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-7 90
   #
   # Fetch the tag information for the current branch
   - git fetch origin --tags
@@ -45,7 +62,7 @@ before_install:
 
 install:
   #- pip install -U platformio
-  - pip install -U https://github.com/platformio/platformio-core/archive/develop.zip
+  - pip install -U https://github.com/platformio/platformio-core/archive/master.zip
 
 before_script:
   # Update PlatformIO packages

LICENSE

@@ -3,7 +3,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (c) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -634,7 +634,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     {one line to give the program's name and a brief idea of what it does.}
-    Copyright (C) {year}  {name of author}
+    Copyright (c) {year}  {name of author}
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -654,7 +654,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    {project}  Copyright (C) {year}  {fullname}
+    {project}  Copyright (c) {year}  {fullname}
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.