chiark
/
gitweb
/
~ianmdlvl
/
marlin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d494688
)
Update after testing
author
Daid
<daid303@gmail.com>
Sat, 19 May 2012 16:48:43 +0000
(18:48 +0200)
committer
Daid
<daid303@gmail.com>
Sat, 19 May 2012 16:48:43 +0000
(18:48 +0200)
Marlin/Marlin.pde
patch
|
blob
|
history
diff --git
a/Marlin/Marlin.pde
b/Marlin/Marlin.pde
index 6d8a7b4dc8d7ed028478589f5f57985578ddc949..a1843a0ad3877025dce24433527e3babe11af616 100644
(file)
--- a/
Marlin/Marlin.pde
+++ b/
Marlin/Marlin.pde
@@
-1279,12
+1279,12
@@
void process_commands()
if (codenum > 0)
{
codenum += millis(); // keep track of when we started waiting
if (codenum > 0)
{
codenum += millis(); // keep track of when we started waiting
- while(millis() < codenum &&
buttons == 0
){
+ while(millis() < codenum &&
!CLICKED
){
manage_heater();
manage_inactivity(1);
}
}else{
manage_heater();
manage_inactivity(1);
}
}else{
- while(
buttons == 0
) {
+ while(
!CLICKED
) {
manage_heater();
manage_inactivity(1);
}
manage_heater();
manage_inactivity(1);
}