Whups, last one was bad. This one is good.

This commit is contained in:
Will Bradley 2011-12-03 02:18:42 -07:00
parent a3844c0318
commit e9acb7ce98

View File

@ -31,9 +31,7 @@
* Relay outputs on digital pins 6,7,8,9 //TODO: fix this conflict -WB * Relay outputs on digital pins 6,7,8,9 //TODO: fix this conflict -WB
* Reader 1: pins 2,3 * Reader 1: pins 2,3
* Ethernet: pins 10,11,12,13 (reserved for the Ethernet shield) * Ethernet: pins 10,11,12,13 (reserved for the Ethernet shield)
* LCD: pins 6, 5, 4 * LCD: pins 7, 6, 5, 4, 3, 2
* Buzzer Pin: 8
* Warning LED: 9
* *
* Quickstart tips: * Quickstart tips:
* Compile and upload the code, then log in via serial console at 57600,8,N,1 * Compile and upload the code, then log in via serial console at 57600,8,N,1
@ -138,6 +136,8 @@ void setup(){ // Runs once at Arduino boot-up
// start the Ethernet connection: // start the Ethernet connection:
Ethernet.begin(mac, ip); Ethernet.begin(mac, ip);
// set up the LCD's number of rows and columns:
lcd.begin(16, 2);
} }
void loop() // Main branch, runs over and over again void loop() // Main branch, runs over and over again
@ -222,22 +222,16 @@ void loop() // Main branch, runs over and ov
delay(130); delay(130);
tone(buzzerPin, 1109, 100); tone(buzzerPin, 1109, 100);
digitalWrite(warningLED, LOW); digitalWrite(warningLED, LOW);
lcd.setCursor(15, 1);
lcd.print(" ");
delay(500); delay(500);
} }
} }
if(remaining == 15) { if(remaining == 10) {
for(int berp=0; berp<4; berp++){ for(int berp=0; berp<4; berp++){
digitalWrite(warningLED, HIGH); digitalWrite(warningLED, HIGH);
tone(buzzerPin, 1661, 800); tone(buzzerPin, 1661, 800);
lcd.setCursor(15, 1);
lcd.print("!");
delay(800); delay(800);
digitalWrite(warningLED, LOW); digitalWrite(warningLED, LOW);
lcd.setCursor(15, 1);
lcd.print("!");
delay(200); delay(200);
} }
} }