Merge branch 'master' into test

.vscode/arduino.json

@@ -1,7 +1,9 @@
 {
+
     "board": "esp8266:esp8266:huzzah",
     "configuration": "CpuFrequency=80,VTable=flash,FlashSize=4M1M,LwIPVariant=v2mss536,Debug=Disabled,DebugLevel=None____,FlashErase=none,UploadSpeed=115200",
     "sketch": "ParadoxAlarmSystem/ParadoxAlarmSystemOTA/ParadoxAlarmSystemOTA.ino",
     "port": "COM5",
     "output": "../ArduinoOutput"
+
 }

.vscode/c_cpp_properties.json

@@ -27,6 +27,7 @@
             "compilerPath": "/usr/bin/clang",
             "cStandard": "c11",
             "cppStandard": "c++17"
+
         },
         {
             "name": "Win32",
@@ -35,6 +36,7 @@
                 "C:\\Users\\marag\\AppData\\Local\\Arduino15\\packages\\esp8266\\hardware\\esp8266\\2.4.2\\**"
             ],
             "forcedInclude": []
+
         }
     ],
     "version": 4

.vscode/settings.json

@@ -1,5 +1,6 @@
 {
     "files.associations": {
+
         "array": "cpp",
         "iterator": "cpp",
         "string": "cpp",

ParadoxAlarmSystem/ParadoxAlarmSystemOTA/ParadoxAlarmSystemOTA.ino

@@ -16,8 +16,10 @@
 
 #define mqtt_server       "192.168.4.225"
 #define mqtt_port         "1883"
+
 #define Hostname          "paradoxdCTL" //not more than 15 
 
+
 #define paradoxRX  13
 #define paradoxTX  15
 
@@ -435,31 +437,38 @@ void callback(char* topic, byte* payload, unsigned int length) {
 
 byte getPanelCommand(String data){
   byte retval=0x00;
+
   data.toLowerCase();
   if (data == "stay" || data=="0")
   {
 
     retval = Stay_Arm;
 
   }
+
   else if (data == "arm" || data=="1")
   {    
     retval= Full_Arm;
   }
   else if (data == "sleep" || data=="2")
+
   {
 
     retval= Sleep_Arm;
 
   }
+
   else if (data == "disarm" || data == "3")
+
   {
 
     retval=Disarm;
 
   }
 
+
   else if (data == "bypass" || data == "10")
+
   {
 
     retval=Bypass;
@@ -488,6 +497,7 @@ byte getPanelCommand(String data){
     retval=0x92;
 
   }
+
   else if (data == "disconnect" || data == "99")
   {
     retval=0x00;

README.md

@@ -1,6 +1,13 @@
 # ParadoxRs232toMqtt
+First stable test version of v2 is ready https://github.com/maragelis/ParadoxRs232toMqtt/tree/test
+
+Feel free to test the test branch, and contribute to dev branch.
+
+
+
 This project uses a wemos esp8266 to read events of the serial bus of any Paradox alarm system and send it to Mqtt
 
+
   Alarm system serial on wemos 
   paradoxTX gpio15 wemos d8 
   paradoxRX gpio13 wemos d7
@@ -9,6 +16,7 @@ This project uses a wemos esp8266 to read events of the serial bus of any Parado
 
 
 Set Hassio flag to 1 for Home assistant see wiki (Home Assistant in V2)
+
         
         
 The 37 byte message is broken down into a json message with "Event Group" and "Sub-group" 
@@ -48,6 +56,7 @@ password is user 4 digit password
 
 Command can be one of the following 
 
+
   arm,
   disarm,
   sleep,
@@ -68,3 +77,17 @@ Command can be one of the following
   		 subcomand 1 panel voltage and battery data 	
   all others send 0
 
+
+
+20190104 Added wiki Node-red v2 flow 
+
+20190103 Added v2 test branch (stable working) 
+
+20180804 Wiki added Home Assistant Config (works with node-red) 
+
+20180721 Changed to user based password, use the same 4 digit code used on panel for control. 
+
+
+
+Continue reading wiki ....
+