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

rectangular object enlarged, counting E improved

This commit is contained in:
PavelSindler 2017-10-04 14:48:16 +02:00
parent 6b7866b7be
commit e8c4677506
2 changed files with 232 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

271
Firmware/ultralcd.cpp
View File

@ -602,12 +602,18 @@ void lcd_commands()
#ifdef SNMM #ifdef SNMM
if (lcd_commands_type == LCD_COMMAND_V2_CAL) if (lcd_commands_type == LCD_COMMAND_V2_CAL)
{ {
char cmd1[30];
float width = 0.4;
float length = 20 - width;
float extr = count_e(0.2, width, length);
float extr_short_segment = count_e(0.2, width, width);
lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS; lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS;
if (lcd_commands_step == 0) if (lcd_commands_step == 0)
{ {
lcd_commands_step = 7; lcd_commands_step = 10;
} }
if (lcd_commands_step == 7 && !blocks_queued() && cmd_buffer_empty()) if (lcd_commands_step == 10 && !blocks_queued() && cmd_buffer_empty())
{ {
enquecommand_P(PSTR("M107")); enquecommand_P(PSTR("M107"));
enquecommand_P(PSTR("M104 S210")); enquecommand_P(PSTR("M104 S210"));
@ -624,9 +630,9 @@ void lcd_commands()
enquecommand_P(PSTR("G92 E0")); enquecommand_P(PSTR("G92 E0"));
enquecommand_P(PSTR("M203 E100")); enquecommand_P(PSTR("M203 E100"));
enquecommand_P(PSTR("M92 E140")); enquecommand_P(PSTR("M92 E140"));
lcd_commands_step = 6; lcd_commands_step = 9;
} }
if (lcd_commands_step == 6 && !blocks_queued() && cmd_buffer_empty()) if (lcd_commands_step == 9 && !blocks_queued() && cmd_buffer_empty())
{ {
lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS; lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS;
enquecommand_P(PSTR("G1 Z0.250 F7200.000")); enquecommand_P(PSTR("G1 Z0.250 F7200.000"));
@ -648,9 +654,9 @@ void lcd_commands()
lcd_goto_menu(lcd_babystep_z, 0, false); lcd_goto_menu(lcd_babystep_z, 0, false);
lcd_commands_step = 5; lcd_commands_step = 8;
} }
if (lcd_commands_step == 5 && !blocks_queued() && cmd_buffer_empty()) //draw meander if (lcd_commands_step == 8 && !blocks_queued() && cmd_buffer_empty()) //draw meander
{ {
lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS; lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS;
@ -672,36 +678,123 @@ void lcd_commands()
enquecommand_P(PSTR("G1 X200 Y55 E0.49386")); enquecommand_P(PSTR("G1 X200 Y55 E0.49386"));
enquecommand_P(PSTR("G1 X50 Y55 E3.62773")); enquecommand_P(PSTR("G1 X50 Y55 E3.62773"));
lcd_commands_step = 7;
}
if (lcd_commands_step == 7 && !blocks_queued() && cmd_buffer_empty())
{
lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS;
strcpy(cmd1, "G1 X50 Y35 E");
strcat(cmd1, ftostr43(extr));
enquecommand(cmd1);
for (int i = 0; i < 4; i++) {
strcpy(cmd1, "G1 X70 Y");
strcat(cmd1, ftostr32(35 - i*width * 2));
strcat(cmd1, " E");
strcat(cmd1, ftostr43(extr));
enquecommand(cmd1);
strcpy(cmd1, "G1 Y");
strcat(cmd1, ftostr32(35 - (2 * i + 1)*width));
strcat(cmd1, "E ");
strcat(cmd1, ftostr43(extr_short_segment));
enquecommand(cmd1);
strcpy(cmd1, "G1 X50 Y");
strcat(cmd1, ftostr32(35 - (2 * i + 1)*width));
strcat(cmd1, " E");
strcat(cmd1, ftostr43(extr));
enquecommand(cmd1);
strcpy(cmd1, "G1 Y");
strcat(cmd1, ftostr32(35 - (i + 1)*width * 2));
strcat(cmd1, "E ");
strcat(cmd1, ftostr43(extr_short_segment));
enquecommand(cmd1);
}
lcd_commands_step = 6;
}
if (lcd_commands_step == 6 && !blocks_queued() && cmd_buffer_empty())
{
lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS;
for (int i = 4; i < 8; i++) {
strcpy(cmd1, "G1 X70 Y");
strcat(cmd1, ftostr32(35 - i*width * 2));
strcat(cmd1, " E");
strcat(cmd1, ftostr43(extr));
enquecommand(cmd1);
strcpy(cmd1, "G1 Y");
strcat(cmd1, ftostr32(35 - (2 * i + 1)*width));
strcat(cmd1, "E ");
strcat(cmd1, ftostr43(extr_short_segment));
enquecommand(cmd1);
strcpy(cmd1, "G1 X50 Y");
strcat(cmd1, ftostr32(35 - (2 * i + 1)*width));
strcat(cmd1, " E");
strcat(cmd1, ftostr43(extr));
enquecommand(cmd1);
strcpy(cmd1, "G1 Y");
strcat(cmd1, ftostr32(35 - (i + 1)*width * 2));
strcat(cmd1, "E ");
strcat(cmd1, ftostr43(extr_short_segment));
enquecommand(cmd1);
}
lcd_commands_step = 5;
}
if (lcd_commands_step == 5 && !blocks_queued() && cmd_buffer_empty())
{
lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS;
for (int i = 8; i < 12; i++) {
strcpy(cmd1, "G1 X70 Y");
strcat(cmd1, ftostr32(35 - i*width * 2));
strcat(cmd1, " E");
strcat(cmd1, ftostr43(extr));
enquecommand(cmd1);
strcpy(cmd1, "G1 Y");
strcat(cmd1, ftostr32(35 - (2 * i + 1)*width));
strcat(cmd1, "E ");
strcat(cmd1, ftostr43(extr_short_segment));
enquecommand(cmd1);
strcpy(cmd1, "G1 X50 Y");
strcat(cmd1, ftostr32(35 - (2 * i + 1)*width));
strcat(cmd1, " E");
strcat(cmd1, ftostr43(extr));
enquecommand(cmd1);
strcpy(cmd1, "G1 Y");
strcat(cmd1, ftostr32(35 - (i + 1)*width * 2));
strcat(cmd1, "E ");
strcat(cmd1, ftostr43(extr_short_segment));
enquecommand(cmd1);
}
lcd_commands_step = 4; lcd_commands_step = 4;
} }
if (lcd_commands_step == 4 && !blocks_queued() && cmd_buffer_empty()) if (lcd_commands_step == 4 && !blocks_queued() && cmd_buffer_empty())
{ {
char cmd1[30];
float width = 0.4;
float extr = 0.5; // for 20mm
lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS; lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS;
strcpy(cmd1, "G1 X50 Y35 E"); for (int i = 12; i < 16; i++) {
strcat(cmd1, ftostr32(extr));
enquecommand(cmd1);
for (int i = 0; i < 5; i++) {
strcpy(cmd1, "G1 X70 Y"); strcpy(cmd1, "G1 X70 Y");
strcat(cmd1, ftostr32(35 - i*width * 2)); strcat(cmd1, ftostr32(35 - i*width * 2));
strcat(cmd1, " E"); strcat(cmd1, " E");
strcat(cmd1, ftostr32(extr)); strcat(cmd1, ftostr43(extr));
enquecommand(cmd1); enquecommand(cmd1);
strcpy(cmd1, "G1 Y"); strcpy(cmd1, "G1 Y");
strcat(cmd1, ftostr32(35 - (2 * i + 1)*width)); strcat(cmd1, ftostr32(35 - (2 * i + 1)*width));
strcat(cmd1, "E ");
strcat(cmd1, ftostr43(extr_short_segment));
enquecommand(cmd1); enquecommand(cmd1);
strcpy(cmd1, "G1 X50 Y"); strcpy(cmd1, "G1 X50 Y");
strcat(cmd1, ftostr32(35 - (2 * i + 1)*width)); strcat(cmd1, ftostr32(35 - (2 * i + 1)*width));
strcat(cmd1, " E"); strcat(cmd1, " E");
strcat(cmd1, ftostr32(extr)); strcat(cmd1, ftostr43(extr));
enquecommand(cmd1); enquecommand(cmd1);
strcpy(cmd1, "G1 Y"); strcpy(cmd1, "G1 Y");
strcat(cmd1, ftostr32(35 - (i + 1)*width * 2)); strcat(cmd1, ftostr32(35 - (i + 1)*width * 2));
strcat(cmd1, "E ");
strcat(cmd1, ftostr43(extr_short_segment));
enquecommand(cmd1); enquecommand(cmd1);
} }
@ -772,15 +865,19 @@ void lcd_commands()
#else //if not SNMM #else //if not SNMM
if (lcd_commands_type == LCD_COMMAND_V2_CAL) if (lcd_commands_type == LCD_COMMAND_V2_CAL)
{ {
char cmd1[30];
float width = 0.4;
float length = 20 - width;
float extr = count_e(0.2, width, length);
float extr_short_segment = count_e(0.2, width, width);
lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS; lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS;
if (lcd_commands_step == 0) if (lcd_commands_step == 0)
{ {
lcd_commands_step = 6; lcd_commands_step = 9;
} }
if (lcd_commands_step == 6 && !blocks_queued() && cmd_buffer_empty()) if (lcd_commands_step == 9 && !blocks_queued() && cmd_buffer_empty())
{ {
enquecommand_P(PSTR("M107")); enquecommand_P(PSTR("M107"));
enquecommand_P(PSTR("M104 S210")); enquecommand_P(PSTR("M104 S210"));
@ -791,9 +888,9 @@ void lcd_commands()
enquecommand_P(PSTR("G87")); //sets calibration status enquecommand_P(PSTR("G87")); //sets calibration status
enquecommand_P(PSTR("G28")); enquecommand_P(PSTR("G28"));
enquecommand_P(PSTR("G92 E0.0")); enquecommand_P(PSTR("G92 E0.0"));
lcd_commands_step = 5; lcd_commands_step = 8;
} }
if (lcd_commands_step == 5 && !blocks_queued() && cmd_buffer_empty()) if (lcd_commands_step == 8 && !blocks_queued() && cmd_buffer_empty())
{ {
lcd_implementation_clear(); lcd_implementation_clear();
@ -808,9 +905,9 @@ void lcd_commands()
enquecommand_P(PSTR("G1 Z0.150 F7200.000")); enquecommand_P(PSTR("G1 Z0.150 F7200.000"));
enquecommand_P(PSTR("M204 S1000")); //set acceleration enquecommand_P(PSTR("M204 S1000")); //set acceleration
enquecommand_P(PSTR("G1 F4000")); enquecommand_P(PSTR("G1 F4000"));
lcd_commands_step = 4; lcd_commands_step = 7;
} }
if (lcd_commands_step == 4 && !blocks_queued() && cmd_buffer_empty()) //draw meander if (lcd_commands_step == 7 && !blocks_queued() && cmd_buffer_empty()) //draw meander
{ {
lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS; lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS;
@ -850,39 +947,127 @@ void lcd_commands()
enquecommand_P(PSTR("G1 X200 Y55 E0.49386")); enquecommand_P(PSTR("G1 X200 Y55 E0.49386"));
enquecommand_P(PSTR("G1 X50 Y55 E3.62773")); enquecommand_P(PSTR("G1 X50 Y55 E3.62773"));
lcd_commands_step = 6;
}
if (lcd_commands_step == 6 && !blocks_queued() && cmd_buffer_empty())
{
lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS;
strcpy(cmd1, "G1 X50 Y35 E");
strcat(cmd1, ftostr43(extr));
enquecommand(cmd1);
for (int i = 0; i < 4; i++) {
strcpy(cmd1, "G1 X70 Y");
strcat(cmd1, ftostr32(35 - i*width * 2));
strcat(cmd1, " E");
strcat(cmd1, ftostr43(extr));
enquecommand(cmd1);
strcpy(cmd1, "G1 Y");
strcat(cmd1, ftostr32(35 - (2 * i + 1)*width));
strcat(cmd1, "E ");
strcat(cmd1, ftostr43(extr_short_segment));
enquecommand(cmd1);
strcpy(cmd1, "G1 X50 Y");
strcat(cmd1, ftostr32(35 - (2 * i + 1)*width));
strcat(cmd1, " E");
strcat(cmd1, ftostr43(extr));
enquecommand(cmd1);
strcpy(cmd1, "G1 Y");
strcat(cmd1, ftostr32(35 - (i + 1)*width * 2));
strcat(cmd1, "E ");
strcat(cmd1, ftostr43(extr_short_segment));
enquecommand(cmd1);
}
lcd_commands_step = 5;
}
if (lcd_commands_step == 5 && !blocks_queued() && cmd_buffer_empty())
{
lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS;
for (int i = 4; i < 8; i++) {
strcpy(cmd1, "G1 X70 Y");
strcat(cmd1, ftostr32(35 - i*width * 2));
strcat(cmd1, " E");
strcat(cmd1, ftostr43(extr));
enquecommand(cmd1);
strcpy(cmd1, "G1 Y");
strcat(cmd1, ftostr32(35 - (2 * i + 1)*width));
strcat(cmd1, "E ");
strcat(cmd1, ftostr43(extr_short_segment));
enquecommand(cmd1);
strcpy(cmd1, "G1 X50 Y");
strcat(cmd1, ftostr32(35 - (2 * i + 1)*width));
strcat(cmd1, " E");
strcat(cmd1, ftostr43(extr));
enquecommand(cmd1);
strcpy(cmd1, "G1 Y");
strcat(cmd1, ftostr32(35 - (i + 1)*width * 2));
strcat(cmd1, "E ");
strcat(cmd1, ftostr43(extr_short_segment));
enquecommand(cmd1);
}
lcd_commands_step = 4;
}
if (lcd_commands_step == 4 && !blocks_queued() && cmd_buffer_empty())
{
lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS;
for (int i = 8; i < 12; i++) {
strcpy(cmd1, "G1 X70 Y");
strcat(cmd1, ftostr32(35 - i*width * 2));
strcat(cmd1, " E");
strcat(cmd1, ftostr43(extr));
enquecommand(cmd1);
strcpy(cmd1, "G1 Y");
strcat(cmd1, ftostr32(35 - (2 * i + 1)*width));
strcat(cmd1, "E ");
strcat(cmd1, ftostr43(extr_short_segment));
enquecommand(cmd1);
strcpy(cmd1, "G1 X50 Y");
strcat(cmd1, ftostr32(35 - (2 * i + 1)*width));
strcat(cmd1, " E");
strcat(cmd1, ftostr43(extr));
enquecommand(cmd1);
strcpy(cmd1, "G1 Y");
strcat(cmd1, ftostr32(35 - (i + 1)*width * 2));
strcat(cmd1, "E ");
strcat(cmd1, ftostr43(extr_short_segment));
enquecommand(cmd1);
}
lcd_commands_step = 3; lcd_commands_step = 3;
} }
if (lcd_commands_step == 3 && !blocks_queued() && cmd_buffer_empty()) if (lcd_commands_step == 3 && !blocks_queued() && cmd_buffer_empty())
{ {
char cmd1[30];
float width = 0.4;
float extr = 0.5; // for 20mm
lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS; lcd_timeoutToStatus = millis() + LCD_TIMEOUT_TO_STATUS;
strcpy(cmd1, "G1 X50 Y35 E"); for (int i = 12; i < 16; i++) {
strcat(cmd1, ftostr32(extr));
enquecommand(cmd1);
for (int i = 0; i < 5; i++) {
strcpy(cmd1, "G1 X70 Y"); strcpy(cmd1, "G1 X70 Y");
strcat(cmd1, ftostr32(35 - i*width*2)); strcat(cmd1, ftostr32(35 - i*width * 2));
strcat(cmd1, " E"); strcat(cmd1, " E");
strcat(cmd1, ftostr32(extr)); strcat(cmd1, ftostr43(extr));
enquecommand(cmd1); enquecommand(cmd1);
strcpy(cmd1, "G1 Y"); strcpy(cmd1, "G1 Y");
strcat(cmd1, ftostr32(35 - (2*i+1)*width)); strcat(cmd1, ftostr32(35 - (2 * i + 1)*width));
strcat(cmd1, "E ");
strcat(cmd1, ftostr43(extr_short_segment));
enquecommand(cmd1); enquecommand(cmd1);
strcpy(cmd1, "G1 X50 Y"); strcpy(cmd1, "G1 X50 Y");
strcat(cmd1, ftostr32(35 - (2*i+1)*width)); strcat(cmd1, ftostr32(35 - (2 * i + 1)*width));
strcat(cmd1, " E"); strcat(cmd1, " E");
strcat(cmd1, ftostr32(extr)); strcat(cmd1, ftostr43(extr));
enquecommand(cmd1); enquecommand(cmd1);
strcpy(cmd1, "G1 Y"); strcpy(cmd1, "G1 Y");
strcat(cmd1, ftostr32(35 - (i + 1)*width*2)); strcat(cmd1, ftostr32(35 - (i + 1)*width * 2));
strcat(cmd1, "E ");
strcat(cmd1, ftostr43(extr_short_segment));
enquecommand(cmd1); enquecommand(cmd1);
} }
lcd_commands_step = 2; lcd_commands_step = 2;
} }
@ -1098,6 +1283,12 @@ void lcd_commands()
} }
static float count_e(float layer_heigth, float extrusion_width, float extrusion_length) {
//returns filament length in mm which needs to be extrude to form line with extrusion_length * extrusion_width * layer heigth dimensions
float extr = extrusion_length * layer_heigth * extrusion_width / (M_PI * pow(1.75, 2) / 4);
return extr;
}
static void lcd_return_to_status() { static void lcd_return_to_status() {
lcd_implementation_init( // to maybe revive the LCD if static electricity killed it. lcd_implementation_init( // to maybe revive the LCD if static electricity killed it.
#if defined(LCD_PROGRESS_BAR) && defined(SDSUPPORT) #if defined(LCD_PROGRESS_BAR) && defined(SDSUPPORT)

1
Firmware/ultralcd.h
View File

@ -234,6 +234,7 @@ static void lcd_babystep_z();
#ifdef SDCARD_SORT_ALPHA #ifdef SDCARD_SORT_ALPHA
static void lcd_sort_type_set(); static void lcd_sort_type_set();
#endif #endif
static float count_e(float layer_heigth, float extrusion_width, float extrusion_length);
void stack_error(); void stack_error();
static void lcd_ping_allert(); static void lcd_ping_allert();
void lcd_printer_connected(); void lcd_printer_connected();