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

Fix merge issues #21

Merged
merged 62 commits into from
Jul 24, 2020
Merged

Fix merge issues #21

merged 62 commits into from
Jul 24, 2020

Conversation

rhapsodyv
Copy link

Description

It just merge Marlin/bufix-2.0.x to Mks/bufix-2.0.x, solving conflits.

Related Issues

MarlinFirmware#18500

sjasonsmith and others added 30 commits July 15, 2020 01:14
@sjasonsmith
Fix some Power Loss Recovery behaviors (MarlinFirmware#18558)
76b67d5
@thinkyhead
PLR followup
ef90cb7
@thisiskeithb
Fix Hotend Idle Timeout trigger (MarlinFirmware#18657)
246eac0
@thinkyhead
[cron] Bump distribution date (2020-07-16)
05c999a
@ellensp @thinkyhead
Fix SKR 1.4 LCD / ADC Keypad sanity-check (MarlinFirmware#18670)
0223ca8
@thinkyhead
Broadcast host actions
ed3df41 
Fixes MarlinFirmware#18565
@thinkyhead
Sanity-check BABYSTEP_MULTIPLICATOR_*
11e2975
@thinkyhead
[cron] Bump distribution date (2020-07-17)
6b0e8e5
@thinkyhead
Fix material_preset reference issue
b880712
@Evg33
Chopper Timing Preset for 24V 0.9° (MarlinFirmware#18662)
1d68688
@Sergey1560
Fix passive Chamber Temp reading (MarlinFirmware#18674)
9424567
@thinkyhead
Fix check_hotends with > 1 hotend
6dd2b12
@thinkyhead
Tweak and use SD_ORDER
e90bbb3
@hub-jba
ExtUI for Anycubic I3 Mega (MarlinFirmware#18655)
4abad60
@GerogeFu @thinkyhead
Support FT81050 with FYSETC F6 (MarlinFirmware#18678)
bd0430d 
Co-authored-by: Scott Lahteine <[email protected]>
@thinkyhead
Smaller SD EEPROM file on Ender 3 V2
e34684a
@mtowara @thinkyhead
Use safe_delay for PSU_POWERUP_DELAY (MarlinFirmware#18680)
f4aba99 
Co-authored-by: Scott Lahteine <[email protected]>
@thinkyhead
Fix E3V2 M0/M1 and wait_for_user
c2363a8
@thinkyhead
[cron] Bump distribution date (2020-07-18)
f51388f
@rhapsodyv
Chitu V6 - Stepper Z2 pins (MarlinFirmware#18683)
b9d4b0d
@yufanyufan
Fix DGUS write variable endianness (MarlinFirmware#18689)
6f0885a
@TheNitek
Trigorilla Pro board (MarlinFirmware#18692)
afce012
Prettier BLTouch menu items (MarlinFirmware#18682)
a3795e3
@pmjdebruijn
Return to Status on PID Autotune (MarlinFirmware#18695)
d579b70
@thinkyhead
Misc formatting, cleanup
0ddef55
@thinkyhead
[cron] Bump distribution date (2020-07-19)
e85d828
@yufanyufan
More customizable DGUSDisplay (MarlinFirmware#18700)
cfc3668
@marknn3
Fix encoder reverse, partial steps handling (MarlinFirmware#18694)
d96691f
@ccccmagicboy
Update Chinese (cn) language (MarlinFirmware#18705)
12ebb71
@yufanyufan
Fix endian DGUS WriteVariable (MarlinFirmware#18703)
1c94033
thinkyhead and others added 26 commits July 19, 2020 22:06
@thinkyhead
Fix some LVGL warnings
0a86291
@rhapsodyv
Patch auto-deps for Windows CXX (MarlinFirmware#18721)
cea097d
@thinkyhead
[cron] Bump distribution date (2020-07-21)
3aecd92
@thinkyhead
Matching mat.bed_temp condition
e78f123
@rhapsodyv
Ignore unused (but downloaded) libraries (MarlinFirmware#18728)
9ca070f
@ivankravets
Use development version of PlatformIO (MarlinFirmware#18724)
f1ffca1
@rhapsodyv
Fix build for Windows path edge case
2a72f49
@rhapsodyv
Filter some unused Marlin/src subfolders (MarlinFirmware#18729)
f34024a
@yufanyufan
New DGUS UI var / definition syntax (MarlinFirmware#18718)
469f63f
@thinkyhead
Optimize LCD, Wifi, etc. libraries (MarlinFirmware#18730)
6027055
@thinkyhead
Fix inline AnycubicSerial method
2119e19
@thinkyhead
Anycubic followup
1e5d735
@thinkyhead
[cron] Bump distribution date (2020-07-22)
2af216c
@thisiskeithb
Fix Spanish preheat strings (MarlinFirmware#18743)
a9e6af8
@thinkyhead
Explicit SdFat
748c8a7
@InsanityAutomation
Custom Nozzle Wipe (MarlinFirmware#18736)
b4b19ae
@thinkyhead
[cron] Bump distribution date (2020-07-23)
0b46fcd
@sjasonsmith
Linear Advance: Only change E DIR when needed (MarlinFirmware#18744)
f9b1da7
@Diegovd
Fix links to secure sites (MarlinFirmware#18745)
42fbd52
@InsanityAutomation
Fast Filament Change temperature check (MarlinFirmware#18738)
e1191de
@rhapsodyv
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into mks-bugfix-…
58de3da 
…2.0.x
@rhapsodyv
SPI_GRAPHICAL_TFT is a variant of TFT_LVGL_UI, not other lcd
0d3dee9
@rhapsodyv
script path
8ef749a
@rhapsodyv
restore env:mks_robin_nano35_v2, because nano 2 needs a file named Ro…
01ae3cf 
…bin_nano35.bin
@rhapsodyv
text
79076e3
@rhapsodyv
create the paths if not exist
728e39e
@rhapsodyv rhapsodyv mentioned this pull request Jul 24, 2020
Merged
@makerbase-mks makerbase-mks merged commit 942a2f8 into makerbase-mks:bugfix-2.0.x Jul 24, 2020
@rhapsodyv rhapsodyv deleted the mks-bugfix-2.0.x branch October 25, 2020 00:32
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.