Krautspace/hackerspace-status-arduino
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Arduino Code: auslagerung in neue Funktion printState

Browse source
This commit is contained in:
Martin Ness 2016-05-01 14:03:34 +02:00
parent c7c3152108
commit a90280ff97
1 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
status/status.ino
View file

@ -83,7 +83,7 @@ boolean transition() {
if (state_previous == STATE_OFF && state_current == STATE_ON) { if (state_previous == STATE_OFF && state_current == STATE_ON) {
digitalWrite(LED_R, LOW); digitalWrite(LED_R, LOW);
digitalWrite(LED_G, HIGH); digitalWrite(LED_G, HIGH);
Serial.print("ON\n"); printState(state_current);
stateBegan = millis(); stateBegan = millis();
return true; return true;
} }
@ -94,19 +94,19 @@ boolean transition() {
if (state_previous == STATE_ON && state_current == STATE_HALF) { if (state_previous == STATE_ON && state_current == STATE_HALF) {
digitalWrite(LED_G, LOW); digitalWrite(LED_G, LOW);
digitalWrite(LED_Y, HIGH); digitalWrite(LED_Y, HIGH);
Serial.print("HALF\n"); printState(state_current);
return true; return true;
} }
if (state_previous == STATE_ON && state_current == STATE_OFF) { if (state_previous == STATE_ON && state_current == STATE_OFF) {
digitalWrite(LED_G, LOW); digitalWrite(LED_G, LOW);
digitalWrite(LED_R, HIGH); digitalWrite(LED_R, HIGH);
Serial.print("OFF\n"); printState(state_current);
return true; return true;
} }
if (state_previous == STATE_HALF && state_current == STATE_OFF) { if (state_previous == STATE_HALF && state_current == STATE_OFF) {
digitalWrite(LED_Y, LOW); digitalWrite(LED_Y, LOW);
digitalWrite(LED_R, HIGH); digitalWrite(LED_R, HIGH);
Serial.print("OFF\n"); printState(state_current);
return true; return true;
} }
if (state_previous == STATE_HALF && state_current == STATE_ON) { if (state_previous == STATE_HALF && state_current == STATE_ON) {
@ -119,24 +119,29 @@ boolean transition() {
digitalWrite(LED_G, LOW); digitalWrite(LED_G, LOW);
digitalWrite(LED_Y, LOW); digitalWrite(LED_Y, LOW);
digitalWrite(LED_R, HIGH); digitalWrite(LED_R, HIGH);
Serial.print("OFF\n"); printState(state_current);
return true; return true;
} }
return false; return false;
} }
// schreibt den aktuellen Zustand auf die Serialeverbindung
void printState(byte state) {
switch (state) {
case STATE_OFF:
Serial.print("OFF\n");
break;
case STATE_HALF:
Serial.print("HALF\n");
break;
case STATE_ON:
Serial.print("ON\n");
}
}
void handleSerial() { void handleSerial() {
if (Serial.read() != -1) { if (Serial.read() != -1) {
switch (state_current) { printState(state_current);
case STATE_OFF:
Serial.print("OFF\n");
break;
case STATE_HALF:
Serial.print("HALF\n");
break;
case STATE_ON:
Serial.print("ON\n");
}
do { do {
delay(10); delay(10);
} while (Serial.read() != -1); } while (Serial.read() != -1);