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

Indentations

This commit is contained in:
3d-gussner 2021-02-16 12:31:23 +01:00
parent d6c6517fcd
commit 66ea1bdfba
1 changed files with 81 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Firmware/Marlin_main.cpp
View File

@ -3818,7 +3818,8 @@ void process_commands()
- TMC_SET_STEP - TMC_SET_STEP
- TMC_SET_CHOP - TMC_SET_CHOP
*/ */
if (code_seen_P(PSTR("M117"))) { //moved to highest priority place to be able to to print strings which includes "G", "PRUSA" and "^" if (code_seen_P(PSTR("M117"))) //moved to highest priority place to be able to to print strings which includes "G", "PRUSA" and "^"
{
starpos = (strchr(strchr_pointer + 5, '*')); starpos = (strchr(strchr_pointer + 5, '*'));
if (starpos != NULL) if (starpos != NULL)
*(starpos) = '\0'; *(starpos) = '\0';
@ -3840,18 +3841,21 @@ void process_commands()
- `string` - Must for M1 and optional for M0 message to display on the LCD - `string` - Must for M1 and optional for M0 message to display on the LCD
*/ */
else if (code_seen_P(PSTR("M0")) || code_seen_P(PSTR("M1 "))) { // M0 and M1 - (Un)conditional stop - Wait for user button press on LCD else if (code_seen_P(PSTR("M0")) || code_seen_P(PSTR("M1 "))) // M0 and M1 - (Un)conditional stop - Wait for user button press on LCD
{
char *src = strchr_pointer + 2; char *src = strchr_pointer + 2;
codenum = 0; codenum = 0;
bool hasP = false, hasS = false; bool hasP = false, hasS = false;
if (code_seen('P')) { if (code_seen('P'))
{
codenum = code_value(); // milliseconds to wait codenum = code_value(); // milliseconds to wait
hasP = codenum > 0; hasP = codenum > 0;
} }
if (code_seen('S')) { if (code_seen('S'))
{
codenum = code_value() * 1000; // seconds to wait codenum = code_value() * 1000; // seconds to wait
hasS = codenum > 0; hasS = codenum > 0;
} }
@ -3859,26 +3863,33 @@ void process_commands()
if (starpos != NULL) *(starpos) = '\0'; if (starpos != NULL) *(starpos) = '\0';
while (*src == ' ') ++src; while (*src == ' ') ++src;
custom_message_type = CustomMsg::M0Wait; custom_message_type = CustomMsg::M0Wait;
if (!hasP && !hasS && *src != '\0') { if (!hasP && !hasS && *src != '\0')
{
lcd_setstatus(src); lcd_setstatus(src);
} else { }
else
{
LCD_MESSAGERPGM(_i("Wait for user..."));////MSG_USERWAIT LCD_MESSAGERPGM(_i("Wait for user..."));////MSG_USERWAIT
} }
lcd_ignore_click(); //call lcd_ignore_click aslo for else ??? lcd_ignore_click(); //call lcd_ignore_click aslo for else ???
st_synchronize(); st_synchronize();
previous_millis_cmd = _millis(); previous_millis_cmd = _millis();
if (codenum > 0){ if (codenum > 0)
{
codenum += _millis(); // keep track of when we started waiting codenum += _millis(); // keep track of when we started waiting
KEEPALIVE_STATE(PAUSED_FOR_USER); KEEPALIVE_STATE(PAUSED_FOR_USER);
while(_millis() < codenum && !lcd_clicked()){ while(_millis() < codenum && !lcd_clicked())
{
manage_heater(); manage_heater();
manage_inactivity(true); manage_inactivity(true);
lcd_update(0); lcd_update(0);
} }
KEEPALIVE_STATE(IN_HANDLER); KEEPALIVE_STATE(IN_HANDLER);
lcd_ignore_click(false); lcd_ignore_click(false);
}else{ }
else
{
marlin_wait_for_click(); marlin_wait_for_click();
} }
if (IS_SD_PRINTING) if (IS_SD_PRINTING)