From 4c567653305cd13ab327ea1396718d3ab00dcc88 Mon Sep 17 00:00:00 2001
From: Mike S <Mike@Michaels-MacBook-Pro.local>
Date: Fri, 31 Jan 2014 11:03:56 -0700
Subject: [PATCH] Commented Combo Code

---
 Firmware/Combo/Combo.ino | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/Firmware/Combo/Combo.ino b/Firmware/Combo/Combo.ino
index 62195da..4498beb 100644
--- a/Firmware/Combo/Combo.ino
+++ b/Firmware/Combo/Combo.ino
@@ -1,9 +1,11 @@
 /* 
- Code to 
+ Code checks for combination in order. Must press upper left button, then upper right button,
+ then lower left for success.  Any wrong button will result in an unplesant sound, 
+ and the code will reset.
  
  Prof Mike Soltys
  University of Colorado
- 1/28/2014
+ 1/31/2014
  */
 
 
@@ -63,13 +65,22 @@ void loop() {
     if (Button == UR){
       // if so, turn that button on and continue
       digitalWrite(led_UR, HIGH);  
-      // play success tone!
-      tone(BUZZER1,399,1000);
-      // interesting fact: 399 Hz is the "most plesant" frequency
-      // http://www.ncbi.nlm.nih.gov/pubmed/503755
+      Button = ButtonWait();
+      if (Button == LL){
+        // if so, turn that button on and continue
+        digitalWrite(led_LL, HIGH);  
+        // play success tone!
+        tone(BUZZER1,399,1000);
+        // interesting fact: 399 Hz is the "most plesant" frequency
+        // http://www.ncbi.nlm.nih.gov/pubmed/503755
 
-      // if at any point a wrong button is pressed, the code will jump down
-      // to delay 1000, turn off the LEDs, and restart at the top of void loop()
+        // if at any point a wrong button is pressed, the code will jump down
+        // to delay 1000, turn off the LEDs, and restart at the top of void loop()
+      }
+      // if the wrong button is pressed, play an unplesant sound
+      else {
+        tone(BUZZER1,2000,500);
+      }
     }
     // if the wrong button is pressed, play an unplesant sound
     else {
@@ -80,7 +91,7 @@ void loop() {
   else {
     tone(BUZZER1,2000,500);
   }
-  
+
   // wait a second and turn off all LEDS
   delay(1000);
   digitalWrite(led_UR, LOW);
@@ -132,3 +143,4 @@ int ButtonWait(void){
 
 
 
+