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

Merge remote-tracking branch 'upstream' into private-build2

This commit is contained in:
Ted Hess 2017-11-06 09:25:10 -05:00
parent 652749b0a4 f2d9c00103
commit 9868fcd8fc
10 changed files with 54 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Marlin_main.cpp
View File

@ -2132,7 +2132,7 @@ void gcode_M768() {
bool check_commands() {
bool end_command_found = false;
if (buflen)
while (buflen)
{
if ((code_seen("M84")) || (code_seen("M 84"))) end_command_found = true;
if (!cmdbuffer_front_already_processed)

4
Firmware/cardreader.cpp
View File

@ -246,7 +246,7 @@ void CardReader::startFileprint()
{
sdprinting = true;
#ifdef SDCARD_SORT_ALPHA
flush_presort();
// flush_presort();
#endif
}
}
@ -1047,7 +1047,7 @@ void CardReader::printingHasFinished()
}
autotempShutdown();
#ifdef SDCARD_SORT_ALPHA
//presort();
//if(!check_file) presort();
#endif
}
}

10
Firmware/language_all.cpp
View File

@ -67,7 +67,7 @@ const char MSG_AUTO_MODE_ON_EN[] PROGMEM = "Mode [auto power]";
const char MSG_AUTO_MODE_ON_CZ[] PROGMEM = "Mod [automaticky]";
const char MSG_AUTO_MODE_ON_IT[] PROGMEM = "Mode [auto]";
const char MSG_AUTO_MODE_ON_ES[] PROGMEM = "Modo [auto]";
const char MSG_AUTO_MODE_ON_PL[] PROGMEM = "Mod [auto]";
const char MSG_AUTO_MODE_ON_PL[] PROGMEM = "Tryb [auto]";
const char MSG_AUTO_MODE_ON_DE[] PROGMEM = "Mode [Auto]";
const char * const MSG_AUTO_MODE_ON_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_AUTO_MODE_ON_EN,
@ -2638,7 +2638,7 @@ const char MSG_SELFTEST_CHECK_BED_CZ[] PROGMEM = "Kontrola bed ";
const char MSG_SELFTEST_CHECK_BED_IT[] PROGMEM = "Verifica letto";
const char MSG_SELFTEST_CHECK_BED_ES[] PROGMEM = "Control de cama";
const char MSG_SELFTEST_CHECK_BED_PL[] PROGMEM = "Kontrola bed ";
const char MSG_SELFTEST_CHECK_BED_DE[] PROGMEM = "Pruefe Bed ";
const char MSG_SELFTEST_CHECK_BED_DE[] PROGMEM = "Pruefe Bett ";
const char * const MSG_SELFTEST_CHECK_BED_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_SELFTEST_CHECK_BED_EN,
MSG_SELFTEST_CHECK_BED_CZ,
@ -3037,7 +3037,7 @@ const char MSG_SILENT_MODE_OFF_EN[] PROGMEM = "Mode [high power]";
const char MSG_SILENT_MODE_OFF_CZ[] PROGMEM = "Mod [vys. vykon]";
const char MSG_SILENT_MODE_OFF_IT[] PROGMEM = "Mode [forte]";
const char MSG_SILENT_MODE_OFF_ES[] PROGMEM = "Modo [rend.pleno]";
const char MSG_SILENT_MODE_OFF_PL[] PROGMEM = "Mod [w wydajnosc]";
const char MSG_SILENT_MODE_OFF_PL[] PROGMEM = "Tryb[w wydajnosc]";
const char MSG_SILENT_MODE_OFF_DE[] PROGMEM = "Mode [Hohe Leist]";
const char * const MSG_SILENT_MODE_OFF_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_SILENT_MODE_OFF_EN,
@ -3052,7 +3052,7 @@ const char MSG_SILENT_MODE_ON_EN[] PROGMEM = "Mode [silent]";
const char MSG_SILENT_MODE_ON_CZ[] PROGMEM = "Mod [tichy]";
const char MSG_SILENT_MODE_ON_IT[] PROGMEM = "Modo [silenzioso]";
const char MSG_SILENT_MODE_ON_ES[] PROGMEM = "Modo [silencio]";
const char MSG_SILENT_MODE_ON_PL[] PROGMEM = "Mod [cichy]";
const char MSG_SILENT_MODE_ON_PL[] PROGMEM = "Tryb [cichy]";
const char MSG_SILENT_MODE_ON_DE[] PROGMEM = "Mode [leise]";
const char * const MSG_SILENT_MODE_ON_LANG_TABLE[LANG_NUM] PROGMEM = {
MSG_SILENT_MODE_ON_EN,
@ -3879,7 +3879,7 @@ const char * const MSG_WIZARD_V2_CAL_LANG_TABLE[LANG_NUM] PROGMEM = {
const char MSG_WIZARD_V2_CAL_2_EN[] PROGMEM = "I will start to print line and you will gradually lower the nozzle by rotating the knob, until you reach optimal height. Check the pictures in our handbook in chapter Calibration.";
const char MSG_WIZARD_V2_CAL_2_CZ[] PROGMEM = "Zacnu tisknout linku a Vy budete postupne snizovat trysku otacenim tlacitka dokud nedosahnete optimalni vysky. Prohlednete si obrazky v nasi prirucce v kapitole Kalibrace";
const char MSG_WIZARD_V2_CAL_2_IT[] PROGMEM = "Adesso iniziero a stampare una linea e tu dovrai abbassare l'ugello gradualmente ruotando la manopola, sino a raggiungere una altezza ottimale. Per favore, dai uno sguardo alla immagine nel capitolo Calibrazione del nostro manuale.";
const char MSG_WIZARD_V2_CAL_2_IT[] PROGMEM = "Adesso iniziero a stampare una linea e tu dovrai abbassare l'ugello poco per volta ruotando la manopola sino a raggiungere una altezza ottimale. Per favore dai uno sguardo all'immagine del nostro manuale, cap.Calibrazione.";
const char MSG_WIZARD_V2_CAL_2_ES[] PROGMEM = "Voy a comenzar a imprimir la linea y tu bajaras el nozzle gradualmente al rotar el mando, hasta que llegues a la altura optima. Mira las imagenes del capitulo Calibracion en el manual.";
const char MSG_WIZARD_V2_CAL_2_PL[] PROGMEM = "Zaczne drukowac linie. Stopniowo opuszczaj dysze przekrecajac guzik, poki nie uzyskasz optymalnej wysokosci. Sprawdz obrazki w naszym poradniku w rozdz. Kalibracja";
const char MSG_WIZARD_V2_CAL_2_DE[] PROGMEM = "Ich werde jetzt erste Linie drucken. Waehrend des Druckes koennen Sie die Duese allmaehlich senken indem Sie den Knopf drehen, bis Sie die optimale Hoehe erreichen. Ueberpruefen Sie die Bilder in unserem Handbuch im Kapitel Kalibrierung";

2
Firmware/language_de.h
View File

@ -182,7 +182,7 @@
#define(length = 20) MSG_SELFTEST_CHECK_X "Pruefe X Achse "
#define(length = 20) MSG_SELFTEST_CHECK_Y "Pruefe Y Achse "
#define(length = 20) MSG_SELFTEST_CHECK_Z "Pruefe Z Achse "
#define(length = 20) MSG_SELFTEST_CHECK_BED "Pruefe Bed "
#define(length = 20) MSG_SELFTEST_CHECK_BED "Pruefe Bett "
#define(length = 20) MSG_SELFTEST_CHECK_ALLCORRECT "Alles richtig "
#define MSG_SELFTEST "Selbsttest "
#define(length = 20) MSG_SELFTEST_FAILED "Selbsttest misslung."

2
Firmware/language_en.h
View File

@ -156,7 +156,7 @@
#define MSG_ERR_COLD_EXTRUDE_STOP " cold extrusion prevented"
#define MSG_BABYSTEPPING_X "Babystepping X"
#define MSG_BABYSTEPPING_Y "Babystepping Y"
#define MSG_BABYSTEPPING_Z "Adjusting Z"
#define(length=20) MSG_BABYSTEPPING_Z "Adjusting Z"
#define MSG_SERIAL_ERROR_MENU_STRUCTURE "Error in menu structure"
#define MSG_LANGUAGE_NAME "English"

2
Firmware/language_es.h
View File

@ -123,7 +123,7 @@
#define MSG_ERR_COLD_EXTRUDE_STOP " cold extrusion prevented"
#define MSG_BABYSTEPPING_X "Babystepping X"
#define MSG_BABYSTEPPING_Y "Babystepping Y"
#define MSG_BABYSTEPPING_Z "Adjusting Z"
#define MSG_BABYSTEPPING_Z "Ajustar Z"
#define MSG_SERIAL_ERROR_MENU_STRUCTURE "Error in menu structure"
#define MSG_SET_HOME_OFFSETS "Set home offsets"
#define MSG_SET_ORIGIN "Set origin"

4
Firmware/language_it.h
View File

@ -132,7 +132,7 @@
#define MSG_ERR_COLD_EXTRUDE_STOP " cold extrusion prevented"
#define MSG_BABYSTEPPING_X "Babystepping X"
#define MSG_BABYSTEPPING_Y "Babystepping Y"
#define MSG_BABYSTEPPING_Z "Adjusting Z"
#define MSG_BABYSTEPPING_Z "Compensazione Z"
#define MSG_SERIAL_ERROR_MENU_STRUCTURE "Error in menu structure"
#define MSG_LANGUAGE_NAME "Italiano"
@ -324,7 +324,7 @@
#define MSG_WIZARD_Z_CAL "Adesso avviero una Calibrazione Z."
#define MSG_WIZARD_WILL_PREHEAT "Adesso preriscaldero l'ugello per PLA."
#define MSG_WIZARD_V2_CAL "Adesso tarero lo stacco fra ugello e superfice del piatto."
#define MSG_WIZARD_V2_CAL_2 "Adesso iniziero a stampare una linea e tu dovrai abbassare l'ugello gradualmente ruotando la manopola, sino a raggiungere una altezza ottimale. Per favore, dai uno sguardo alla immagine nel capitolo Calibrazione del nostro manuale."
#define MSG_WIZARD_V2_CAL_2 "Adesso iniziero a stampare una linea e tu dovrai abbassare l'ugello poco per volta ruotando la manopola sino a raggiungere una altezza ottimale. Per favore dai uno sguardo all'immagine del nostro manuale, cap.Calibrazione."
#define MSG_V2_CALIBRATION "Cal. primo layer."
#define MSG_WIZARD_DONE "Ben fatto. Buona stampa!"
#define MSG_WIZARD_LOAD_FILAMENT "Per favore inserisci il filamento di PLA nell'estrusore, poi premi la manopola per caricare."

8
Firmware/language_pl.h
View File

@ -61,9 +61,9 @@
#define MSG_PRESS "Nacisnij przycisk"
#define MSG_INSERT_FILAMENT "Wprowadz filament"
#define MSG_CHANGING_FILAMENT "Wymiana filamentu"
#define MSG_SILENT_MODE_ON "Mod [cichy]"
#define MSG_SILENT_MODE_OFF "Mod [w wydajnosc]"
#define MSG_AUTO_MODE_ON "Mod [auto]"
#define MSG_SILENT_MODE_ON "Tryb [cichy]"
#define MSG_SILENT_MODE_OFF "Tryb[w wydajnosc]"
#define MSG_AUTO_MODE_ON "Tryb [auto]"
#define MSG_REBOOT "Restart drukarki"
#define MSG_TAKE_EFFECT " wprow. zmian"
#define MSG_HEATING "Grzanie..."
@ -122,7 +122,7 @@
#define MSG_ERR_COLD_EXTRUDE_STOP " cold extrusion prevented"
#define MSG_BABYSTEPPING_X "Babystepping X"
#define MSG_BABYSTEPPING_Y "Babystepping Y"
#define MSG_BABYSTEPPING_Z "Dostavovani Z"
#define MSG_BABYSTEPPING_Z "Dostrojenie Z"
#define MSG_SERIAL_ERROR_MENU_STRUCTURE "Error in menu structure"
#define MSG_SET_HOME_OFFSETS "Nastav pocatek home"
#define MSG_SET_ORIGIN "Nastav pocatek"

26
Firmware/temperature.cpp
View File

@ -211,6 +211,9 @@ static int temp_runaway_error_counter[4];
long bias, d;
float Ku, Tu;
float max = 0, min = 10000;
uint8_t safety_check_cycles = 0;
const uint8_t safety_check_cycles_count = (extruder < 0) ? 45 : 10; //10 cycles / 20s delay for extruder and 45 cycles / 90s for heatbed
float temp_ambient;
#if (defined(EXTRUDER_0_AUTO_FAN_PIN) && EXTRUDER_0_AUTO_FAN_PIN > -1) || \
(defined(EXTRUDER_1_AUTO_FAN_PIN) && EXTRUDER_1_AUTO_FAN_PIN > -1) || \
@ -248,7 +251,6 @@ static int temp_runaway_error_counter[4];
for(;;) {
if(temp_meas_ready == true) { // temp sample ready
updateTemperaturesFromRawValues();
@ -347,11 +349,31 @@ static int temp_runaway_error_counter[4];
p=soft_pwm[extruder];
SERIAL_PROTOCOLPGM("ok T:");
}
SERIAL_PROTOCOL(input);
SERIAL_PROTOCOLPGM(" @:");
SERIAL_PROTOCOLLN(p);
if (safety_check_cycles == 0) { //save ambient temp
temp_ambient = input;
//SERIAL_ECHOPGM("Ambient T: ");
//MYSERIAL.println(temp_ambient);
safety_check_cycles++;
}
else if (safety_check_cycles < safety_check_cycles_count) { //delay
safety_check_cycles++;
}
else if (safety_check_cycles == safety_check_cycles_count){ //check that temperature is rising
safety_check_cycles++;
//SERIAL_ECHOPGM("Time from beginning: ");
//MYSERIAL.print(safety_check_cycles_count * 2);
//SERIAL_ECHOPGM("s. Difference between current and ambient T: ");
//MYSERIAL.println(input - temp_ambient);
if (abs(input - temp_ambient) < 5.0) {
temp_runaway_stop(false, (extruder<0));
pid_tuning_finished = true;
return;
}
}
temp_millis = millis();
}
if(((millis() - t1) + (millis() - t2)) > (10L*60L*1000L*2L)) {

22
Firmware/ultralcd.cpp
View File

@ -1320,14 +1320,19 @@ void lcd_commands()
pid_tuning_finished = false;
custom_message_state = 0;
lcd_setstatuspgm(MSG_PID_FINISHED);
strcpy(cmd1, "M301 P");
strcat(cmd1, ftostr32(_Kp));
strcat(cmd1, " I");
strcat(cmd1, ftostr32(_Ki));
strcat(cmd1, " D");
strcat(cmd1, ftostr32(_Kd));
enquecommand(cmd1);
enquecommand_P(PSTR("M500"));
if (_Kp != 0 || _Ki != 0 || _Kd != 0) {
strcpy(cmd1, "M301 P");
strcat(cmd1, ftostr32(_Kp));
strcat(cmd1, " I");
strcat(cmd1, ftostr32(_Ki));
strcat(cmd1, " D");
strcat(cmd1, ftostr32(_Kd));
enquecommand(cmd1);
enquecommand_P(PSTR("M500"));
}
else {
SERIAL_ECHOPGM("Invalid PID cal. results. Not stored to EEPROM.");
}
display_time = millis();
lcd_commands_step = 1;
}
@ -5898,7 +5903,6 @@ static bool check_file(const char* filename) {
get_command();
result = check_commands();
}
cmdqueue_reset();
card.printingHasFinished();
strncpy_P(lcd_status_message, WELCOME_MSG, LCD_WIDTH);
return result;