|
|
@@ -85,6 +85,7 @@ unsigned long display_time; //just timer for showing pid finished message on lcd
|
|
|
float pid_temp = DEFAULT_PID_TEMP;
|
|
|
|
|
|
static bool forceMenuExpire = false;
|
|
|
+bool lcd_autoDeplete;
|
|
|
|
|
|
|
|
|
static float manual_feedrate[] = MANUAL_FEEDRATE;
|
|
|
@@ -121,6 +122,7 @@ static void lcd_control_temperature_preheat_pla_settings_menu();
|
|
|
static void lcd_control_temperature_preheat_abs_settings_menu();
|
|
|
static void lcd_control_motion_menu();
|
|
|
static void lcd_control_volumetric_menu();
|
|
|
+static void lcd_settings_linearity_correction_menu_save();
|
|
|
static void prusa_stat_printerstatus(int _status);
|
|
|
static void prusa_stat_farm_number();
|
|
|
static void prusa_stat_temperatures();
|
|
|
@@ -534,9 +536,9 @@ void lcdui_print_extruder(void)
|
|
|
{
|
|
|
int chars = 0;
|
|
|
if (mmu_extruder == tmp_extruder)
|
|
|
- chars = lcd_printf_P(_N(" T%u"), mmu_extruder);
|
|
|
+ chars = lcd_printf_P(_N(" T%u"), mmu_extruder+1);
|
|
|
else
|
|
|
- chars = lcd_printf_P(_N(" %u>%u"), mmu_extruder, tmp_extruder);
|
|
|
+ chars = lcd_printf_P(_N(" %u>%u"), mmu_extruder+1, tmp_extruder+1);
|
|
|
lcd_space(5 - chars);
|
|
|
}
|
|
|
|
|
|
@@ -1886,20 +1888,22 @@ static void lcd_menu_extruder_info()
|
|
|
// Shutter register is an index of LASER shutter time. It is automatically controlled by the chip's internal
|
|
|
// auto-exposure algorithm. When the chip is tracking on a good reflection surface, the Shutter is small.
|
|
|
// When the chip is tracking on a poor reflection surface, the Shutter is large. Value ranges from 0 to 46.
|
|
|
-
|
|
|
- if (!fsensor_enabled)
|
|
|
- lcd_puts_P(_N("Filament sensor\n" "is disabled."));
|
|
|
- else
|
|
|
+ if (mmu_enabled == false)
|
|
|
{
|
|
|
- if (!moves_planned() && !IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LCD_COMMAND_V2_CAL))
|
|
|
- pat9125_update();
|
|
|
- lcd_printf_P(_N(
|
|
|
- "Fil. Xd:%3d Yd:%3d\n"
|
|
|
- "Int: %3d Shut: %3d"
|
|
|
- ),
|
|
|
- pat9125_x, pat9125_y,
|
|
|
- pat9125_b, pat9125_s
|
|
|
- );
|
|
|
+ if (!fsensor_enabled)
|
|
|
+ lcd_puts_P(_N("Filament sensor\n" "is disabled."));
|
|
|
+ else
|
|
|
+ {
|
|
|
+ if (!moves_planned() && !IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LCD_COMMAND_V2_CAL))
|
|
|
+ pat9125_update();
|
|
|
+ lcd_printf_P(_N(
|
|
|
+ "Fil. Xd:%3d Yd:%3d\n"
|
|
|
+ "Int: %3d Shut: %3d"
|
|
|
+ ),
|
|
|
+ pat9125_x, pat9125_y,
|
|
|
+ pat9125_b, pat9125_s
|
|
|
+ );
|
|
|
+ }
|
|
|
}
|
|
|
#endif //FILAMENT_SENSOR
|
|
|
|
|
|
@@ -2094,9 +2098,7 @@ static void lcd_support_menu()
|
|
|
uint8_t ip[4]; // 4bytes
|
|
|
char ip_str[3*4+3+1]; // 16bytes
|
|
|
} _menu_data_t;
|
|
|
-#if (22 > MENU_DATA_SIZE)
|
|
|
-#error "check MENU_DATA_SIZE definition!"
|
|
|
-#endif
|
|
|
+ static_assert(sizeof(menu_data)>= sizeof(_menu_data_t),"_menu_data_t doesn't fit into menu_data");
|
|
|
_menu_data_t* _md = (_menu_data_t*)&(menu_data[0]);
|
|
|
if (_md->status == 0 || lcd_draw_update == 2)
|
|
|
{
|
|
|
@@ -2425,6 +2427,7 @@ static void lcd_menu_AutoLoadFilament()
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
+ static_assert(sizeof(menu_data)>=sizeof(ShortTimer), "ShortTimer doesn't fit into menu_data");
|
|
|
ShortTimer* ptimer = (ShortTimer*)&(menu_data[0]);
|
|
|
if (!ptimer->running()) ptimer->start();
|
|
|
lcd_set_cursor(0, 0);
|
|
|
@@ -2540,9 +2543,7 @@ static void _lcd_move(const char *name, int axis, int min, int max)
|
|
|
bool initialized; // 1byte
|
|
|
bool endstopsEnabledPrevious; // 1byte
|
|
|
} _menu_data_t;
|
|
|
-#if (2 > MENU_DATA_SIZE)
|
|
|
-#error "check MENU_DATA_SIZE definition!"
|
|
|
-#endif
|
|
|
+ static_assert(sizeof(menu_data)>= sizeof(_menu_data_t),"_menu_data_t doesn't fit into menu_data");
|
|
|
_menu_data_t* _md = (_menu_data_t*)&(menu_data[0]);
|
|
|
if (!_md->initialized)
|
|
|
{
|
|
|
@@ -2746,9 +2747,7 @@ static void _lcd_babystep(int axis, const char *msg)
|
|
|
int babystepMem[3]; // 6bytes
|
|
|
float babystepMemMM[3]; // 12bytes
|
|
|
} _menu_data_t;
|
|
|
-#if (19 > MENU_DATA_SIZE)
|
|
|
-#error "check MENU_DATA_SIZE definition!"
|
|
|
-#endif
|
|
|
+ static_assert(sizeof(menu_data)>= sizeof(_menu_data_t),"_menu_data_t doesn't fit into menu_data");
|
|
|
_menu_data_t* _md = (_menu_data_t*)&(menu_data[0]);
|
|
|
if (_md->status == 0)
|
|
|
{
|
|
|
@@ -2820,16 +2819,14 @@ static void lcd_babystep_z()
|
|
|
|
|
|
typedef struct
|
|
|
{ // 12bytes + 9bytes = 21bytes total
|
|
|
- uint8_t reserved[MENU_DATA_EDIT_SIZE]; //12 bytes reserved for number editing functions
|
|
|
+ menu_data_edit_t reserved; //12 bytes reserved for number editing functions
|
|
|
int8_t status; // 1byte
|
|
|
int16_t left; // 2byte
|
|
|
int16_t right; // 2byte
|
|
|
int16_t front; // 2byte
|
|
|
int16_t rear; // 2byte
|
|
|
} _menu_data_adjust_bed_t;
|
|
|
-#if (21 > MENU_DATA_SIZE)
|
|
|
-#error "check MENU_DATA_SIZE definition!"
|
|
|
-#endif
|
|
|
+static_assert(sizeof(menu_data)>= sizeof(_menu_data_adjust_bed_t),"_menu_data_adjust_bed_t doesn't fit into menu_data");
|
|
|
|
|
|
void lcd_adjust_bed_reset(void)
|
|
|
{
|
|
|
@@ -4042,15 +4039,16 @@ static void lcd_crash_mode_set()
|
|
|
static void lcd_fsensor_state_set()
|
|
|
{
|
|
|
FSensorStateMenu = !FSensorStateMenu; //set also from fsensor_enable() and fsensor_disable()
|
|
|
- if (!FSensorStateMenu) {
|
|
|
- fsensor_disable();
|
|
|
- if (fsensor_autoload_enabled)
|
|
|
- menu_submenu(lcd_filament_autoload_info);
|
|
|
- }else{
|
|
|
- fsensor_enable();
|
|
|
- if (fsensor_not_responding)
|
|
|
- menu_submenu(lcd_fsensor_fail);
|
|
|
- }
|
|
|
+ if (!FSensorStateMenu) {
|
|
|
+ fsensor_disable();
|
|
|
+ if (fsensor_autoload_enabled && !mmu_enabled)
|
|
|
+ menu_submenu(lcd_filament_autoload_info);
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ fsensor_enable();
|
|
|
+ if (fsensor_not_responding && !mmu_enabled)
|
|
|
+ menu_submenu(lcd_fsensor_fail);
|
|
|
+ }
|
|
|
}
|
|
|
#endif //FILAMENT_SENSOR
|
|
|
|
|
|
@@ -4490,28 +4488,182 @@ void lcd_wizard(int state) {
|
|
|
lcd_return_to_status();
|
|
|
lcd_update(2);
|
|
|
}
|
|
|
-#ifdef LINEARITY_CORRECTION
|
|
|
+
|
|
|
+#ifdef TMC2130
|
|
|
void lcd_settings_linearity_correction_menu(void)
|
|
|
{
|
|
|
MENU_BEGIN();
|
|
|
- if (menu_item_back_P(_T(MSG_MAIN)))
|
|
|
- {
|
|
|
- lcd_settings_menu_back();
|
|
|
- return;
|
|
|
- }
|
|
|
-// MENU_ITEM_BACK_P(_T(MSG_SETTINGS));
|
|
|
+ MENU_ITEM_BACK_P(_T(MSG_SETTINGS));
|
|
|
#ifdef TMC2130_LINEARITY_CORRECTION_XYZ
|
|
|
//tmc2130_wave_fac[X_AXIS]
|
|
|
- int corr[4] = {tmc2130_wave_fac[X_AXIS], tmc2130_wave_fac[Y_AXIS], tmc2130_wave_fac[Z_AXIS], tmc2130_wave_fac[E_AXIS]};
|
|
|
|
|
|
- MENU_ITEM_EDIT_int3_P(_i("X-correct"), &corr[X_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_EXTRUDER_CORRECTION c=9 r=0
|
|
|
- MENU_ITEM_EDIT_int3_P(_i("Y-correct"), &corr[Y_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_EXTRUDER_CORRECTION c=9 r=0
|
|
|
- MENU_ITEM_EDIT_int3_P(_i("Z-correct"), &corr[Z_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_EXTRUDER_CORRECTION c=9 r=0
|
|
|
+ MENU_ITEM_EDIT_int3_P(_i("X-correct"), &tmc2130_wave_fac[X_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_EXTRUDER_CORRECTION c=9 r=0
|
|
|
+ MENU_ITEM_EDIT_int3_P(_i("Y-correct"), &tmc2130_wave_fac[Y_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_EXTRUDER_CORRECTION c=9 r=0
|
|
|
+ MENU_ITEM_EDIT_int3_P(_i("Z-correct"), &tmc2130_wave_fac[Z_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_EXTRUDER_CORRECTION c=9 r=0
|
|
|
#endif //TMC2130_LINEARITY_CORRECTION_XYZ
|
|
|
- MENU_ITEM_EDIT_int3_P(_i("E-correct"), &corr[E_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_EXTRUDER_CORRECTION c=9 r=0
|
|
|
+ MENU_ITEM_EDIT_int3_P(_i("E-correct"), &tmc2130_wave_fac[E_AXIS], TMC2130_WAVE_FAC1000_MIN-TMC2130_WAVE_FAC1000_STP, TMC2130_WAVE_FAC1000_MAX);////MSG_EXTRUDER_CORRECTION c=9 r=0
|
|
|
MENU_END();
|
|
|
+ if(menu_leaving)
|
|
|
+ {
|
|
|
+ lcd_settings_linearity_correction_menu_save();
|
|
|
+ }
|
|
|
}
|
|
|
-#endif //LINEARITY_CORRECTION
|
|
|
+#endif // TMC2130
|
|
|
+
|
|
|
+#ifdef FILAMENT_SENSOR
|
|
|
+#define SETTINGS_FILAMENT_SENSOR \
|
|
|
+do\
|
|
|
+{\
|
|
|
+ if (FSensorStateMenu == 0)\
|
|
|
+ {\
|
|
|
+ if (fsensor_not_responding)\
|
|
|
+ {\
|
|
|
+ /* Filament sensor not working*/\
|
|
|
+ MENU_ITEM_FUNCTION_P(_i("Fil. sensor [N/A]"), lcd_fsensor_state_set);/*////MSG_FSENSOR_NA c=0 r=0*/\
|
|
|
+ MENU_ITEM_SUBMENU_P(_T(MSG_FSENS_AUTOLOAD_NA), lcd_fsensor_fail);\
|
|
|
+ }\
|
|
|
+ else\
|
|
|
+ {\
|
|
|
+ /* Filament sensor turned off, working, no problems*/\
|
|
|
+ MENU_ITEM_FUNCTION_P(_T(MSG_FSENSOR_OFF), lcd_fsensor_state_set);\
|
|
|
+ if (mmu_enabled == false)if (mmu_enabled == false)\
|
|
|
+ {\
|
|
|
+ MENU_ITEM_SUBMENU_P(_T(MSG_FSENS_AUTOLOAD_NA), lcd_filament_autoload_info);\
|
|
|
+ }\
|
|
|
+ }\
|
|
|
+ }\
|
|
|
+ else\
|
|
|
+ {\
|
|
|
+ /* Filament sensor turned on, working, no problems*/\
|
|
|
+ MENU_ITEM_FUNCTION_P(_T(MSG_FSENSOR_ON), lcd_fsensor_state_set);\
|
|
|
+ if (mmu_enabled == false)\
|
|
|
+ {\
|
|
|
+ if (fsensor_autoload_enabled)\
|
|
|
+ MENU_ITEM_FUNCTION_P(_i("F. autoload [on]"), lcd_set_filament_autoload);/*////MSG_FSENS_AUTOLOAD_ON c=17 r=1*/\
|
|
|
+ else\
|
|
|
+ MENU_ITEM_FUNCTION_P(_i("F. autoload [off]"), lcd_set_filament_autoload);/*////MSG_FSENS_AUTOLOAD_OFF c=17 r=1*/\
|
|
|
+ }\
|
|
|
+ }\
|
|
|
+}\
|
|
|
+while(0)
|
|
|
+
|
|
|
+#else //FILAMENT_SENSOR
|
|
|
+#define SETTINGS_FILAMENT_SENSOR do{}while(0)
|
|
|
+#endif //FILAMENT_SENSOR
|
|
|
+
|
|
|
+#ifdef TMC2130
|
|
|
+#define SETTINGS_SILENT_MODE \
|
|
|
+do\
|
|
|
+{\
|
|
|
+ if(!farm_mode)\
|
|
|
+ {\
|
|
|
+ if (SilentModeMenu == SILENT_MODE_NORMAL)\
|
|
|
+ {\
|
|
|
+ MENU_ITEM_FUNCTION_P(_T(MSG_STEALTH_MODE_OFF), lcd_silent_mode_set);\
|
|
|
+ }\
|
|
|
+ else MENU_ITEM_FUNCTION_P(_T(MSG_STEALTH_MODE_ON), lcd_silent_mode_set);\
|
|
|
+ if (SilentModeMenu == SILENT_MODE_NORMAL)\
|
|
|
+ {\
|
|
|
+ if (CrashDetectMenu == 0)\
|
|
|
+ {\
|
|
|
+ MENU_ITEM_FUNCTION_P(_T(MSG_CRASHDETECT_OFF), lcd_crash_mode_set);\
|
|
|
+ }\
|
|
|
+ else MENU_ITEM_FUNCTION_P(_T(MSG_CRASHDETECT_ON), lcd_crash_mode_set);\
|
|
|
+ }\
|
|
|
+ else MENU_ITEM_SUBMENU_P(_T(MSG_CRASHDETECT_NA), lcd_crash_mode_info);\
|
|
|
+ }\
|
|
|
+}\
|
|
|
+while (0)
|
|
|
+
|
|
|
+#else //TMC2130
|
|
|
+#define SETTINGS_SILENT_MODE \
|
|
|
+do\
|
|
|
+{\
|
|
|
+ if(!farm_mode)\
|
|
|
+ {\
|
|
|
+ switch (SilentModeMenu)\
|
|
|
+ {\
|
|
|
+ case SILENT_MODE_POWER:\
|
|
|
+ MENU_ITEM_FUNCTION_P(_T(MSG_SILENT_MODE_OFF), lcd_silent_mode_set);\
|
|
|
+ break;\
|
|
|
+ case SILENT_MODE_SILENT:\
|
|
|
+ MENU_ITEM_FUNCTION_P(_T(MSG_SILENT_MODE_ON), lcd_silent_mode_set);\
|
|
|
+ break;\
|
|
|
+ case SILENT_MODE_AUTO:\
|
|
|
+ MENU_ITEM_FUNCTION_P(_T(MSG_AUTO_MODE_ON), lcd_silent_mode_set);\
|
|
|
+ break;\
|
|
|
+ default:\
|
|
|
+ MENU_ITEM_FUNCTION_P(_T(MSG_SILENT_MODE_OFF), lcd_silent_mode_set);\
|
|
|
+ break; /* (probably) not needed*/\
|
|
|
+ }\
|
|
|
+ }\
|
|
|
+}\
|
|
|
+while (0)
|
|
|
+#endif //TMC2130
|
|
|
+
|
|
|
+#ifdef SDCARD_SORT_ALPHA
|
|
|
+#define SETTINGS_SD \
|
|
|
+do\
|
|
|
+{\
|
|
|
+ if (card.ToshibaFlashAir_isEnabled())\
|
|
|
+ MENU_ITEM_FUNCTION_P(_i("SD card [flshAir]"), lcd_toshiba_flash_air_compatibility_toggle);/*////MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1*/\
|
|
|
+ else\
|
|
|
+ MENU_ITEM_FUNCTION_P(_i("SD card [normal]"), lcd_toshiba_flash_air_compatibility_toggle);/*////MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1*/\
|
|
|
+\
|
|
|
+ if (!farm_mode)\
|
|
|
+ {\
|
|
|
+ uint8_t sdSort;\
|
|
|
+ EEPROM_read(EEPROM_SD_SORT, (uint8_t*)&sdSort, sizeof(sdSort));\
|
|
|
+ switch (sdSort)\
|
|
|
+ {\
|
|
|
+ case SD_SORT_TIME: MENU_ITEM_FUNCTION_P(_i("Sort: [time]"), lcd_sort_type_set); break;/*////MSG_SORT_TIME c=17 r=1*/\
|
|
|
+ case SD_SORT_ALPHA: MENU_ITEM_FUNCTION_P(_i("Sort: [alphabet]"), lcd_sort_type_set); break;/*////MSG_SORT_ALPHA c=17 r=1*/\
|
|
|
+ default: MENU_ITEM_FUNCTION_P(_i("Sort: [none]"), lcd_sort_type_set);/*////MSG_SORT_NONE c=17 r=1*/\
|
|
|
+ }\
|
|
|
+ }\
|
|
|
+}\
|
|
|
+while (0)
|
|
|
+#else // SDCARD_SORT_ALPHA
|
|
|
+#define SETTINGS_SD \
|
|
|
+do\
|
|
|
+{\
|
|
|
+ if (card.ToshibaFlashAir_isEnabled())\
|
|
|
+ MENU_ITEM_FUNCTION_P(_i("SD card [flshAir]"), lcd_toshiba_flash_air_compatibility_toggle);/*////MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1*/\
|
|
|
+ else\
|
|
|
+ MENU_ITEM_FUNCTION_P(_i("SD card [normal]"), lcd_toshiba_flash_air_compatibility_toggle);/*////MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1*/\
|
|
|
+}\
|
|
|
+while (0)
|
|
|
+#endif // SDCARD_SORT_ALPHA
|
|
|
+
|
|
|
+#define SETTINGS_SOUND \
|
|
|
+do\
|
|
|
+{\
|
|
|
+ switch(eSoundMode)\
|
|
|
+ {\
|
|
|
+ case e_SOUND_MODE_LOUD:\
|
|
|
+ MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_LOUD),lcd_sound_state_set);\
|
|
|
+ break;\
|
|
|
+ case e_SOUND_MODE_ONCE:\
|
|
|
+ MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_ONCE),lcd_sound_state_set);\
|
|
|
+ break;\
|
|
|
+ case e_SOUND_MODE_SILENT:\
|
|
|
+ MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_SILENT),lcd_sound_state_set);\
|
|
|
+ break;\
|
|
|
+ case e_SOUND_MODE_MUTE:\
|
|
|
+ MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_MUTE),lcd_sound_state_set);\
|
|
|
+ break;\
|
|
|
+ default:\
|
|
|
+ MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_LOUD),lcd_sound_state_set);\
|
|
|
+ }\
|
|
|
+}\
|
|
|
+while (0)
|
|
|
+
|
|
|
+static void auto_deplete_switch()
|
|
|
+{
|
|
|
+ lcd_autoDeplete = !lcd_autoDeplete;
|
|
|
+ eeprom_update_byte((unsigned char *)EEPROM_AUTO_DEPLETE, lcd_autoDeplete);
|
|
|
+}
|
|
|
+
|
|
|
static void lcd_settings_menu()
|
|
|
{
|
|
|
EEPROM_read(EEPROM_SILENT, (uint8_t*)&SilentModeMenu, sizeof(SilentModeMenu));
|
|
|
@@ -4520,71 +4672,28 @@ static void lcd_settings_menu()
|
|
|
|
|
|
MENU_ITEM_SUBMENU_P(_i("Temperature"), lcd_control_temperature_menu);////MSG_TEMPERATURE c=0 r=0
|
|
|
if (!homing_flag)
|
|
|
- MENU_ITEM_SUBMENU_P(_i("Move axis"), lcd_move_menu_1mm);////MSG_MOVE_AXIS c=0 r=0
|
|
|
+ MENU_ITEM_SUBMENU_P(_i("Move axis"), lcd_move_menu_1mm);////MSG_MOVE_AXIS c=0 r=0
|
|
|
if (!isPrintPaused)
|
|
|
- MENU_ITEM_GCODE_P(_i("Disable steppers"), PSTR("M84"));////MSG_DISABLE_STEPPERS c=0 r=0
|
|
|
+ MENU_ITEM_GCODE_P(_i("Disable steppers"), PSTR("M84"));////MSG_DISABLE_STEPPERS c=0 r=0
|
|
|
|
|
|
-#ifndef TMC2130
|
|
|
- if (!farm_mode)
|
|
|
- { //dont show in menu if we are in farm mode
|
|
|
- switch (SilentModeMenu)
|
|
|
- {
|
|
|
- case SILENT_MODE_POWER: MENU_ITEM_FUNCTION_P(_T(MSG_SILENT_MODE_OFF), lcd_silent_mode_set); break;
|
|
|
- case SILENT_MODE_SILENT: MENU_ITEM_FUNCTION_P(_T(MSG_SILENT_MODE_ON), lcd_silent_mode_set); break;
|
|
|
- case SILENT_MODE_AUTO: MENU_ITEM_FUNCTION_P(_T(MSG_AUTO_MODE_ON), lcd_silent_mode_set); break;
|
|
|
- default: MENU_ITEM_FUNCTION_P(_T(MSG_SILENT_MODE_OFF), lcd_silent_mode_set); break; // (probably) not needed
|
|
|
- }
|
|
|
- }
|
|
|
-#endif //TMC2130
|
|
|
+ SETTINGS_FILAMENT_SENSOR;
|
|
|
|
|
|
-#ifdef FILAMENT_SENSOR
|
|
|
- if (FSensorStateMenu == 0)
|
|
|
- {
|
|
|
- if (fsensor_not_responding)
|
|
|
- {
|
|
|
- // Filament sensor not working
|
|
|
- MENU_ITEM_FUNCTION_P(_i("Fil. sensor [N/A]"), lcd_fsensor_state_set);////MSG_FSENSOR_NA c=0 r=0
|
|
|
- MENU_ITEM_SUBMENU_P(_T(MSG_FSENS_AUTOLOAD_NA), lcd_fsensor_fail);
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- // Filament sensor turned off, working, no problems
|
|
|
- MENU_ITEM_FUNCTION_P(_T(MSG_FSENSOR_OFF), lcd_fsensor_state_set);
|
|
|
- MENU_ITEM_SUBMENU_P(_T(MSG_FSENS_AUTOLOAD_NA), lcd_filament_autoload_info);
|
|
|
- }
|
|
|
- }
|
|
|
- else
|
|
|
+ if (mmu_enabled)
|
|
|
{
|
|
|
- // Filament sensor turned on, working, no problems
|
|
|
- MENU_ITEM_FUNCTION_P(_T(MSG_FSENSOR_ON), lcd_fsensor_state_set);
|
|
|
- if (fsensor_autoload_enabled)
|
|
|
- MENU_ITEM_FUNCTION_P(_i("F. autoload [on]"), lcd_set_filament_autoload);////MSG_FSENS_AUTOLOAD_ON c=17 r=1
|
|
|
- else
|
|
|
- MENU_ITEM_FUNCTION_P(_i("F. autoload [off]"), lcd_set_filament_autoload);////MSG_FSENS_AUTOLOAD_OFF c=17 r=1
|
|
|
+ if (lcd_autoDeplete) MENU_ITEM_FUNCTION_P(_i("Auto deplete [on]"), auto_deplete_switch);
|
|
|
+ else MENU_ITEM_FUNCTION_P(_i("Auto deplete[off]"), auto_deplete_switch);
|
|
|
}
|
|
|
-#endif //FILAMENT_SENSOR
|
|
|
|
|
|
if (fans_check_enabled == true)
|
|
|
MENU_ITEM_FUNCTION_P(_i("Fans check [on]"), lcd_set_fan_check);////MSG_FANS_CHECK_ON c=17 r=1
|
|
|
else
|
|
|
MENU_ITEM_FUNCTION_P(_i("Fans check [off]"), lcd_set_fan_check);////MSG_FANS_CHECK_OFF c=17 r=1
|
|
|
|
|
|
-#ifdef TMC2130
|
|
|
- if(!farm_mode)
|
|
|
- {
|
|
|
- if (SilentModeMenu == SILENT_MODE_NORMAL) { MENU_ITEM_FUNCTION_P(_T(MSG_STEALTH_MODE_OFF), lcd_silent_mode_set); }
|
|
|
- else MENU_ITEM_FUNCTION_P(_T(MSG_STEALTH_MODE_ON), lcd_silent_mode_set);
|
|
|
- if (SilentModeMenu == SILENT_MODE_NORMAL)
|
|
|
- {
|
|
|
- if (CrashDetectMenu == 0) { MENU_ITEM_FUNCTION_P(_T(MSG_CRASHDETECT_OFF), lcd_crash_mode_set); }
|
|
|
- else MENU_ITEM_FUNCTION_P(_T(MSG_CRASHDETECT_ON), lcd_crash_mode_set);
|
|
|
- }
|
|
|
- else MENU_ITEM_SUBMENU_P(_T(MSG_CRASHDETECT_NA), lcd_crash_mode_info);
|
|
|
- }
|
|
|
-#ifdef LINEARITY_CORRECTION
|
|
|
+ SETTINGS_SILENT_MODE;
|
|
|
+
|
|
|
+#if defined (TMC2130) && defined (LINEARITY_CORRECTION)
|
|
|
MENU_ITEM_SUBMENU_P(_i("Lin. correction"), lcd_settings_linearity_correction_menu);
|
|
|
-#endif //LINEARITY_CORRECTION
|
|
|
-#endif //TMC2130
|
|
|
+#endif //LINEARITY_CORRECTION && TMC2130
|
|
|
|
|
|
if (temp_cal_active == false)
|
|
|
MENU_ITEM_FUNCTION_P(_i("Temp. cal. [off]"), lcd_temp_calibration_set);////MSG_TEMP_CALIBRATION_OFF c=20 r=1
|
|
|
@@ -4605,45 +4714,9 @@ static void lcd_settings_menu()
|
|
|
MENU_ITEM_SUBMENU_P(_i("Select language"), lcd_language_menu);////MSG_LANGUAGE_SELECT c=0 r=0
|
|
|
#endif //(LANG_MODE != 0)
|
|
|
|
|
|
- if (card.ToshibaFlashAir_isEnabled())
|
|
|
- MENU_ITEM_FUNCTION_P(_i("SD card [flshAir]"), lcd_toshiba_flash_air_compatibility_toggle);////MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1
|
|
|
- else
|
|
|
- MENU_ITEM_FUNCTION_P(_i("SD card [normal]"), lcd_toshiba_flash_air_compatibility_toggle);////MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1
|
|
|
-
|
|
|
-#ifdef SDCARD_SORT_ALPHA
|
|
|
- if (!farm_mode)
|
|
|
- {
|
|
|
- uint8_t sdSort;
|
|
|
- EEPROM_read(EEPROM_SD_SORT, (uint8_t*)&sdSort, sizeof(sdSort));
|
|
|
- switch (sdSort)
|
|
|
- {
|
|
|
- case SD_SORT_TIME: MENU_ITEM_FUNCTION_P(_i("Sort: [time]"), lcd_sort_type_set); break;////MSG_SORT_TIME c=17 r=1
|
|
|
- case SD_SORT_ALPHA: MENU_ITEM_FUNCTION_P(_i("Sort: [alphabet]"), lcd_sort_type_set); break;////MSG_SORT_ALPHA c=17 r=1
|
|
|
- default: MENU_ITEM_FUNCTION_P(_i("Sort: [none]"), lcd_sort_type_set);////MSG_SORT_NONE c=17 r=1
|
|
|
- }
|
|
|
- }
|
|
|
-#endif // SDCARD_SORT_ALPHA
|
|
|
-
|
|
|
+ SETTINGS_SD;
|
|
|
+ SETTINGS_SOUND;
|
|
|
|
|
|
-//-//
|
|
|
-switch(eSoundMode)
|
|
|
- {
|
|
|
- case e_SOUND_MODE_LOUD:
|
|
|
- MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_LOUD),lcd_sound_state_set);
|
|
|
- break;
|
|
|
- case e_SOUND_MODE_ONCE:
|
|
|
- MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_ONCE),lcd_sound_state_set);
|
|
|
- break;
|
|
|
- case e_SOUND_MODE_SILENT:
|
|
|
- MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_SILENT),lcd_sound_state_set);
|
|
|
- break;
|
|
|
- case e_SOUND_MODE_MUTE:
|
|
|
- MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_MUTE),lcd_sound_state_set);
|
|
|
- break;
|
|
|
- default:
|
|
|
- MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_LOUD),lcd_sound_state_set);
|
|
|
- }
|
|
|
-//-//
|
|
|
if (farm_mode)
|
|
|
{
|
|
|
MENU_ITEM_SUBMENU_P(PSTR("Farm number"), lcd_farm_no);
|
|
|
@@ -4653,7 +4726,6 @@ switch(eSoundMode)
|
|
|
MENU_END();
|
|
|
}
|
|
|
|
|
|
-#ifdef LINEARITY_CORRECTION
|
|
|
#ifdef TMC2130
|
|
|
static void lcd_ustep_linearity_menu_save()
|
|
|
{
|
|
|
@@ -4664,7 +4736,8 @@ static void lcd_ustep_linearity_menu_save()
|
|
|
}
|
|
|
#endif //TMC2130
|
|
|
|
|
|
-static void lcd_settings_menu_back()
|
|
|
+
|
|
|
+static void lcd_settings_linearity_correction_menu_save()
|
|
|
{
|
|
|
#ifdef TMC2130
|
|
|
bool changed = false;
|
|
|
@@ -4679,9 +4752,8 @@ static void lcd_settings_menu_back()
|
|
|
lcd_ustep_linearity_menu_save();
|
|
|
if (changed) tmc2130_init();
|
|
|
#endif //TMC2130
|
|
|
- menu_menu = lcd_main_menu;
|
|
|
}
|
|
|
-#endif //LINEARITY_CORRECTION
|
|
|
+
|
|
|
|
|
|
static void lcd_calibration_menu()
|
|
|
{
|
|
|
@@ -5560,7 +5632,7 @@ static void lcd_main_menu()
|
|
|
else
|
|
|
{
|
|
|
#ifdef FILAMENT_SENSOR
|
|
|
- if ( ((fsensor_autoload_enabled == true) && (fsensor_enabled == true)))
|
|
|
+ if ((fsensor_autoload_enabled == true) && (fsensor_enabled == true) && (mmu_enabled == false))
|
|
|
MENU_ITEM_SUBMENU_P(_i("AutoLoad filament"), lcd_menu_AutoLoadFilament);////MSG_AUTOLOAD_FILAMENT c=17 r=0
|
|
|
else
|
|
|
#endif //FILAMENT_SENSOR
|
|
|
@@ -5635,16 +5707,14 @@ static void lcd_colorprint_change() {
|
|
|
static void lcd_tune_menu()
|
|
|
{
|
|
|
typedef struct
|
|
|
- { // 3bytes total
|
|
|
- // To recognize, whether the menu has been just initialized.
|
|
|
- int8_t status; // 1byte
|
|
|
- // Backup of extrudemultiply, to recognize, that the value has been changed and
|
|
|
- // it needs to be applied.
|
|
|
- int16_t extrudemultiply; // 2byte
|
|
|
+ {
|
|
|
+ menu_data_edit_t reserved; //!< reserved for number editing functions
|
|
|
+ int8_t status; //!< To recognize, whether the menu has been just initialized.
|
|
|
+ //! Backup of extrudemultiply, to recognize, that the value has been changed and
|
|
|
+ //! it needs to be applied.
|
|
|
+ int16_t extrudemultiply;
|
|
|
} _menu_data_t;
|
|
|
-#if (3 > MENU_DATA_SIZE)
|
|
|
-#error "check MENU_DATA_SIZE definition!"
|
|
|
-#endif
|
|
|
+ static_assert(sizeof(menu_data)>= sizeof(_menu_data_t),"_menu_data_t doesn't fit into menu_data");
|
|
|
_menu_data_t* _md = (_menu_data_t*)&(menu_data[0]);
|
|
|
if (_md->status == 0)
|
|
|
{
|
|
|
@@ -6050,14 +6120,19 @@ bool lcd_selftest()
|
|
|
{
|
|
|
_progress = lcd_selftest_screen(8, _progress, 3, true, 2000); //bed ok
|
|
|
#ifdef FILAMENT_SENSOR
|
|
|
- _progress = lcd_selftest_screen(9, _progress, 3, true, 2000); //check filaments sensor
|
|
|
- _result = lcd_selftest_fsensor();
|
|
|
+ if (mmu_enabled == false) {
|
|
|
+ _progress = lcd_selftest_screen(9, _progress, 3, true, 2000); //check filaments sensor
|
|
|
+ _result = lcd_selftest_fsensor();
|
|
|
+ }
|
|
|
#endif // FILAMENT_SENSOR
|
|
|
}
|
|
|
if (_result)
|
|
|
{
|
|
|
#ifdef FILAMENT_SENSOR
|
|
|
- _progress = lcd_selftest_screen(10, _progress, 3, true, 2000); //fil sensor OK
|
|
|
+ if (mmu_enabled == false)
|
|
|
+ {
|
|
|
+ _progress = lcd_selftest_screen(10, _progress, 3, true, 2000); //fil sensor OK
|
|
|
+ }
|
|
|
#endif // FILAMENT_SENSOR
|
|
|
_progress = lcd_selftest_screen(11, _progress, 3, true, 5000); //all correct
|
|
|
}
|
|
|
@@ -6954,6 +7029,12 @@ void menu_action_sddirectory(const char* filename)
|
|
|
|
|
|
void ultralcd_init()
|
|
|
{
|
|
|
+ {
|
|
|
+ uint8_t autoDepleteRaw = eeprom_read_byte(reinterpret_cast<uint8_t*>(EEPROM_AUTO_DEPLETE));
|
|
|
+ if (0xff == autoDepleteRaw) lcd_autoDeplete = false;
|
|
|
+ else lcd_autoDeplete = autoDepleteRaw;
|
|
|
+
|
|
|
+ }
|
|
|
lcd_init();
|
|
|
lcd_refresh();
|
|
|
lcd_longpress_func = menu_lcd_longpress_func;
|
Marek Bel