';
foreach ($_values as $key => $value) {
$value['oriKey'] = $key;
@@ -1241,7 +1240,7 @@ public static function constructValuePage($_nodeId, $_values, $_nodeStatus) {
$nodeValues .= '
' . $data['property'] . ' | ';
$prop = $data['property'];
}
- $globProperty=$cc.'-'.$data['endpoint'].'-'.$prop;
+ $globProperty = $cc . '-' . $data['endpoint'] . '-' . $prop;
if (isset($data['description'])) {
$nodeValues .= '
' . $data['label'] . ' | ';
} else {
@@ -1249,10 +1248,10 @@ public static function constructValuePage($_nodeId, $_values, $_nodeStatus) {
}
$nodeValues .= '
';
$waitingValue = '';
- if (isset($waiting[$globProperty])){
- if ($waiting[$globProperty]['value'] == $data['value']){
+ if (isset($waiting[$globProperty])) {
+ if ($waiting[$globProperty]['value'] == $data['value']) {
unset($waiting[$globProperty]);
- $eqLogic->setCache('waiting',$waiting);
+ $eqLogic->setCache('waiting', $waiting);
} else {
$waitingValue = $waiting[$globProperty]['value'];
}
@@ -1324,8 +1323,8 @@ public static function constructValuePage($_nodeId, $_values, $_nodeStatus) {
if ($tooltip != '') {
$span .= ' ';
}
- if ($waitingValue != ''){
- $span.=' '.$waitingValue.'';
+ if ($waitingValue != '') {
+ $span .= ' ' . $waitingValue . '';
}
$updates[str_replace(' ', '_', $data['id'])] = array('value' => $span);
$nodeValues .= '' . $span . '';
@@ -1371,7 +1370,7 @@ public static function constructValuePage($_nodeId, $_values, $_nodeStatus) {
$nodeValues .= ' data-type="' . $data['type'] . '"';
$nodeValues .= ' data-label="' . $data['label'] . '"';
$nodeValues .= ' data-path="' . $data['id'] . '"';
- if (isset($data['unit'])){
+ if (isset($data['unit'])) {
$nodeValues .= ' data-unit="' . $data['unit'] . '"';
} else {
$nodeValues .= ' data-unit=""';
@@ -1386,7 +1385,7 @@ public static function constructValuePage($_nodeId, $_values, $_nodeStatus) {
$nodeValues .= ' data-type="' . $data['type'] . '"';
$nodeValues .= ' data-label="' . $data['label'] . '"';
$nodeValues .= ' data-path="' . $data['id'] . '"';
- if (isset($data['unit'])){
+ if (isset($data['unit'])) {
$nodeValues .= ' data-unit="' . $data['unit'] . '"';
} else {
$nodeValues .= ' data-unit=""';
@@ -1472,7 +1471,7 @@ public static function constructHealthPage($_values, $_mobile = False) {
$polling = '' . $numberPoll . '';
}
$healthPage .= ' | ' . $polling . ' | ';
-
+
$numberRefresh = 0;
if (is_object($eqLogic)) {
$refreshes = $eqLogic->getConfiguration('refreshes', array());
@@ -1527,16 +1526,16 @@ public static function constructHealthPage($_values, $_mobile = False) {
} else {
$next = self::secondsToTime($values['values']['132-0-wakeUpInterval']['value'] - $wakedup);
}
- if ($wakedup > 3*$values['values']['132-0-wakeUpInterval']['value']) {
+ if ($wakedup > 3 * $values['values']['132-0-wakeUpInterval']['value']) {
$action = '
' . __('Equipement', __FILE__) . '';
- if (config::byKey('notifyMissWakeup', __CLASS__, 1)==1 && $eqLogic->getIsEnable()==1){
- if (version_compare(jeedom::version(),'4.4.0','>=')){
- message::add('zwavejs',"L'équipement : " . $eqLogic->getHumanName(true) . ' avec le nodeId : ' . $eqLogic->getLogicalId(). ", ne s'est pas reveillé au moins 4 fois. Il a peut être un problème (batterie ou autres).", $action,'Wakeup-'.$eqLogic->getLogicalId(),true,'alertingReturnBack');
+ if (config::byKey('notifyMissWakeup', __CLASS__, 1) == 1 && $eqLogic->getIsEnable() == 1) {
+ if (version_compare(jeedom::version(), '4.4.0', '>=')) {
+ message::add('zwavejs', "L'équipement : " . $eqLogic->getHumanName(true) . ' avec le nodeId : ' . $eqLogic->getLogicalId() . ", ne s'est pas reveillé au moins 4 fois. Il a peut être un problème (batterie ou autres).", $action, 'Wakeup-' . $eqLogic->getLogicalId(), true, 'alertingReturnBack');
} else {
- message::add('zwavejs',"L'équipement : " . $eqLogic->getHumanName(true) . ' avec le nodeId : ' . $eqLogic->getLogicalId(). ", ne s'est pas reveillé au moins 4 fois. Il a peut être un problème (batterie ou autres).", $action,'Wakeup-'.$eqLogic->getLogicalId(),true);
+ message::add('zwavejs', "L'équipement : " . $eqLogic->getHumanName(true) . ' avec le nodeId : ' . $eqLogic->getLogicalId() . ", ne s'est pas reveillé au moins 4 fois. Il a peut être un problème (batterie ou autres).", $action, 'Wakeup-' . $eqLogic->getLogicalId(), true);
}
}
- $eqLogic->setConfiguration('missedWakeup',true);
+ $eqLogic->setConfiguration('missedWakeup', true);
$eqLogic->save();
}
$healthPage .= '
' . $next . '';
@@ -1696,25 +1695,26 @@ public static function autoCreateCommandAction($_path, $_type, $_label, $_unit,
}
}
}
-
+
public static function getWaiting() {
$globWaiting = array();
foreach (self::byType(__CLASS__) as $eqLogic) {
- $waitings = $eqLogic->getCache('waiting',array());
+ $waitings = $eqLogic->getCache('waiting', array());
if (is_object($eqLogic)) {
$image = 'plugins/zwavejs/core/config/devices/' . $eqLogic->getImgFilePath();
if (!is_file(dirname(__FILE__) . '/../config/devices/' . $eqLogic->getImgFilePath())) {
$image = 'plugins/zwavejs/plugin_info/zwavejs_icon.png';
}
- foreach ($waitings as $property=>$data){
- $globWaiting[] = array('id'=>$eqLogic->getLogicalId(),
- 'eqId'=>$eqLogic->getId(),
- 'image'=>$image,
- 'name'=>$eqLogic->getHumanName(true),
- 'property'=>$property,
- 'value'=>$data['value'],
- 'date'=>$data['date']
- );
+ foreach ($waitings as $property => $data) {
+ $globWaiting[] = array(
+ 'id' => $eqLogic->getLogicalId(),
+ 'eqId' => $eqLogic->getId(),
+ 'image' => $image,
+ 'name' => $eqLogic->getHumanName(true),
+ 'property' => $property,
+ 'value' => $data['value'],
+ 'date' => $data['date']
+ );
}
}
}
@@ -1744,17 +1744,17 @@ public function handleCommandUpdate($_change, $_init = false) {
$this->updateCmd($cmdId, $_change['newValue']);
}
}
-
+
public function handleNotificationUpdate($_change, $_cc) {
// log::add(__CLASS__, 'debug', '[' . __FUNCTION__ . '] ' . 'Notification pour le node ' . $this->getHumanName());
// log::add(__CLASS__, 'debug', '[' . __FUNCTION__ . '] ' . $this->getHumanName() . ' ' . json_encode($_change) . ' sur la CC ' . $_cc);
- foreach ($_change as $key => $value){
+ foreach ($_change as $key => $value) {
if ($key == 'parameters') {
- foreach ($value as $keyparam => $valueparam){
- $this->updateCmd($_cc.'-'.'0-notification-'.$key.'-'.$keyparam, $valueparam);
+ foreach ($value as $keyparam => $valueparam) {
+ $this->updateCmd($_cc . '-' . '0-notification-' . $key . '-' . $keyparam, $valueparam);
}
} else {
- $this->updateCmd($_cc.'-'.'0-notification-'.$key, $value);
+ $this->updateCmd($_cc . '-' . '0-notification-' . $key, $value);
}
}
}
@@ -1765,7 +1765,7 @@ public function updateCmd($_cmdId, $_value) {
"Air_temperature" => "Air temperature"
);
//log::add(__CLASS__, 'debug', '[' . __FUNCTION__ . '] ' . $_cmdId . ' ' . $_value);
- $waiting = $this->getCache('waiting',array());
+ $waiting = $this->getCache('waiting', array());
$_cmdId = str_replace('_', ' ', $_cmdId);
$cmdId = explode('-', $_cmdId, 3);
$class = $cmdId[0];
@@ -1811,10 +1811,10 @@ public function updateCmd($_cmdId, $_value) {
// log::add(__CLASS__, 'debug', $label);
$this->checkAndUpdateCmd($_cmdId . '-label', $label);
}
- if (isset($waiting[$_cmdId])){
- if ($waiting[$_cmdId]['value'] == $_value){
+ if (isset($waiting[$_cmdId])) {
+ if ($waiting[$_cmdId]['value'] == $_value) {
unset($waiting[$_cmdId]);
- $this->setCache('waiting',$waiting);
+ $this->setCache('waiting', $waiting);
}
}
}
@@ -1962,7 +1962,7 @@ public function handleProperties($_device) {
$command['name'] = $details['name'];
}
if (isset($details['filterVisible'])) {
- if (in_array($command['name'],$details['filterVisible']['commands'])){
+ if (in_array($command['name'], $details['filterVisible']['commands'])) {
$command['isVisible'] = $details['filterVisible']['value'];
}
}
@@ -2064,8 +2064,8 @@ public function getEqLogicInfos() {
$result = array();
$result['interview'] = $this->getConfiguration('interview', false);
$command_counter = 0;
- foreach ($this->getCmd() as $cmd){
- if (!in_array($cmd->getLogicalId(),array('0-0-nodeStatus','0-0-pingNode','0-0-healNode','0-0-isFailedNode'))){
+ foreach ($this->getCmd() as $cmd) {
+ if (!in_array($cmd->getLogicalId(), array('0-0-nodeStatus', '0-0-pingNode', '0-0-healNode', '0-0-isFailedNode'))) {
$command_counter += 1;
}
}
@@ -2240,25 +2240,24 @@ public function createCommand($_update = 0) {
public function pollValue($_class) {
// log::add(__CLASS__, 'debug', '[' . __FUNCTION__ . '] ' . $_class);
- if (stripos($_class,'-value-') === false) {
+ if (stripos($_class, '-value-') === false) {
$command = explode('-', $_class, 3);
$args = array('args' => array(array('nodeId' => intval($this->getLogicalId()), 'commandClass' => intval($command[1]), 'endpoint' => intval($command[0]), 'property' => $command[2])));
- }
- else {
+ } else {
$command = explode('-', $_class, 4);
- $args = array('args' => array(array('nodeId' => intval($this->getLogicalId()), 'commandClass' => intval($command[1]), 'endpoint' => intval($command[0]), 'property' => $command[2], 'propertyKey' => intval($command[3]))));
+ $args = array('args' => array(array('nodeId' => intval($this->getLogicalId()), 'commandClass' => intval($command[1]), 'endpoint' => intval($command[0]), 'property' => $command[2], 'propertyKey' => intval($command[3]))));
}
log::add(__CLASS__, 'debug', $this->getHumanName() . '[' . __FUNCTION__ . '] ' . json_encode($args));
self::publishMqttApi('pollValue', $args);
}
-
- public function refreshIfNeeded($_path,$_value) {
+
+ public function refreshIfNeeded($_path, $_value) {
log::add(__CLASS__, 'debug', '[' . __FUNCTION__ . '] ' . $_path . ' ' . $_value);
$refreshes = $this->getConfiguration('refreshes', '');
- if (is_array($refreshes) && count($refreshes) >0 ) {
+ if (is_array($refreshes) && count($refreshes) > 0) {
foreach ($refreshes as $refresh) {
$source = $refresh['refresh::source'];
- if (strpos(str_replace('/','-',$_path).'-'.$_value,$source) !== false){
+ if (strpos(str_replace('/', '-', $_path) . '-' . $_value, $source) !== false) {
log::add(__CLASS__, 'debug', '[' . __FUNCTION__ . '] Found refresh');
$cmd = 'php ' . dirname(__FILE__) . '/../../core/php/refresher.php id=' . $this->getId();
$cmd .= ' target=' . $refresh['refresh::target'] . '';
@@ -2324,7 +2323,7 @@ public function execute($_options = array()) {
return;
}
if ($property == 'refreshNodeCC') {
- zwavejs::refreshNodeCC(intval($node),intval($cc));
+ zwavejs::refreshNodeCC(intval($node), intval($cc));
return;
}
if ($cc == 0 && $endpoint == 0) {
@@ -2361,6 +2360,6 @@ public function execute($_options = array()) {
return;
}
zwavejs::publishMqttValue($node, $path, $value);
- $eqLogic->refreshIfNeeded($path,$value);
+ $eqLogic->refreshIfNeeded($path, $value);
}
}
diff --git a/docs/fr_FR/changelog.md b/docs/fr_FR/changelog.md
index 589139e0..ffd2f95f 100644
--- a/docs/fr_FR/changelog.md
+++ b/docs/fr_FR/changelog.md
@@ -4,9 +4,13 @@
>
>S'il n'y a pas d'information sur la mise à jour, c'est que celle-ci concerne uniquement de la mise à jour de documentation, de traduction ou de texte.
+# 15/11/2024
+
+- Correction de la méthode d'installation des dépendances
+
# 27/09/2024
-- Changement des versions minimum, core 4.4 et OS Debian 11 minimum
+- Changement des versions minimales: core 4.4 et OS Debian 11
# 26/09/2024
@@ -36,9 +40,9 @@
**Ajouts de Configurations**
- Ajout de la configuration *Neo Signal Repeater* (propriétés : Temperature, Humidity)
-- Ajout de la configuration *Shelly Qubino Wave 1* (propriétés : Switch, Notification Mains, Notification Over-Current, Notification Heat-Sensor)
+- Ajout de la configuration *Shelly Qubino Wave 1* (propriétés : Switch, Notification Mains, Notification Over-Current, Notification Heat-Sensor)
- Ajout de la configuration *Shelly Qubino Wave 1 PM* (propriétés : Switch, Power, Energy, Notification Mains, Notification Over-Current, Notification Heat-Sensor)
-- Ajout de la configuration *Shelly Qubino Wave Pro 1* (propriétés : Switch, Notification Mains, Notification Heat-Sensor)
+- Ajout de la configuration *Shelly Qubino Wave Pro 1* (propriétés : Switch, Notification Mains, Notification Heat-Sensor)
- Ajout de la configuration *Shelly Qubino Wave Pro 1 PM* (propriétés : Switch, Power, Energy, Notification Mains, Notification Over-Current, Notification Over-Voltage, Notification Heat-Sensor)
- Ajout de la configuration *Shelly Qubino Wave 2 PM* (propriétés : Switch, Power, Energy, Notification Mains, Notification Over-Current, Notification Heat-Sensor)
- Ajout de la configuration *Shelly Qubino Wave Pro 2* (propriétés : Switch)
@@ -67,7 +71,7 @@
**Améliorations**
- Rajout d'une option permettant d'activer ou désactiver le *Soft Reset*
-- Passage à la version *9.6.2* de ZwaveJsUI
+- Passage à la version *9.6.2* de ZwaveJsUI
**Ajouts de Configurations**
diff --git a/plugin_info/packages.json b/plugin_info/packages.json
index 9d5353fd..046f707c 100644
--- a/plugin_info/packages.json
+++ b/plugin_info/packages.json
@@ -1,17 +1,14 @@
{
- "plugin" : {
- "mqtt2" : {}
+ "plugin": {
+ "mqtt2": {}
},
- "apt":{
- "nodejs" : {}
+ "apt": {
+ "nodejs": {}
},
- "npm": {
- "yarn": {}
+ "pre-install": {
+ "script": "plugins/zwavejs/resources/pre_install.sh"
},
- "pre-install" : {
- "script" : "plugins/zwavejs/resources/pre_install.sh"
- },
- "post-install" : {
- "script" : "plugins/zwavejs/resources/post_install.sh"
+ "post-install": {
+ "script": "plugins/zwavejs/resources/post_install.sh"
}
}
diff --git a/resources/post_install.sh b/resources/post_install.sh
index bdcabaa0..7e7ffffd 100644
--- a/resources/post_install.sh
+++ b/resources/post_install.sh
@@ -7,8 +7,8 @@ BASEDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
cd $BASEDIR
cd zwave-js-ui
-sudo yarn install
-sudo yarn run build
+sudo npm install
+sudo npm run build
chown -R www-data:www-data *
if [ -e /dev/ttyAMA0 ]; then
@@ -36,5 +36,4 @@ then
echo "And reboot your Raspberry Pi"
fi
fi
-echo "Everything is successfully installed!"
-
+echo "Everything is successfully installed!"
\ No newline at end of file