diff options
author | PavelSindler <pavel@prusa3d.cz> | 2017-11-12 12:49:24 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-12 12:49:24 +0300 |
commit | ba4cc16e11b14f2f6e6c5397a00f278304d4fdfc (patch) | |
tree | 490b7a1d22fcb0bf85216e8db67a9ddcbd8769b1 | |
parent | 100c800dc85912bc3161e6b6859004bb324c6d91 (diff) | |
parent | 4c5f9c8bf107a43cb2a4b1f5b71f5bd7a694e27e (diff) |
Merge pull request #275 from PavelSindler/MK2v3.1.0
first layer cal. gcode corrections
-rw-r--r-- | Firmware/ultralcd.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index a2420dc12..7776b79d2 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -672,8 +672,8 @@ void lcd_commands() { lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS; enquecommand_P(PSTR("G1 Z0.250 F7200.000")); - enquecommand_P(PSTR("G1 X50.0 E80.0 F1000.0")); - enquecommand_P(PSTR("G1 X160.0 E20.0 F1000.0")); + enquecommand_P(PSTR("G1 X50.0 E80.0 F1000.0")); + enquecommand_P(PSTR("G1 X160.0 E20.0 F1000.0")); enquecommand_P(PSTR("G1 Z0.200 F7200.000")); enquecommand_P(PSTR("G1 X220.0 E13 F1000.0")); enquecommand_P(PSTR("G1 X240.0 E0 F1000.0")); @@ -732,7 +732,7 @@ void lcd_commands() enquecommand(cmd1); strcpy(cmd1, "G1 Y"); strcat(cmd1, ftostr32(35 - (2 * i + 1)*width)); - strcat(cmd1, "E "); + strcat(cmd1, " E"); strcat(cmd1, ftostr43(extr_short_segment)); enquecommand(cmd1); strcpy(cmd1, "G1 X50 Y"); @@ -742,7 +742,7 @@ void lcd_commands() enquecommand(cmd1); strcpy(cmd1, "G1 Y"); strcat(cmd1, ftostr32(35 - (i + 1)*width * 2)); - strcat(cmd1, "E "); + strcat(cmd1, " E"); strcat(cmd1, ftostr43(extr_short_segment)); enquecommand(cmd1); } @@ -761,7 +761,7 @@ void lcd_commands() enquecommand(cmd1); strcpy(cmd1, "G1 Y"); strcat(cmd1, ftostr32(35 - (2 * i + 1)*width)); - strcat(cmd1, "E "); + strcat(cmd1, " E"); strcat(cmd1, ftostr43(extr_short_segment)); enquecommand(cmd1); strcpy(cmd1, "G1 X50 Y"); @@ -771,7 +771,7 @@ void lcd_commands() enquecommand(cmd1); strcpy(cmd1, "G1 Y"); strcat(cmd1, ftostr32(35 - (i + 1)*width * 2)); - strcat(cmd1, "E "); + strcat(cmd1, " E"); strcat(cmd1, ftostr43(extr_short_segment)); enquecommand(cmd1); } @@ -790,7 +790,7 @@ void lcd_commands() enquecommand(cmd1); strcpy(cmd1, "G1 Y"); strcat(cmd1, ftostr32(35 - (2 * i + 1)*width)); - strcat(cmd1, "E "); + strcat(cmd1, " E"); strcat(cmd1, ftostr43(extr_short_segment)); enquecommand(cmd1); strcpy(cmd1, "G1 X50 Y"); @@ -800,7 +800,7 @@ void lcd_commands() enquecommand(cmd1); strcpy(cmd1, "G1 Y"); strcat(cmd1, ftostr32(35 - (i + 1)*width * 2)); - strcat(cmd1, "E "); + strcat(cmd1, " E"); strcat(cmd1, ftostr43(extr_short_segment)); enquecommand(cmd1); } @@ -819,7 +819,7 @@ void lcd_commands() enquecommand(cmd1); strcpy(cmd1, "G1 Y"); strcat(cmd1, ftostr32(35 - (2 * i + 1)*width)); - strcat(cmd1, "E "); + strcat(cmd1, " E"); strcat(cmd1, ftostr43(extr_short_segment)); enquecommand(cmd1); strcpy(cmd1, "G1 X50 Y"); @@ -829,7 +829,7 @@ void lcd_commands() enquecommand(cmd1); strcpy(cmd1, "G1 Y"); strcat(cmd1, ftostr32(35 - (i + 1)*width * 2)); - strcat(cmd1, "E "); + strcat(cmd1, " E"); strcat(cmd1, ftostr43(extr_short_segment)); enquecommand(cmd1); } @@ -840,7 +840,7 @@ void lcd_commands() if (lcd_commands_step == 3 && !blocks_queued() && cmd_buffer_empty()) { lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS; - enquecommand_P(PSTR("G1 E - 0.07500 F2100.00000")); + enquecommand_P(PSTR("G1 E-0.07500 F2100.00000")); enquecommand_P(PSTR("G4 S0")); enquecommand_P(PSTR("G1 E-4 F2100.00000")); enquecommand_P(PSTR("G1 Z0.5 F7200.000")); @@ -871,7 +871,7 @@ void lcd_commands() enquecommand_P(PSTR("G1 X50 Y1 E-5.0000")); enquecommand_P(PSTR("G1 F2400")); enquecommand_P(PSTR("G1 X0 Y1 E5.0000")); - enquecommand_P(PSTR("G1 X50 Y1 E - 5.0000")); + enquecommand_P(PSTR("G1 X50 Y1 E-5.0000")); enquecommand_P(PSTR("G1 F2400")); enquecommand_P(PSTR("G1 X0 Y1 E5.0000")); enquecommand_P(PSTR("G1 X50 Y1 E-3.0000")); @@ -931,8 +931,8 @@ void lcd_commands() lcd_implementation_clear(); lcd_goto_menu(lcd_babystep_z, 0, false); - enquecommand_P(PSTR("G1 X60.0 E9.0 F1000.0")); //intro line - enquecommand_P(PSTR("G1 X100.0 E12.5 F1000.0")); //intro line + enquecommand_P(PSTR("G1 X60.0 E9.0 F1000.0")); //intro line + enquecommand_P(PSTR("G1 X100.0 E12.5 F1000.0")); //intro line enquecommand_P(PSTR("G92 E0.0")); enquecommand_P(PSTR("G21")); //set units to millimeters enquecommand_P(PSTR("G90")); //use absolute coordinates @@ -1002,7 +1002,7 @@ void lcd_commands() enquecommand(cmd1); strcpy(cmd1, "G1 Y"); strcat(cmd1, ftostr32(35 - (2 * i + 1)*width)); - strcat(cmd1, "E "); + strcat(cmd1, " E"); strcat(cmd1, ftostr43(extr_short_segment)); enquecommand(cmd1); strcpy(cmd1, "G1 X50 Y"); @@ -1012,7 +1012,7 @@ void lcd_commands() enquecommand(cmd1); strcpy(cmd1, "G1 Y"); strcat(cmd1, ftostr32(35 - (i + 1)*width * 2)); - strcat(cmd1, "E "); + strcat(cmd1, " E"); strcat(cmd1, ftostr43(extr_short_segment)); enquecommand(cmd1); } @@ -1031,7 +1031,7 @@ void lcd_commands() enquecommand(cmd1); strcpy(cmd1, "G1 Y"); strcat(cmd1, ftostr32(35 - (2 * i + 1)*width)); - strcat(cmd1, "E "); + strcat(cmd1, " E"); strcat(cmd1, ftostr43(extr_short_segment)); enquecommand(cmd1); strcpy(cmd1, "G1 X50 Y"); @@ -1041,7 +1041,7 @@ void lcd_commands() enquecommand(cmd1); strcpy(cmd1, "G1 Y"); strcat(cmd1, ftostr32(35 - (i + 1)*width * 2)); - strcat(cmd1, "E "); + strcat(cmd1, " E"); strcat(cmd1, ftostr43(extr_short_segment)); enquecommand(cmd1); } @@ -1060,7 +1060,7 @@ void lcd_commands() enquecommand(cmd1); strcpy(cmd1, "G1 Y"); strcat(cmd1, ftostr32(35 - (2 * i + 1)*width)); - strcat(cmd1, "E "); + strcat(cmd1, " E"); strcat(cmd1, ftostr43(extr_short_segment)); enquecommand(cmd1); strcpy(cmd1, "G1 X50 Y"); @@ -1070,7 +1070,7 @@ void lcd_commands() enquecommand(cmd1); strcpy(cmd1, "G1 Y"); strcat(cmd1, ftostr32(35 - (i + 1)*width * 2)); - strcat(cmd1, "E "); + strcat(cmd1, " E"); strcat(cmd1, ftostr43(extr_short_segment)); enquecommand(cmd1); } @@ -1089,7 +1089,7 @@ void lcd_commands() enquecommand(cmd1); strcpy(cmd1, "G1 Y"); strcat(cmd1, ftostr32(35 - (2 * i + 1)*width)); - strcat(cmd1, "E "); + strcat(cmd1, " E"); strcat(cmd1, ftostr43(extr_short_segment)); enquecommand(cmd1); strcpy(cmd1, "G1 X50 Y"); @@ -1099,7 +1099,7 @@ void lcd_commands() enquecommand(cmd1); strcpy(cmd1, "G1 Y"); strcat(cmd1, ftostr32(35 - (i + 1)*width * 2)); - strcat(cmd1, "E "); + strcat(cmd1, " E"); strcat(cmd1, ftostr43(extr_short_segment)); enquecommand(cmd1); } @@ -1110,7 +1110,7 @@ void lcd_commands() if (lcd_commands_step == 2 && !blocks_queued() && cmd_buffer_empty()) { lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS; - enquecommand_P(PSTR("G1 E - 0.07500 F2100.00000")); + enquecommand_P(PSTR("G1 E-0.07500 F2100.00000")); enquecommand_P(PSTR("M107")); //turn off printer fan enquecommand_P(PSTR("M104 S0")); // turn off temperature enquecommand_P(PSTR("M140 S0")); // turn off heatbed |