A happy assortment of fixes (T2425, T2398, T2427, T2267)

The following change will affect all printers:

- Restored old behavior of returning to first LCD menu item on back (T2425)
- Actually disabled PRINTJOB_TIMER_AUTOSTART (T2267)

The following changes will affect Hibiscus only:

- Changed default Z-offset to -1.1 (T2398)
- Fixed issue where "G29 V4" would crash if a failed probe happened (T2427)
master
Marcio Teixeira 7 years ago
parent b4ec240300
commit 633a7b1971

@ -13,7 +13,7 @@
* got disabled. * got disabled.
*/ */
#define LULZBOT_FW_VERSION ".33" // Change this with each update #define LULZBOT_FW_VERSION ".34" // Change this with each update
#if ( \ #if ( \
!defined(LULZBOT_Gladiola_Mini) && \ !defined(LULZBOT_Gladiola_Mini) && \
@ -1595,8 +1595,7 @@
#define LULZBOT_EXECUTE_IMMEDIATE_IMPL \ #define LULZBOT_EXECUTE_IMMEDIATE_IMPL \
void execute_commands_immediate_P(const char *pgcode) { \ void execute_commands_immediate_P(const char *pgcode) { \
/* Save the parser state */ \ /* Save the parser state */ \
char saved_cmd[strlen(parser.command_ptr) + 1]; \ char *saved_cmd = parser.command_ptr; \
strcpy(saved_cmd, parser.command_ptr); \
/* Process individual commands in string */ \ /* Process individual commands in string */ \
while(pgm_read_byte_near(pgcode) != '\0') { \ while(pgm_read_byte_near(pgcode) != '\0') { \
/* Break up string at '\n' delimiters */ \ /* Break up string at '\n' delimiters */ \
@ -1744,7 +1743,11 @@
#define LULZBOT_DEFAULT_YJERK 12.0 #define LULZBOT_DEFAULT_YJERK 12.0
#define LULZBOT_DEFAULT_ZJERK 0.4 #define LULZBOT_DEFAULT_ZJERK 0.4
#define LULZBOT_Z_PROBE_OFFSET_FROM_EXTRUDER -1.375 #if defined(LULZBOT_USE_Z_BELT)
#define LULZBOT_Z_PROBE_OFFSET_FROM_EXTRUDER -1.1
#else
#define LULZBOT_Z_PROBE_OFFSET_FROM_EXTRUDER -1.375
#endif
#elif defined(LULZBOT_IS_TAZ) #elif defined(LULZBOT_IS_TAZ)
#define LULZBOT_DEFAULT_XJERK 8.0 #define LULZBOT_DEFAULT_XJERK 8.0
@ -1901,6 +1904,7 @@
#define LULZBOT_THIN_OVERLAY_ARROWS #define LULZBOT_THIN_OVERLAY_ARROWS
#define LULZBOT_DISABLE_KILL_BUTTON #define LULZBOT_DISABLE_KILL_BUTTON
#define LULZBOT_ZOFFSET_PRECISION ftostr32 #define LULZBOT_ZOFFSET_PRECISION ftostr32
#define LULZBOT_RESET_SELECTION_TO_FIRST_ON_MENU_BACK
#endif #endif
/* Marlin requires static PSTRs to display on the LCD display, because of this */ /* Marlin requires static PSTRs to display on the LCD display, because of this */

@ -1295,7 +1295,7 @@
* M76 - Pause the print job timer * M76 - Pause the print job timer
* M77 - Stop the print job timer * M77 - Stop the print job timer
*/ */
#define PRINTJOB_TIMER_AUTOSTART //#define PRINTJOB_TIMER_AUTOSTART LULZBOT_PRINTJOB_TIMER_AUTOSTART_DISABLED
/** /**
* Print Counter * Print Counter

@ -586,8 +586,10 @@ uint16_t max_display_update_time = 0;
if (screen_history_depth > 0) { if (screen_history_depth > 0) {
--screen_history_depth; --screen_history_depth;
lcd_goto_screen( lcd_goto_screen(
screen_history[screen_history_depth].menu_function, screen_history[screen_history_depth].menu_function
screen_history[screen_history_depth].encoder_position #if !defined(LULZBOT_RESET_SELECTION_TO_FIRST_ON_MENU_BACK)
,screen_history[screen_history_depth].encoder_position
#endif
); );
} }
else else

Loading…
Cancel
Save