bugfix

Author: zoic21

core/class/ajaxSystem.class.php

@@ -382,12 +382,15 @@ public function execute($_options = array()) {
       }
     } else if ($eqLogic->getConfiguration('type') == 'device') {
       $command = array(
-        'command' => $this->getLogicalId(),
+        'command' => explode(" ", $this->getLogicalId())[0],
         'deviceType' => $eqLogic->getConfiguration('device')
       );
       if($this->getConfiguration('AdditionalParam',null) != null){
         $command['AdditionalParam'] = $this->getConfiguration('AdditionalParam',null);
       }
+      if(!isset($command['command']) || $command['command'] == ''){
+        $command['command'] = $this->getLogicalId();
+      }
       log::add('ajaxSystem','debug','Command send to ajax : '.json_encode($command));
       ajaxSystem::request('/user/{userId}/hubs/' . $eqLogic->getConfiguration('hub_id') . '/devices/' . $eqLogic->getLogicalId() . '/command', $command, 'POST');
     } else if ($eqLogic->getConfiguration('type') == 'group') {

core/config/devices/LightSwitchTwoWay.json

@@ -47,7 +47,7 @@
         "subtype": "other",
         "isVisible": 1,
         "isHistorized": 0,
-        "logicalId": "SWITCH_ON",
+        "logicalId": "SWITCH_ON 1",
         "value" :"Etat 1",
         "template":{
           "dashboard" : "prise",
@@ -65,7 +65,7 @@
         "subtype": "other",
         "isVisible": 1,
         "isHistorized": 0,
-        "logicalId": "SWITCH_OFF",
+        "logicalId": "SWITCH_OFF 1",
         "value" :"Etat 1",
         "template":{
           "dashboard" : "prise",
@@ -83,7 +83,7 @@
         "subtype": "other",
         "isVisible": 1,
         "isHistorized": 0,
-        "logicalId": "SWITCH_ON",
+        "logicalId": "SWITCH_ON 2",
         "value" :"Etat 2",
         "template":{
           "dashboard" : "prise",
@@ -101,7 +101,7 @@
         "subtype": "other",
         "isVisible": 1,
         "isHistorized": 0,
-        "logicalId": "SWITCH_OFF",
+        "logicalId": "SWITCH_OFF 2",
         "value" :"Etat 2",
         "template":{
           "dashboard" : "prise",