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

resolve hidden conflicts in commented code

This commit is contained in:
DRracer 2019-07-22 17:29:43 +02:00
parent 65087b89ee
commit 6f79ef4c9c
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Firmware/Marlin_main.cpp
View File

@ -8943,11 +8943,7 @@ void bed_check(float x_dimension, float y_dimension, int x_points_num, int y_poi
unsigned int custom_message_type_old = custom_message_type; unsigned int custom_message_type_old = custom_message_type;
unsigned int custom_message_state_old = custom_message_state; unsigned int custom_message_state_old = custom_message_state;
<<<<<<< HEAD
custom_message_type = CustomMsg::MeshBedLeveling; custom_message_type = CustomMsg::MeshBedLeveling;
=======
custom_message_type = CustomMsgTypes::MESHBL;
>>>>>>> origin/code-size-reduction
custom_message_state = (x_points_num * y_points_num) + 10; custom_message_state = (x_points_num * y_points_num) + 10;
lcd_update(1); lcd_update(1);
@ -9145,11 +9141,7 @@ void bed_analysis(float x_dimension, float y_dimension, int x_points_num, int y_
} }
unsigned int custom_message_type_old = custom_message_type; unsigned int custom_message_type_old = custom_message_type;
unsigned int custom_message_state_old = custom_message_state; unsigned int custom_message_state_old = custom_message_state;
<<<<<<< HEAD
custom_message_type = CustomMsg::MeshBedLeveling; custom_message_type = CustomMsg::MeshBedLeveling;
=======
custom_message_type = CustomMsgTypes::MESHBL;
>>>>>>> origin/code-size-reduction
custom_message_state = (x_points_num * y_points_num) + 10; custom_message_state = (x_points_num * y_points_num) + 10;
lcd_update(1); lcd_update(1);

4
Firmware/ultralcd.cpp
View File

@ -6600,11 +6600,7 @@ static void lcd_main_menu()
if(fan_check_error == EFCE_OK) if(fan_check_error == EFCE_OK)
MENU_ITEM_SUBMENU_P(_i("Resume print"), lcd_resume_print);////MSG_RESUME_PRINT MENU_ITEM_SUBMENU_P(_i("Resume print"), lcd_resume_print);////MSG_RESUME_PRINT
#else #else
<<<<<<< HEAD
MENU_ITEM_SUBMENU_P(_i("Resume print"), lcd_resume_print);////MSG_RESUME_PRINT
=======
MENU_ITEM_SUBMENU_P(_i("Resume print"), lcd_resume_print);////MSG_RESUME_PRINT MENU_ITEM_SUBMENU_P(_i("Resume print"), lcd_resume_print);////MSG_RESUME_PRINT
>>>>>>> upstream/MK3
#endif #endif
} }