Skip to content

Commit

Permalink
Add nozzle change to main menu when QUICK_NOZZLE_CHANGE is defined
Browse files Browse the repository at this point in the history 
Add Nozzle diameter to Info screen when printer inactive and QUICK_NOZZLE_CHANGE defined
Solves prusa3d#4488
  • Loading branch information
@3d-gussner
3d-gussner committed Jan 10, 2024
1 parent d625059 commit b041c0c
Show file tree
Hide file tree
Showing 13 changed files with 66 additions and 6 deletions.
36 changes: 30 additions & 6 deletions Firmware/ultralcd.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -497,9 +497,13 @@ void lcdui_print_time(void)
chars = lcd_printf_P(_N(LCD_STR_CLOCK "%02u:%02u%c%c"), print_t / 60, print_t % 60, suff, suff_doubt);
else //time>=100h
chars = lcd_printf_P(_N(LCD_STR_CLOCK "%3uh %c%c"), print_t / 60, suff, suff_doubt);
}
else
} else {
#ifdef QUICK_NOZZLE_CHANGE
chars = lcd_printf_P(PSTR("Nd. %4.2f"),(float)eeprom_read_word((uint16_t*)EEPROM_NOZZLE_DIAMETER_uM)/1000.0);
#else
chars = lcd_printf_P(_N(LCD_STR_CLOCK "--:-- "));
#endif //QUICK_NOZZLE_CHANGE
}
lcd_space(8 - chars);
}

Expand Down Expand Up @@ -621,9 +625,20 @@ void lcdui_print_status_line(void) {
//!
//! @code{.unparsed}
//! |01234567890123456789|
//! |N 000/000D Z000.0 |
//! |B 000/000D F100% |
//! |USB100% T0 t--:-- |
//! |N000/000D Z000.00 |
//! |B000/000D F100% |
//! | ---% t--:-- | // Idle
//!
//! | ---% F? t--:-- | // Idle + MMU3
//!
//! |Smooth1 t--:-- | // Idle + Muliple sheets
//!
//! |Smooth1 F? t--:-- | // Idle + Muliple sheets + MMU3
//!
//! |Smooth1 Nd. 0.40| // Idle + Muliple sheets + QUICK_NOZZLE_CHANGE
//!
//! | SD 99% F1 t00:17R | // SD print + MMU3
//!
//! |Status line.........|
//! ----------------------
//! N - nozzle temp symbol LCD_STR_THERMOMETER
Expand Down Expand Up @@ -5160,7 +5175,12 @@ static void lcd_printer_ready_state_toggle()
//! | Preheat | not printing + not paused
//! | Print from SD | not printing or paused
//!
//! | Switch sheet | farm mode
//! | Switch sheet | NOT farm mode
//! AND multiple sheets calibrated AND not active
//!
//! | Nozzle diameter | NOT farm mode
//! AND multiple sheets calibrated AND not active
//! AND QUICK_NOZZLE_CHANGE defined
//!
//! | AutoLoad filament | not printing + not mmu or paused
//! | Load filament | not printing + mmu or paused
Expand Down Expand Up @@ -5290,6 +5310,10 @@ static void lcd_main_menu()
if ((nextSheet >= 0) && (sheet != nextSheet)) { // show menu only if we have 2 or more sheets initialized
MENU_ITEM_FUNCTION_E(EEPROM_Sheets_base->s[sheet], eeprom_switch_to_next_sheet);
}
#ifdef QUICK_NOZZLE_CHANGE
SETTINGS_NOZZLE;
#endif //QUICK_NOZZLE_CHANGE

}

