-
-
Notifications
You must be signed in to change notification settings - Fork 19.2k
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.
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
Creality Ender 3 S1 Pro/Plus initial implementation based on lcd_rts.cpp #25948
base: bugfix-2.1.x
Are you sure you want to change the base?
Creality Ender 3 S1 Pro/Plus initial implementation based on lcd_rts.cpp #25948
Conversation
This is MARLIN-E3S1PRO-FORK-BYTT final release. This fork was ported from the Original Creality Ender 3 S1 Pro Code from here: https://github.com/CrealityOfficial/Ender-3S1/tree/s1_pro This port was created by Thomas Toka. This code is based on Marlin bugfix-2.1.x taken from: Marlin Github on the 08th june 2023 after this commit: MarlinFirmware@683916e Other Code was implemented from: Creality Github Synman Github Mriscoc Github johncarlson21 Github Initial commit code taken from the Creality Ender 3 S1 Github Repo: CrealityOfficial/Ender-3S1@f8be17f Crosschecked with the initial and following commits of Synman: synman@25d641e Laser implementation partly taken from Creality´s commit from: CrealityOfficial/Ender-3S1@cb5f3c3 Extended temperature table from mriscoc from: https://github.com/mriscoc/Ender3V2S1/blob/Ender3V2S1-Released/Marlin/src/module/thermistor/thermistor_1.h#L27 Cardreader Update inspiration taken from: https://github.com/CrealityOfficial/CR-10-Smart-Pro/blob/main/Marlin/src/lcd/dwin/lcd_rts.cpp Autopid implementation and other functions taken from here: https://github.com/CrealityOfficial/Ender-5S1 Meshviewer taken from: https://github.com/johncarlson21/SV04-Marlin-2.1.x
bbc7227
to
875e073
Compare
Thanks for the submission of the code in its raw form. Obviously this will require some weeks of cleanup before it will be suitable for merging into our carefully curated codebase, so get ready for the real work to begin. |
dd43774
to
b989967
Compare
b989967
to
b9e8bcd
Compare
better remove this switch as the ids after the switch won´t be available in their needed order when the laser is deactivated
- probing margin needs to be 45 all around for abl. we cant reach the last 40 mm on y max on the pro and plus with th probe. also the manual tramming points match those outer abl points - laser feature is enabled only for abl builds as ubl does not fit then
Can't wait to try this on my S1 Pro |
Great Thanks for your firmware for ENDER 3S1 Plus. I like it. But I cant understand about "laser feature", In MENU I didnt find any labels for working with laser??? |
The PR Version is meanwhile a bit behind my production branches. Laser is fixed in the latest releases i made. but not in the pr and only active in the ABL Builds. My actual production branch is this here: https://github.com/ThomasToka/Marlin/tree/MARLIN-E3S1PROFORK-BYTT-RELEASE-CODE-v005 |
6a01c11
to
8bb172f
Compare
8bb172f
to
40707c0
Compare
d5d5f4c
to
5dd53f0
Compare
e4c3d53
to
d22deb4
Compare
d22deb4
to
acc1d6b
Compare
c624e13
to
e6f1b07
Compare
This PR is well out of date so it's probably best to close it and start with a fresh PR after you've had a chance to rebase your working branch on the latest |
My actual branch has so many enhancements that the whole Marlin is dynamic.
If you want:
I have everything some people only dream to have in Marlin. |
9c65146
to
4f65466
Compare
@ThomasToka This looks very interesting :) |
Well.. Its got a bit more advanced meanwhile.. Simply have a look in v025 in the releases. read the installation.txt |
It's now installed, calibrated, 3DBenchy printed from PrusaSlicer via OctoPrint. So far all good! Will use it for some days and get familiar with it. Thanks for making this firmware available and also for answering promptly. There have been many things I have wanted Creality to fix, sent them several emails. But it seems that you fixed several or all of them! |
Please come over to my discord. https://discord.com/invite/Fh4jsUJWe6 Please post there in #installation-help . |
c792921
to
37fb26b
Compare
37d77d6
to
aa44542
Compare
This is MARLIN-E3S1PROFORK-BYTT final release.
This fork was ported from the Original Creality Ender 3 S1 Pro Code from here: https://github.com/CrealityOfficial/Ender-3S1/tree/s1_pro
This port was created by Thomas Toka.
This code is based on Marlin bugfix-2.1.x taken from: Marlin Github
on the 08th june 2023 after this commit:
683916e
Other Code was implemented from:
Creality Github
Synman Github
Mriscoc Github
johncarlson21 Github
Initial commit code taken from the Creality Ender 3 S1 Github Repo: CrealityOfficial/Ender-3S1@f8be17f
Crosschecked with the initial and following commits of Synman: synman@25d641e
Laser implementation partly taken from Creality´s commit from: CrealityOfficial/Ender-3S1@cb5f3c3
Extended temperature table from mriscoc from:
https://github.com/mriscoc/Ender3V2S1/blob/Ender3V2S1-Released/Marlin/src/module/thermistor/thermistor_1.h#L27
Cardreader Update inspiration taken from:
https://github.com/CrealityOfficial/CR-10-Smart-Pro/blob/main/Marlin/src/lcd/dwin/lcd_rts.cpp
Autopid implementation and other functions taken from here: https://github.com/CrealityOfficial/Ender-5S1
Meshviewer taken from:
https://github.com/johncarlson21/SV04-Marlin-2.1.x
Description
This is the pull request to support the Creality Ender 3 S1 Pro and Ender 3 S1 Plus with the stock touchscreen display.
This code is based on the official release of creality with many many enhancements integrated.
It supports both display hardware versions delivered by the manufacturer which are DWIN and Dacai.
The screen firmware is based on the newly released "3S1 PRO High Speed" files that have the version number 1.0.4.
In the screen folder are three files:
The used lcd_rts.cpp class is still backward compatible to the stock screen firmware released by Creality.
The code is well tested and in production use for months.
The building of the firmware is based on the marlin build system. All variants are buildable.
The "personal" build is a build for the person that maintains it. So it has set some debug headers and the zoffset for the builders
machine. Search for "personal" in configuration.h to change you zoffset.
The laser feature is enabled and also implemented like in crealities release. Still untested.
Abl builds are fully supported with the new screen firmware.
Ubl builds only work with the stock display firmware.
My little community participated in the beta and release candidate phase so its functional in production and has so far
only minor bugs.
The cardviewer class has been extended to support folders and subfolders. This also works with the stock screen firmware.
If a user installs the attached screen firmware it unlocks new features like:
Besides the new features it has many many enhancements like:
I tried to be as transparent as possible to keep marlin working and everything that is relevant should work after this pr also.
This is my first pull request ever. So dont kill me if i did something wrong!
Requirements
Creality Ender 3 S1 Pro or Plus
Benefits
Support for Ender 3 S1 Pro or Plus with the stock display firmware or with enhanced display firmware made by Thomas Toka for the E3S1PROFORK-BYTT
Configurations
inside this pr.
Related Issues