SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Allow fractional seconds in G4 and M0

Browse source
This commit is contained in:
Scott Lahteine 2015-05-12 07:52:08 -07:00
parent b2bd9aae7c
commit 27ad381e25
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/Marlin_main.cpp
View file

@ -1793,7 +1793,7 @@ inline void gcode_G4() {
millis_t codenum = 0;
if (code_seen('P')) codenum = code_value_long(); // milliseconds to wait
if (code_seen('S')) codenum = code_value_long() * 1000; // seconds to wait
if (code_seen('S')) codenum = code_value() * 1000; // seconds to wait
st_synchronize();
refresh_cmd_timeout();
@ -2660,7 +2660,7 @@ inline void gcode_G92() {
hasP = codenum > 0;
}
if (code_seen('S')) {
codenum = code_value_short() * 1000UL; // seconds to wait
codenum = code_value() * 1000; // seconds to wait
hasS = codenum > 0;
}
char* starpos = strchr(src, '*');