bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Prusa MMU2 (#12967)

Browse Source
This commit is contained in:
revilor
2019-02-01 02:10:52 +01:00
committed by Scott Lahteine
parent 996f7d1642
commit 6a57d0b381
180 changed files with 6218 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/lcd/dogm/status_screen_lite_ST7920.cpp
View File

@ -402,7 +402,7 @@ void ST7920_Lite_Status_Screen::draw_degree_symbol(uint8_t x, uint8_t y, const b
const bool oddChar = x & 1;
const uint8_t x_word = x >> 1,
y_top = degree_symbol_y_top,
y_bot = y_top + sizeof(degree_symbol)/sizeof(degree_symbol[0]);
y_bot = y_top + COUNT(degree_symbol);
for (uint8_t i = y_top; i < y_bot; i++) {
uint8_t byte = pgm_read_byte(p_bytes++);
set_gdram_address(x_word, i + y * 16);

88
Marlin/src/lcd/language/language_en.h
View File

@ -1117,6 +1117,94 @@
#define MSG_M600_TOO_COLD _UxGT("M600: Too cold")
#endif
#ifndef MSG_MMU2_FILAMENT_CHANGE_HEADER
#define MSG_MMU2_FILAMENT_CHANGE_HEADER _UxGT("FILAMENT CHANGE")
#endif
#ifndef MSG_MMU2_CHOOSE_FILAMENT_HEADER
#define MSG_MMU2_CHOOSE_FILAMENT_HEADER _UxGT("CHOOSE FILAMENT")
#endif
#ifndef MSG_MMU2_MENU
#define MSG_MMU2_MENU _UxGT("MMU")
#endif
#ifndef MSG_MMU2_WRONG_FIRMWARE
#define MSG_MMU2_WRONG_FIRMWARE _UxGT("Update MMU firmware!")
#endif
#ifndef MSG_MMU2_NOT_RESPONDING
#define MSG_MMU2_NOT_RESPONDING _UxGT("MMU needs attention.")
#endif
#ifndef MSG_MMU2_RESUME
#define MSG_MMU2_RESUME _UxGT("Resume print")
#endif
#ifndef MSG_MMU2_RESUMING
#define MSG_MMU2_RESUMING _UxGT("Resuming...")
#endif
#ifndef MSG_MMU2_LOAD_FILAMENT
#define MSG_MMU2_LOAD_FILAMENT _UxGT("Load filament")
#endif
#ifndef MSG_MMU2_LOAD_ALL
#define MSG_MMU2_LOAD_ALL _UxGT("Load all")
#endif
#ifndef MSG_MMU2_LOAD_TO_NOZZLE
#define MSG_MMU2_LOAD_TO_NOZZLE _UxGT("Load to nozzle")
#endif
#ifndef MSG_MMU2_EJECT_FILAMENT
#define MSG_MMU2_EJECT_FILAMENT _UxGT("Eject filament")
#endif
#ifndef MSG_MMU2_EJECT_FILAMENT0
#define MSG_MMU2_EJECT_FILAMENT0 _UxGT("Eject filament 1")
#endif
#ifndef MSG_MMU2_EJECT_FILAMENT1
#define MSG_MMU2_EJECT_FILAMENT1 _UxGT("Eject filament 2")
#endif
#ifndef MSG_MMU2_EJECT_FILAMENT2
#define MSG_MMU2_EJECT_FILAMENT2 _UxGT("Eject filament 3")
#endif
#ifndef MSG_MMU2_EJECT_FILAMENT3
#define MSG_MMU2_EJECT_FILAMENT3 _UxGT("Eject filament 4")
#endif
#ifndef MSG_MMU2_EJECT_FILAMENT4
#define MSG_MMU2_EJECT_FILAMENT4 _UxGT("Eject filament 5")
#endif
#ifndef MSG_MMU2_UNLOAD_FILAMENT
#define MSG_MMU2_UNLOAD_FILAMENT _UxGT("Unload filament")
#endif
#ifndef MSG_MMU2_LOADING_FILAMENT
#define MSG_MMU2_LOADING_FILAMENT _UxGT("Loading fil. %i...")
#endif
#ifndef MSG_MMU2_EJECTING_FILAMENT
#define MSG_MMU2_EJECTING_FILAMENT _UxGT("Ejecting fil. ...")
#endif
#ifndef MSG_MMU2_UNLOADING_FILAMENT
#define MSG_MMU2_UNLOADING_FILAMENT _UxGT("Unloading fil....")
#endif
#ifndef MSG_MMU2_ALL
#define MSG_MMU2_ALL _UxGT("All")
#endif
#ifndef MSG_MMU2_FILAMENT0
#define MSG_MMU2_FILAMENT0 _UxGT("Filament 1")
#endif
#ifndef MSG_MMU2_FILAMENT1
#define MSG_MMU2_FILAMENT1 _UxGT("Filament 2")
#endif
#ifndef MSG_MMU2_FILAMENT2
#define MSG_MMU2_FILAMENT2 _UxGT("Filament 3")
#endif
#ifndef MSG_MMU2_FILAMENT3
#define MSG_MMU2_FILAMENT3 _UxGT("Filament 4")
#endif
#ifndef MSG_MMU2_FILAMENT4
#define MSG_MMU2_FILAMENT4 _UxGT("Filament 5")
#endif
#ifndef MSG_MMU2_RESET
#define MSG_MMU2_RESET _UxGT("Reset MMU")
#endif
#ifndef MSG_MMU2_RESETTING
#define MSG_MMU2_RESETTING _UxGT("Resetting MMU...")
#endif
#ifndef MSG_MMU2_EJECT_RECOVER
#define MSG_MMU2_EJECT_RECOVER _UxGT("Remove, click")
#endif
//
// Filament Change screens show up to 3 lines on a 4-line display
// ...or up to 2 lines on a 3-line display

8
Marlin/src/lcd/menu/menu_main.cpp
View File

@ -86,6 +86,10 @@ void menu_abort_confirm() {
END_MENU();
}
#if ENABLED(PRUSA_MMU2)
#include "../../feature/prusa_MMU2/mmu2_menu.h"
#endif
void menu_tune();
void menu_motion();
void menu_temperature();
@ -138,6 +142,10 @@ void menu_main() {
MENU_ITEM(submenu, MSG_MOTION, menu_motion);
MENU_ITEM(submenu, MSG_TEMPERATURE, menu_temperature);
#if ENABLED(MMU2_MENUS)
MENU_ITEM(submenu, MSG_MMU2_MENU, menu_mmu2);
#endif
}
MENU_ITEM(submenu, MSG_CONFIGURATION, menu_configuration);