Merge branch 'MK2' of https://github.com/prusa3d/Prusa-Firmware into private-build2

Firmware/Configuration.h

@@ -5,7 +5,7 @@
 #include "Configuration_prusa.h"
 
 // Firmware version
-#define FW_version "3.1.0-RC2"
+#define FW_version "3.1.0"
 
 #define FW_PRUSA3D_MAGIC "PRUSA3DFW"
 #define FW_PRUSA3D_MAGIC_LEN 10

Firmware/cardreader.cpp

@@ -126,11 +126,9 @@ void CardReader::lsDive(const char *prepend, SdFile parent, const char * const m
 			case LS_SerialPrint:
 				createFilename(filename, p);
 				SERIAL_PROTOCOL(prepend);
-				if (longFilename[0] != 0) {
-					SERIAL_PROTOCOL(longFilename);
-				} else {
-					SERIAL_PROTOCOL(filename);
-				}
+
+				SERIAL_PROTOCOL(filename);
+
 				MYSERIAL.write(' ');
 				SERIAL_PROTOCOLLN(p.fileSize);
 				break;

Firmware/language_all.cpp

@@ -1689,6 +1689,21 @@ const char * const MSG_M115_REPORT_LANG_TABLE[1] PROGMEM = {
 	MSG_M115_REPORT_EN
 };
 
+const char MSG_M117_V2_CALIBRATION_EN[] PROGMEM = "M117 First layer cal.";
+const char MSG_M117_V2_CALIBRATION_CZ[] PROGMEM = "M117 Kal. prvni vrstvy";
+const char MSG_M117_V2_CALIBRATION_IT[] PROGMEM = "M117 Cal. primo layer.";
+const char MSG_M117_V2_CALIBRATION_ES[] PROGMEM = "M117 Cal. primera cap.";
+const char MSG_M117_V2_CALIBRATION_PL[] PROGMEM = "M117 Kal. 1. warstwy";
+const char MSG_M117_V2_CALIBRATION_DE[] PROGMEM = "M117 Erste-Schicht Kal.";
+const char * const MSG_M117_V2_CALIBRATION_LANG_TABLE[LANG_NUM] PROGMEM = {
+	MSG_M117_V2_CALIBRATION_EN,
+	MSG_M117_V2_CALIBRATION_CZ,
+	MSG_M117_V2_CALIBRATION_IT,
+	MSG_M117_V2_CALIBRATION_ES,
+	MSG_M117_V2_CALIBRATION_PL,
+	MSG_M117_V2_CALIBRATION_DE
+};
+
 const char MSG_M119_REPORT_EN[] PROGMEM = "Reporting endstop status";
 const char * const MSG_M119_REPORT_LANG_TABLE[1] PROGMEM = {
 	MSG_M119_REPORT_EN

Firmware/language_all.h

@@ -316,6 +316,8 @@ extern const char* const MSG_M109_INVALID_EXTRUDER_LANG_TABLE[1];
 #define MSG_M109_INVALID_EXTRUDER LANG_TABLE_SELECT_EXPLICIT(MSG_M109_INVALID_EXTRUDER_LANG_TABLE, 0)
 extern const char* const MSG_M115_REPORT_LANG_TABLE[1];
 #define MSG_M115_REPORT LANG_TABLE_SELECT_EXPLICIT(MSG_M115_REPORT_LANG_TABLE, 0)
+extern const char* const MSG_M117_V2_CALIBRATION_LANG_TABLE[LANG_NUM];
+#define MSG_M117_V2_CALIBRATION LANG_TABLE_SELECT(MSG_M117_V2_CALIBRATION_LANG_TABLE)
 extern const char* const MSG_M119_REPORT_LANG_TABLE[1];
 #define MSG_M119_REPORT LANG_TABLE_SELECT_EXPLICIT(MSG_M119_REPORT_LANG_TABLE, 0)
 extern const char* const MSG_M200_INVALID_EXTRUDER_LANG_TABLE[1];

Firmware/language_cz.h

@@ -352,3 +352,4 @@
 #define MSG_PLEASE_LOAD_PLA					"Nejdrive zavedte PLA filament prosim."
 #define MSG_FILE_CNT						"Nektere soubory nebudou setrideny. Maximalni pocet souboru pro setrideni je 100."
 #define MSG_WIZARD_HEATING					"Predehrivam trysku. Prosim cekejte."
+#define MSG_M117_V2_CALIBRATION				"M117 Kal. prvni vrstvy"

Firmware/language_de.h

@@ -364,3 +364,4 @@
 #define MSG_PLEASE_LOAD_PLA					"Bitte laden Sie zuerst PLA Filament."
 #define MSG_FILE_CNT						"Einige Dateien werden nicht sortiert. Max. Anzahl der Dateien in einem Ordner ist 100."
 #define MSG_WIZARD_HEATING					"Vorheizen der Duese. Bitte warten."
+#define MSG_M117_V2_CALIBRATION				"M117 Erste-Schicht Kal."

Firmware/language_en.h

@@ -352,3 +352,4 @@
 #define(lenght=20, lines=2) MSG_PLA_FILAMENT_LOADED				"Is PLA filament loaded?"
 #define(lenght=20, lines=4) MSG_PLEASE_LOAD_PLA					"Please load PLA filament first."
 #define(length=20, lines=8) MSG_FILE_CNT						"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
+#define(length=25, lines=1) MSG_M117_V2_CALIBRATION				"M117 First layer cal."

Firmware/language_es.h

@@ -346,3 +346,4 @@
 #define MSG_PLEASE_LOAD_PLA					"Carga el filamento PLA primero por favor."
 #define MSG_FILE_CNT						"Algunos archivos no seran ordenados. El Max. num. de archivos para ordenar en 1 carpeta es 100."
 #define MSG_WIZARD_HEATING					"Precalentando nozzle. Espera por favor."
+#define MSG_M117_V2_CALIBRATION				"M117 Cal. primera cap."

Firmware/language_it.h

@@ -337,3 +337,4 @@
 #define MSG_PLEASE_LOAD_PLA					"Per favore prima caricare filamento di PLA."
 #define MSG_FILE_CNT						"Alcuni dei file non potranno essere organizzati. 100 e il n. max. di file che possono essere organizzati."
 #define MSG_WIZARD_HEATING					"Sto preriscaldando l'ugello. Per favore attendi."
+#define MSG_M117_V2_CALIBRATION				"M117 Cal. primo layer."

Firmware/language_pl.h

@@ -349,3 +349,4 @@
 #define MSG_PLEASE_LOAD_PLA					"Prosze, najpierw zaladuj filament PLA."
 #define MSG_FILE_CNT						"Niektore pliki nie beda sortowane. Max. ilosc plikow do sortu w 1 folderze to 100."
 #define MSG_WIZARD_HEATING					"Nagrzewanie dyszy. Prosze czekac."
+#define MSG_M117_V2_CALIBRATION				"M117 Kal. 1. warstwy"

Firmware/ultralcd.cpp

@@ -588,10 +588,15 @@ void lcd_commands()
 	if (lcd_commands_type == LCD_COMMAND_LONG_PAUSE)
 	{
 		if(lcd_commands_step == 0) {
-			card.pauseSDPrint();
-			lcd_setstatuspgm(MSG_FINISHING_MOVEMENTS);
-			lcdDrawUpdate = 3;
-			lcd_commands_step = 1;
+			if (card.sdprinting) {
+				card.pauseSDPrint();
+				lcd_setstatuspgm(MSG_FINISHING_MOVEMENTS);
+				lcdDrawUpdate = 3;
+				lcd_commands_step = 1;
+			}
+			else {
+				lcd_commands_type = 0;
+			}
 		}
 		if (lcd_commands_step == 1 && !blocks_queued()) {
 			lcd_setstatuspgm(MSG_PRINT_PAUSED);
@@ -684,7 +689,7 @@ void lcd_commands()
 			enquecommand_P(PSTR("M190 S55"));
 			enquecommand_P(PSTR("M109 S210"));
 			enquecommand_P(PSTR("T0"));
-			enquecommand_P(PSTR("M117 First layer cal."));
+			enquecommand_P(MSG_M117_V2_CALIBRATION);
 			enquecommand_P(PSTR("G87")); //sets calibration status
 			enquecommand_P(PSTR("G28"));
 			enquecommand_P(PSTR("G21")); //set units to millimeters
@@ -947,7 +952,7 @@ void lcd_commands()
 			enquecommand_P(PSTR("M140 S55"));
 			enquecommand_P(PSTR("M190 S55"));
 			enquecommand_P(PSTR("M109 S210"));
-			enquecommand_P(PSTR("M117 First layer cal."));
+			enquecommand_P(MSG_M117_V2_CALIBRATION);
 			enquecommand_P(PSTR("G87")); //sets calibration status
 			enquecommand_P(PSTR("G28"));
 			enquecommand_P(PSTR("G92 E0.0"));