Skip to content

Update doors.ino #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dtbaker wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update doors.ino #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fac71e
Update doors.ino
dtbaker May 3, 2018
127b5cb
Update doors.ino
dtbaker May 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions doors.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,18 @@ MFRC522 mfrc522(NFC_SS_PIN, NFC_RST_PIN); // Create MFRC522 instance
WiFiClient wifiClient;
PubSubClient pubSubClient(MQTT_SERVER, MQTT_PORT, msgRecieved, wifiClient);

volatile boolean doorStateChange = 1;
volatile boolean doorStatePrevious = 0; // 0=closed, 1=open // todo: move to magic numbers.
volatile boolean doorStateCurrent = 0; // 0=closed, 1=open // todo: move to magic numbers.
volatile boolean doorStateChange = 0;
volatile unsigned long intTime = 0;
#define INT_DEBOUNCE 100

void handleDoorStateChangeISR()
{
doorStateCurrent = digitalRead(HALL_EFFECT_PIN) ? 1 : 0; // 0=closed, 1=open // todo: move to magic numbers.
unsigned long timeNow = millis();
if(timeNow - intTime > INT_DEBOUNCE){
doorStateChange = 1;
if(doorStateCurrent != doorStatePrevious || timeNow - intTime > INT_DEBOUNCE){
doorStateChange = 1; // Tell our main loop that the door state change needs to be sent via MQTT
intTime = timeNow;
}
}
Expand Down Expand Up @@ -124,11 +127,12 @@ void loop()
if(doorStateChange){
doorStateChange = 0;
String doorMsgStr;
if(digitalRead(HALL_EFFECT_PIN)){
if(doorStateCurrent){
doorMsgStr = String(DEVICE_NAME) + ";open";
} else {
doorMsgStr = String(DEVICE_NAME) + ";closed";
}
doorStatePrevious = doorStateCurrent;
char msg[20];
doorMsgStr.toCharArray(msg, 20);
pubSubClient.publish("techspace/doors", msg);
Expand Down