Merge branch 'CrealityDwin2.0_Bleeding' into F1rstLayer_Touchscreens
This commit is contained in:
InsanityAutomation
@@ -458,7 +458,7 @@
|
||||
#define SpriteExtruder
|
||||
#endif
|
||||
|
||||
#if ANY(MachineCR10SV2, MachineEnder2Pro)
|
||||
#if ANY(MachineCR10SV2)
|
||||
#define lerdgeFilSensor
|
||||
#endif
|
||||
|
||||
@@ -718,7 +718,7 @@
|
||||
*
|
||||
* :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000]
|
||||
*/
|
||||
#if ANY(MachineEnder3V2, MachineEnder3S1, CrealityViewerKit, MachineCR6, MachineCR6Max, MachineEnder3Touchscreen, MachineCR10Smart, MachineCR10SmartPro, FORCEV2DISPLAY)
|
||||
#if ANY(MachineEnder3V2, MachineEnder3S1, CrealityViewerKit, MachineCR6, MachineCR6Max, MachineEnder3Touchscreen, MachineCR10Smart, MachineCR10SmartPro, FORCEV2DISPLAY, MachineEnder2Pro)
|
||||
#define BAUDRATE 115200
|
||||
#else
|
||||
#define BAUDRATE 250000
|
||||
@@ -1727,9 +1727,8 @@
|
||||
#define J_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
|
||||
#define K_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
|
||||
#define W_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
|
||||
#define Z_MIN_PROBE_ENDSTOP_INVERTING false // Set to true to invert the logic of the probe.
|
||||
|
||||
#if NONE(ABL_EZABL, MachineCR2020, MachineCR5)
|
||||
#if NONE(ABL_EZABL, MachineCR2020)
|
||||
#define Z_MIN_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
|
||||
#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the probe.
|
||||
#else
|
||||
|
||||
@@ -2689,6 +2689,8 @@
|
||||
#define FILAMENT_CHANGE_UNLOAD_LENGTH 125
|
||||
#elif ANY(MachineEnder5Plus, MachineCR10Max, MachineCR10S4, MachineCR10S5)
|
||||
#define FILAMENT_CHANGE_UNLOAD_LENGTH 700
|
||||
#elif ANY(MachineEnder2, MachineEnder2Pro)
|
||||
#define FILAMENT_CHANGE_UNLOAD_LENGTH 325 // (mm) The length of filament for a complete unload.
|
||||
#else
|
||||
#define FILAMENT_CHANGE_UNLOAD_LENGTH 430 // (mm) The length of filament for a complete unload.
|
||||
#endif
|
||||
@@ -4181,9 +4183,9 @@
|
||||
|
||||
#define MAIN_MENU_ITEM_1_DESC "Setup"
|
||||
#if (ENABLED(ABL_UBL))
|
||||
#define MAIN_MENU_ITEM_1_GCODE "M190S" CommBedTmp "\nG28" DualZComm "\nG29P1\nG29P3\nG29S1\nG29S0\nG29F0.0\nG29A\nM104S215\nG28\nM109S215\nG1X150Y150F5000\nG1Z0\nM500\nM400\nM117 Set Z Offset"
|
||||
#define MAIN_MENU_ITEM_1_GCODE "M190S" CommBedTmp "\nG28" DualZComm "\nG29P1\nG29P3\nG29S1\nG29S0\nG29F0.0\nG29A\nM104S215\nG28\nM109S215\nG1X150Y150F5000\nG1Z0\nM500\nM400\nM77\nM117 Set Z Offset"
|
||||
#elif ENABLED(ABL_BI)
|
||||
#define MAIN_MENU_ITEM_1_GCODE "M190S" CommBedTmp "\nG28" DualZComm "\nG29\nM400\nM104S215\nG28\nM109S215\nM420S1\nG1X100Y100F5000\nG1Z0\nM500\nM117 Set Z Offset"
|
||||
#define MAIN_MENU_ITEM_1_GCODE "M190S" CommBedTmp "\nG28" DualZComm "\nG29\nM400\nM104S215\nG28\nM109S215\nM420S1\nG1X100Y100F5000\nG1Z0\nM500\nM77\nM117 Set Z Offset"
|
||||
#endif
|
||||
//#define MAIN_MENU_ITEM_1_CONFIRM // Show a confirmation dialog before this action
|
||||
|
||||
|
||||
@@ -2541,6 +2541,10 @@ void onLevelingStart() {
|
||||
|
||||
}
|
||||
|
||||
void onLevelingDone() {
|
||||
|
||||
}
|
||||
|
||||
void onSteppersEnabled()
|
||||
{
|
||||
|
||||
|
||||
@@ -28,14 +28,14 @@ This branch is specifically intended to support the kits sold by F1rst Layer inc
|
||||
- [CR30](https://www.tinymachines3d.com/products/cr-30-infinite-z-belt-3d-printer?rfsn=3419592.cc302fe)
|
||||
- [Sermoon D1](https://amzn.to/3LXfZeD)
|
||||
- [CR5 / Pro HT](https://amzn.to/3gWvpBt)
|
||||
- [Ender 3 S1](https://www.tinymachines3d.com/products/ender-3-s1-3d-printer?rfsn=3419592.cc302fe)
|
||||
- [Ender 2 Pro](https://www.tinymachines3d.com/products/ender-2-pro-3d-printer?rfsn=3419592.cc302fe)
|
||||
|
||||
- CR10S, CR10S4, CR20 and Pro, CR10, CR10Mini, CR2020, Ender 4, Ender 2 - Legacy support
|
||||
- These configurations exist however due to age and product availability are no longer actively tested
|
||||
|
||||
## Coming Soon
|
||||
- [Ender 3 S1](https://www.tinymachines3d.com/products/ender-3-s1-3d-printer?rfsn=3419592.cc302fe)
|
||||
- [CR10 Smart Pro](https://www.tinymachines3d.com/products/cr-10-smart-pro-3d-printer?rfsn=3419592.cc302fe)
|
||||
- [Ender 2 Pro](https://www.tinymachines3d.com/products/ender-2-pro-3d-printer?rfsn=3419592.cc302fe)
|
||||
- [CR200B]()
|
||||
|
||||
## Resin machines below from Tiny Machines are listed simply as an additional way to help support the project. If youre considering buying one, please do so through the following links :
|
||||
@@ -75,6 +75,14 @@ We have now created a dedicated Discord server to handle support and archive rel
|
||||
Insanity Automation Discord - https://discord.gg/TKmJ85PyG4
|
||||
Marlin Firmware Discord - https://discord.gg/n5NJ59y
|
||||
|
||||
## Primary Notes for DW7.4.6
|
||||
- Added Support for the Ender 2 Pro
|
||||
- Added support for the Ender 3 S1 thanks to F1rst Layer providing a machine!
|
||||
- Added support for the new DACAI screens being used on current production E3V2 and S1 machines
|
||||
- Added support for runtime configurable runout sensors matching RRF M591 including type and polarity
|
||||
- Moved E3V2/S1 machines to Marlin Display
|
||||
- - Due to the ongoing fued between developers and GPL violations involved with both the Pro/Enahnced UI and the Jyers UI, we have decided to support neither and stay away from the conflict as much as possible. The Marlin UI has more configuration functionality and the menus are more adaptive to the configuration of the machine. This is based off of the default Marlin menu system and will be the most stable long term going forward as well. The cosmetics and graphical icons may not be as nice as with the other UI's however we belive the added functionality more than makes up for it.
|
||||
|
||||
## Primary Notes for DW7.4.5
|
||||
- Added support for CR10 Smart - Thanks to Tinymachines for providing the machine
|
||||
- Revised file size issues causing corrupted screens on DWINOS3/4 displays (Sermoon, E6/7 etc)
|
||||
@@ -87,11 +95,11 @@ Marlin Firmware Discord - https://discord.gg/n5NJ59y
|
||||
## Primary Notes for DW7.4.4
|
||||
- Added Feedrate / Accel / Jerk Screens
|
||||
- Touchscreen DGUS tools bumped to 8.2
|
||||
-- All Portrait displays operate with the same build
|
||||
-- Older screens (10S Pro) audio file selection is a bit off, havnt found a way to properly enforce wav file used yet
|
||||
- - All Portrait displays operate with the same build
|
||||
- - Older screens (10S Pro) audio file selection is a bit off, havnt found a way to properly enforce wav file used yet
|
||||
- Ender 7 support
|
||||
- Sermoon D1 Support
|
||||
-- Some users have reported Z clicking that the scripts run in the Leveling screen resolves, so if you hear clicking from the Z stepper when printing, run measuring from the leveling screen after powerup before printing.
|
||||
- - Some users have reported Z clicking that the scripts run in the Leveling screen resolves, so if you hear clicking from the Z stepper when printing, run measuring from the leveling screen after powerup before printing.
|
||||
- E3V2 Screens Icon issue fixed thanks to note from Jyers on icon file size limit
|
||||
|
||||
## Primary Notes for DW7.4.3
|
||||
|
||||
Reference in New Issue
Block a user