Skip to content

Commit

Permalink
Merge branch 'bugfix-2.0.x' into rmpel/bugfix-2.0.x/ender-3-skr-14-tu…
Browse files Browse the repository at this point in the history
…rbo-bttsfs

* bugfix-2.0.x: (1598 commits)
  [cron] Bump distribution date (2022-02-19)
  ♻️ Refactor HAL as singleton (MarlinFirmware#23357)
  ✏️ Fix getLFNName parameter (MarlinFirmware#23752)
  🚨 Fix TEMP_SENSOR_BOARD warnings (MarlinFirmware#23754)
  🐛 Fix HAS_TMC26X feature path (MarlinFirmware#23757)
  [cron] Bump distribution date (2022-02-18)
  🐛 Patch Creality RAMPS FET / FAN pins
  [cron] Bump distribution date (2022-02-17)
  🧑‍💻 Update MightyBoard FET pins (MarlinFirmware#23728)
  [cron] Bump distribution date (2022-02-16)
  ♻️ Rename XATC z_values => z_offset
  🐛 Fix XATC divide-by-zero (MarlinFirmware#23743)
  [cron] Bump distribution date (2022-02-14)
  ♻️ No ui.reinit_lcd on any ExtUI (MarlinFirmware#23722)
  📝 Update conditionals descriptions
  🔧 HAS_LCDPRINT conditional
  [cron] Bump distribution date (2022-02-12)
  ✨ More Nozzle Park move options (MarlinFirmware#23158)
  ✏️ Fix E3V2 display with BTT SKR Mini E3 v3 (MarlinFirmware#23719)
  🚸 Align MKS UI heated bed status with HAS_MULTI_HOTEND (MarlinFirmware#23718)
  ...

# Conflicts:
#	Marlin/Configuration.h
#	Marlin/Configuration_adv.h
  • Loading branch information
rmpel committed Feb 20, 2022
2 parents fca1839 + 20c3c94 commit d042748
Show file tree
Hide file tree
Showing 2,128 changed files with 186,816 additions and 60,564 deletions.
4 changes: 2 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ root = true
[{*.patch,syntax_test_*}]
trim_trailing_whitespace = false

[{*.c,*.cpp,*.h}]
[{*.c,*.cpp,*.h,*.ino}]
charset = utf-8

[{*.c,*.cpp,*.h,Makefile}]
[{*.c,*.cpp,*.h,*.ino,Makefile}]
trim_trailing_whitespace = true
insert_final_newline = true
end_of_line = lf
Expand Down
60 changes: 42 additions & 18 deletions .github/workflows/test-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,28 +56,33 @@ jobs:

# STM32F1 (Maple) Environments

- STM32F103RC_btt
- STM32F103RC_btt_USB
- STM32F103RE_btt
- STM32F103RE_btt_USB
- STM32F103RC_fysetc
#- STM32F103RC_btt_maple
- STM32F103RC_btt_USB_maple
- STM32F103RC_fysetc_maple
- STM32F103RC_meeb
- jgaurora_a5s_a1
- STM32F103VE_longer
- mks_robin
- mks_robin_lite
- mks_robin_pro
- STM32F103RET6_creality
- mks_robin_nano35
- jgaurora_a5s_a1_maple
- STM32F103VE_longer_maple
#- mks_robin_maple
- mks_robin_lite_maple
- mks_robin_pro_maple
#- mks_robin_nano35_maple
#- STM32F103RE_creality_maple
- STM32F103VE_ZM3E4V2_USB_maple

# STM32 (ST) Environments

- STM32F103RC_btt
#- STM32F103RC_btt_USB
- STM32F103RE_btt
- STM32F103RE_btt_USB
- STM32F103RE_creality
- STM32F103VE_longer
- STM32F407VE_black
- STM32F401VE_STEVAL
- BIGTREE_BTT002
- BIGTREE_SKR_PRO
- BIGTREE_GTR_V1_0
- mks_robin_stm32
- mks_robin
- ARMED
- FYSETC_S6
- STM32F070CB_malyan
Expand All @@ -86,9 +91,13 @@ jobs:
- FLYF407ZG
- rumba32
- LERDGEX
- mks_robin_nano35_stm32
- LERDGEK
- mks_robin_nano35
- NUCLEO_F767ZI
- REMRAM_V1
- BTT_SKR_SE_BX
- chitu_f103
- Index_Mobo_Rev03

# Put lengthy tests last

Expand All @@ -98,12 +107,30 @@ jobs:
# Non-working environment tests
#- at90usb1286_cdc
#- STM32F103CB_malyan
#- STM32F103RE
#- mks_robin_mini

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
uses: actions/setup-python@v1
uses: actions/setup-python@v2
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
Expand All @@ -113,9 +140,6 @@ jobs:
pip install -U https://github.com/platformio/platformio-core/archive/develop.zip
platformio update
- name: Check out the PR
uses: actions/checkout@v2

- name: Run ${{ matrix.test-platform }} Tests
run: |
make tests-single-ci TEST_TARGET=${{ matrix.test-platform }}
49 changes: 14 additions & 35 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,16 @@
# Generated files
_Version.h
bdf2u8g
marlin_config.json
mczip.h
*.gen
*.sublime-workspace

#
# OS
#
applet/
*.DS_Store
.DS_Store

#
# Misc
Expand All @@ -37,7 +41,6 @@ applet/
*.rej
*.bak
*.idea
*.s
*.i
*.ii
*.swp
Expand Down Expand Up @@ -122,29 +125,6 @@ tags
.gcc-flags.json
/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
Configuration_Secure.h

Expand All @@ -160,16 +140,19 @@ __vm/
vc-fileutils.settings

# Visual Studio Code
.vscode
.vscode/.browse.c_cpp.db*
.vscode/c_cpp_properties.json
.vscode/launch.json
.vscode/*.db
.vscode/*
!.vscode/extensions.json

#Simulation
imgui.ini
eeprom.dat
spi_flash.bin

# cmake
#cmake
CMakeLists.txt
src/CMakeLists.txt
CMakeListsPrivate.txt
build/

# CLion
cmake-build-*
Expand All @@ -186,7 +169,3 @@ __pycache__

# IOLogger logs
*_log.csv

# Simulation / Native
eeprom.dat
imgui.ini
11 changes: 11 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
// 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"
]
}
Loading

0 comments on commit d042748

Please sign in to comment.