forked from MarlinFirmware/Marlin
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/2.0.x' into 2.0.x
- Loading branch information
Showing
1,994 changed files
with
77,459 additions
and
724,636 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,3 @@ | ||
custom: http://www.thinkyhead.com/donate-to-marlin | ||
github: [thinkyhead] | ||
patreon: thinkyhead | ||
custom: ["http://www.thinkyhead.com/donate-to-marlin"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
Thanks for your contribution! Unfortunately we can't accept PRs directed at release branches. We make patches to the bugfix branches and only later do we push them out as releases. | ||
|
||
Please redo this PR starting with the `bugfix-2.0.x` branch and be careful to target `bugfix-2.0.x` when resubmitting the PR. | ||
|
||
It may help to set your fork's default branch to `bugfix-2.0.x`. | ||
|
||
See [this page](http://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
# | ||
# 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: | | ||
# Inline Bump Script | ||
[[ "$GITHUB_REPOSITORY" == "MarlinFirmware/Marlin" ]] || exit 0 | ||
DIST=$( date +"%Y-%m-%d" ) | ||
eval "sed -E -i 's/(#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' Marlin/src/inc/Version.h" && \ | ||
git config user.name "${GITHUB_ACTOR}" && \ | ||
git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" && \ | ||
git add . && \ | ||
git commit -m "[cron] Bump distribution date ($DIST)" && \ | ||
git push |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
# | ||
# comment-pr.yml | ||
# Add a comment to any PR directed to a release branch | ||
# | ||
|
||
name: PR Bad Target | ||
|
||
on: | ||
pull_request: | ||
branches: | ||
- 1.0.x | ||
- 1.1.x | ||
- 2.0.x | ||
|
||
jobs: | ||
bad_target: | ||
|
||
name: PR Bad Target | ||
runs-on: ubuntu-latest | ||
|
||
steps: | ||
- uses: actions/checkout@v1 | ||
- uses: harupy/comment-on-pr@master | ||
env: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
with: | ||
filename: bad-target.md |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,104 @@ | ||
# | ||
# test-builds.yml | ||
# Do test builds to catch compile errors | ||
# | ||
|
||
name: CI | ||
|
||
on: | ||
pull_request: | ||
branches: | ||
- bugfix-2.0.x | ||
- dev-2.1.x | ||
paths-ignore: | ||
- config/** | ||
- data/** | ||
- docs/** | ||
- '**/*.md' | ||
|
||
jobs: | ||
test_builds: | ||
|
||
runs-on: ubuntu-latest | ||
|
||
strategy: | ||
matrix: | ||
test-platform: | ||
# Base Environments | ||
|
||
- DUE | ||
- esp32 | ||
- linux_native | ||
- mega2560 | ||
- teensy31 | ||
- teensy35 | ||
- SAMD51_grandcentral_m4 | ||
|
||
# Extended AVR Environments | ||
|
||
- FYSETC_F6_13 | ||
- mega1280 | ||
- rambo | ||
- sanguino1284p | ||
- sanguino644p | ||
|
||
# Extended STM32 Environments | ||
|
||
- STM32F103RC_btt | ||
- STM32F103RC_btt_USB | ||
- STM32F103RE_btt | ||
- STM32F103RE_btt_USB | ||
- STM32F103RC_fysetc | ||
- jgaurora_a5s_a1 | ||
- STM32F103VE_longer | ||
- STM32F407VE_black | ||
- BIGTREE_SKR_PRO | ||
- BIGTREE_GTR_V1_0 | ||
- mks_robin | ||
- ARMED | ||
- FYSETC_S6 | ||
|
||
# Put lengthy tests last | ||
|
||
- LPC1768 | ||
- LPC1769 | ||
|
||
# STM32 with non-STM framework. both broken for now. they should use HAL_STM32 which is working. | ||
|
||
#- STM32F4 | ||
#- STM32F7 | ||
|
||
# Non-working environment tests | ||
|
||
#- BIGTREE_BTT002 | ||
#- at90usb1286_cdc | ||
#- at90usb1286_dfu | ||
#- STM32F103CB_malyan | ||
#- mks_robin_lite | ||
#- mks_robin_mini | ||
#- mks_robin_nano | ||
|
||
steps: | ||
|
||
- name: Select Python 3.7 | ||
uses: actions/setup-python@v1 | ||
with: | ||
python-version: '3.7' # Version range or exact version of a Python version to use, using semvers version range syntax. | ||
architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified | ||
|
||
- name: Install PlatformIO | ||
run: | | ||
pip install -U https://github.com/platformio/platformio-core/archive/master.zip | ||
platformio update | ||
- name: Check out the PR | ||
uses: actions/checkout@v2 | ||
|
||
- 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} | ||
run_tests . ${{ matrix.test-platform }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.