Chenkai Shao
/
4180Final
Automatic cocktail maker
Revision 2:2351d0558c70, committed 2015-12-03
- Comitter:
- cshao06
- Date:
- Thu Dec 03 04:58:36 2015 +0000
- Parent:
- 1:aa2e8e59127c
- Commit message:
- Fixed distance sensor
Changed in this revision
main.cpp | Show annotated file Show diff for this revision Revisions of this file |
diff -r aa2e8e59127c -r 2351d0558c70 main.cpp --- a/main.cpp Thu Dec 03 04:28:49 2015 +0000 +++ b/main.cpp Thu Dec 03 04:58:36 2015 +0000 @@ -130,7 +130,7 @@ Thread t2(thread2); Thread t3(thread3); Thread t4(thread4); - Thread t5(thread5); + //Thread t5(thread5); t_enabled = false; char message; char msg[10]; @@ -141,6 +141,9 @@ spi.frequency(500000); enable=0; latch=0; + wait(10); + while(distSensor < 0.05) {} + pc.putc('l'); int i; while (1)