Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge Upstream Repo #20

Merged
merged 148 commits into from
Apr 7, 2023
Merged

Merge Upstream Repo #20

merged 148 commits into from
Apr 7, 2023

Conversation

shadow578
Copy link
Owner

merge upsteam commits

thinkyhead and others added 30 commits March 5, 2023 00:26
@thinkyhead
[cron] Bump distribution date (2023-03-05)
f3f7b1e
@hcebke
🐛 Fix apply_power for SPINDLE_SERVO (MarlinFirmware#25465)
dee4ef0
@alextrical
🐛 Fix Flash EEPROM for STM32G0B1CB (MarlinFirmware#25469)
33ed748
@TA1GI
🌐 Update Turkish language (MarlinFirmware#25447)
c63577f
@thinkyhead
[cron] Bump distribution date (2023-03-06)
c2572de
@thinkyhead
🧑‍💻 Script to make non-accented languages
22f370a
@thinkyhead
🌐 Update Turkish language
e053827 
Followup to MarlinFirmware#25447
@thinkyhead
[cron] Bump distribution date (2023-03-07)
0e2837e
@albatorsssx @thinkyhead
🌐 DGUS Reloaded non-accented French (MarlinFirmware#25443)
cc31537 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
@thinkyhead
🔧 Add DGUS_LCD_UI RELOADED conditions
4b9bb85
@thinkyhead
[cron] Bump distribution date (2023-03-08)
0b473ee
@Misterke @thinkyhead
✨ Extra Z Servo Probe options (MarlinFirmware#21427)
db5ff20 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
@thinkyhead
🔧 Update some config.ini options
1d06fe8
@willis7
🔨 VSCode + Devcontainer support (MarlinFirmware#22420)
32dcd7f
@thinkyhead
[cron] Bump distribution date (2023-03-09)
26f96dc
@evg-zhabotinsky
✨ Z_SAFE_HOMING_POINT_ABSOLUTE (MarlinFirmware#23069)
904ddf8
@thinkyhead
[cron] Bump distribution date (2023-03-10)
cff3952
@thisiskeithb
✨ BTT Octopus Max EZ 1.0, SKR 3.0 / 3.0 EZ (MarlinFirmware#25387)
28b101c 
BTT Octopus Max EZ V1.0 (STM32H723VE/ZE), SKR V3.0 / V3.0 EZ (STM32H723VG)
@thinkyhead
[cron] Bump distribution date (2023-03-11)
987923e
@thisiskeithb
🐛 Fix Anet ET4 SD_SS_PIN (MarlinFirmware#25492)
3e12934
@thinkyhead
[cron] Bump distribution date (2023-03-12)
fe32582
@thisiskeithb
BTT Octopus … followup (MarlinFirmware#25495)
4527908 
Followup to MarlinFirmware#25387
@thinkyhead @tombrazier
⚡️ Exit from ISR on AVR already does sei
cb66bff 
Co-Authored-By: tombrazier <68918209+tombrazier@users.noreply.github.com>
@thinkyhead @tombrazier
🎨 Cosmetic stepper updates
f9d3939 
Co-Authored-By: tombrazier <68918209+tombrazier@users.noreply.github.com>
@thinkyhead @tombrazier
✨ MAX7219_DEBUG_MULTISTEPPING
4fdb0fb 
Co-Authored-By: tombrazier <68918209+tombrazier@users.noreply.github.com>
@thinkyhead @tombrazier
⚡️ Use hal_timer_t for timing vars
194f587 
Co-Authored-By: tombrazier <68918209+tombrazier@users.noreply.github.com>
@thinkyhead @tombrazier
⚡️ Use cached la_active state
d554844 
Co-Authored-By: tombrazier <68918209+tombrazier@users.noreply.github.com>
@thinkyhead @tombrazier
⚡️ Use AxisFlags for step_needed
4a0cb4f 
Co-Authored-By: tombrazier <68918209+tombrazier@users.noreply.github.com>
@thinkyhead
[cron] Bump distribution date (2023-03-13)
e1a209d
@thinkyhead @tombrazier
⚡️ Major shaper optimization
e4b83ad 
Co-Authored-By: tombrazier <68918209+tombrazier@users.noreply.github.com>
thinkyhead and others added 25 commits March 29, 2023 22:34
@thinkyhead
🐛 Fix _HAS_FAN for fan on Pin 0
a8ac83b
@thinkyhead
🎨 Refine probe, more debug
49f1cc8
@thinkyhead
🩹 Fix displayed mix percentages
c91f3a7
@thinkyhead
[cron] Bump distribution date (2023-03-31)
b1398cf
@thinkyhead
🔧 DGUS_LCD_UI selectable options
20e2305
@ellensp
🔧 Fix SENSORLESS hit state error (MarlinFirmware#25604)
16bd900
@thinkyhead
🧑‍💻 CardReader adjustments (MarlinFirmware#25611)
06e5273
@thinkyhead
[cron] Bump distribution date (2023-04-01)
afb9ed7
@thinkyhead
🎨 HAS_SHAPING => HAS_ZV_SHAPING
8cdf43f
@thinkyhead @ulendoalex
✨ Fixed-Time Motion with Input Shaping by Ulendo (MarlinFirmware#25394)
c37fa3c 
Co-authored-by: Ulendo Alex <alex@ulendo.io>
@eduard-sukharev
🐛 Fix Long FIlename lookup (MarlinFirmware#25598)
06d9a2f
@GMagician
🌐 Update Italian language (MarlinFirmware#25587)
1be2a7e
@thinkyhead
🔨 Move Docker local test script
c47189a 
Followup to MarlinFirmware#25583
@thinkyhead
🩹 FT_MOTION Followup
c25a673
@thinkyhead
🐛 Ensure root for 'M503 C'
80839cf
@thinkyhead
🐛 Clean up DELTA babystep Z
e687490
@thinkyhead
🐛 INVERT_*_DIR for FT_MOTION (MarlinFirmware#25637)
4aec74f
@thinkyhead
🔧 Move DOGLCD options
7e700c1
@thinkyhead
🧑‍💻 Update pinsformat.js
42a5ae8
@thinkyhead
📝 Update Ender # labels
5b1f087
@thinkyhead
[cron] Bump distribution date (2023-04-07)
2fa4a77
@ellensp
🚸 Support CoreXY without Z (MarlinFirmware#25630)
74b205c
@thinkyhead
🎨 Apply const (MarlinFirmware#25643)
27b8288
@shadow578
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marlin…
82de862 
… into MarlinFirmware-bugfix-2.1.x
@shadow578
update pins_Aquila_X2.h to new format
02d49a2
@shadow578 shadow578 marked this pull request as ready for review April 7, 2023 13:05
@shadow578 shadow578 merged commit 2f3e407 into aquila Apr 7, 2023
@shadow578 shadow578 deleted the MarlinFirmware-bugfix-2.1.x branch April 7, 2023 13:06
@shadow578 shadow578 restored the MarlinFirmware-bugfix-2.1.x branch April 7, 2023 13:09
@shadow578 shadow578 deleted the MarlinFirmware-bugfix-2.1.x branch April 7, 2023 13:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.