Bump to head

.github/FUNDING.yml

@@ -1,3 +1,3 @@
 github: [thinkyhead]
 patreon: thinkyhead
-custom: ["https://www.patreon.com/InsanityAutomation"]
+custom: ["http://www.thinkyhead.com/donate-to-marlin"]

.github/contributing.md

@@ -34,15 +34,16 @@ 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](https://reprap.org/forum/list.php?415)
+* [Marlin RepRap forum](http://forums.reprap.org/list.php?415)
 * [MarlinFirmware on Facebook](https://www.facebook.com/groups/1049718498464482/)
 
-If chat is more your speed, you can join the MarlinFirmware Discord server:
+If chat is more your speed, you can join the MarlinFirmware Slack team:
 
-* 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.
+* 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.
 
 ## How Can I Contribute?
 
@@ -92,7 +93,7 @@ Before creating a suggestion, please check [this list](#before-submitting-a-sugg
 
 #### Before Submitting a Feature Request
 
-* **Check the [Marlin website](https://marlinfw.org/)** for tips — you might discover that the feature is already included. Most importantly, check if you're using [the latest version of Marlin](https://github.com/MarlinFirmware/Marlin/releases) and if you can get the desired behavior by changing [Marlin's config settings](https://marlinfw.org/docs/configuration/configuration.html).
+* **Check the [Marlin website](http://marlinfw.org/)** for tips — you might discover that the feature is already included. Most importantly, check if you're using [the latest version of Marlin](https://github.com/MarlinFirmware/Marlin/releases) and if you can get the desired behavior by changing [Marlin's config settings](http://marlinfw.org/docs/configuration/configuration.html).
 * **Perform a [cursory search](https://github.com/MarlinFirmware/Marlin/issues?q=is%3Aissue)** to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
 
 #### How Do I Submit A (Good) Feature Request?
@@ -116,12 +117,12 @@ Unsure where to begin contributing to Marlin? You can start by looking through t
 
 ### Pull Requests
 
-Pull Requests should always be targeted to working branches (e.g., `bugfix-1.1.x` and/or `bugfix-2.0.x`) and never to release branches (e.g., `1.1.x`). If this is your first Pull Request, please read our [Guide to Pull Requests](https://marlinfw.org/docs/development/getting_started_pull_requests.html) and Github's [Pull Request](https://help.github.com/articles/creating-a-pull-request/) documentation.
+Pull Requests should always be targeted to working branches (e.g., `bugfix-1.1.x` and/or `bugfix-2.0.x`) and never to release branches (e.g., `1.1.x`). If this is your first Pull Request, please read our [Guide to Pull Requests](http://marlinfw.org/docs/development/getting_started_pull_requests.html) and Github's [Pull Request](https://help.github.com/articles/creating-a-pull-request/) documentation.
 
 * Fill in [the required template](pull_request_template.md).
 * Don't include issue numbers in the PR title.
 * Include pictures, diagrams, and links to videos in your Pull Request to demonstrate your changes, if needed.
-* Follow the [Coding Standards](https://marlinfw.org/docs/development/coding_standards.html) posted on our website.
+* Follow the [Coding Standards](http://marlinfw.org/docs/development/coding_standards.html) posted on our website.
 * Document new code with clear and concise comments.
 * End all files with a newline.
 
@@ -136,7 +137,7 @@ Pull Requests should always be targeted to working branches (e.g., `bugfix-1.1.x
 
 ### C++ Coding Standards
 
-* Please read and follow the [Coding Standards](https://marlinfw.org/docs/development/coding_standards.html) posted on our website. Failure to follow these guidelines will delay evaluation and acceptance of Pull Requests.
+* Please read and follow the [Coding Standards](http://marlinfw.org/docs/development/coding_standards.html) posted on our website. Failure to follow these guidelines will delay evaluation and acceptance of Pull Requests.
 
 ### Documentation
 

.github/issue_template.md

@@ -2,13 +2,9 @@
 
 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 use one of the following options:
+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.
 
-- The Marlin Firmware forum at https://reprap.org/forum/list.php?415
-- The MarlinFirmware Facebook Group at https://www.facebook.com/groups/1049718498464482/
-- The MarlinFirmware Discord Server at https://discord.gg/n5NJ59y.
-
-Before filing an issue be sure to test the latest "bugfix" branch to see whether the issue is already addressed.
+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.
 
 -->
 

.github/lock.yml

@@ -1,40 +0,0 @@
-#
-# Configuration for Lock Threads - https://github.com/dessant/lock-threads-app
-#
-
-# Number of days of inactivity before a closed issue or pull request is locked
-daysUntilLock: 60
-
-# Skip issues and pull requests created before a given timestamp. Timestamp must
-# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
-skipCreatedBefore: false
-
-# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
-exemptLabels: [ 'no-locking' ]
-
-# Label to add before locking, such as `outdated`. Set to `false` to disable
-lockLabel: false
-
-# Comment to post before locking. Set to `false` to disable
-lockComment: >
-  This thread has been automatically locked since there has not been
-  any recent activity after it was closed. Please open a new issue for
-  related bugs.
-
-# Assign `resolved` as the reason for locking. Set to `false` to disable
-setLockReason: true
-
-# Limit to only `issues` or `pulls`
-# only: issues
-
-# Optionally, specify configuration settings just for `issues` or `pulls`
-# issues:
-#   exemptLabels:
-#     - help-wanted
-#   lockLabel: outdated
-
-# pulls:
-#   daysUntilLock: 30
-
-# Repository to extend settings from
-# _extends: repo

.github/pull_request_template.md

@@ -14,10 +14,6 @@ We must be able to understand your proposed change from this description. If we
 
 <!-- What does this fix or improve? -->
 
-### Configurations
-
-<!-- Attach any Configuration.h, Configuration_adv.h, or platformio.ini files needed to compile/test your Pull Request. -->
-
 ### Related Issues
 
 <!-- Whether this fixes a bug or fulfills a feature request, please list any related Issues here. -->

.github/workflows/test-builds.yml

@@ -9,14 +9,7 @@ on:
   pull_request:
     branches:
     - bugfix-2.0.x
-    paths-ignore:
-    - config/**
-    - data/**
-    - docs/**
-    - '**/*.md'
-  push:
-    branches:
-    - bugfix-2.0.x
+    - dev-2.1.x
     paths-ignore:
     - config/**
     - data/**
@@ -25,8 +18,6 @@ on:
 
 jobs:
   test_builds:
-    name: Run All Tests
-    if: github.repository == 'MarlinFirmware/Marlin'
 
     runs-on: ubuntu-latest
 
@@ -38,49 +29,33 @@ jobs:
         - DUE
         - esp32
         - linux_native
-        - mega2560
+        - megaatmega2560
         - teensy31
         - teensy35
-        - teensy41
         - SAMD51_grandcentral_m4
 
         # Extended AVR Environments
 
         - FYSETC_F6_13
-        - mega1280
+        - megaatmega1280
         - rambo
-        - sanguino1284p
-        - sanguino644p
+        - sanguino_atmega1284p
+        - sanguino_atmega644p
 
         # Extended STM32 Environments
 
-        - STM32F103RC_btt
-        - STM32F103RC_btt_USB
-        - STM32F103RE_btt
-        - STM32F103RE_btt_USB
+        - STM32F103RC_bigtree
+        - STM32F103RC_bigtree_USB
+        - STM32F103RE_bigtree
+        - STM32F103RE_bigtree_USB
         - STM32F103RC_fysetc
-        - STM32F103RC_meeb
         - jgaurora_a5s_a1
         - STM32F103VE_longer
         - STM32F407VE_black
-        - STM32F401VE_STEVAL
-        - BIGTREE_BTT002
         - BIGTREE_SKR_PRO
-        - BIGTREE_GTR_V1_0
         - mks_robin
-        - mks_robin_stm32
         - ARMED
         - FYSETC_S6
-        - STM32F070CB_malyan
-        - STM32F070RB_malyan
-        - malyan_M300
-        - mks_robin_lite
-        - FLYF407ZG
-        - rumba32
-        - mks_robin_pro
-        - STM32F103RET6_creality
-        - LERDGEX
-        - mks_robin_nano35
 
         # Put lengthy tests last
 
@@ -93,10 +68,14 @@ jobs:
         #- STM32F7
 
         # Non-working environment tests
+
+        #- BIGTREE_BTT002
         #- at90usb1286_cdc
         #- at90usb1286_dfu
         #- STM32F103CB_malyan
+        #- mks_robin_lite
         #- mks_robin_mini
+        #- mks_robin_nano
 
     steps:
 
@@ -108,7 +87,7 @@ jobs:
 
     - name: Install PlatformIO
       run: |
-        pip install -U https://github.com/platformio/platformio-core/archive/develop.zip
+        pip install -U https://github.com/platformio/platformio-core/archive/master.zip
         platformio update
 
     - name: Check out the PR
@@ -117,7 +96,8 @@ jobs:
     - name: Run ${{ matrix.test-platform }} Tests
       run: |
         # Inline tests script
+        [[ "$GITHUB_REPOSITORY" == "MarlinFirmware/Marlin" ]] || exit 0
         chmod +x buildroot/bin/*
-        chmod +x buildroot/tests/*
-        export PATH=./buildroot/bin/:./buildroot/tests/:${PATH}
+        chmod +x buildroot/share/tests/*
+        export PATH=./buildroot/bin/:./buildroot/share/tests/:${PATH}
         run_tests . ${{ matrix.test-platform }}

.gitignore

@@ -16,7 +16,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # Our automatic versioning scheme generates the following file

.travis.yml

@@ -0,0 +1,84 @@
+dist: bionic
+sudo: false
+
+language: python
+python:
+  - "3.7"
+
+notifications:
+  email: false
+
+env:
+  # Base Environments
+  - TEST_PLATFORM="DUE"
+  - TEST_PLATFORM="esp32"
+  - TEST_PLATFORM="linux_native"
+  - TEST_PLATFORM="megaatmega2560"
+  - TEST_PLATFORM="teensy31"
+  - TEST_PLATFORM="teensy35"
+
+  # 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="STM32F103RC_bigtree"
+  - TEST_PLATFORM="STM32F103RC_bigtree_USB"
+  - TEST_PLATFORM="STM32F103RE_bigtree"
+  - TEST_PLATFORM="STM32F103RE_bigtree_USB"
+  - TEST_PLATFORM="STM32F103RC_fysetc"
+  - TEST_PLATFORM="jgaurora_a5s_a1"
+  - TEST_PLATFORM="STM32F103VE_longer"
+  - TEST_PLATFORM="STM32F407VE_black"
+  - TEST_PLATFORM="BIGTREE_SKR_PRO"
+  - TEST_PLATFORM="mks_robin"
+  - TEST_PLATFORM="ARMED"
+
+  # STM32 with non-STM framework. both broken for now. they should use HAL_STM32 which is working.
+  #- TEST_PLATFORM="STM32F4"
+  #- TEST_PLATFORM="STM32F7"
+
+  # Put lengthy tests last
+  - TEST_PLATFORM="LPC1768"
+  - TEST_PLATFORM="LPC1769"
+
+  # Non-working environment tests
+  #- TEST_PLATFORM="BIGTREE_BTT002" this board isn't released yet. we need pinout to be sure about what we do
+  #- TEST_PLATFORM="at90usb1286_cdc"
+  #- TEST_PLATFORM="at90usb1286_dfu"
+  #- TEST_PLATFORM="STM32F103CB_malyan"
+  #- TEST_PLATFORM="mks_robin_lite"
+  #- TEST_PLATFORM="mks_robin_mini"
+  #- TEST_PLATFORM="mks_robin_nano"
+  #- TEST_PLATFORM="SAMD51_grandcentral_m4"
+
+before_install:
+  #
+  # Fetch the tag information for the current branch
+  - git fetch origin --tags
+  #
+  # Publish the buildroot script folder
+  - chmod +x ${TRAVIS_BUILD_DIR}/buildroot/bin/*
+  - chmod +x ${TRAVIS_BUILD_DIR}/buildroot/share/tests/*
+  - export PATH=${TRAVIS_BUILD_DIR}/buildroot/bin/:${TRAVIS_BUILD_DIR}/buildroot/share/tests/:${PATH}
+
+install:
+  #- pip install -U platformio
+  - pip install -U https://github.com/platformio/platformio-core/archive/master.zip
+
+before_script:
+  # Update PlatformIO packages
+  - platformio update
+  #
+  # Change current working directory to the build dir
+  - cd ${TRAVIS_BUILD_DIR}
+  #
+  # Generate custom version include
+  - generate_version ${TRAVIS_BUILD_DIR}/Marlin/
+  - cat ${TRAVIS_BUILD_DIR}/Marlin/Version.h
+  #
+script:
+  - run_tests ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM}

LICENSE

@@ -3,7 +3,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (c) 2007 Free Software Foundation, Inc. <https://www.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.
 
@@ -647,7 +647,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -666,11 +666,12 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
+<http://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 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/licenses/why-not-lgpl.html>.
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+

MKS_TFT_BLTouchBIL/mks_config.txt

@@ -0,0 +1,223 @@
+#--------------------------------------------------------------------
+#########  Printer type setting  ##################################
+
+#mainboard firmware setting(marlin:1; repetier:2; smoothie:3)
+>cfg_firmware_type:1
+
+#machine setting (Normal:1; Delta:2)
+>cfg_machine_type:1
+
+#baud rate (9600:1; 57600:2; 115200:3; 250000:4)
+>cfg_baud_rate:4
+
+#multi-language(enable:1, disable:0)
+>cfg_multiple_language:0
+
+#languages setting
+#(simplified Chinese:1; traditional Chinese:2; English:3; Russian:4; Spanish:5). This configuration is valid when "cfg_multiple_language" is disabled.
+>cfg_language_type:3
+
+#extruder number(one:1; dual:2)
+>cfg_sprayer_counter:1
+
+#enable heated bed(yes:1; no: 0)
+>cfg_custom_bed_flag:1
+
+#the max target temp of extruder and heated bed
+>cfg_max_sprayer_temperature:270
+>cfg_max_hotbed_temperature:150
+
+#pause position (-1 is invalid; Z-axis is relative position)
+>cfg_XPOS:-1
+>cfg_YPOS:-1
+>cfg_ZADD:10
+
+#-----------------------------------------------------------------------
+#########  Advanced Function Option  ##################################
+
+#enable UPS?(yes:1; no:0)
+>cfg_have_ups_device:0
+
+#enable power detecting module(mks 220det:1; mks pwc:0)
+>cfg_insert_det_module:0
+
+#enable auto off after print finish function (no:0; Yes:1）
+>cfg_print_finish_close_Machine:0
+
+#set PB0 signal when use it for sencond nozzle (high level:1; low level:0)
+>cfg_PB0_trigger_Level:0
+
+#set PB1 signal (high level:1; low level:0)
+>cfg_PB1_trigger_Level:0
+
+#set error range of Z-axis on breakpoints recovery
+>cfg_breakpoint_z_error:0.2
+
+#---------------------------------------------------------------------------
+
+#########  Filament Change Function  ##############################
+
+#the speed to extrude filament(mm/min)
+>cfg_filament_load_speed:400
+#the lenght to extrude filament (mm)
+>cfg_filament_load_length:100
+
+#the speed to retract filament(mm/min)
+>cfg_filament_unload_speed:2000
+#the lenght to retract filament(mm)
+>cfg_filament_unload_length:100
+
+#It is the minimum temperature for filament change.
+It will auto heat up if the current temp doesn't reach the target.
+>cfg_filament_load_limit_temperature:200
+
+#The length of Load filament before unloader filament.
+>cfg_unload_retract_length:5
+
+#The speed of load filament  before unloader filament.
+>cfg_unload_retract_speed:500
+
+#---------------------------------------------------------------------------
+
+############  Leveling Function  ########################################
+
+#leveling mode(manual:0; auto:1; conceal leveling button:2)
+>cfg_leveling_mode:0
+
+#the command of auto leveling (G29 is available for Marlin.While G32 is for  Repetier and Smoothieware)
+>cfg_auto_leveling_cmd:G28;G29;
+
+#the point number of manual leveling:(3,4,5 point available)
+>cfg_point_number:5
+
+#the coordinates of 5 point on manual leveling
+>cfg_point1:50,50
+>cfg_point2:270,50
+>cfg_point3:270,270
+>cfg_point4:50,270
+>cfg_point5:150,150
+
+#the travel speed of leveling(mm/min)
+>cfg_leveling_z_speed:1500
+>cfg_leveling_xy_speed:5000
+
+#---------------------------------------------------------------------------
+
+#############  WIFI Function  ##########################################
+
+#wifi model(MKS WIFI TFT:0;  MKS HLK-WIFI:1)
+>cfg_wifi_type:0
+
+#wifi mode(0:sta;1:ap)
+>cfg_wifi_mode:1
+
+#wifi name and password
+>cfg_wifi_ap_name:Artillery
+>cfg_wifi_key_code:12345678
+
+#0:disable cloud service 1:enable cloud service
+>cfg_cloud_enable:0
+#cloud service adress
+>cfg_wifi_cloud_host:www.baizhongyun.cn
+#cloud service port
+>cfg_cloud_port:10086
+
+#Dynamic access IP
+>cfg_ip_dhcp_flag:1
+
+#IP/mask/gateway
+>cfg_ip_address:192.168.3.100
+>cfg_ip_mask:255.255.255.0
+>cfg_ip_gate:192.168.3.1
+
+#--------------------------------------------------------------------------------
+
+############## Function Customization #######################################
+
+#user-defined function1 and 2.(display this button .  disable: 0; enable: 1)
+>cfg_function_btn1_display:1
+
+
+#command of user-defined function
+>function_btn1_cmd:M84;
+
+
+#set number of  "More" button
+>moreitem_pic_cnt:7
+
+#edit command for 1~7 "More" button,each command must be separated by semicolon ";"
+>moreitem_button1_cmd:M502; M500;
+
+>moreitem_button2_cmd:M190S75; M104S215; G28; G29L1; G1X100Y100; G1Z0;
+
+>moreitem_button3_cmd:M290Z0.025; M500;
+
+>moreitem_button4_cmd:M290Z-0.025; M500;
+
+>moreitem_button5_cmd:M106S128; M303C8S215E0U; M500;
+
+>moreitem_button6_cmd:M999; M280P0S90;
+
+>moreitem_button7_cmd:M190S75;G28;G34I3;G29;G28;M420S1;M109S215;G1X150Y150;G1Z0;M500;M400;M77;
+
+#how many "More" button display on screen interface
+>morefunc_cnt:4
+
+#command setting on button1~6
+>morefunc1_cmd:M290 Z0.025; M500;
+>morefunc2_cmd:M290 Z-0.025; M500;
+>morefunc3_cmd:M290 Z-0.01; M500;
+>morefunc4_cmd:M290 Z0.01; M500;
+>morefunc5_cmd:G28;
+>morefunc6_cmd:G28;
+
+#---------------------------------------------------------------------------------
+##### Display Customization(button and logo customized see User's Manual) #######
+
+#the color of screen background
+>cfg_background_color:0x000000
+
+#the color of title text
+>cfg_title_color:0xFFFFFF
+
+#the color of temperature,fan,(etc) background
+>cfg_state_background_color:0x000000
+
+#the color of temprature,fan,(etc) text
+>cfg_state_text_color:0xFFFFFF
+
+#the color of file button
+>cfg_filename_background_color:0x000000
+
+#the color of file text
+>cfg_filename_color:0xFFFFFF
+
+#the color of background in printing
+>cfg_printingstat_word_background_color:0x000000
+
+#the color of text in printing status
+>cfg_printingstat_word_color:0xFFFFFF
+
+#3D effects setting (disable: 0; enable: 1)
+>cfg_BUTTON_3D_effects:1
+
+#The screen is flipped 180°(0: no flip, 1: flip)
+>cfg_OVERTURN_180:0
+
+#shield the function of detection power (0:no shield ,1:shield)
+>cfg_disable_PWR_det:0
+
+#shield the function of detection filament (0:no shield ,1:shield)
+>cfg_disable_MT_det:0
+
+#Whether to support the function of dual extruder single nozzle.(0: disable, 1: enable)
+#the extruder number need set to dual.
+>cfg_single_nozzle:0
+
+#For the M110 command plus check, the version of Marlin 1.0.2 and below is set to 1, and the other versions are set to 0.
+>cfg_M110_add_checkSum:0
+
+#Enable function of display error message. (no:0; Yes:1）
+>cfg_display_eeror_message:1
+
+#-----------------------------------------------------------------------