| 
					
				 | 
			
			
				@@ -5923,35 +5923,28 @@ static void fil_load_menu() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	MENU_BEGIN(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	MENU_ITEM_BACK_P(_T(MSG_MAIN)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	MENU_ITEM_FUNCTION_P(_i("Load all"), load_all);////MSG_LOAD_ALL c=17 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	MENU_ITEM_FUNCTION_P(_i("Load filament 1"), extr_adj_0);////MSG_LOAD_FILAMENT_1 c=17 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	MENU_ITEM_FUNCTION_P(_i("Load filament 2"), extr_adj_1);////MSG_LOAD_FILAMENT_2 c=17 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	MENU_ITEM_FUNCTION_P(_i("Load filament 3"), extr_adj_2);////MSG_LOAD_FILAMENT_3 c=17 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	MENU_ITEM_FUNCTION_P(_i("Load filament 4"), extr_adj_3);////MSG_LOAD_FILAMENT_4 c=17 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '1', extr_adj, 0);////MSG_LOAD_FILAMENT_1 c=16 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '2', extr_adj, 1);////MSG_LOAD_FILAMENT_2 c=17 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '3', extr_adj, 2);////MSG_LOAD_FILAMENT_3 c=17 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '4', extr_adj, 3);////MSG_LOAD_FILAMENT_4 c=17 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	if (mmu_enabled) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		MENU_ITEM_FUNCTION_P(_i("Load filament 5"), extr_adj_4); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	    MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '5', extr_adj, 3); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	MENU_END(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-template <uint8_t filament> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-static void mmu_load_to_nozzle() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    menu_back(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    lcd_mmu_load_to_nozzle(filament); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 static void mmu_load_to_nozzle_menu() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 if(bFilamentAction) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	MENU_BEGIN(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	MENU_ITEM_BACK_P(_T(MSG_MAIN)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	MENU_ITEM_FUNCTION_P(_i("Load filament 1"), mmu_load_to_nozzle<0>); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	MENU_ITEM_FUNCTION_P(_i("Load filament 2"), mmu_load_to_nozzle<1>); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	MENU_ITEM_FUNCTION_P(_i("Load filament 3"), mmu_load_to_nozzle<2>); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	MENU_ITEM_FUNCTION_P(_i("Load filament 4"), mmu_load_to_nozzle<3>); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	MENU_ITEM_FUNCTION_P(_i("Load filament 5"), mmu_load_to_nozzle<4>); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '1', lcd_mmu_load_to_nozzle, 0); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '2', lcd_mmu_load_to_nozzle, 1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '3', lcd_mmu_load_to_nozzle, 2); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '4', lcd_mmu_load_to_nozzle, 3); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '5', lcd_mmu_load_to_nozzle, 4); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	MENU_END(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 else { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -5966,8 +5959,7 @@ else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-template <uint8_t filament> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-static void mmu_eject_filament() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+static void mmu_eject_filament(uint8_t filament) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     menu_back(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     mmu_eject_filament(filament, true); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -5979,11 +5971,11 @@ static void mmu_fil_eject_menu() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         MENU_BEGIN(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         MENU_ITEM_BACK_P(_T(MSG_MAIN)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        MENU_ITEM_FUNCTION_P(_i("Eject filament 1"), mmu_eject_filament<0>); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        MENU_ITEM_FUNCTION_P(_i("Eject filament 2"), mmu_eject_filament<1>); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        MENU_ITEM_FUNCTION_P(_i("Eject filament 3"), mmu_eject_filament<2>); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        MENU_ITEM_FUNCTION_P(_i("Eject filament 4"), mmu_eject_filament<3>); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        MENU_ITEM_FUNCTION_P(_i("Eject filament 5"), mmu_eject_filament<4>); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), '1', mmu_eject_filament, 0); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), '2', mmu_eject_filament, 1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), '3', mmu_eject_filament, 2); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), '4', mmu_eject_filament, 3); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), '5', mmu_eject_filament, 4); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         MENU_END(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     else 
			 |