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

Change "Extruder N" to "Filament N" 

Change in memory:
Flash: -52 bytes
SRAM: 0 bytes
This commit is contained in:
Guðni Már Gilbert 2023-02-28 20:49:35 +00:00 committed by DRracer
parent 03280c48d5
commit a20a7232a8
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Marlin_main.cpp
View File

@ -3469,7 +3469,7 @@ static void mmu_M600_load_filament(bool automatic, float nozzle_temp) {
slot = SpoolJoin::spooljoin.nextSlot(); slot = SpoolJoin::spooljoin.nextSlot();
} else { } else {
// Only ask for the slot if automatic/SpoolJoin is off // Only ask for the slot if automatic/SpoolJoin is off
slot = choose_menu_P(_T(MSG_SELECT_EXTRUDER), _T(MSG_EXTRUDER)); slot = choose_menu_P(_T(MSG_SELECT_FILAMENT), _T(MSG_FILAMENT));
} }
setTargetHotend(nozzle_temp); setTargetHotend(nozzle_temp);

8
Firmware/Tcodes.cpp
View File

@ -29,11 +29,7 @@ struct SChooseFromMenu {
}; };
SChooseFromMenu TCodeChooseFromMenu() { SChooseFromMenu TCodeChooseFromMenu() {
if (MMU2::mmu2.Enabled()) { return SChooseFromMenu( choose_menu_P(_T(MSG_SELECT_FILAMENT), _T(MSG_FILAMENT)), MMU2::mmu2.Enabled() );
return SChooseFromMenu( choose_menu_P(_T(MSG_SELECT_FILAMENT), _T(MSG_FILAMENT)), true );
} else {
return SChooseFromMenu( choose_menu_P(_T(MSG_SELECT_EXTRUDER), _T(MSG_EXTRUDER)), false );
}
} }
void TCodes(char *const strchr_pointer, uint8_t codeValue) { void TCodes(char *const strchr_pointer, uint8_t codeValue) {
@ -48,7 +44,7 @@ void TCodes(char *const strchr_pointer, uint8_t codeValue) {
} else if (strchr_pointer[index] == 'x'){ } else if (strchr_pointer[index] == 'x'){
// load to extruder gears; if mmu is not present do nothing // load to extruder gears; if mmu is not present do nothing
if (MMU2::mmu2.Enabled()) { if (MMU2::mmu2.Enabled()) {
MMU2::mmu2.tool_change(strchr_pointer[index], choose_menu_P(_T(MSG_SELECT_EXTRUDER), _T(MSG_EXTRUDER))); MMU2::mmu2.tool_change(strchr_pointer[index], choose_menu_P(_T(MSG_SELECT_FILAMENT), _T(MSG_FILAMENT)));
} }
} else if (strchr_pointer[index] == 'c'){ } else if (strchr_pointer[index] == 'c'){
// load from extruder gears to nozzle (nozzle should be preheated) // load from extruder gears to nozzle (nozzle should be preheated)