diff --git a/earthquake/earthquake.ino b/earthquake/earthquake.ino index e46d12dffff1d7523d6a1a0c8c600d83043dc777..8ae1061ad80eca7189cc0d600adfba42a6addf83 100644 --- a/earthquake/earthquake.ino +++ b/earthquake/earthquake.ino @@ -117,8 +117,10 @@ void setup() { } +int iter = 0; +bool detected = 0; void loop() { - + reading = digitalRead(inPin); if (reading == HIGH && previous == LOW && millis() - time > debounce) { if (state == HIGH) @@ -134,7 +136,8 @@ void loop() { if(!isState(stateOn)){ clearLCD(); printLCD(0,0,"Arduino ON"); - delay(1000); + delay(2000); + lcd.noBacklight(); } gyroOn(); } else { @@ -142,10 +145,8 @@ void loop() { if(!isState(stateOff)){ clearLCD(); printLCD(0,0,"Arduino OFF"); - delay(1000); } } - } @@ -160,6 +161,7 @@ void dmpDataReady() { void toggleButtonInit(){ pinMode(inPin, INPUT); pinMode(outPin, OUTPUT); + state = LOW; } void sevenSegmentInit(){ @@ -299,22 +301,26 @@ void gyroOn(){ changeShift(); bool check = isChange(); if(check){ + iter+=1; + } + if(check && !detected && iter==100){ magnitudeC = (int) magnitudeConvert(); - Serial.println(amplitude); Serial.println(magnitudeC); - displaySevenSegment(magnitudeC%10); + displaySevenSegment(magnitudeC); ledActive(); - } else { - Serial.print("aworld\t"); - Serial.print(aaWorld.x); - Serial.print("\t"); - Serial.print(aaWorld.y); - Serial.print("\t"); - Serial.println(aaWorld.z); + detected = 1; + } else if(iter==0){ + detected = 0; ledDeactive(); amplitude = 0; displaySevenSegment(0); } + + if(detected){ + iter+=1; + iter=iter%1000; + } +// Serial.println(iter); } }