Bump to head

.editorconfig

@@ -0,0 +1,19 @@
+# editorconfig.org
+root = true
+
+[{*.patch,syntax_test_*}]
+trim_trailing_whitespace = false
+
+[{*.c,*.cpp,*.h}]
+charset = utf-8
+
+[{*.c,*.cpp,*.h,Makefile}]
+trim_trailing_whitespace = true
+insert_final_newline = true
+end_of_line = lf
+indent_style = space
+indent_size = 2
+
+[{*.py,*.conf,*.sublime-project}]
+indent_style = tab
+indent_size = 4

.github/FUNDING.yml

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

.github/workflows/bump-date.yml

@@ -1,25 +0,0 @@
-#
-# bump-date.yml
-# Bump the distribution date once per day
-#
-
-name: Bump Distribution Date
-
-on:
-  schedule:
-    - cron:  '0 0 * * *'
-
-jobs:
-  bump_date:
-
-    runs-on: ubuntu-latest
-
-    steps:
-
-    - name: Check out bugfix-2.0.x
-      uses: actions/checkout@v2
-      with:
-        ref: bugfix-2.0.x
-
-    - name: Bump Distribution Date
-      run: source ./buildroot/bin/bump_date

.github/workflows/test-builds.yml

@@ -32,6 +32,7 @@ jobs:
         - megaatmega2560
         - teensy31
         - teensy35
+        - SAMD51_grandcentral_m4
 
         # Extended AVR Environments
 
@@ -54,6 +55,7 @@ jobs:
         - BIGTREE_SKR_PRO
         - mks_robin
         - ARMED
+        - FYSETC_S6
 
         # Put lengthy tests last
 
@@ -74,7 +76,6 @@ jobs:
         #- mks_robin_lite
         #- mks_robin_mini
         #- mks_robin_nano
-        #- SAMD51_grandcentral_m4
 
     steps:
 
@@ -94,6 +95,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/share/tests/*
         export PATH=./buildroot/bin/:./buildroot/share/tests/:${PATH}

.gitignore

@@ -1,6 +1,6 @@
 #
 # Marlin 3D Printer Firmware
-# Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+# Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
 #
 # Based on Sprinter and grbl.
 # Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -146,6 +146,9 @@ Marlin/*/*/readme.txt
 Marlin/*/*/*/readme.txt
 Marlin/*/*/*/*/readme.txt
 
+# Secure Credentials
+Configuration_Secure.h
+
 #Visual Studio
 *.sln
 *.vcxproj

.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}

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
+
+#-----------------------------------------------------------------------