SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #6978 from thinkyhead/fix_z_endstop_adj

Browse source 
Fix z_endstop_adj initializer
This commit is contained in:
Scott Lahteine 2017-06-07 16:07:21 -05:00 committed by GitHub
commit 7f0945d2b1
4 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Marlin/Marlin_main.cpp
View file

@ -7918,19 +7918,18 @@ inline void gcode_M121() { endstops.enable_globally(false); }
#ifdef PAUSE_PARK_X_POS #ifdef PAUSE_PARK_X_POS
+ PAUSE_PARK_X_POS + PAUSE_PARK_X_POS
#endif #endif
#if HOTENDS > 1 && DISABLED(DUAL_X_CARRIAGE)
+ (active_extruder ? hotend_offset[X_AXIS][active_extruder] : 0)
#endif
; ;
const float y_pos = parser.seen('Y') ? parser.value_linear_units() : 0 const float y_pos = parser.seen('Y') ? parser.value_linear_units() : 0
#ifdef PAUSE_PARK_Y_POS #ifdef PAUSE_PARK_Y_POS
+ PAUSE_PARK_Y_POS + PAUSE_PARK_Y_POS
#endif #endif
;
#if HOTENDS > 1 && DISABLED(DUAL_X_CARRIAGE) #if HOTENDS > 1 && DISABLED(DUAL_X_CARRIAGE)
if (active_extruder > 0) { + (active_extruder ? hotend_offset[Y_AXIS][active_extruder] : 0)
if (!parser.seen('X')) x_pos += hotend_offset[X_AXIS][active_extruder];
if (!parser.seen('Y')) y_pos += hotend_offset[Y_AXIS][active_extruder];
}
#endif #endif
;
const bool job_running = print_job_timer.isRunning(); const bool job_running = print_job_timer.isRunning();

2
Marlin/configuration_store.cpp
View file

@ -1192,7 +1192,7 @@ void MarlinSettings::reset() {
#elif ENABLED(Z_DUAL_ENDSTOPS) #elif ENABLED(Z_DUAL_ENDSTOPS)
float z_endstop_adj = z_endstop_adj =
#ifdef Z_DUAL_ENDSTOPS_ADJUSTMENT #ifdef Z_DUAL_ENDSTOPS_ADJUSTMENT
Z_DUAL_ENDSTOPS_ADJUSTMENT Z_DUAL_ENDSTOPS_ADJUSTMENT
#else #else

3
Marlin/ultralcd.cpp
View file

@ -1731,7 +1731,10 @@ void kill_screen(const char* lcd_msg) {
static bool _level_state; static bool _level_state;
void _lcd_toggle_bed_leveling() { set_bed_leveling_enabled(_level_state); } void _lcd_toggle_bed_leveling() { set_bed_leveling_enabled(_level_state); }
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
void _lcd_set_z_fade_height() { set_z_fade_height(planner.z_fade_height); } void _lcd_set_z_fade_height() { set_z_fade_height(planner.z_fade_height); }
#endif
/** /**
* Step 1: Bed Level entry-point * Step 1: Bed Level entry-point

7
buildroot/bin/build_marlin_fail Executable file
View file

@ -0,0 +1,7 @@
#!/usr/bin/env bash
if arduino --verify --board arduino:avr:mega:cpu=atmega2560 Marlin/Marlin.ino ; then
return 1
else
return 0
fi