Fixed bug where peripheral type was not checked following API command.

AxisCommunications · Feb 21, 2014 · 50fbc5c · 50fbc5c
1 parent 8461071
commit 50fbc5c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/PACSDoor.cpp b/PACSDoor.cpp
@@ -129,7 +129,7 @@ bool PACSDoor::enterPIN(char* readerId, char* code) {
 bool PACSDoor::openDoor(char* doorMonitorId) { 
 
  PACSPeripheral* p = findPeripheralById(doorMonitorId);
- if (p != NULL) {
+ if ((p != NULL) && (p->type == DOORMONITOR)) {
  setPinActive(p->pin, p->activeLevel); 
  return true; 
  }
@@ -142,7 +142,7 @@ bool PACSDoor::openDoor(char* doorMonitorId) {
 bool PACSDoor::closeDoor(char* doorMonitorId) {
 
  PACSPeripheral* p = findPeripheralById(doorMonitorId);
- if (p != NULL) {
+ if ((p != NULL) && (p->type == DOORMONITOR)) {
  setPinInactive(p->pin, p->activeLevel); 
  return true; 
  }
@@ -155,7 +155,7 @@ bool PACSDoor::closeDoor(char* doorMonitorId) {
 bool PACSDoor::pushREX(char* rexId) {
 
  PACSPeripheral* p = findPeripheralById(rexId);
- if (p != NULL) {
+ if ((p != NULL) && (p->type == REX)) {
  setPinActive(p->pin, p->activeLevel); 
  delay(10);
  setPinInactive(p->pin, p->activeLevel); 

diff --git a/dctt.ino b/dctt.ino
@@ -1176,6 +1176,7 @@ void apiCMD(WebServer &server, WebServer::ConnectionType type, char *url_tail, b
 
  server.httpSuccess("text/html", NULL);
  server.printP(ok);
+ server.printCRLF();
 
  }
 }