wp
/
Marlin-Ai3M
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into pr/3

This commit is contained in:
Marco Nieddu 2019-02-18 23:08:39 +01:00
parent b25aa626e7 0bd5ca912e
commit 7273369c8d
2 changed files with 36 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
Marlin/AnycubicTFT.cpp
View File

@ -309,24 +309,9 @@ void AnycubicTFTClass::HandleSpecialMenu()
} else if (strcmp(SelectedDirectory, "<preheat bed>")==0) { } else if (strcmp(SelectedDirectory, "<preheat bed>")==0) {
SERIAL_PROTOCOLLNPGM("Special Menu: Preheat Bed"); SERIAL_PROTOCOLLNPGM("Special Menu: Preheat Bed");
enqueue_and_echo_commands_P(PSTR("M140 S60")); enqueue_and_echo_commands_P(PSTR("M140 S60"));
} else if (strcmp(SelectedDirectory, "<start mesh leveling>")==0) { } else if (strcmp(SelectedDirectory, "<auto bed leveling>")==0) {
SERIAL_PROTOCOLLNPGM("Special Menu: Start Mesh Leveling"); SERIAL_PROTOCOLLNPGM("Special Menu: Auto Bed Leveling");
enqueue_and_echo_commands_P(PSTR("G29 S1")); enqueue_and_echo_commands_P(PSTR("G28\nG29"));
} else if (strcmp(SelectedDirectory, "<next mesh point>")==0) {
SERIAL_PROTOCOLLNPGM("Special Menu: Next Mesh Point");
enqueue_and_echo_commands_P(PSTR("G29 S2"));
} else if (strcmp(SelectedDirectory, "<z up 0.1>")==0) {
SERIAL_PROTOCOLLNPGM("Special Menu: Z Up 0.1");
enqueue_and_echo_commands_P(PSTR("G91\nG1 Z+0.1\nG90"));
} else if (strcmp(SelectedDirectory, "<z up 0.02>")==0) {
SERIAL_PROTOCOLLNPGM("Special Menu: Z Up 0.02");
enqueue_and_echo_commands_P(PSTR("G91\nG1 Z+0.02\nG90"));
} else if (strcmp(SelectedDirectory, "<z down 0.02>")==0) {
SERIAL_PROTOCOLLNPGM("Special Menu: Z Down 0.02");
enqueue_and_echo_commands_P(PSTR("G91\nG1 Z-0.02\nG90"));
} else if (strcmp(SelectedDirectory, "<z down 0.1>")==0) {
SERIAL_PROTOCOLLNPGM("Special Menu: Z Down 0.1");
enqueue_and_echo_commands_P(PSTR("G91\nG1 Z-0.1\nG90"));
} else if (strcmp(SelectedDirectory, "<filamentchange pause>")==0) { } else if (strcmp(SelectedDirectory, "<filamentchange pause>")==0) {
SERIAL_PROTOCOLLNPGM("Special Menu: FilamentChange Pause"); SERIAL_PROTOCOLLNPGM("Special Menu: FilamentChange Pause");
PausedByFilamentChange=true; PausedByFilamentChange=true;
@ -343,42 +328,30 @@ void AnycubicTFTClass::Ls()
{ {
if (SpecialMenu) { if (SpecialMenu) {
switch (filenumber) { switch (filenumber) {
case 0: // First Page case 0: // First Page
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Z Up 0.1>"); ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Preheat bed>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Z Up 0.1>"); ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Preheat bed>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Z Up 0.02>"); ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Auto Bed Leveling>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Z Up 0.02>"); ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Auto Bed Leveling>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Z Down 0.02>"); ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Save EEPROM>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Z Down 0.02>"); ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Save EEPROM>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Z Down 0.1>"); ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Exit>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Z Down 0.1>"); ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Exit>");
break; break;
case 4: // Second Page case 4: // Second Page
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Preheat bed>"); ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Auto Tune Hotend PID>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Preheat bed>"); ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Auto Tune Hotend PID>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Start Mesh Leveling>"); ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Auto Tune Hotbed PID>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Start Mesh Leveling>"); ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Auto Tune Hotbed PID>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Next Mesh Point>"); ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Load FW Defaults>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Next Mesh Point>"); ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Load FW Defaults>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Save EEPROM>"); ANYCUBIC_SERIAL_PROTOCOLLNPGM("<FilamentChange Pause>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Save EEPROM>"); ANYCUBIC_SERIAL_PROTOCOLLNPGM("<FilamentChange Pause>")
break; break;
case 8: // Third Page case 8: // Third Page
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Exit>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Exit>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Auto Tune Hotend PID>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Auto Tune Hotend PID>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Auto Tune Hotbed PID>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Auto Tune Hotbed PID>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Load FW Defaults>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Load FW Defaults>");
break;
case 12: // Fourth Page
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<FilamentChange Pause>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<FilamentChange Pause>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<FilamentChange Resume>"); ANYCUBIC_SERIAL_PROTOCOLLNPGM("<FilamentChange Resume>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<FilamentChange Resume>"); ANYCUBIC_SERIAL_PROTOCOLLNPGM("<FilamentChange Resume>");
break; break;

