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

Bring Neptune-2 up to date #2

Open
wants to merge 552 commits into
base: elegoo-neptune-2
Choose a base branch
from
Open

Bring Neptune-2 up to date #2

wants to merge 552 commits into from

Conversation

thinkyhead
Copy link

This is just a quick merge of the current upstream bugfix-2.0.x to bring this branch up to date with that particular branch. Brings it a little closer to being able to bring it up to date with bugfix-2.1.x.

thinkyhead and others added 30 commits May 7, 2022 18:11
@thinkyhead
🩹 Use LCD_CONTRAST_INIT in pins files
7ffe4de
@ellensp @thinkyhead
🐛 Fix STM32 Pins Debugging (MarlinFirmware#22896)
4fd7d1b
@InsanityAutomation @thinkyhead
🩹 Fix and clean up E3V2 draw (MarlinFirmware#23979, MarlinFirmware#24013
7f1c5ad 
)
@ellensp @thinkyhead
🐛 Fix Manual Move cold extrude override (MarlinFirmware#24045)
27b1484 
Followup to MarlinFirmware#19606

Co-authored-by: Scott Lahteine <[email protected]>
@thisiskeithb @thinkyhead
🧑‍💻 Preheat menu improvements (MarlinFirmware#24017)
01c9c26 
Co-authored-by: Scott Lahteine <[email protected]>
@ellensp @thinkyhead
🌐 Update Russian language (MarlinFirmware#23978)
7b39604
@LPR-Michael @thinkyhead
🌐 Update Chinese language (MarlinFirmware#23865)
54e5438
@sphawes @thinkyhead
✨ Add M3426 A<addr> parameter (MarlinFirmware#24130)
995221e 
Co-authored-by: Scott Lahteine <[email protected]>
@HoverClub @thinkyhead
🧑‍💻 Define isr_float_t to assert a non-FPU float (MarlinFirmware#23969)
b0d621d 
Co-authored-by: Scott Lahteine <[email protected]>
@thinkyhead
💥 Rename ExtUI settings methods
4ec9af4
@tombrazier @thinkyhead
♻️ Refactor and fix ABL Bilinear (MarlinFirmware#23868, MarlinFirmwar…
7456589 
…e#24009, MarlinFirmware#24107)
@GMagician @thinkyhead
🐛 Fix PID edit menu for Bed, Chamber (MarlinFirmware#23987)
bed8abe
@GMagician @thinkyhead
🔧 Sanity-check SWITCHING_TOOLHEAD_X_POS (MarlinFirmware#23985)
cbc6f23
@thisiskeithb @thinkyhead
✏️ Fix FYSETC Mini Panel neopixel type (MarlinFirmware#24011, MarlinF…
8d3c84a 
…irmware#24111)
@GMagician @thinkyhead
🌐 Update Italian language (MarlinFirmware#24019)
4b45607
@thinkyhead
🐛 Update M913, M914 report
7b5e2cd 
Followup to MarlinFirmware#11248, MarlinFirmware#11249, MarlinFirmware#23400
@thinkyhead
🎨 Use LEDColor default C-CTOR
28d2bc3
@ellensp @thinkyhead
🩹 Fix DGUS_PREHEAT_UI enable with DGUS_LCD_CLASSIC (MarlinFirmware#24066
230db90 
)
@robbycandra @thinkyhead
🩹 Fix DEBUG_CARDREADER (MarlinFirmware#24023)
8fb3074
@thinkyhead
🩹 Fix ADVANCED_PAUSE_RESUME_PRIME check
4c84769 
Fixes MarlinFirmware#23824
@thisiskeithb @thinkyhead
🐛 Fix ProUI / JyersUI leveling preheat (MarlinFirmware#24060, MarlinF…
7fa2dce 
…irmware#24064)

Co-Authored-By: Scott Lahteine <[email protected]>
@thinkyhead
🧑‍💻 Handle PLR in manage_media
f35404f
@thinkyhead
🩹 Fix ESP32 servos, SD_IGNORE_AT_STARTUP
7444933 
Fixes MarlinFirmware#24007
Followup to aaf5bf0
@thinkyhead
🚸 More ExtUI events for ABL / UBL
4bdec5e
@robbycandra @thinkyhead
⚰️ Clean up dead option (MarlinFirmware#24006)
044bf8a
@thinkyhead
♻️ Consolidate DGUSScreenHandler class (MarlinFirmware#24067)
9ab1a57
@GMagician @thinkyhead
📝 Obsolete freeze comment (MarlinFirmware#23964)
aa4c991 
Followup to MarlinFirmware#23944
@thinkyhead
🔧 Move LASER_COOLANT_FLOW_METER to LASER_FEATURE
8f01808
@thinkyhead
🎨 Tweak NEOPIXEL_LED format (MarlinFirmware#24110)
975b90c
@ellensp @thinkyhead
✏️Fix Markforged endstops/G38 (MarlinFirmware#24141)
727e7e7
strnk and others added 27 commits July 29, 2022 04:24
@strnk @thinkyhead
🩹 Fix ST7565 LCD contrast init (MarlinFirmware#24457)
ab346f2
@thinkyhead
🎨 Fix comments, formatting
cd9a23c
@Dids @thinkyhead
🩹 Fix safe homing sanity-check (MarlinFirmware#24462)
9c2d0f4
@thinkyhead
📝 Note about UBL bad splits
0ef496d
@thinkyhead
🎨 Misc. 6-axis cleanup
0281459
@ellensp @thinkyhead
🐛 Fix BACKLASH_COMPENSATION compile (MarlinFirmware#24072)
407c325 
Followup to MarlinFirmware#23826
@thisiskeithb @thinkyhead
🔧 Assert Probe Temp Comp requirements (MarlinFirmware#24468)
6904e31
@thinkyhead
🩹 Apply linearval in M600
69a1c53
@lujios @thinkyhead
🩹 Fix G33 Delta Sensorless Probing compile (MarlinFirmware#24291)
799b8fc
@ellensp @thinkyhead
🩹 Fix G60/G61 debug code (MarlinFirmware#24231)
a720b1a
@thinkyhead
🧑‍💻 Fix MAP macro use
9ba4c58 
Followup to MarlinFirmware#24191
@InsanityAutomation @thinkyhead
🚸 Machine-relative Z_STEPPER_ALIGN_XY (MarlinFirmware#24261)
3441e91 
Co-authored-by: Scott Lahteine <[email protected]>
@thisiskeithb @thinkyhead
📝 Update board MCU comments (MarlinFirmware#24486)
39f6ae0
@ellensp @thinkyhead
📺 SKR_MINI_SCREEN_ADAPTER for BTT SKR Mini E3 V3 (MarlinFirmware#24521)
78789ee
@thinkyhead
🧑‍💻 Add Sim debug with lldb
5ccaf1d
@thinkyhead
🧑‍💻 Fix and improve build_all_examples
09cc547
@thinkyhead
🩹 Revert extra axis changes
daa7ee6
@tombrazier @thinkyhead
⚡️ Optimize G2-G3 Arcs (MarlinFirmware#24366)
096bea2
@tombrazier @thinkyhead
⚡️ Optimize Planner calculations (MarlinFirmware#24484, MarlinFirmwar…
eee8f11 
…e#24509)
@thisiskeithb
👷 CI for bugfix-2.0.x, updates (MarlinFirmware#24560)
3fab489
@thinkyhead
♻️ Small sound / buzz refactor (MarlinFirmware#24520)
9a0d0e7
@mriscoc @thinkyhead
🚸 Fix, update ProUI (MarlinFirmware#24251, MarlinFirmware#24473, Marl…
2bf631c 
…inFirmware#24500)
@thinkyhead
🧑‍💻 Axis macros parity with 2.1.x
0922702
@thinkyhead
🧑‍💻 Further script updates
79bd1a6
@thinkyhead
🚑️ Fix XYZEval = N not setting E
d5699dd
@moonglow
🩹 Fix M907 "extra axis" limit (MarlinFirmware#24559)
d1211b9
@thinkyhead
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into elegoo-nept…
f9428ba 
…une-2
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.