bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

UBL patch from Bob-the-Kuhn

Browse Source
This commit is contained in:
Scott Lahteine 2017-03-20 15:38:25 -05:00
parent 100c9bc52d
commit cc3204509c
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Marlin/Marlin_main.cpp Normal file → Executable file
View File

@ -508,7 +508,13 @@ static uint8_t target_extruder;
#endif #endif
#if ENABLED(Z_DUAL_ENDSTOPS) #if ENABLED(Z_DUAL_ENDSTOPS)
float z_endstop_adj = 0; float z_endstop_adj =
#ifdef Z_DUAL_ENDSTOPS_ADJUSTMENT
Z_DUAL_ENDSTOPS_ADJUSTMENT
#else
0
#endif
;
#endif #endif
// Extruder offsets // Extruder offsets
@ -2281,7 +2287,7 @@ static void clean_up_after_endstop_or_probe_move() {
if (enable) planner.unapply_leveling(current_position); if (enable) planner.unapply_leveling(current_position);
} }
#elif HAS_ABL #elif HAS_ABL && !ENABLED(AUTO_BED_LEVELING_UBL)
#if ENABLED(AUTO_BED_LEVELING_BILINEAR) #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
const bool can_change = (!enable || (bilinear_grid_spacing[0] && bilinear_grid_spacing[1])); const bool can_change = (!enable || (bilinear_grid_spacing[0] && bilinear_grid_spacing[1]));
@ -2302,7 +2308,11 @@ static void clean_up_after_endstop_or_probe_move() {
else else
planner.unapply_leveling(current_position); planner.unapply_leveling(current_position);
} }
#elif ENABLED(AUTO_BED_LEVELING_UBL)
if (blm.state.EEPROM_storage_slot == 0) {
blm.state.active = enable;
blm.store_state();
}
#endif #endif
} }
@ -7139,6 +7149,8 @@ void quickstop_stepper() {
const bool new_status = const bool new_status =
#if ENABLED(MESH_BED_LEVELING) #if ENABLED(MESH_BED_LEVELING)
mbl.active() mbl.active()
#elif ENABLED(AUTO_BED_LEVELING_UBL)
blm.state.active
#else #else
planner.abl_enabled planner.abl_enabled
#endif #endif

1
Marlin/enum.h Normal file → Executable file
View File

@ -75,6 +75,7 @@ enum DebugFlags {
DEBUG_DRYRUN = _BV(3), ///< Ignore temperature setting and E movement commands DEBUG_DRYRUN = _BV(3), ///< Ignore temperature setting and E movement commands
DEBUG_COMMUNICATION = _BV(4), ///< Not implemented DEBUG_COMMUNICATION = _BV(4), ///< Not implemented
DEBUG_LEVELING = _BV(5), ///< Print detailed output for homing and leveling DEBUG_LEVELING = _BV(5), ///< Print detailed output for homing and leveling
DEBUG_MESH_ADJUST = _BV(6), ///< UBL bed leveling
DEBUG_ALL = 0xFF DEBUG_ALL = 0xFF
}; };