瀏覽代碼

selftest static memory error fixed; snmm: updated stop print messages

PavelSindler 7 年之前
父節點
當前提交
1e734d361a
共有 5 個文件被更改,包括 38 次插入16 次删除
  1. 22 4
      Firmware/language_all.cpp
  2. 6 6
      Firmware/language_all.h
  3. 4 1
      Firmware/language_cz.h
  4. 1 1
      Firmware/language_en.h
  5. 5 4
      Firmware/ultralcd.cpp

+ 22 - 4
Firmware/language_all.cpp

@@ -26,7 +26,13 @@ const char * const MSG_ADJUSTZ_LANG_TABLE[LANG_NUM] PROGMEM = {
 };
 
 const char MSG_ALL_EN[] PROGMEM = "All";
-const char * const MSG_ALL_LANG_TABLE[1] PROGMEM = {
+const char MSG_ALL_CZ[] PROGMEM = "Vse";
+const char * const MSG_ALL_LANG_TABLE[LANG_NUM] PROGMEM = {
+	MSG_ALL_EN,
+	MSG_ALL_CZ,
+	MSG_ALL_EN,
+	MSG_ALL_EN,
+	MSG_ALL_EN,
 	MSG_ALL_EN
 };
 
@@ -706,7 +712,13 @@ const char * const MSG_COUNT_X_LANG_TABLE[1] PROGMEM = {
 };
 
 const char MSG_CURRENT_EN[] PROGMEM = "Current";
-const char * const MSG_CURRENT_LANG_TABLE[1] PROGMEM = {
+const char MSG_CURRENT_CZ[] PROGMEM = "Pouze aktualni";
+const char * const MSG_CURRENT_LANG_TABLE[LANG_NUM] PROGMEM = {
+	MSG_CURRENT_EN,
+	MSG_CURRENT_CZ,
+	MSG_CURRENT_EN,
+	MSG_CURRENT_EN,
+	MSG_CURRENT_EN,
 	MSG_CURRENT_EN
 };
 
@@ -3164,8 +3176,14 @@ const char * const MSG_USB_PRINTING_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_USB_PRINTING_DE
 };
 
-const char MSG_USED_EN[] PROGMEM = "Used";
-const char * const MSG_USED_LANG_TABLE[1] PROGMEM = {
+const char MSG_USED_EN[] PROGMEM = "Used during print";
+const char MSG_USED_CZ[] PROGMEM = "Pouzite behem tisku";
+const char * const MSG_USED_LANG_TABLE[LANG_NUM] PROGMEM = {
+	MSG_USED_EN,
+	MSG_USED_CZ,
+	MSG_USED_EN,
+	MSG_USED_EN,
+	MSG_USED_EN,
 	MSG_USED_EN
 };
 

+ 6 - 6
Firmware/language_all.h

@@ -30,8 +30,8 @@ extern const char* const MSG_ACTIVE_EXTRUDER_LANG_TABLE[1];
 #define MSG_ACTIVE_EXTRUDER LANG_TABLE_SELECT_EXPLICIT(MSG_ACTIVE_EXTRUDER_LANG_TABLE, 0)
 extern const char* const MSG_ADJUSTZ_LANG_TABLE[LANG_NUM];
 #define MSG_ADJUSTZ LANG_TABLE_SELECT(MSG_ADJUSTZ_LANG_TABLE)
-extern const char* const MSG_ALL_LANG_TABLE[1];
-#define MSG_ALL LANG_TABLE_SELECT_EXPLICIT(MSG_ALL_LANG_TABLE, 0)
+extern const char* const MSG_ALL_LANG_TABLE[LANG_NUM];
+#define MSG_ALL LANG_TABLE_SELECT(MSG_ALL_LANG_TABLE)
 extern const char* const MSG_AMAX_LANG_TABLE[1];
 #define MSG_AMAX LANG_TABLE_SELECT_EXPLICIT(MSG_AMAX_LANG_TABLE, 0)
 extern const char* const MSG_AUTHOR_LANG_TABLE[1];
@@ -142,8 +142,8 @@ extern const char* const MSG_CORRECTLY_LANG_TABLE[LANG_NUM];
 #define MSG_CORRECTLY LANG_TABLE_SELECT(MSG_CORRECTLY_LANG_TABLE)
 extern const char* const MSG_COUNT_X_LANG_TABLE[1];
 #define MSG_COUNT_X LANG_TABLE_SELECT_EXPLICIT(MSG_COUNT_X_LANG_TABLE, 0)
-extern const char* const MSG_CURRENT_LANG_TABLE[1];
-#define MSG_CURRENT LANG_TABLE_SELECT_EXPLICIT(MSG_CURRENT_LANG_TABLE, 0)
+extern const char* const MSG_CURRENT_LANG_TABLE[LANG_NUM];
+#define MSG_CURRENT LANG_TABLE_SELECT(MSG_CURRENT_LANG_TABLE)
 extern const char* const MSG_DISABLE_STEPPERS_LANG_TABLE[LANG_NUM];
 #define MSG_DISABLE_STEPPERS LANG_TABLE_SELECT(MSG_DISABLE_STEPPERS_LANG_TABLE)
 extern const char* const MSG_DWELL_LANG_TABLE[LANG_NUM];
@@ -586,8 +586,8 @@ extern const char* const MSG_UNLOAD_FILAMENT_4_LANG_TABLE[LANG_NUM];
 #define MSG_UNLOAD_FILAMENT_4 LANG_TABLE_SELECT(MSG_UNLOAD_FILAMENT_4_LANG_TABLE)
 extern const char* const MSG_USB_PRINTING_LANG_TABLE[LANG_NUM];
 #define MSG_USB_PRINTING LANG_TABLE_SELECT(MSG_USB_PRINTING_LANG_TABLE)
-extern const char* const MSG_USED_LANG_TABLE[1];
-#define MSG_USED LANG_TABLE_SELECT_EXPLICIT(MSG_USED_LANG_TABLE, 0)
+extern const char* const MSG_USED_LANG_TABLE[LANG_NUM];
+#define MSG_USED LANG_TABLE_SELECT(MSG_USED_LANG_TABLE)
 extern const char* const MSG_USERWAIT_LANG_TABLE[LANG_NUM];
 #define MSG_USERWAIT LANG_TABLE_SELECT(MSG_USERWAIT_LANG_TABLE)
 extern const char* const MSG_VMIN_LANG_TABLE[1];

+ 4 - 1
Firmware/language_cz.h

@@ -292,4 +292,7 @@
 #define MSG_TEMP_CALIBRATION_DONE						"Teplotni kalibrace dokoncena. Pokracujte stiskem tlacitka."
 #define MSG_TEMP_CALIBRATION_ON							"Tepl. kal. [ON]"
 #define MSG_TEMP_CALIBRATION_OFF						"Tepl. kal. [OFF]"
-#define MSG_PREPARE_FILAMENT							"Pripravte filament"
+#define MSG_PREPARE_FILAMENT							"Pripravte filament"
+#define MSG_ALL											"Vse"
+#define MSG_USED										"Pouzite behem tisku"
+#define MSG_CURRENT										"Pouze aktualni"

+ 1 - 1
Firmware/language_en.h

@@ -294,7 +294,7 @@
 #define(length=20, lines=1) MSG_TEMP_CALIBRATION_OFF			"Temp. cal. [OFF]"
 #define(length=20, lines=1) MSG_PREPARE_FILAMENT				"Prepare new filament"
 #define(length=19, lines=1) MSG_ALL								"All"
-#define(length=19, lines=1) MSG_USED							"Used"
+#define(length=19, lines=1) MSG_USED							"Used during print"
 #define(length=19, lines=1) MSG_CURRENT							"Current"
 
 

+ 5 - 4
Firmware/ultralcd.cpp

@@ -4319,10 +4319,11 @@ static bool lcd_selfcheck_endstops()
 	if (READ(X_MIN_PIN) ^ X_MIN_ENDSTOP_INVERTING == 1 || READ(Y_MIN_PIN) ^ Y_MIN_ENDSTOP_INVERTING == 1 || READ(Z_MIN_PIN) ^ Z_MIN_ENDSTOP_INVERTING == 1)
 	{
 		_result = false;
-		String  _error = String((READ(X_MIN_PIN) ^ X_MIN_ENDSTOP_INVERTING == 1) ? "X" : "") +
-			String((READ(Y_MIN_PIN) ^ Y_MIN_ENDSTOP_INVERTING == 1) ? "Y" : "") +
-			String((READ(Z_MIN_PIN) ^ Z_MIN_ENDSTOP_INVERTING == 1) ? "Z" : "");
-		lcd_selftest_error(3, _error.c_str(), "");
+		char _error[4] = "";
+		if (READ(X_MIN_PIN) ^ X_MIN_ENDSTOP_INVERTING == 1) strcat(_error, "X");
+		if (READ(Y_MIN_PIN) ^ Y_MIN_ENDSTOP_INVERTING == 1) strcat(_error, "Y");
+		if (READ(Z_MIN_PIN) ^ Z_MIN_ENDSTOP_INVERTING == 1) strcat(_error, "Z");
+		lcd_selftest_error(3, _error, "");
 	}
 	manage_heater();
 	manage_inactivity(true);