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 branch 'bugfix-2.0.x' into HomeEnder3-SKR1_3
* bugfix-2.0.x: (1131 commits) TOUCH_MI_DEPLOY_XPOS fallback to X_MIN_POS (MarlinFirmware#16226) Fix bad #ifdef (MarlinFirmware#16227) Move status screen defines Improve A20M config Tweak some config names Cardreader read/write open methods Include Z in SCARA steps feedrate (MarlinFirmware#16193) Update M503 MBL G29 report (MarlinFirmware#16199) Fix compile error (macro substitution typo) (MarlinFirmware#16194) Add MKS Robin Mini EEPROM defines (MarlinFirmware#16203) Flsun QQ-S example config (MarlinFirmware#16204) Fix RAMBo CNC test Tweak ExtUI Probeless Babystepping (MarlinFirmware#16177) Onboard (always-on) pullups support (MarlinFirmware#16144) Add a CI test for RAMBo + CNC (MarlinFirmware#16126) Disable SD_CHECK_AND_RETRY in BTT E3 configs (MarlinFirmware#16143) Invert E dir of Geeetech A10 (MarlinFirmware#16149) MKS 12864 OLED pins for SGEN-L (MarlinFirmware#16188) Update BTT comments for USB/SD Composite (MarlinFirmware#16130) Use error message !! hints (MarlinFirmware#16145) ... # Conflicts: # Marlin/Configuration.h # Marlin/Configuration_adv.h # Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h # platformio.ini
- Loading branch information
Showing
1,530 changed files
with
318,852 additions
and
57,926 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
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 @@ | ||
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
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
Oops, something went wrong.