이다은 / raspberry

Go to a project
Toggle navigation Toggle navigation pinning
daeun
6237eced 1 parent 6dc26ffa

a

Inline Side-by-side
Showing 1 changed file with 8 additions and 3 deletions
...@@ -12,7 +12,7 @@ int data[] = { 0,0,0,0,0,0 }; ...@@ -12,7 +12,7 @@ int data[] = { 0,0,0,0,0,0 };
12 int state = 2; 12 int state = 2;
13 13
14 int KeypadRead(){ 14 int KeypadRead(){
15 - int i, keypadnum = -1; 15 + int keypadnum = -1;
16 if (!digitalRead(Keypad[0])) { 16 if (!digitalRead(Keypad[0])) {
17 keypadnum = 0; 17 keypadnum = 0;
18 state = 0; 18 state = 0;
...@@ -52,6 +52,9 @@ void timer() { ...@@ -52,6 +52,9 @@ void timer() {
52 delay(1); 52 delay(1);
53 } 53 }
54 } 54 }
55 +void start() {
56 + state = 0;
57 +}
55 void stop() { 58 void stop() {
56 state = 1; 59 state = 1;
57 } 60 }
...@@ -78,14 +81,16 @@ void init() { ...@@ -78,14 +81,16 @@ void init() {
78 } 81 }
79 int main(){ 82 int main(){
80 init(); 83 init();
84 + if (wiringPiISR(Keypad[0], INT_EDGE_FALLING, &start < 0) {
85 + return 1;
86 + }
81 if (wiringPiISR(Keypad[1], INT_EDGE_FALLING, &stop) < 0) { 87 if (wiringPiISR(Keypad[1], INT_EDGE_FALLING, &stop) < 0) {
82 return 1; 88 return 1;
83 } 89 }
84 if (wiringPiISR(Keypad[2], INT_EDGE_FALLING, &reset) < 0) { 90 if (wiringPiISR(Keypad[2], INT_EDGE_FALLING, &reset) < 0) {
85 return 1; 91 return 1;
86 } 92 }
87 - if (!digitalRead(Keypad[0]) && state==0) { 93 + if (state==0) {
88 - state = 0;
89 unsigned long prevtime = millis(); 94 unsigned long prevtime = millis();
90 while (1) { 95 while (1) {
91 unsigned long curtime = millis(); 96 unsigned long curtime = millis();
......