bugfix state for tow way switch

Author: zoic21

core/config/devices/LightSwitchTwoWay.json

@@ -2,12 +2,20 @@
     "name" : "Va et vient",
     "commands" : [
       {
-        "name": "Etat",
+        "name": "Etat 1",
         "type": "info",
         "subtype": "binary",
         "isVisible": 0,
         "isHistorized": 0,
-        "logicalId": "channelStatus"
+        "logicalId": "channelStatus_1"
+      },
+      {
+        "name": "Etat 2",
+        "type": "info",
+        "subtype": "binary",
+        "isVisible": 0,
+        "isHistorized": 0,
+        "logicalId": "channelStatus_2"
       },
       {
         "name": "Source evenement",
@@ -34,26 +42,52 @@
         "logicalId": "eventCode"
       },
       {
-        "name": "On",
+        "name": "On 1",
+        "type": "action",
+        "subtype": "other",
+        "isVisible": 1,
+        "isHistorized": 0,
+        "logicalId": "SWITCH_ON",
+        "value" :"Etat 1",
+        "template":{
+          "dashboard" : "prise",
+          "mobile" : "prise"
+        }
+      },
+      {
+        "name": "Off 1",
+        "type": "action",
+        "subtype": "other",
+        "isVisible": 1,
+        "isHistorized": 0,
+        "logicalId": "SWITCH_OFF",
+        "value" :"Etat 1",
+        "template":{
+          "dashboard" : "prise",
+          "mobile" : "prise"
+        }
+      },
+      {
+        "name": "On 2",
         "type": "action",
         "subtype": "other",
         "isVisible": 1,
         "isHistorized": 0,
         "logicalId": "SWITCH_ON",
-        "value" :"Etat",
+        "value" :"Etat 2",
         "template":{
           "dashboard" : "prise",
           "mobile" : "prise"
         }
       },
       {
-        "name": "Off",
+        "name": "Off 2",
         "type": "action",
         "subtype": "other",
         "isVisible": 1,
         "isHistorized": 0,
         "logicalId": "SWITCH_OFF",
-        "value" :"Etat",
+        "value" :"Etat 2",
         "template":{
           "dashboard" : "prise",
           "mobile" : "prise"

core/php/jeeAjaxSystem.php

@@ -70,6 +70,26 @@
       if ($convert_key == 'realState') {
         $value = ($value == 0) ? 1 : 0;
       }
+      if($ajaxSystem->getConfiguration('device') == 'LightSwitchTwoWay' && $key == 'channelStatus'){
+          switch ($value) {
+              case 0:
+                  $ajaxSystem->checkAndUpdateCmd('channelStatus_1', 0);
+                  $ajaxSystem->checkAndUpdateCmd('channelStatus_2', 0);
+                  break;
+              case 1:
+                  $ajaxSystem->checkAndUpdateCmd('channelStatus_1', 1);
+                  $ajaxSystem->checkAndUpdateCmd('channelStatus_2', 0);
+                  break;
+              case 2:
+                  $ajaxSystem->checkAndUpdateCmd('channelStatus_1', 0);
+                  $ajaxSystem->checkAndUpdateCmd('channelStatus_2', 1);
+                  break;
+              case 3:
+                  $ajaxSystem->checkAndUpdateCmd('channelStatus_1', 1);
+                  $ajaxSystem->checkAndUpdateCmd('channelStatus_2', 1);
+                  break;
+          }
+      }
       $ajaxSystem->checkAndUpdateCmd($convert_key, $value);
       if ($ajaxSystem->getConfiguration('device') == 'Socket') {
         $current = $ajaxSystem->getCmd('info', 'currentMA');