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

Merge branch 'Fix_warnings_ledvinap' into fix_compiler_warnings

This commit is contained in:
Marek Bel 2018-08-01 17:53:49 +02:00
parent 441ed5677d 48d6ebffd8
commit b0077182e5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Firmware/Marlin_main.cpp
View File

@ -3351,8 +3351,8 @@ void process_commands()
if(code_seen("CRASH_DETECTED")) if(code_seen("CRASH_DETECTED"))
{ {
uint8_t mask = 0; uint8_t mask = 0;
if (code_seen("X")) mask |= X_AXIS_MASK; if (code_seen('X')) mask |= X_AXIS_MASK;
if (code_seen("Y")) mask |= Y_AXIS_MASK; if (code_seen('Y')) mask |= Y_AXIS_MASK;
crashdet_detected(mask); crashdet_detected(mask);
} }
else if(code_seen("CRASH_RECOVER")) else if(code_seen("CRASH_RECOVER"))
@ -4281,10 +4281,10 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
if (code_seen('X')) dimension_x = code_value(); if (code_seen('X')) dimension_x = code_value();
if (code_seen('Y')) dimension_y = code_value(); if (code_seen('Y')) dimension_y = code_value();
if (code_seen('XP')) points_x = code_value(); if (code_seen("XP")) { strchr_pointer+=1; points_x = code_value(); }
if (code_seen('YP')) points_y = code_value(); if (code_seen("YP")) { strchr_pointer+=1; points_y = code_value(); }
if (code_seen('XO')) offset_x = code_value(); if (code_seen("XO")) { strchr_pointer+=1; offset_x = code_value(); }
if (code_seen('YO')) offset_y = code_value(); if (code_seen("YO")) { strchr_pointer+=1; offset_y = code_value(); }
bed_analysis(dimension_x,dimension_y,points_x,points_y,offset_x,offset_y); bed_analysis(dimension_x,dimension_y,points_x,points_y,offset_x,offset_y);