Compare commits
31 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 988140a467 | |||
| c320503d78 | |||
| d90d15817c | |||
| 4479f438fd | |||
| e05616ada1 | |||
| b4402a789a | |||
| b385758e22 | |||
| 34cda524c4 | |||
| 900047298e | |||
| c86c85437f | |||
| 18d0e1b365 | |||
| a34b4471b5 | |||
| ae9372bc16 | |||
| 848e9ea241 | |||
| d21d6f6c9e | |||
| b35d0c61b9 | |||
| 5c1c99da0c | |||
| 261778e540 | |||
| 6ee6205e18 | |||
| d47ceb2e8b | |||
| 75beeb7b25 | |||
| 522735b858 | |||
| 4f7d610c96 | |||
| d2cee0be7a | |||
| 20c60fe8f1 | |||
| 877b3c65f9 | |||
| aa9b6280ff | |||
| 2a9ecf46a5 | |||
| cf9a8e184e | |||
| b12fe74d75 | |||
| 8b927a283e |
+2
-2
@@ -4,10 +4,10 @@ root = true
|
|||||||
[{*.patch,syntax_test_*}]
|
[{*.patch,syntax_test_*}]
|
||||||
trim_trailing_whitespace = false
|
trim_trailing_whitespace = false
|
||||||
|
|
||||||
[{*.c,*.cpp,*.h,*.ino}]
|
[{*.c,*.cpp,*.h}]
|
||||||
charset = utf-8
|
charset = utf-8
|
||||||
|
|
||||||
[{*.c,*.cpp,*.h,*.ino,Makefile}]
|
[{*.c,*.cpp,*.h,Makefile}]
|
||||||
trim_trailing_whitespace = true
|
trim_trailing_whitespace = true
|
||||||
insert_final_newline = true
|
insert_final_newline = true
|
||||||
end_of_line = lf
|
end_of_line = lf
|
||||||
|
|||||||
@@ -56,33 +56,28 @@ jobs:
|
|||||||
|
|
||||||
# STM32F1 (Maple) Environments
|
# STM32F1 (Maple) Environments
|
||||||
|
|
||||||
#- STM32F103RC_btt_maple
|
- STM32F103RC_btt
|
||||||
- STM32F103RC_btt_USB_maple
|
- STM32F103RC_btt_USB
|
||||||
- STM32F103RC_fysetc_maple
|
- STM32F103RE_btt
|
||||||
|
- STM32F103RE_btt_USB
|
||||||
|
- STM32F103RC_fysetc
|
||||||
- STM32F103RC_meeb
|
- STM32F103RC_meeb
|
||||||
- jgaurora_a5s_a1_maple
|
- jgaurora_a5s_a1
|
||||||
- STM32F103VE_longer_maple
|
- STM32F103VE_longer
|
||||||
#- mks_robin_maple
|
- mks_robin
|
||||||
- mks_robin_lite_maple
|
- mks_robin_lite
|
||||||
- mks_robin_pro_maple
|
- mks_robin_pro
|
||||||
#- mks_robin_nano35_maple
|
- STM32F103RET6_creality
|
||||||
#- STM32F103RE_creality_maple
|
- mks_robin_nano35
|
||||||
- STM32F103VE_ZM3E4V2_USB_maple
|
|
||||||
|
|
||||||
# STM32 (ST) Environments
|
# STM32 (ST) Environments
|
||||||
|
|
||||||
- STM32F103RC_btt
|
|
||||||
#- STM32F103RC_btt_USB
|
|
||||||
- STM32F103RE_btt
|
|
||||||
- STM32F103RE_btt_USB
|
|
||||||
- STM32F103RE_creality
|
|
||||||
- STM32F103VE_longer
|
|
||||||
- STM32F407VE_black
|
- STM32F407VE_black
|
||||||
- STM32F401VE_STEVAL
|
- STM32F401VE_STEVAL
|
||||||
- BIGTREE_BTT002
|
- BIGTREE_BTT002
|
||||||
- BIGTREE_SKR_PRO
|
- BIGTREE_SKR_PRO
|
||||||
- BIGTREE_GTR_V1_0
|
- BIGTREE_GTR_V1_0
|
||||||
- mks_robin
|
- mks_robin_stm32
|
||||||
- ARMED
|
- ARMED
|
||||||
- FYSETC_S6
|
- FYSETC_S6
|
||||||
- STM32F070CB_malyan
|
- STM32F070CB_malyan
|
||||||
@@ -91,13 +86,9 @@ jobs:
|
|||||||
- FLYF407ZG
|
- FLYF407ZG
|
||||||
- rumba32
|
- rumba32
|
||||||
- LERDGEX
|
- LERDGEX
|
||||||
- LERDGEK
|
- mks_robin_nano35_stm32
|
||||||
- mks_robin_nano35
|
|
||||||
- NUCLEO_F767ZI
|
- NUCLEO_F767ZI
|
||||||
- REMRAM_V1
|
- REMRAM_V1
|
||||||
- BTT_SKR_SE_BX
|
|
||||||
- chitu_f103
|
|
||||||
- Index_Mobo_Rev03
|
|
||||||
|
|
||||||
# Put lengthy tests last
|
# Put lengthy tests last
|
||||||
|
|
||||||
@@ -107,30 +98,12 @@ jobs:
|
|||||||
# Non-working environment tests
|
# Non-working environment tests
|
||||||
#- at90usb1286_cdc
|
#- at90usb1286_cdc
|
||||||
#- STM32F103CB_malyan
|
#- STM32F103CB_malyan
|
||||||
#- STM32F103RE
|
|
||||||
#- mks_robin_mini
|
#- mks_robin_mini
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
|
||||||
- name: Check out the PR
|
|
||||||
uses: actions/checkout@v2
|
|
||||||
|
|
||||||
- name: Cache pip
|
|
||||||
uses: actions/cache@v2
|
|
||||||
with:
|
|
||||||
path: ~/.cache/pip
|
|
||||||
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
|
|
||||||
restore-keys: |
|
|
||||||
${{ runner.os }}-pip-
|
|
||||||
|
|
||||||
- name: Cache PlatformIO
|
|
||||||
uses: actions/cache@v2
|
|
||||||
with:
|
|
||||||
path: ~/.platformio
|
|
||||||
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
|
|
||||||
|
|
||||||
- name: Select Python 3.7
|
- name: Select Python 3.7
|
||||||
uses: actions/setup-python@v2
|
uses: actions/setup-python@v1
|
||||||
with:
|
with:
|
||||||
python-version: '3.7' # Version range or exact version of a Python version to use, using semvers version range syntax.
|
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
|
architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
|
||||||
@@ -140,6 +113,9 @@ jobs:
|
|||||||
pip install -U https://github.com/platformio/platformio-core/archive/develop.zip
|
pip install -U https://github.com/platformio/platformio-core/archive/develop.zip
|
||||||
platformio update
|
platformio update
|
||||||
|
|
||||||
|
- name: Check out the PR
|
||||||
|
uses: actions/checkout@v2
|
||||||
|
|
||||||
- name: Run ${{ matrix.test-platform }} Tests
|
- name: Run ${{ matrix.test-platform }} Tests
|
||||||
run: |
|
run: |
|
||||||
make tests-single-ci TEST_TARGET=${{ matrix.test-platform }}
|
make tests-single-ci TEST_TARGET=${{ matrix.test-platform }}
|
||||||
|
|||||||
+36
-16
@@ -22,16 +22,12 @@
|
|||||||
# Generated files
|
# Generated files
|
||||||
_Version.h
|
_Version.h
|
||||||
bdf2u8g
|
bdf2u8g
|
||||||
marlin_config.json
|
|
||||||
mczip.h
|
|
||||||
*.gen
|
|
||||||
*.sublime-workspace
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# OS
|
# OS
|
||||||
#
|
#
|
||||||
applet/
|
applet/
|
||||||
.DS_Store
|
*.DS_Store
|
||||||
|
|
||||||
#
|
#
|
||||||
# Misc
|
# Misc
|
||||||
@@ -41,6 +37,7 @@ applet/
|
|||||||
*.rej
|
*.rej
|
||||||
*.bak
|
*.bak
|
||||||
*.idea
|
*.idea
|
||||||
|
*.s
|
||||||
*.i
|
*.i
|
||||||
*.ii
|
*.ii
|
||||||
*.swp
|
*.swp
|
||||||
@@ -111,7 +108,7 @@ tags
|
|||||||
*.app
|
*.app
|
||||||
*.i*86
|
*.i*86
|
||||||
*.x86_64
|
*.x86_64
|
||||||
|
*.hex
|
||||||
|
|
||||||
# Debug files
|
# Debug files
|
||||||
*.dSYM/
|
*.dSYM/
|
||||||
@@ -125,6 +122,29 @@ tags
|
|||||||
.gcc-flags.json
|
.gcc-flags.json
|
||||||
/lib/
|
/lib/
|
||||||
|
|
||||||
|
# Workaround for Deviot+platformio quirks
|
||||||
|
Marlin/lib
|
||||||
|
Marlin/platformio.ini
|
||||||
|
Marlin/*/platformio.ini
|
||||||
|
Marlin/*/*/platformio.ini
|
||||||
|
Marlin/*/*/*/platformio.ini
|
||||||
|
Marlin/*/*/*/*/platformio.ini
|
||||||
|
Marlin/.travis.yml
|
||||||
|
Marlin/*/.travis.yml
|
||||||
|
Marlin/*/*/.travis.yml
|
||||||
|
Marlin/*/*/*/.travis.yml
|
||||||
|
Marlin/*/*/*/*/.travis.yml
|
||||||
|
Marlin/.gitignore
|
||||||
|
Marlin/*/.gitignore
|
||||||
|
Marlin/*/*/.gitignore
|
||||||
|
Marlin/*/*/*/.gitignore
|
||||||
|
Marlin/*/*/*/*/.gitignore
|
||||||
|
Marlin/readme.txt
|
||||||
|
Marlin/*/readme.txt
|
||||||
|
Marlin/*/*/readme.txt
|
||||||
|
Marlin/*/*/*/readme.txt
|
||||||
|
Marlin/*/*/*/*/readme.txt
|
||||||
|
|
||||||
# Secure Credentials
|
# Secure Credentials
|
||||||
Configuration_Secure.h
|
Configuration_Secure.h
|
||||||
|
|
||||||
@@ -140,19 +160,16 @@ __vm/
|
|||||||
vc-fileutils.settings
|
vc-fileutils.settings
|
||||||
|
|
||||||
# Visual Studio Code
|
# Visual Studio Code
|
||||||
.vscode/*
|
.vscode
|
||||||
!.vscode/extensions.json
|
.vscode/.browse.c_cpp.db*
|
||||||
|
.vscode/c_cpp_properties.json
|
||||||
|
.vscode/launch.json
|
||||||
|
.vscode/*.db
|
||||||
|
|
||||||
#Simulation
|
# cmake
|
||||||
imgui.ini
|
|
||||||
eeprom.dat
|
|
||||||
spi_flash.bin
|
|
||||||
|
|
||||||
#cmake
|
|
||||||
CMakeLists.txt
|
CMakeLists.txt
|
||||||
src/CMakeLists.txt
|
src/CMakeLists.txt
|
||||||
CMakeListsPrivate.txt
|
CMakeListsPrivate.txt
|
||||||
build/
|
|
||||||
|
|
||||||
# CLion
|
# CLion
|
||||||
cmake-build-*
|
cmake-build-*
|
||||||
@@ -169,4 +186,7 @@ __pycache__
|
|||||||
|
|
||||||
# IOLogger logs
|
# IOLogger logs
|
||||||
*_log.csv
|
*_log.csv
|
||||||
.vscode/extensions.json
|
|
||||||
|
# Simulation / Native
|
||||||
|
eeprom.dat
|
||||||
|
imgui.ini
|
||||||
|
|||||||
Vendored
-11
@@ -1,11 +0,0 @@
|
|||||||
{
|
|
||||||
// See http://go.microsoft.com/fwlink/?LinkId=827846
|
|
||||||
// for the documentation about the extensions.json format
|
|
||||||
"recommendations": [
|
|
||||||
"marlinfirmware.auto-build",
|
|
||||||
"platformio.platformio-ide"
|
|
||||||
],
|
|
||||||
"unwantedRecommendations": [
|
|
||||||
"ms-vscode.cpptools-extension-pack"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,7 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
for file in *; do
|
|
||||||
if [ "$file" != "*" ] ; then
|
|
||||||
zip $file.zip $file
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user