3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #810 from PavelSindler/octoprint_features

Browse Source 
Improve crash detection and filament detection when printing from USB
This commit is contained in:
XPila 2018-06-05 20:52:18 +02:00 committed by GitHub
commit 850f9c8912
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 85 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
Firmware/Marlin_main.cpp
View File

@ -116,6 +116,9 @@
//Macro for print fan speed
#define FAN_PULSE_WIDTH_LIMIT ((fanSpeed > 100) ? 3 : 4) //time in ms
#define PRINTING_TYPE_SD 0
#define PRINTING_TYPE_USB 1
// look here for descriptions of G-codes: http://linuxcnc.org/handbook/gcode/g-code.html
// http://objects.reprap.org/wiki/Mendel_User_Manual:_RepRapGCodes
@ -483,6 +486,7 @@ boolean chdkActive = false;
// save/restore printing
static uint32_t saved_sdpos = 0;
static uint8_t saved_printing_type = PRINTING_TYPE_SD;
static float saved_pos[4] = { 0, 0, 0, 0 };
// Feedrate hopefully derived from an active block of the planner at the time the print has been canceled, in mm/min.
static float saved_feedrate2 = 0;
@ -626,12 +630,12 @@ void crashdet_disable()
void crashdet_stop_and_save_print()
{
stop_and_save_print_to_ram(10, 0); //XY - no change, Z 10mm up, E - no change
stop_and_save_print_to_ram(10, -2); //XY - no change, Z 10mm up, E -2mm retract
}
void crashdet_restore_print_and_continue()
{
restore_print_from_ram_and_continue(0); //XYZ = orig, E - no change
restore_print_from_ram_and_continue(2); //XYZ = orig, E +2mm unretract
// babystep_apply();
}
@ -1732,7 +1736,15 @@ void loop()
planner_add_sd_length(sdlen.value);
sei();
}
}
}
else if((*ptr == CMDBUFFER_CURRENT_TYPE_USB_WITH_LINENR) && !IS_SD_PRINTING){
cli();
*ptr ++ = CMDBUFFER_CURRENT_TYPE_TO_BE_REMOVED;
// and one for each command to previous block in the planner queue.
planner_add_sd_length(1);
sei();
}
// Now it is safe to release the already processed command block. If interrupted by the power panic now,
// this block's SD card length will not be counted twice as its command type has been replaced
// by CMDBUFFER_CURRENT_TYPE_TO_BE_REMOVED.
@ -6933,7 +6945,7 @@ void FlushSerialRequestResend()
void ClearToSend()
{
previous_millis_cmd = millis();
if (CMDBUFFER_CURRENT_TYPE == CMDBUFFER_CURRENT_TYPE_USB)
if ((CMDBUFFER_CURRENT_TYPE == CMDBUFFER_CURRENT_TYPE_USB) || (CMDBUFFER_CURRENT_TYPE == CMDBUFFER_CURRENT_TYPE_USB_WITH_LINENR))
SERIAL_PROTOCOLLNRPGM(_T(MSG_OK));
}
@ -8496,13 +8508,34 @@ void restore_print_from_eeprom() {
void stop_and_save_print_to_ram(float z_move, float e_move)
{
if (saved_printing) return;
unsigned char nplanner_blocks;
unsigned char nlines;
uint16_t sdlen_planner;
uint16_t sdlen_cmdqueue;
cli();
unsigned char nplanner_blocks = number_of_blocks();
saved_sdpos = sdpos_atomic; //atomic sd position of last command added in queue
uint16_t sdlen_planner = planner_calc_sd_length(); //length of sd commands in planner
saved_sdpos -= sdlen_planner;
uint16_t sdlen_cmdqueue = cmdqueue_calc_sd_length(); //length of sd commands in cmdqueue
saved_sdpos -= sdlen_cmdqueue;
if (card.sdprinting) {
nplanner_blocks = number_of_blocks();
saved_sdpos = sdpos_atomic; //atomic sd position of last command added in queue
sdlen_planner = planner_calc_sd_length(); //length of sd commands in planner
saved_sdpos -= sdlen_planner;
sdlen_cmdqueue = cmdqueue_calc_sd_length(); //length of sd commands in cmdqueue
saved_sdpos -= sdlen_cmdqueue;
saved_printing_type = PRINTING_TYPE_SD;
}
else if (is_usb_printing) { //reuse saved_sdpos for storing line number
saved_sdpos = gcode_LastN; //start with line number of command added recently to cmd queue
//reuse planner_calc_sd_length function for getting number of lines of commands in planner:
nlines = planner_calc_sd_length(); //number of lines of commands in planner
saved_sdpos -= nlines;
saved_sdpos -= buflen; //number of blocks in cmd buffer
saved_printing_type = PRINTING_TYPE_USB;
}
else {
//not sd printing nor usb printing
}
#if 0
SERIAL_ECHOPGM("SDPOS_ATOMIC="); MYSERIAL.println(sdpos_atomic, DEC);
@ -8511,7 +8544,8 @@ void stop_and_save_print_to_ram(float z_move, float e_move)
SERIAL_ECHOPGM("SDLEN_CMDQ="); MYSERIAL.println(sdlen_cmdqueue, DEC);
SERIAL_ECHOPGM("PLANNERBLOCKS="); MYSERIAL.println(int(nplanner_blocks), DEC);
SERIAL_ECHOPGM("SDSAVED="); MYSERIAL.println(saved_sdpos, DEC);
SERIAL_ECHOPGM("SDFILELEN="); MYSERIAL.println(card.fileSize(), DEC);
//SERIAL_ECHOPGM("SDFILELEN="); MYSERIAL.println(card.fileSize(), DEC);
{
card.setIndex(saved_sdpos);
@ -8523,7 +8557,6 @@ void stop_and_save_print_to_ram(float z_move, float e_move)
MYSERIAL.print(char(card.get()));
SERIAL_ECHOLNPGM("End of command buffer");
}
{
// Print the content of the planner buffer, line by line:
card.setIndex(saved_sdpos);
@ -8618,11 +8651,17 @@ void stop_and_save_print_to_ram(float z_move, float e_move)
#if 1
// Rather than calling plan_buffer_line directly, push the move into the command queue,
char buf[48];
// First unretract (relative extrusion)
strcpy_P(buf, PSTR("G1 E"));
dtostrf(e_move, 6, 3, buf + strlen(buf));
strcat_P(buf, PSTR(" F"));
dtostrf(retract_feedrate*60, 8, 3, buf + strlen(buf));
enquecommand(buf, false);
// Then lift Z axis
strcpy_P(buf, PSTR("G1 Z"));
dtostrf(saved_pos[Z_AXIS] + z_move, 8, 3, buf + strlen(buf));
strcat_P(buf, PSTR(" E"));
// Relative extrusion
dtostrf(e_move, 6, 3, buf + strlen(buf));
strcat_P(buf, PSTR(" F"));
dtostrf(homing_feedrate[Z_AXIS], 8, 3, buf + strlen(buf));
// At this point the command queue is empty.
@ -8649,14 +8688,23 @@ void restore_print_from_ram_and_continue(float e_move)
float e = saved_pos[E_AXIS] - e_move;
plan_set_e_position(e);
plan_buffer_line(saved_pos[X_AXIS], saved_pos[Y_AXIS], saved_pos[Z_AXIS], saved_pos[E_AXIS], homing_feedrate[Z_AXIS]/13, active_extruder);
st_synchronize();
memcpy(current_position, saved_pos, sizeof(saved_pos));
memcpy(destination, current_position, sizeof(destination));
card.setIndex(saved_sdpos);
sdpos_atomic = saved_sdpos;
card.sdprinting = true;
st_synchronize();
memcpy(current_position, saved_pos, sizeof(saved_pos));
memcpy(destination, current_position, sizeof(destination));
if (saved_printing_type == PRINTING_TYPE_SD) { //was sd printing
card.setIndex(saved_sdpos);
sdpos_atomic = saved_sdpos;
card.sdprinting = true;
}
else if (saved_printing_type == PRINTING_TYPE_USB) { //was usb printing
gcode_LastN = saved_sdpos; //saved_sdpos was reused for storing line number when usb printing
FlushSerialRequestResend();
}
else {
//not sd printing nor usb printing
}
saved_printing = false;
printf_P(PSTR("ok\n")); //dummy response because of octoprint is waiting for this
}
void print_world_coordinates()

8
Firmware/cmdqueue.cpp
View File

@ -386,7 +386,7 @@ void get_command()
}
while (MYSERIAL.available() > 0) {
char serial_char = MYSERIAL.read();
/* if (selectedSerialPort == 1)
{
@ -413,6 +413,9 @@ void get_command()
}
cmdbuffer[bufindw+serial_count+CMDHDRSIZE] = 0; //terminate string
if(!comment_mode){
gcode_N = 0;
// Line numbers must be first in buffer
if ((strstr(cmdbuffer+bufindw+CMDHDRSIZE, "PRUSA") == NULL) &&
@ -494,7 +497,8 @@ void get_command()
kill("", 2);
// Store the current line into buffer, move to the next line.
cmdbuffer[bufindw] = CMDBUFFER_CURRENT_TYPE_USB;
// Store type of entry
cmdbuffer[bufindw] = gcode_N ? CMDBUFFER_CURRENT_TYPE_USB_WITH_LINENR : CMDBUFFER_CURRENT_TYPE_USB;
#ifdef CMDBUFFER_DEBUG
SERIAL_ECHO_START;
SERIAL_ECHOPGM("Storing a command line to buffer: ");

2
Firmware/cmdqueue.h
View File

@ -22,6 +22,8 @@
// to the planner queue, but not yet removed from the cmdqueue.
// This is a temporary state to reduce stepper interrupt locking time.
#define CMDBUFFER_CURRENT_TYPE_TO_BE_REMOVED 5
//Command in cmdbuffer was sent over USB and contains line number
#define CMDBUFFER_CURRENT_TYPE_USB_WITH_LINENR 6
// How much space to reserve for the chained commands
// of type CMDBUFFER_CURRENT_TYPE_CHAINED,

9
Firmware/ultralcd_implementation_hitachi_HD44780.h
View File

@ -830,8 +830,12 @@ if (print_sd_status)
#endif
}
#ifdef CMD_DIAGNOSTICS
lcd.setCursor(LCD_WIDTH - 8 -1, 2);
lcd_printPGM(PSTR(" C"));
lcd.print(buflen); // number of commands in cmd buffer
if (buflen < 9) lcd_printPGM(" ");
#else
//Print time elapsed
lcd.setCursor(LCD_WIDTH - 8 -1, 2);
lcd_printPGM(PSTR(" "));
@ -846,6 +850,7 @@ if (print_sd_status)
lcd_printPGM(PSTR("--:--"));
}
lcd_printPGM(PSTR(" "));
#endif //CMD_DIAGNOSTICS
#ifdef DEBUG_DISABLE_LCD_STATUS_LINE
return;