32
Marlin/Configuration.h
View File

@ -540,7 +540,7 @@
#define X_MAX_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop. #define X_MAX_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop.
#define Y_MAX_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop. #define Y_MAX_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop.
#define Z_MAX_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop. #define Z_MAX_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop.
#define Z_MIN_PROBE_ENDSTOP_INVERTING true // set to true to invert the logic of the probe. #define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the probe.
/** /**
* Stepper Drivers * Stepper Drivers
@ -587,7 +587,7 @@
* (This feature is not required for common micro-switches mounted on PCBs * (This feature is not required for common micro-switches mounted on PCBs
* based on the Makerbot design, since they already include the 100nF capacitor.) * based on the Makerbot design, since they already include the 100nF capacitor.)
*/ */
#define ENDSTOP_NOISE_FILTER //#define ENDSTOP_NOISE_FILTER
//============================================================================= //=============================================================================
//============================== Movement Settings ============================ //============================== Movement Settings ============================
@ -715,7 +715,7 @@
* Use G29 repeatedly, adjusting the Z height at each point with movement commands * Use G29 repeatedly, adjusting the Z height at each point with movement commands
* or (with LCD_BED_LEVELING) the LCD controller. * or (with LCD_BED_LEVELING) the LCD controller.
*/ */
#define PROBE_MANUALLY //#define PROBE_MANUALLY
//#define MANUAL_PROBE_START_Z 0.2 //#define MANUAL_PROBE_START_Z 0.2
/** /**
@ -727,8 +727,8 @@
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * Z Servo Probe, such as an endstop switch on a rotating arm.
*/ */
//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector. #define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector.
//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles #define Z_SERVO_ANGLES {10,90} // Z Servo Deploy and Stow angles
/** /**
* The BLTouch probe uses a Hall effect sensor and emulates a servo. * The BLTouch probe uses a Hall effect sensor and emulates a servo.
@ -782,8 +782,8 @@
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER -9 // X offset: -left +right [of the nozzle] #define X_PROBE_OFFSET_FROM_EXTRUDER 0 // X offset: -left +right [of the nozzle]
#define Y_PROBE_OFFSET_FROM_EXTRUDER -22 // Y offset: -front +behind [the nozzle] #define Y_PROBE_OFFSET_FROM_EXTRUDER -23 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle] #define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
@ -893,7 +893,7 @@
#define Y_MIN_POS 0 #define Y_MIN_POS 0
#define Z_MIN_POS 0 #define Z_MIN_POS 0
#define X_MAX_POS X_BED_SIZE #define X_MAX_POS X_BED_SIZE
#define Y_MAX_POS Y_BED_SIZE #define Y_MAX_POS 225
#define Z_MAX_POS 205 #define Z_MAX_POS 205
/** /**
@ -981,9 +981,9 @@
*/ */
//#define AUTO_BED_LEVELING_3POINT //#define AUTO_BED_LEVELING_3POINT
//#define AUTO_BED_LEVELING_LINEAR //#define AUTO_BED_LEVELING_LINEAR
//#define AUTO_BED_LEVELING_BILINEAR #define AUTO_BED_LEVELING_BILINEAR
//#define AUTO_BED_LEVELING_UBL //#define AUTO_BED_LEVELING_UBL
#define MESH_BED_LEVELING //#define MESH_BED_LEVELING
/** /**
* Normally G28 leaves leveling disabled on completion. Enable * Normally G28 leaves leveling disabled on completion. Enable
@ -1026,14 +1026,14 @@
#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR) #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
// Set the number of grid points per dimension. // Set the number of grid points per dimension.
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 5
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach). // Set the boundaries for probing (where the probe can reach).
#define LEFT_PROBE_BED_POSITION 25 #define LEFT_PROBE_BED_POSITION 10
#define RIGHT_PROBE_BED_POSITION 181 #define RIGHT_PROBE_BED_POSITION 190
#define FRONT_PROBE_BED_POSITION 25 #define FRONT_PROBE_BED_POSITION 10
#define BACK_PROBE_BED_POSITION 185 #define BACK_PROBE_BED_POSITION 202
// The Z probe minimum outer margin (to validate G29 parameters). // The Z probe minimum outer margin (to validate G29 parameters).
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -1924,7 +1924,7 @@
* Set this manually if there are extra servos needing manual control. * Set this manually if there are extra servos needing manual control.
* Leave undefined or set to 0 to entirely disable the servo subsystem. * Leave undefined or set to 0 to entirely disable the servo subsystem.
*/ */
//#define NUM_SERVOS 3 // Servo index starts with 0 for M280 command #define NUM_SERVOS 1 // Servo index starts with 0 for M280 command
// Delay (in milliseconds) before the next move will start, to give the servo time to reach its target angle. // Delay (in milliseconds) before the next move will start, to give the servo time to reach its target angle.
// 300ms is a good value but you can try less delay. // 300ms is a good value but you can try less delay.