jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More smart pro tweaks

Browse Source
This commit is contained in:
InsanityAutomation
2022-05-08 17:33:13 -04:00
parent 01ef9afdd0
commit e4e9f01bf0
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/Configuration.h
+5 -3
View File
@@ -450,7 +450,7 @@
#endif
#endif
#if ENABLED(MachineEnder3S1)
#if ANY(MachineEnder3S1, MachineCR10SmartPro)
#define SpriteExtruder
#endif
@@ -1854,7 +1854,7 @@
// Enable this feature if all enabled endstop pins are interrupt-capable.
// This will remove the need to poll the interrupt pins, saving many CPU cycles.
#if ANY(MachineEnder3V2, MachineEnder3S1, Creality422, MachineEnder2Pro) && NONE(SKRE3Turbo, SKR14Turbo, SKR14, SKR13)
#if ANY(MachineEnder3V2, MachineEnder3S1, Creality422, MachineEnder2Pro, MachineCR10SmartPro) && NONE(SKRE3Turbo, SKR14Turbo, SKR14, SKR13)
#define ENDSTOP_INTERRUPTS_FEATURE
#endif
@@ -1870,7 +1870,7 @@
*
* :[2,3,4,5,6,7]
*/
#if ANY(MachineEnder5Plus, CableExtensionNoiseFilter, MachineCR6, MachineCR6Max, MachineEnder6, MachineCR10Smart, MachineCR10SmartPro, MachineSermoonD1)
#if ANY(MachineEnder5Plus, CableExtensionNoiseFilter, MachineCR6, MachineCR6Max, MachineEnder6, MachineCR10Smart, MachineSermoonD1)
#define ENDSTOP_NOISE_THRESHOLD 2
#endif
@@ -2331,6 +2331,8 @@
#define NOZZLE_TO_PROBE_OFFSET { -45, -5, 0 }
#elif ENABLED(MachineEnder3S1)
#define NOZZLE_TO_PROBE_OFFSET { -37, -39, -2.0 }
#elif ENABLED(MachineCR10SmartPro)
#define NOZZLE_TO_PROBE_OFFSET { -30, -40, -1.0 }
#elif (ENABLED(ABL_BLTOUCH) && ENABLED(HotendStock))
#define NOZZLE_TO_PROBE_OFFSET { -41, -8, 0 }
#elif ((ANY(ABL_EZABL, ABL_NCSW)) && ENABLED(HotendStock))
Marlin/Configuration_adv.h
+12 -6
View File
@@ -4181,25 +4181,31 @@
#define DualZComm ""
#endif
#if ENABLED(EXTENSIBLE_UI)
#define PRINTTIMERSTOP ""
#else
#define PRINTTIMERSTOP "M77\n"
#endif
#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\nM77\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\n" PRINTTIMERSTOP "M117 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\nM77\nM117 Set Z Offset"
#define MAIN_MENU_ITEM_1_GCODE "M190S" CommBedTmp "\nG28" DualZComm "\nG29\nM400\nM104S215\nG28\nM109S215\nM420S1\nG1X100Y100F5000\nG1Z0\nM500\n" PRINTTIMERSTOP "M117 Set Z Offset"
#endif
//#define MAIN_MENU_ITEM_1_CONFIRM // Show a confirmation dialog before this action
#define MAIN_MENU_ITEM_1_CONFIRM // Show a confirmation dialog before this action
#define MAIN_MENU_ITEM_2_DESC "PID Tune"
#define MAIN_MENU_ITEM_2_GCODE "M106S128\nM303C8S215E0U\nM500\nM117 PID Tune Done"
//#define MAIN_MENU_ITEM_2_CONFIRM // Show a confirmation dialog before this action
#define MAIN_MENU_ITEM_2_CONFIRM // Show a confirmation dialog before this action
#define MAIN_MENU_ITEM_3_DESC "Prep for Z Adjust"
#define MAIN_MENU_ITEM_3_GCODE "M190S" CommBedTmp "\nM104S215\nG28\nG29L1\nG1 X100Y100F5000\nG1Z0"
//#define MAIN_MENU_ITEM_3_CONFIRM // Show a confirmation dialog before this action
#define MAIN_MENU_ITEM_3_CONFIRM // Show a confirmation dialog before this action
#define MAIN_MENU_ITEM_4_DESC "Store Settings"
#define MAIN_MENU_ITEM_4_GCODE "M500\nM117 Settings Stored"
//#define MAIN_MENU_ITEM_4_CONFIRM // Show a confirmation dialog before this action
#define MAIN_MENU_ITEM_4_CONFIRM // Show a confirmation dialog before this action
//#define MAIN_MENU_ITEM_5_DESC "Run Mesh Validation"
//#define MAIN_MENU_ITEM_5_GCODE "G26"