Skip to content

Commit d042748

Browse files
committed
Merge branch 'bugfix-2.0.x' into rmpel/bugfix-2.0.x/ender-3-skr-14-turbo-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
2 parents fca1839 + 20c3c94 commit d042748

File tree

2,128 files changed

+186816
-60564
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,128 files changed

+186816
-60564
lines changed

.editorconfig

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ root = true
44
[{*.patch,syntax_test_*}]
55
trim_trailing_whitespace = false
66

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

10-
[{*.c,*.cpp,*.h,Makefile}]
10+
[{*.c,*.cpp,*.h,*.ino,Makefile}]
1111
trim_trailing_whitespace = true
1212
insert_final_newline = true
1313
end_of_line = lf

.github/workflows/test-builds.yml

+42-18
Original file line numberDiff line numberDiff line change
@@ -56,28 +56,33 @@ jobs:
5656

5757
# STM32F1 (Maple) Environments
5858

59-
- STM32F103RC_btt
60-
- STM32F103RC_btt_USB
61-
- STM32F103RE_btt
62-
- STM32F103RE_btt_USB
63-
- STM32F103RC_fysetc
59+
#- STM32F103RC_btt_maple
60+
- STM32F103RC_btt_USB_maple
61+
- STM32F103RC_fysetc_maple
6462
- STM32F103RC_meeb
65-
- jgaurora_a5s_a1
66-
- STM32F103VE_longer
67-
- mks_robin
68-
- mks_robin_lite
69-
- mks_robin_pro
70-
- STM32F103RET6_creality
71-
- mks_robin_nano35
63+
- jgaurora_a5s_a1_maple
64+
- STM32F103VE_longer_maple
65+
#- mks_robin_maple
66+
- mks_robin_lite_maple
67+
- mks_robin_pro_maple
68+
#- mks_robin_nano35_maple
69+
#- STM32F103RE_creality_maple
70+
- STM32F103VE_ZM3E4V2_USB_maple
7271

7372
# STM32 (ST) Environments
7473

74+
- STM32F103RC_btt
75+
#- STM32F103RC_btt_USB
76+
- STM32F103RE_btt
77+
- STM32F103RE_btt_USB
78+
- STM32F103RE_creality
79+
- STM32F103VE_longer
7580
- STM32F407VE_black
7681
- STM32F401VE_STEVAL
7782
- BIGTREE_BTT002
7883
- BIGTREE_SKR_PRO
7984
- BIGTREE_GTR_V1_0
80-
- mks_robin_stm32
85+
- mks_robin
8186
- ARMED
8287
- FYSETC_S6
8388
- STM32F070CB_malyan
@@ -86,9 +91,13 @@ jobs:
8691
- FLYF407ZG
8792
- rumba32
8893
- LERDGEX
89-
- mks_robin_nano35_stm32
94+
- LERDGEK
95+
- mks_robin_nano35
9096
- NUCLEO_F767ZI
9197
- REMRAM_V1
98+
- BTT_SKR_SE_BX
99+
- chitu_f103
100+
- Index_Mobo_Rev03
92101

93102
# Put lengthy tests last
94103

@@ -98,12 +107,30 @@ jobs:
98107
# Non-working environment tests
99108
#- at90usb1286_cdc
100109
#- STM32F103CB_malyan
110+
#- STM32F103RE
101111
#- mks_robin_mini
102112

103113
steps:
104114

115+
- name: Check out the PR
116+
uses: actions/checkout@v2
117+
118+
- name: Cache pip
119+
uses: actions/cache@v2
120+
with:
121+
path: ~/.cache/pip
122+
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
123+
restore-keys: |
124+
${{ runner.os }}-pip-
125+
126+
- name: Cache PlatformIO
127+
uses: actions/cache@v2
128+
with:
129+
path: ~/.platformio
130+
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
131+
105132
- name: Select Python 3.7
106-
uses: actions/setup-python@v1
133+
uses: actions/setup-python@v2
107134
with:
108135
python-version: '3.7' # Version range or exact version of a Python version to use, using semvers version range syntax.
109136
architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
@@ -113,9 +140,6 @@ jobs:
113140
pip install -U https://github.com/platformio/platformio-core/archive/develop.zip
114141
platformio update
115142
116-
- name: Check out the PR
117-
uses: actions/checkout@v2
118-
119143
- name: Run ${{ matrix.test-platform }} Tests
120144
run: |
121145
make tests-single-ci TEST_TARGET=${{ matrix.test-platform }}

.gitignore

+14-35
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,16 @@
2222
# Generated files
2323
_Version.h
2424
bdf2u8g
25+
marlin_config.json
26+
mczip.h
27+
*.gen
28+
*.sublime-workspace
2529

2630
#
2731
# OS
2832
#
2933
applet/
30-
*.DS_Store
34+
.DS_Store
3135

3236
#
3337
# Misc
@@ -37,7 +41,6 @@ applet/
3741
*.rej
3842
*.bak
3943
*.idea
40-
*.s
4144
*.i
4245
*.ii
4346
*.swp
@@ -122,29 +125,6 @@ tags
122125
.gcc-flags.json
123126
/lib/
124127

125-
# Workaround for Deviot+platformio quirks
126-
Marlin/lib
127-
Marlin/platformio.ini
128-
Marlin/*/platformio.ini
129-
Marlin/*/*/platformio.ini
130-
Marlin/*/*/*/platformio.ini
131-
Marlin/*/*/*/*/platformio.ini
132-
Marlin/.travis.yml
133-
Marlin/*/.travis.yml
134-
Marlin/*/*/.travis.yml
135-
Marlin/*/*/*/.travis.yml
136-
Marlin/*/*/*/*/.travis.yml
137-
Marlin/.gitignore
138-
Marlin/*/.gitignore
139-
Marlin/*/*/.gitignore
140-
Marlin/*/*/*/.gitignore
141-
Marlin/*/*/*/*/.gitignore
142-
Marlin/readme.txt
143-
Marlin/*/readme.txt
144-
Marlin/*/*/readme.txt
145-
Marlin/*/*/*/readme.txt
146-
Marlin/*/*/*/*/readme.txt
147-
148128
# Secure Credentials
149129
Configuration_Secure.h
150130

@@ -160,16 +140,19 @@ __vm/
160140
vc-fileutils.settings
161141

162142
# Visual Studio Code
163-
.vscode
164-
.vscode/.browse.c_cpp.db*
165-
.vscode/c_cpp_properties.json
166-
.vscode/launch.json
167-
.vscode/*.db
143+
.vscode/*
144+
!.vscode/extensions.json
145+
146+
#Simulation
147+
imgui.ini
148+
eeprom.dat
149+
spi_flash.bin
168150

169-
# cmake
151+
#cmake
170152
CMakeLists.txt
171153
src/CMakeLists.txt
172154
CMakeListsPrivate.txt
155+
build/
173156

174157
# CLion
175158
cmake-build-*
@@ -186,7 +169,3 @@ __pycache__
186169

187170
# IOLogger logs
188171
*_log.csv
189-
190-
# Simulation / Native
191-
eeprom.dat
192-
imgui.ini

.vscode/extensions.json

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
// See http://go.microsoft.com/fwlink/?LinkId=827846
3+
// for the documentation about the extensions.json format
4+
"recommendations": [
5+
"marlinfirmware.auto-build",
6+
"platformio.platformio-ide"
7+
],
8+
"unwantedRecommendations": [
9+
"ms-vscode.cpptools-extension-pack"
10+
]
11+
}

0 commit comments

Comments
 (0)