josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4563 from 3d-gussner/MK3_Quick_nozzle_change_menu 

Add nozzle diameter change to main menu for REVO builds
This commit is contained in:
3d-gussner 2024-01-19 14:26:18 +01:00 committed by GitHub
parent b56330819c 13fb11889e
commit 02b91dc2cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 68 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Firmware/ultralcd.cpp
View File

@ -495,9 +495,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);
}
@ -619,9 +623,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
@ -5174,7 +5189,12 @@ static void lcd_shutdown_menu()
//! | 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
@ -5304,6 +5324,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 ) ) {

3
Firmware/variants/MK25-RAMBo10a.h
View File

@ -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

3
Firmware/variants/MK25-RAMBo13a.h
View File

@ -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

3
Firmware/variants/MK25S-RAMBo10a.h
View File

@ -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

3
Firmware/variants/MK25S-RAMBo13a.h
View File

@ -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

3
Firmware/variants/MK3-E3DREVO.h
View File

@ -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

3
Firmware/variants/MK3-E3DREVO_HF_60W.h
View File

@ -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

3
Firmware/variants/MK3.h
View File

@ -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

5
Firmware/variants/MK3S-E3DREVO.h
View File

@ -17,7 +17,7 @@
#define NOZZLE_TYPE "E3DREVO"
// Printer name
#define CUSTOM_MENDEL_NAME "Prusa i3 MK3S-R"
#define CUSTOM_MENDEL_NAME "Prusa i3 MK3S+R"
// Electronics
#define MOTHERBOARD BOARD_EINSY_1_0a
@ -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

5
Firmware/variants/MK3S-E3DREVO_HF_60W.h
View File

@ -17,7 +17,7 @@
#define NOZZLE_TYPE "E3DREVO_HF_60W"
// Printer name
#define CUSTOM_MENDEL_NAME "Prusa MK3S-RHF60"
#define CUSTOM_MENDEL_NAME "Prusa MK3S+RHF60"
// Electronics
#define MOTHERBOARD BOARD_EINSY_1_0a
@ -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

3
Firmware/variants/MK3S.h
View File

@ -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

3
Firmware/variants/obsolete/1_75mm_MK2-RAMBo10a-E3Dv6full.h
View File

@ -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

3
Firmware/variants/obsolete/1_75mm_MK2-RAMBo13a-E3Dv6full.h
View File

@ -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