if ( ! ( printer_active() || (eFilamentAction != FilamentAction::None) || Stopped ) ) {
Expand Down
3 changes: 3 additions & 0 deletions Firmware/variants/MK25-RAMBo10a.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,9 @@
// Extrude mintemp
#define EXTRUDE_MINTEMP 175

// Quick nozzle change supported
//#define QUICK_NOZZLE_CHANGE

// Extruder cooling fans
#define EXTRUDER_0_AUTO_FAN_PIN 8
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
Expand Down
3 changes: 3 additions & 0 deletions Firmware/variants/MK25-RAMBo13a.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,9 @@
// Extrude mintemp
#define EXTRUDE_MINTEMP 175

// Quick nozzle change supported
//#define QUICK_NOZZLE_CHANGE

// Extruder cooling fans
#define EXTRUDER_0_AUTO_FAN_PIN 8
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
Expand Down
3 changes: 3 additions & 0 deletions Firmware/variants/MK25S-RAMBo10a.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,9 @@
// Extrude mintemp
#define EXTRUDE_MINTEMP 175

// Quick nozzle change supported
//#define QUICK_NOZZLE_CHANGE

// Extruder cooling fans
#define EXTRUDER_0_AUTO_FAN_PIN 8
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
Expand Down
3 changes: 3 additions & 0 deletions Firmware/variants/MK25S-RAMBo13a.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,9 @@
// Extrude mintemp
#define EXTRUDE_MINTEMP 175

// Quick nozzle change supported
//#define QUICK_NOZZLE_CHANGE

// Extruder cooling fans
#define EXTRUDER_0_AUTO_FAN_PIN 8
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
Expand Down
3 changes: 3 additions & 0 deletions Firmware/variants/MK3-E3DREVO.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,9 @@
// Extrude mintemp
#define EXTRUDE_MINTEMP 175

// Quick nozzle change supported
#define QUICK_NOZZLE_CHANGE

// Extruder cooling fans
#define EXTRUDER_0_AUTO_FAN_PIN 8
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
Expand Down
3 changes: 3 additions & 0 deletions Firmware/variants/MK3-E3DREVO_HF_60W.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,9 @@
// Extrude mintemp
#define EXTRUDE_MINTEMP 175

// Quick nozzle change supported
#define QUICK_NOZZLE_CHANGE

// Extruder cooling fans
#define EXTRUDER_0_AUTO_FAN_PIN 8
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
Expand Down
3 changes: 3 additions & 0 deletions Firmware/variants/MK3.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,9 @@
// Extrude mintemp
#define EXTRUDE_MINTEMP 175

// Quick nozzle change supported
//#define QUICK_NOZZLE_CHANGE

// Extruder cooling fans
#define EXTRUDER_0_AUTO_FAN_PIN 8
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
Expand Down
3 changes: 3 additions & 0 deletions Firmware/variants/MK3S-E3DREVO.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,9 @@
// Extrude mintemp
#define EXTRUDE_MINTEMP 175

// Quick nozzle change supported
#define QUICK_NOZZLE_CHANGE

// Extruder cooling fans
#define EXTRUDER_0_AUTO_FAN_PIN 8
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
Expand Down
3 changes: 3 additions & 0 deletions Firmware/variants/MK3S-E3DREVO_HF_60W.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,9 @@
// Extrude mintemp
#define EXTRUDE_MINTEMP 175

// Quick nozzle change supported
#define QUICK_NOZZLE_CHANGE

// Extruder cooling fans
#define EXTRUDER_0_AUTO_FAN_PIN 8
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
Expand Down
3 changes: 3 additions & 0 deletions Firmware/variants/MK3S.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,9 @@
// Extrude mintemp
#define EXTRUDE_MINTEMP 175

// Quick nozzle change supported
//#define QUICK_NOZZLE_CHANGE

// Extruder cooling fans
#define EXTRUDER_0_AUTO_FAN_PIN 8
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
Expand Down
3 changes: 3 additions & 0 deletions Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,9 @@ EXTRUDER SETTINGS
// Extrude mintemp
#define EXTRUDE_MINTEMP 175

// Quick nozzle change supported
//#define QUICK_NOZZLE_CHANGE

// Extruder cooling fans
#define EXTRUDER_0_AUTO_FAN_PIN 8
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
Expand Down
3 changes: 3 additions & 0 deletions Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,9 @@ EXTRUDER SETTINGS
// Extrude mintemp
#define EXTRUDE_MINTEMP 175

// Quick nozzle change supported
//#define QUICK_NOZZLE_CHANGE

// Extruder cooling fans
#define EXTRUDER_0_AUTO_FAN_PIN 8
#define EXTRUDER_AUTO_FAN_TEMPERATURE 50
Expand Down

0 comments on commit b041c0c

Please sign in to comment.