Stable

.github/workflows/translations.yml

@@ -0,0 +1,18 @@
+name: translate
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - beta
+
+jobs:
+  auto-translate:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: jeedom/jeetranslate@main
+        with:
+          deepl_api_key: ${{ secrets.DEEPL_API_KEY }}
+          include_empty_translation: false
+          target_languages: "en_US,es_ES,de_DE,it_IT,pt_PT"
+          use_core_translations: true

core/class/ajaxSystem.class.php

@@ -382,9 +382,22 @@ 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();
+      }
+      if(isset(explode(" ", $this->getLogicalId())[1]) && explode(" ", $this->getLogicalId())[1] != ""){
+          $command['additionalParam'] = array(
+            'additionalParamType' => 'CHANNELS',
+            'channels' => array("CHANNEL_".explode(" ", $this->getLogicalId())[1])
+          );
+      }
+      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') {
       if ($this->getLogicalId() == 'ARM') {

core/config/devices/LightSwitchTwoChannelTwoWay.json

@@ -0,0 +1,107 @@
+{
+    "name" : "Interrupteur double va et vient",
+    "commands" : [
+      {
+        "name": "Etat 1",
+        "type": "info",
+        "subtype": "binary",
+        "isVisible": 0,
+        "isHistorized": 0,
+        "logicalId": "channelStatus_1"
+      },
+      {
+        "name": "Etat 2",
+        "type": "info",
+        "subtype": "binary",
+        "isVisible": 0,
+        "isHistorized": 0,
+        "logicalId": "channelStatus_2"
+      },
+      {
+        "name": "Source evenement",
+        "type": "info",
+        "subtype": "string",
+        "isVisible": 0,
+        "isHistorized": 0,
+        "logicalId": "sourceObjectName"
+      },
+      {
+        "name": "Evenement",
+        "type": "info",
+        "subtype": "string",
+        "isVisible": 0,
+        "isHistorized": 0,
+        "logicalId": "event"
+      },
+      {
+        "name": "Code evenement",
+        "type": "info",
+        "subtype": "string",
+        "isVisible": 0,
+        "isHistorized": 0,
+        "logicalId": "eventCode"
+      },
+      {
+        "name": "On 1",
+        "type": "action",
+        "subtype": "other",
+        "isVisible": 1,
+        "isHistorized": 0,
+        "logicalId": "SWITCH_ON 1",
+        "value" :"Etat 1",
+        "template":{
+          "dashboard" : "prise",
+          "mobile" : "prise"
+        },
+        "configuration" :{
+          "AdditionalParam" : {
+            "ChannelsAdditionalParam" : "CHANNEL_1"
+          }
+        }
+      },
+      {
+        "name": "Off 1",
+        "type": "action",
+        "subtype": "other",
+        "isVisible": 1,
+        "isHistorized": 0,
+        "logicalId": "SWITCH_OFF 1",
+        "value" :"Etat 1",
+        "template":{
+          "dashboard" : "prise",
+          "mobile" : "prise"
+        },
+        "configuration" :{
+          "AdditionalParam" : {
+            "ChannelsAdditionalParam" : "CHANNEL_1"
+          }
+        }
+      },
+      {
+        "name": "On 2",
+        "type": "action",
+        "subtype": "other",
+        "isVisible": 1,
+        "isHistorized": 0,
+        "logicalId": "SWITCH_ON 2",
+        "value" :"Etat 2",
+        "template":{
+          "dashboard" : "prise",
+          "mobile" : "prise"
+        }
+      },
+      {
+        "name": "Off 2",
+        "type": "action",
+        "subtype": "other",
+        "isVisible": 1,
+        "isHistorized": 0,
+        "logicalId": "SWITCH_OFF 2",
+        "value" :"Etat 2",
+        "template":{
+          "dashboard" : "prise",
+          "mobile" : "prise"
+        }
+      }
+    ]
+  }

core/config/devices/LightSwitchTwoGang.json

@@ -0,0 +1,107 @@
+{
+    "name" : "Interrupteur double",
+    "commands" : [
+      {
+        "name": "Etat 1",
+        "type": "info",
+        "subtype": "binary",
+        "isVisible": 0,
+        "isHistorized": 0,
+        "logicalId": "channelStatus_1"
+      },
+      {
+        "name": "Etat 2",
+        "type": "info",
+        "subtype": "binary",
+        "isVisible": 0,
+        "isHistorized": 0,
+        "logicalId": "channelStatus_2"
+      },
+      {
+        "name": "Source evenement",
+        "type": "info",
+        "subtype": "string",
+        "isVisible": 0,
+        "isHistorized": 0,
+        "logicalId": "sourceObjectName"
+      },
+      {
+        "name": "Evenement",
+        "type": "info",
+        "subtype": "string",
+        "isVisible": 0,
+        "isHistorized": 0,
+        "logicalId": "event"
+      },
+      {
+        "name": "Code evenement",
+        "type": "info",
+        "subtype": "string",
+        "isVisible": 0,
+        "isHistorized": 0,
+        "logicalId": "eventCode"
+      },
+      {
+        "name": "On 1",
+        "type": "action",
+        "subtype": "other",
+        "isVisible": 1,
+        "isHistorized": 0,
+        "logicalId": "SWITCH_ON 1",
+        "value" :"Etat 1",
+        "template":{
+          "dashboard" : "prise",
+          "mobile" : "prise"
+        },
+        "configuration" :{
+          "AdditionalParam" : {
+            "ChannelsAdditionalParam" : "CHANNEL_1"
+          }
+        }
+      },
+      {
+        "name": "Off 1",
+        "type": "action",
+        "subtype": "other",
+        "isVisible": 1,
+        "isHistorized": 0,
+        "logicalId": "SWITCH_OFF 1",
+        "value" :"Etat 1",
+        "template":{
+          "dashboard" : "prise",
+          "mobile" : "prise"
+        },
+        "configuration" :{
+          "AdditionalParam" : {
+            "ChannelsAdditionalParam" : "CHANNEL_1"
+          }
+        }
+      },
+      {
+        "name": "On 2",
+        "type": "action",
+        "subtype": "other",
+        "isVisible": 1,
+        "isHistorized": 0,
+        "logicalId": "SWITCH_ON 2",
+        "value" :"Etat 2",
+        "template":{
+          "dashboard" : "prise",
+          "mobile" : "prise"
+        }
+      },
+      {
+        "name": "Off 2",
+        "type": "action",
+        "subtype": "other",
+        "isVisible": 1,
+        "isHistorized": 0,
+        "logicalId": "SWITCH_OFF 2",
+        "value" :"Etat 2",
+        "template":{
+          "dashboard" : "prise",
+          "mobile" : "prise"
+        }
+      }
+    ]
+  }

core/config/devices/LightSwitchTwoWay.json

@@ -60,4 +60,4 @@
         }
       }
     ]
-  }
+  }