Krautspace/space_status
Archived
2
0
Fork 0
Code Issues Pull requests 2 Projects Releases Packages Wiki Activity

Arduino refactoring #4

Open
fiveop wants to merge 28 commits from fiveop/arduino_refactoring into master
pull from: fiveop/arduino_refactoring
merge into: Krautspace:master
Conversation 0 Commits 28 Files changed 1 +6 -19
1 changed files with 6 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 2e90aed245 - Show all commits

25
arduino/door_status.ino
View file

@ -46,41 +46,29 @@ void setup(){
} }
void loop(){ void loop(){
print_state(); // print state
update_measured_state_counter();
update_reported_state();
delay(DELAY_TIME);
update_led_pins();
}
void print_state() {
Serial.print(" "); Serial.print(" ");
Serial.print(reported_state); Serial.print(reported_state);
Serial.print(" "); Serial.print(" ");
Serial.println(measured_state_counter); Serial.println(measured_state_counter);
}
void update_measured_state_counter() { // update measured state
if(LOW == digitalRead(REED_SWITCH_INPUT_PIN)) { if(LOW == digitalRead(REED_SWITCH_INPUT_PIN)) {
measured_state_counter = max(0, measured_state_counter - 1); measured_state_counter = max(0, measured_state_counter - 1);
} else { } else {
measured_state_counter = min(THRESHOLD, measured_state_counter + 1); measured_state_counter = min(THRESHOLD, measured_state_counter + 1);
} }
}
void update_reported_state() { // update reported state
if (measured_state_counter > UPPER_THRESHOLD) { if (measured_state_counter > UPPER_THRESHOLD) {
reported_state = CLOSED_DOOR; reported_state = CLOSED_DOOR;
} else if (measured_state_counter < LOWER_THRESHOLD) { } else if (measured_state_counter < LOWER_THRESHOLD) {
reported_state = OPEN_DOOR; reported_state = OPEN_DOOR;
} }
}
void update_led_pins() { delay(DELAY_TIME);
// update led pins
if (reported_state == CLOSED_DOOR) { if (reported_state == CLOSED_DOOR) {
digitalWrite(RED_LED_OUTPUT_PIN, HIGH); digitalWrite(RED_LED_OUTPUT_PIN, HIGH);
digitalWrite(GREEN_LED_OUTPUT_PIN, LOW); digitalWrite(GREEN_LED_OUTPUT_PIN, LOW);
@ -88,7 +76,6 @@ void update_led_pins() {
digitalWrite(RED_LED_OUTPUT_PIN, LOW); digitalWrite(RED_LED_OUTPUT_PIN, LOW);
digitalWrite(GREEN_LED_OUTPUT_PIN, HIGH); digitalWrite(GREEN_LED_OUTPUT_PIN, HIGH);
} }
if (measured_state_counter == constrain(measured_state_counter, LOWER_THRESHOLD, UPPER_THRESHOLD)) { if (measured_state_counter == constrain(measured_state_counter, LOWER_THRESHOLD, UPPER_THRESHOLD)) {
digitalWrite(YELLOW_LED_OUTPUT_PIN, HIGH); digitalWrite(YELLOW_LED_OUTPUT_PIN, HIGH);
} else { } else {