Added check if PIN was donloaded from PM before issuing arm/disarm co…

…mmands
irekzielinski · Jun 14, 2016 · 23f3003 · 23f3003
1 parent 15ea527
commit 23f3003
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/Libraries/PMax/pmax.h b/Libraries/PMax/pmax.h
@@ -251,6 +251,7 @@ class PowerMaxAlarm
     static bool isBufferOK(const PlinkBuffer* commandBuffer);
     const char* getZoneName(unsigned char zoneId);
 
+    bool isConfigParsed() const { return m_cfg.parsedOK; }
     unsigned int getEnrolledZoneCnt() const;
     unsigned long getSecondsFromLastComm() const;
     void dumpToJson(IOutput* outputStream);

diff --git a/PowerMaxEsp8266/PowerMaxEsp8266.ino b/PowerMaxEsp8266/PowerMaxEsp8266.ino
@@ -256,6 +256,15 @@ void handleTelnetRequests(PowerMaxAlarm* pm) {
   if ( telnetClient.connected() && telnetClient.available() )  {
     c = telnetClient.read();
 
+    if(pm->isConfigParsed() == false &&
+       (c == 'h' || //arm home
+        c == 'a' || //arm away
+        c == 'd'))  //disarm
+    {
+        //DEBUG(LOG_NOTICE,"EPROM is not download yet (no PIN requred to perform this operation)");
+        return;
+    }
+
 #ifdef PM_ALLOW_CONTROL
     if ( c == 'h' ) {
       DEBUG(LOG_NOTICE,"Arming home");

diff --git a/PowerMaxWin/PowerMax.cpp b/PowerMaxWin/PowerMax.cpp
@@ -61,6 +61,15 @@ void KeyPressHandling(PowerMaxAlarm* pm) {
   if ( _kbhit() )  {
     c = getchar();
 
+    if(pm->isConfigParsed() == false &&
+       (c == 'h' || //arm home
+        c == 'a' || //arm away
+        c == 'd'))  //disarm
+    {
+        DEBUG(LOG_NOTICE,"EPROM is not download yet (no PIN requred to perform this operation)");
+        return;
+    }
+
     if ( c == 'c' ) {
       printf("Exiting...");
       exit(1);
@@ -70,6 +79,7 @@ void KeyPressHandling(PowerMaxAlarm* pm) {
       pm->sendCommand(Pmax_ARMHOME);
     }
     else if ( c == 'd' ) {
+
       DEBUG(LOG_NOTICE,"Disarm");
       pm->sendCommand(Pmax_DISARM);
     }