浏览代码

settings menu updated

PavelSindler 7 年之前
父节点
当前提交
67a2e0a706
共有 3 个文件被更改,包括 7 次插入7 次删除
  1. 2 2
      Firmware/language_all.cpp
  2. 2 2
      Firmware/language_en.h
  3. 3 3
      Firmware/ultralcd.cpp

+ 2 - 2
Firmware/language_all.cpp

@@ -1859,14 +1859,14 @@ const char * const MSG_TEMP_CALIBRATION_DONE_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_TEMP_CALIBRATION_DONE_CZ
 };
 
-const char MSG_TEMP_CALIBRATION_OFF_EN[] PROGMEM = "Temp. cal.   [off]";
+const char MSG_TEMP_CALIBRATION_OFF_EN[] PROGMEM = "Temp. cal.  [off]";
 const char MSG_TEMP_CALIBRATION_OFF_CZ[] PROGMEM = "Tepl. kal.  [vyp]";
 const char * const MSG_TEMP_CALIBRATION_OFF_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_TEMP_CALIBRATION_OFF_EN,
 	MSG_TEMP_CALIBRATION_OFF_CZ
 };
 
-const char MSG_TEMP_CALIBRATION_ON_EN[] PROGMEM = "Temp. cal.    [on]";
+const char MSG_TEMP_CALIBRATION_ON_EN[] PROGMEM = "Temp. cal.   [on]";
 const char MSG_TEMP_CALIBRATION_ON_CZ[] PROGMEM = "Tepl. kal.  [zap]";
 const char * const MSG_TEMP_CALIBRATION_ON_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_TEMP_CALIBRATION_ON_EN,

+ 2 - 2
Firmware/language_en.h

@@ -291,8 +291,8 @@
 #define(length=20, lines=1) MSG_PINDA_PREHEAT					"PINDA Heating"
 #define(length=20, lines=1) MSG_TEMP_CALIBRATION				"Temp. cal.          "
 #define(length=20, lines=4) MSG_TEMP_CALIBRATION_DONE			"Temperature calibration is finished. Click to continue."
-#define(length=20, lines=1) MSG_TEMP_CALIBRATION_ON				"Temp. cal.    [on]"
-#define(length=20, lines=1) MSG_TEMP_CALIBRATION_OFF			"Temp. cal.   [off]"
+#define(length=20, lines=1) MSG_TEMP_CALIBRATION_ON				"Temp. cal.   [on]"
+#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 during print"

+ 3 - 3
Firmware/ultralcd.cpp

@@ -1659,7 +1659,7 @@ static void lcd_support_menu()
 void lcd_set_fan_check() {
 	fans_check_enabled = !fans_check_enabled;
 	eeprom_update_byte((unsigned char *)EEPROM_FAN_CHECK_ENABLED, fans_check_enabled);
-	lcd_goto_menu(lcd_support_menu, 15);
+	lcd_goto_menu(lcd_settings_menu, 8);
 }
 
 void lcd_unLoadFilament()
@@ -3233,7 +3233,7 @@ static void lcd_crash_mode_set()
     }else{
         crashdet_enable();
     }
-	lcd_goto_menu(lcd_settings_menu, 7);
+	lcd_goto_menu(lcd_settings_menu, 9);
     
 }
 
@@ -3308,7 +3308,7 @@ void lcd_temp_calibration_set() {
 	temp_cal_active = !temp_cal_active;
 	eeprom_update_byte((unsigned char *)EEPROM_TEMP_CAL_ACTIVE, temp_cal_active);
 	digipot_init();
-	lcd_goto_menu(lcd_pinda_calibration_menu, 2);
+	lcd_goto_menu(lcd_settings_menu, 10);
 }
 
 void lcd_calibrate_pinda() {