Merge pull request #8296 from thinkyhead/bf1_incidentals

[1.1] Misc. fixes picked up from 2.0.x
master
Scott Lahteine 7 years ago committed by GitHub
commit fff4d71ba5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -5055,6 +5055,8 @@ void home_all_axes() { gcode_G28(true); }
bool zig = PR_OUTER_END & 1; // Always end at RIGHT and BACK_PROBE_BED_POSITION bool zig = PR_OUTER_END & 1; // Always end at RIGHT and BACK_PROBE_BED_POSITION
measured_z = 0;
// Outer loop is Y with PROBE_Y_FIRST disabled // Outer loop is Y with PROBE_Y_FIRST disabled
for (uint8_t PR_OUTER_VAR = 0; PR_OUTER_VAR < PR_OUTER_END && !isnan(measured_z); PR_OUTER_VAR++) { for (uint8_t PR_OUTER_VAR = 0; PR_OUTER_VAR < PR_OUTER_END && !isnan(measured_z); PR_OUTER_VAR++) {
@ -8705,8 +8707,8 @@ inline void gcode_M117() { lcd_setstatus(parser.string_arg); }
/** /**
* M118: Display a message in the host console. * M118: Display a message in the host console.
* *
* A Append '// ' for an action command, as in OctoPrint * A1 Append '// ' for an action command, as in OctoPrint
* E Have the host 'echo:' the text * E1 Have the host 'echo:' the text
*/ */
inline void gcode_M118() { inline void gcode_M118() {
if (parser.boolval('E')) SERIAL_ECHO_START(); if (parser.boolval('E')) SERIAL_ECHO_START();
@ -10965,7 +10967,7 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
#if ENABLED(PARKING_EXTRUDER) // Dual Parking extruder #if ENABLED(PARKING_EXTRUDER) // Dual Parking extruder
const float z_diff = hotend_offset[Z_AXIS][active_extruder] - hotend_offset[Z_AXIS][tmp_extruder]; const float z_diff = hotend_offset[Z_AXIS][active_extruder] - hotend_offset[Z_AXIS][tmp_extruder];
float z_raise = 0; float z_raise = PARKING_EXTRUDER_SECURITY_RAISE;
if (!no_move) { if (!no_move) {
const float parkingposx[] = PARKING_EXTRUDER_PARKING_X, const float parkingposx[] = PARKING_EXTRUDER_PARKING_X,
@ -10988,7 +10990,6 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
SERIAL_ECHOLNPGM("Starting Autopark"); SERIAL_ECHOLNPGM("Starting Autopark");
if (DEBUGGING(LEVELING)) DEBUG_POS("current position:", current_position); if (DEBUGGING(LEVELING)) DEBUG_POS("current position:", current_position);
#endif #endif
z_raise = PARKING_EXTRUDER_SECURITY_RAISE;
current_position[Z_AXIS] += z_raise; current_position[Z_AXIS] += z_raise;
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
SERIAL_ECHOLNPGM("(1) Raise Z-Axis "); SERIAL_ECHOLNPGM("(1) Raise Z-Axis ");
@ -13026,6 +13027,7 @@ void prepare_move_to_destination() {
#if ENABLED(CNC_WORKSPACE_PLANES) #if ENABLED(CNC_WORKSPACE_PLANES)
AxisEnum p_axis, q_axis, l_axis; AxisEnum p_axis, q_axis, l_axis;
switch (workspace_plane) { switch (workspace_plane) {
default:
case PLANE_XY: p_axis = X_AXIS; q_axis = Y_AXIS; l_axis = Z_AXIS; break; case PLANE_XY: p_axis = X_AXIS; q_axis = Y_AXIS; l_axis = Z_AXIS; break;
case PLANE_ZX: p_axis = Z_AXIS; q_axis = X_AXIS; l_axis = Y_AXIS; break; case PLANE_ZX: p_axis = Z_AXIS; q_axis = X_AXIS; l_axis = Y_AXIS; break;
case PLANE_YZ: p_axis = Y_AXIS; q_axis = Z_AXIS; l_axis = X_AXIS; break; case PLANE_YZ: p_axis = Y_AXIS; q_axis = Z_AXIS; l_axis = X_AXIS; break;

@ -1384,7 +1384,7 @@ bool SdBaseFile::rmdir() {
* the value zero, false, is returned for failure. * the value zero, false, is returned for failure.
*/ */
bool SdBaseFile::rmRfStar() { bool SdBaseFile::rmRfStar() {
uint16_t index; uint32_t index;
SdBaseFile f; SdBaseFile f;
rewind(); rewind();
while (curPosition_ < fileSize_) { while (curPosition_ < fileSize_) {

@ -64,7 +64,7 @@
* 195 M206 XYZ home_offset (float x3) * 195 M206 XYZ home_offset (float x3)
* 207 M218 XYZ hotend_offset (float x3 per additional hotend) * 207 M218 XYZ hotend_offset (float x3 per additional hotend)
* *
* Global Leveling: * Global Leveling: 4 bytes
* 219 z_fade_height (float) * 219 z_fade_height (float)
* *
* MESH_BED_LEVELING: 43 bytes * MESH_BED_LEVELING: 43 bytes
@ -80,7 +80,7 @@
* ABL_PLANAR: 36 bytes * ABL_PLANAR: 36 bytes
* 270 planner.bed_level_matrix (matrix_3x3 = float x9) * 270 planner.bed_level_matrix (matrix_3x3 = float x9)
* *
* AUTO_BED_LEVELING_BILINEAR: 47 bytes * AUTO_BED_LEVELING_BILINEAR: 46 bytes
* 306 GRID_MAX_POINTS_X (uint8_t) * 306 GRID_MAX_POINTS_X (uint8_t)
* 307 GRID_MAX_POINTS_Y (uint8_t) * 307 GRID_MAX_POINTS_Y (uint8_t)
* 308 bilinear_grid_spacing (int x2) * 308 bilinear_grid_spacing (int x2)

@ -150,7 +150,7 @@ void GCodeParser::parse(char *p) {
#endif #endif
// Only use string_arg for these M codes // Only use string_arg for these M codes
if (letter == 'M') switch (codenum) { case 23: case 28: case 30: case 117: case 118: case 928: string_arg = p; return; default: break; } if (letter == 'M') switch (codenum) { case 23: case 28: case 30: case 117: case 928: string_arg = p; return; default: break; }
#if ENABLED(DEBUG_GCODE_PARSER) #if ENABLED(DEBUG_GCODE_PARSER)
const bool debug = codenum == 800; const bool debug = codenum == 800;
@ -162,6 +162,7 @@ void GCodeParser::parse(char *p) {
* Most codes ignore 'string_arg', but those that want a string will get the right pointer. * Most codes ignore 'string_arg', but those that want a string will get the right pointer.
* The following loop assigns the first "parameter" having no numeric value to 'string_arg'. * The following loop assigns the first "parameter" having no numeric value to 'string_arg'.
* This allows M0/M1 with expire time to work: "M0 S5 You Win!" * This allows M0/M1 with expire time to work: "M0 S5 You Win!"
* For 'M118' you must use 'E1' and 'A1' rather than just 'E' or 'A'
*/ */
string_arg = NULL; string_arg = NULL;
while (char code = *p++) { // Get the next parameter. A NUL ends the loop while (char code = *p++) { // Get the next parameter. A NUL ends the loop

@ -1813,8 +1813,8 @@ void Temperature::isr() {
// Macros for Slow PWM timer logic // Macros for Slow PWM timer logic
#define _SLOW_PWM_ROUTINE(NR, src) \ #define _SLOW_PWM_ROUTINE(NR, src) \
soft_pwm_ ##NR = src; \ soft_pwm_count_ ##NR = src; \
if (soft_pwm_ ##NR > 0) { \ if (soft_pwm_count_ ##NR > 0) { \
if (state_timer_heater_ ##NR == 0) { \ if (state_timer_heater_ ##NR == 0) { \
if (state_heater_ ##NR == 0) state_timer_heater_ ##NR = MIN_STATE_TIME; \ if (state_heater_ ##NR == 0) state_timer_heater_ ##NR = MIN_STATE_TIME; \
state_heater_ ##NR = 1; \ state_heater_ ##NR = 1; \
@ -1831,7 +1831,7 @@ void Temperature::isr() {
#define SLOW_PWM_ROUTINE(n) _SLOW_PWM_ROUTINE(n, soft_pwm_amount[n]) #define SLOW_PWM_ROUTINE(n) _SLOW_PWM_ROUTINE(n, soft_pwm_amount[n])
#define PWM_OFF_ROUTINE(NR) \ #define PWM_OFF_ROUTINE(NR) \
if (soft_pwm_ ##NR < slow_pwm_count) { \ if (soft_pwm_count_ ##NR < slow_pwm_count) { \
if (state_timer_heater_ ##NR == 0) { \ if (state_timer_heater_ ##NR == 0) { \
if (state_heater_ ##NR == 1) state_timer_heater_ ##NR = MIN_STATE_TIME; \ if (state_heater_ ##NR == 1) state_timer_heater_ ##NR = MIN_STATE_TIME; \
state_heater_ ##NR = 0; \ state_heater_ ##NR = 0; \

Loading…
Cancel
Save