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

Apply Marlin coding standards to MBL class

Browse Source
This commit is contained in:
Scott Lahteine
2016-06-03 21:31:38 -07:00
parent c06de0f097
commit c2362c1b3c
6 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Marlin/Marlin_main.cpp
View File

@@ -2645,14 +2645,14 @@ inline void gcode_G28() {
*/
#if ENABLED(MESH_BED_LEVELING)
float pre_home_z = MESH_HOME_SEARCH_Z;
if (mbl.is_active()) {
if (mbl.active()) {
// Save known Z position if already homed
if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS]) {
pre_home_z = current_position[Z_AXIS];
pre_home_z += mbl.get_z(current_position[X_AXIS] - home_offset[X_AXIS],
current_position[Y_AXIS] - home_offset[Y_AXIS]);
}
mbl.is_active(false);
mbl.set_active(false);
}
#endif
@@ -2957,7 +2957,7 @@ inline void gcode_G28() {
if (home_all_axis || (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && homeZ)) {
current_position[Z_AXIS] = MESH_HOME_SEARCH_Z;
sync_plan_position();
mbl.is_active(true);
mbl.set_active(true);
#if ENABLED(MESH_G28_REST_ORIGIN)
current_position[Z_AXIS] = 0.0;
set_destination_to_current();
@@ -2973,7 +2973,7 @@ inline void gcode_G28() {
else if ((axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS]) && (homeX || homeY)) {
current_position[Z_AXIS] = pre_home_z;
sync_plan_position();
mbl.is_active(true);
mbl.set_active(true);
current_position[Z_AXIS] = pre_home_z -
mbl.get_z(current_position[X_AXIS] - home_offset[X_AXIS],
current_position[Y_AXIS] - home_offset[Y_AXIS]);
@@ -3060,7 +3060,7 @@ inline void gcode_G28() {
case MeshReport:
if (mbl.has_mesh()) {
SERIAL_PROTOCOLPGM("State: ");
if (mbl.is_active())
if (mbl.active())
SERIAL_PROTOCOLPGM("On");
else
SERIAL_PROTOCOLPGM("Off");
@@ -3125,7 +3125,7 @@ inline void gcode_G28() {
// After recording the last point, activate the mbl and home
SERIAL_PROTOCOLLNPGM("Mesh probing done.");
probe_point = -1;
mbl.has_mesh(true);
mbl.set_has_mesh(true);
enqueue_and_echo_commands_P(PSTR("G28"));
}
break;
@@ -3175,7 +3175,7 @@ inline void gcode_G28() {
break;
case MeshReset:
if (mbl.is_active()) {
if (mbl.active()) {
current_position[Z_AXIS] +=
mbl.get_z(current_position[X_AXIS] - home_offset[X_AXIS],
current_position[Y_AXIS] - home_offset[Y_AXIS]) - MESH_HOME_SEARCH_Z;
@@ -5982,7 +5982,7 @@ inline void gcode_M410() {
/**
* M420: Enable/Disable Mesh Bed Leveling
*/
inline void gcode_M420() { if (code_seen('S') && code_has_value()) mbl.has_mesh(!!code_value_short()); }
inline void gcode_M420() { if (code_seen('S') && code_has_value()) mbl.set_has_mesh(!!code_value_short()); }
/**
* M421: Set a single Mesh Bed Leveling Z coordinate
@@ -7373,7 +7373,7 @@ void clamp_to_software_endstops(float target[3]) {
// This function is used to split lines on mesh borders so each segment is only part of one mesh area
void mesh_buffer_line(float x, float y, float z, const float e, float feed_rate, const uint8_t& extruder, uint8_t x_splits = 0xff, uint8_t y_splits = 0xff) {
if (!mbl.is_active()) {
if (!mbl.active()) {
planner.buffer_line(x, y, z, e, feed_rate, extruder);
set_current_to_destination();
return;