Browse Source
Fix the G26 out of scope identifiers in the v2.0.0 branch (#8543 )
These changes may need to be warmed over. I tried to fix things with
the least amount of disruption. I just wanted to get the bugfix_v2.0.0
branch working for people again.
pull/1/head
Roxy-3D
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
10 additions and
4 deletions
Marlin/src/feature/bedlevel/bedlevel.cpp
Marlin/src/gcode/bedlevel/G26.cpp
@ -41,7 +41,7 @@
# endif
# endif
# if G26_MESH_VALIDATION
# if ENABLED( G26_MESH_VALIDATION)
bool g26_debug_flag ; // = false
# endif
@ -146,6 +146,8 @@ float g26_extrusion_multiplier,
g26_layer_height ,
g26_prime_length ;
float g26_x_pos = 0 , g26_y_pos = 0 ;
int16_t g26_bed_temp ,
g26_hotend_temp ;
@ -403,7 +405,10 @@ inline bool look_for_lines_to_connect() {
SERIAL_ECHOPAIR ( " , ey= " , ey ) ;
SERIAL_CHAR ( ' ) ' ) ;
SERIAL_EOL ( ) ;
# if ENABLED(AUTO_BED_LEVELING_UBL)
void debug_current_and_destination ( const char * title ) ;
debug_current_and_destination ( PSTR ( " Connecting vertical line. " ) ) ;
# endif
}
print_line_from_here_to_there ( sx , sy , g26_layer_height , ex , ey , g26_layer_height ) ;
}
@ -675,8 +680,9 @@ void GcodeSuite::G26() {
return G26_ERR ;
}
float g26_x_pos = parser . seenval ( ' X ' ) ? RAW_X_POSITION ( parser . value_linear_units ( ) ) : current_position [ X_AXIS ] ,
g26_x_pos = parser . seenval ( ' X ' ) ? RAW_X_POSITION ( parser . value_linear_units ( ) ) : current_position [ X_AXIS ] ,
g26_y_pos = parser . seenval ( ' Y ' ) ? RAW_Y_POSITION ( parser . value_linear_units ( ) ) : current_position [ Y_AXIS ] ;
if ( ! position_is_reachable ( g26_x_pos , g26_y_pos ) ) {
SERIAL_PROTOCOLLNPGM ( " ?Specified X,Y coordinate out of bounds. " ) ;
return G26_ERR ;