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

Rename choose_extruder_menu() to choose_menu_P(), add parameters to make it reusable.

This commit is contained in:
Marek Bel 2018-09-11 16:51:00 +02:00
parent 6c6354b2cb
commit 19a1ccdc76
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Marlin_main.cpp
View File

@ -6816,7 +6816,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
} }
else { else {
if (*(strchr_pointer + index) == '?') { if (*(strchr_pointer + index) == '?') {
tmp_extruder = choose_extruder_menu(); tmp_extruder = choose_menu_P(_T(MSG_CHOOSE_EXTRUDER), _T(MSG_EXTRUDER));
} }
else { else {
tmp_extruder = code_value(); tmp_extruder = code_value();

16
Firmware/ultralcd.cpp
View File

@ -4969,7 +4969,7 @@ static char snmm_stop_print_menu() { //menu for choosing which filaments will be
} }
char choose_extruder_menu() char choose_menu_P(const char *header, const char *item)
{ {
int items_no = mmu_enabled?5:4; int items_no = mmu_enabled?5:4;
int first = 0; int first = 0;
@ -4979,17 +4979,17 @@ char choose_extruder_menu()
enc_dif = lcd_encoder_diff; enc_dif = lcd_encoder_diff;
lcd_clear(); lcd_clear();
lcd_puts_P(_T(MSG_CHOOSE_EXTRUDER)); lcd_puts_P(header);
lcd_set_cursor(0, 1); lcd_set_cursor(0, 1);
lcd_print(">"); lcd_print(">");
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
lcd_puts_at_P(1, i + 1, _T(MSG_EXTRUDER)); lcd_puts_at_P(1, i + 1, item);
} }
KEEPALIVE_STATE(PAUSED_FOR_USER); KEEPALIVE_STATE(PAUSED_FOR_USER);
while (1) { while (1) {
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
lcd_set_cursor(2 + strlen_P(_T(MSG_EXTRUDER)), i+1); lcd_set_cursor(2 + strlen_P(item), i+1);
lcd_print(first + i + 1); lcd_print(first + i + 1);
} }
@ -5012,9 +5012,9 @@ char choose_extruder_menu()
if (first < items_no - 3) { if (first < items_no - 3) {
first++; first++;
lcd_clear(); lcd_clear();
lcd_puts_P(_T(MSG_CHOOSE_EXTRUDER)); lcd_puts_P(header);
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
lcd_puts_at_P(1, i + 1, _T(MSG_EXTRUDER)); lcd_puts_at_P(1, i + 1, item);
} }
} }
} }
@ -5024,9 +5024,9 @@ char choose_extruder_menu()
if (first > 0) { if (first > 0) {
first--; first--;
lcd_clear(); lcd_clear();
lcd_puts_P(_T(MSG_CHOOSE_EXTRUDER)); lcd_puts_P(header);
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
lcd_puts_at_P(1, i + 1, _T(MSG_EXTRUDER)); lcd_puts_at_P(1, i + 1, item);
} }
} }
} }

2
Firmware/ultralcd.h
View File

@ -152,7 +152,7 @@ bool lcd_wait_for_pinda(float temp);
void bowden_menu(); void bowden_menu();
char reset_menu(); char reset_menu();
char choose_extruder_menu(); char choose_menu_P(const char *header, const char *item);
void lcd_pinda_calibration_menu(); void lcd_pinda_calibration_menu();
void lcd_calibrate_pinda(); void lcd_calibrate_pinda();