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

Fix code formatting (indentation).

This commit is contained in:
Marek Bel 2019-05-14 16:45:15 +02:00
parent 4de93ca19c
commit 66d20f0297
2 changed files with 58 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
Firmware/mmu.cpp
View File

@ -1353,35 +1353,36 @@ void mmu_show_warning()
void lcd_mmu_load_to_nozzle(uint8_t filament_nr) void lcd_mmu_load_to_nozzle(uint8_t filament_nr)
{ {
menu_back(); menu_back();
bFilamentAction=false; // NOT in "mmu_load_to_nozzle_menu()" bFilamentAction = false; // NOT in "mmu_load_to_nozzle_menu()"
if (degHotend0() > EXTRUDE_MINTEMP) if (degHotend0() > EXTRUDE_MINTEMP)
{ {
tmp_extruder = filament_nr; tmp_extruder = filament_nr;
lcd_update_enable(false); lcd_update_enable(false);
lcd_clear(); lcd_clear();
lcd_set_cursor(0, 1); lcd_puts_P(_T(MSG_LOADING_FILAMENT)); lcd_set_cursor(0, 1);
lcd_print(" "); lcd_puts_P(_T(MSG_LOADING_FILAMENT));
lcd_print(tmp_extruder + 1); lcd_print(" ");
mmu_command(MmuCmd::T0 + tmp_extruder); lcd_print(tmp_extruder + 1);
manage_response(true, true, MMU_TCODE_MOVE); mmu_command(MmuCmd::T0 + tmp_extruder);
mmu_continue_loading(false); manage_response(true, true, MMU_TCODE_MOVE);
mmu_extruder = tmp_extruder; //filament change is finished mmu_continue_loading(false);
mmu_load_to_nozzle(); mmu_extruder = tmp_extruder; //filament change is finished
load_filament_final_feed(); mmu_load_to_nozzle();
st_synchronize(); load_filament_final_feed();
custom_message_type = CUSTOM_MSG_TYPE_F_LOAD; st_synchronize();
lcd_setstatuspgm(_T(MSG_LOADING_FILAMENT)); custom_message_type = CUSTOM_MSG_TYPE_F_LOAD;
lcd_return_to_status(); lcd_setstatuspgm(_T(MSG_LOADING_FILAMENT));
lcd_update_enable(true); lcd_return_to_status();
lcd_load_filament_color_check(); lcd_update_enable(true);
lcd_setstatuspgm(_T(WELCOME_MSG)); lcd_load_filament_color_check();
custom_message_type = CUSTOM_MSG_TYPE_STATUS; lcd_setstatuspgm(_T(WELCOME_MSG));
} custom_message_type = CUSTOM_MSG_TYPE_STATUS;
else }
{ else
show_preheat_nozzle_warning(); {
} show_preheat_nozzle_warning();
}
} }
#ifdef MMU_HAS_CUTTER #ifdef MMU_HAS_CUTTER

53
Firmware/ultralcd.cpp
View File

@ -5922,22 +5922,23 @@ static void fil_load_menu()
{ {
MENU_BEGIN(); MENU_BEGIN();
MENU_ITEM_BACK_P(_T(MSG_MAIN)); 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 all"), load_all); ////MSG_LOAD_ALL 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), '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), '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), '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 MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '4', extr_adj, 3); ////MSG_LOAD_FILAMENT_4 c=17
if (mmu_enabled) if (mmu_enabled)
{
MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '5', extr_adj, 3); MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '5', extr_adj, 3);
}
MENU_END(); MENU_END();
} }
static void mmu_load_to_nozzle_menu() static void mmu_load_to_nozzle_menu()
{ {
if(bFilamentAction) if (bFilamentAction)
{ {
MENU_BEGIN(); MENU_BEGIN();
MENU_ITEM_BACK_P(_T(MSG_MAIN)); MENU_ITEM_BACK_P(_T(MSG_MAIN));
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), '1', lcd_mmu_load_to_nozzle, 0);
@ -5946,14 +5947,15 @@ if(bFilamentAction)
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), '4', lcd_mmu_load_to_nozzle, 3);
MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '5', lcd_mmu_load_to_nozzle, 4); MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '5', lcd_mmu_load_to_nozzle, 4);
MENU_END(); MENU_END();
} }
else { else
eFilamentAction=e_FILAMENT_ACTION_mmuLoad;
bFilamentFirstRun=false;
if(target_temperature[0]>=EXTRUDE_MINTEMP)
{ {
bFilamentPreheatState=true; eFilamentAction = e_FILAMENT_ACTION_mmuLoad;
mFilamentItem(target_temperature[0],target_temperature_bed); bFilamentFirstRun = false;
if (target_temperature[0] >= EXTRUDE_MINTEMP)
{
bFilamentPreheatState = true;
mFilamentItem(target_temperature[0], target_temperature_bed);
} }
else mFilamentMenu(); else mFilamentMenu();
} }
@ -5967,7 +5969,7 @@ static void mmu_eject_filament(uint8_t filament)
static void mmu_fil_eject_menu() static void mmu_fil_eject_menu()
{ {
if(bFilamentAction) if (bFilamentAction)
{ {
MENU_BEGIN(); MENU_BEGIN();
MENU_ITEM_BACK_P(_T(MSG_MAIN)); MENU_ITEM_BACK_P(_T(MSG_MAIN));
@ -5980,12 +5982,12 @@ static void mmu_fil_eject_menu()
} }
else else
{ {
eFilamentAction=e_FILAMENT_ACTION_mmuEject; eFilamentAction = e_FILAMENT_ACTION_mmuEject;
bFilamentFirstRun=false; bFilamentFirstRun = false;
if(target_temperature[0]>=EXTRUDE_MINTEMP) if (target_temperature[0] >= EXTRUDE_MINTEMP)
{ {
bFilamentPreheatState=true; bFilamentPreheatState = true;
mFilamentItem(target_temperature[0],target_temperature_bed); mFilamentItem(target_temperature[0], target_temperature_bed);
} }
else mFilamentMenu(); else mFilamentMenu();
} }
@ -5995,8 +5997,8 @@ static void mmu_fil_eject_menu()
static void mmu_cut_filament_menu() static void mmu_cut_filament_menu()
{ {
if(bFilamentAction) if(bFilamentAction)
{ {
MENU_BEGIN(); MENU_BEGIN();
MENU_ITEM_BACK_P(_T(MSG_MAIN)); MENU_ITEM_BACK_P(_T(MSG_MAIN));
MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), '1', mmu_cut_filament, 0); MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), '1', mmu_cut_filament, 0);
@ -6005,8 +6007,9 @@ if(bFilamentAction)
MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), '4', mmu_cut_filament, 3); MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), '4', mmu_cut_filament, 3);
MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), '5', mmu_cut_filament, 4); MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), '5', mmu_cut_filament, 4);
MENU_END(); MENU_END();
} }
else { else
{
eFilamentAction=e_FILAMENT_ACTION_mmuCut; eFilamentAction=e_FILAMENT_ACTION_mmuCut;
bFilamentFirstRun=false; bFilamentFirstRun=false;
if(target_temperature[0]>=EXTRUDE_MINTEMP) if(target_temperature[0]>=EXTRUDE_MINTEMP)