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

Sync Marlin Base #2

Merged
merged 214 commits into from
Mar 9, 2020
Merged

Sync Marlin Base #2

merged 214 commits into from
Mar 9, 2020

Conversation

StJa
Copy link
Owner

@StJa StJa commented Mar 9, 2020

Requirements

  • Filling out this template is required. Pull Requests without a clear description may be closed at the maintainers' discretion.

Description

Benefits

Related Issues

thinkyhead and others added 30 commits January 30, 2020 23:24
@thinkyhead
Add sanity-check for new Advanced Pause option
02f6183 
Followup to #16372
@thinkyhead
Include macros for delta ABC
c4df5cf
@Acenotass
Update Russian language (#16745)
0a6ae66
@rebel1
Fix BTT SKR 1.4 extra endstop pins (#16738)
300b81b
@sjasonsmith
Option for Trigorilla 1.4 with add-on endstops board (#16737)
5b3d968
@sjasonsmith
Consistent M112 with Emergency Parser (#16747)
9a8de23
@thinkyhead
Improve mfadd helper script
1af0579 
- Use the original branch name if none is supplied
- Set the remote tracking to the source
- Accept User/Branch or User:Branch syntax
@thinkyhead
Clean up i2c encoder, sanitize serial
e64b7a3
@thinkyhead
Misc cleanup, whitespace
43d3463
@thinkyhead
Encapsulate probe as singleton class (#16751)
90b6324
@InsanityAutomation
G34 automatic point assignment (#16473)
e58d1bf
@sjasonsmith
Fix Temperature::over_autostart_threshold (#16749)
c3cab37
@Acenotass
Update Russian language (#16750)
832d33c
@thinkyhead
Fix CURRENT_STEP_DOWN compile error
0d342ba
@thinkyhead
Drop obsolete SD special char handling
5296af9 
See #14035
@thinkyhead
Probe singleton patch
995a923 
Followup to #16751
@thinkyhead
Fix RGB / Neopixel white color bug
7a4758a 
See #16752
@thinkyhead
Suppress a compile warning
c4cbc54
@thinkyhead
More 8-extruder fixups
22556a7
@thinkyhead
Add EXP labels to SKR pins
63469ed
@thinkyhead
Fix LPC build with USE_WATCHDOG off
4937519
@thinkyhead
Minor string storage optimization
0e72c31
@thinkyhead
Apply REPEAT, RREPEAT, and loop macros (#16757)
4716dac
@thinkyhead
Revert breaking change to _FAN_PWM macro
ee6003b
@thinkyhead
Add Z_AFTER_HOMING to raise Z more in G28 (#16755)
72b4d91
@thinkyhead
Corner Leveling: Add inset for each side (#16759)
7f9c624
@thinkyhead
(c) 2020
bfad23d
@thinkyhead
Tweak mfqp script
202840e
@thinkyhead
Use a different Configurations branch for CI
ff78f79
@ellensp
Fix LCD Z Move character LCD display line (#16772)
7d4fa9d
InsanityAutomation and others added 28 commits February 25, 2020 22:56
@InsanityAutomation
Fix GTR10 overlapping defines (#16976)
ba4f49f
@InsanityAutomation
Toolchange improvements (#16979)
4250a98
@thinkyhead
Language: "failsafe" => "Defaults"
6b9a17b
@thinkyhead
Use a STR_ prefix for non-translated strings
e78f607
@InsanityAutomation
Set LCD status for EEPROM errors (#16977)
cdcd45d
@thinkyhead
More serial strings
5ebba4b
@ellensp
Add LPC1768 Serial ports for pinsDebug (#16980)
70af080
@InsanityAutomation
Correct SKR expansion port pins (#16974)
28008ac
@thinkyhead
String optimize followup
b5c2190
@ellensp
Fix Trinamic pulse rate auto-assignment (#16966)
e76f2ed
@thinkyhead
Allow weird probe values in G33
cf597e2
@thinkyhead
Serial strings in macros
ec1b86d
@thinkyhead
Sanity check for LPC serial pin conflict (#16981)
daa3201
@thinkyhead
Allow servo features in combination (#16960)
0a7e7a6
@thinkyhead @josedpedroso
Add TRAVEL_EXTRA_XYJERK option
02cce7d 
See #16949

Co-Authored-By: josedpedroso <josedpedroso@users.noreply.github.com>
@thinkyhead
Quick-homing sensorless back-off (#16872)
025c50c
@thinkyhead
Prevent park_point compile error
6913a4d
@thinkyhead @josedpedroso
More extra travel jerk changes
263a7be 
Co-Authored-By: josedpedroso <josedpedroso@users.noreply.github.com>
@thinkyhead
Fix unified status bed temp display
6fd7f4f
@thinkyhead
Allow print recovery after parking
18b875d
@thinkyhead
Case-insensitive g-code option (#16932)
832951e
@thinkyhead
Define DIAG pins for MKS SGen-L
633b716
@thinkyhead
Handle print completed LED event in M0
bafe8d9
@thinkyhead
[cron] Bump distribution date (2020-02-27)
a80eda4
@mak0t0san
Fix planner.cpp compile (#16996)
8164cac
@rmoravcik
Update Slovak language (#17002)
9f8ee31
@thinkyhead
Merge 'bugfix-2.0.x' into 2.0.x
b29aae6
@thinkyhead
Version 2.0.4.4 Release
d6e767e
@StJa StJa merged commit 22bfe65 into StJa:2.0.x Mar 9, 2020
StJa added a commit that referenced this pull request Mar 9, 2020
@StJa
Revert "Sync Marlin Base (#2)"
0fd0091 
This reverts commit 22bfe65.
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.