dh/Energiemanager_Symconmodule_Demo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

semikolon vergessen

Browse Source
This commit is contained in:
Daniel Häfliger
2024-11-11 11:03:18 +01:00
parent 8435a0c089
commit 708a488086
2 changed files with 72 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
WP_Steuerung/module.php
View File

@@ -105,32 +105,32 @@ class WP_Steuerung extends IPSModule {
{ {
if($LastPeak && $power == ($this->ReadPropertyInteger("WP_Leistung"))) { if($LastPeak && $power == ($this->ReadPropertyInteger("WP_Leistung"))) {
$this->SetValue("Zustand_WP", 1); $this->SetValue("Zustand_WP", 1);
$this->SetValue("CurrentPower", $this->ReadPropertyInteger("WP_Leistung")) $this->SetValue("CurrentPower", $this->ReadPropertyInteger("WP_Leistung"));
if($its_lock_time){ if($its_lock_time){
$this->SetValue("Zustand_WP", 2); $this->SetValue("Zustand_WP", 2);
$this->SetValue("CurrentPower", $this->ReadPropertyInteger("WP_Leistung")) $this->SetValue("CurrentPower", $this->ReadPropertyInteger("WP_Leistung"));
} }
} elseif($LastPeak && $power == 0){ } elseif($LastPeak && $power == 0){
$this->SetValue("Zustand_WP", 2); $this->SetValue("Zustand_WP", 2);
$this->SetValue("CurrentPower", 0) $this->SetValue("CurrentPower", 0);
} }
elseif($LastPeak == false && $power == ($this->ReadPropertyInteger("WP_Leistung"))){ elseif($LastPeak == false && $power == ($this->ReadPropertyInteger("WP_Leistung"))){
$this->SetValue("Zustand_WP", 3); $this->SetValue("Zustand_WP", 3);
$this->SetValue("CurrentPower", $this->ReadPropertyInteger("WP_Leistung")) $this->SetValue("CurrentPower", $this->ReadPropertyInteger("WP_Leistung"));
} }
elseif($LastPeak == false && $power == 0){ elseif($LastPeak == false && $power == 0){
$this->SetValue("Zustand_WP", 1); $this->SetValue("Zustand_WP", 1);
$this->SetValue("CurrentPower", 0) $this->SetValue("CurrentPower", 0);
if($its_lock_time){ if($its_lock_time){
$this->SetValue("Zustand_WP", 2); $this->SetValue("Zustand_WP", 2);
$this->SetValue("CurrentPower", 0) $this->SetValue("CurrentPower", 0);
} }
@@ -138,43 +138,74 @@ class WP_Steuerung extends IPSModule {
}elseif($state == 2) // Sperre }elseif($state == 2) // Sperre
{ {
if($LastPeak && $power == ($this->ReadPropertyInteger("WP_Leistung"))) { if($LastPeak && $power == ($this->ReadPropertyInteger("WP_Leistung"))) {
$this->SetValue("Zustand_WP", 1); $this->SetValue("Zustand_WP", 1);
if($its_lock_time){ $this->SetValue("CurrentPower", $this->ReadPropertyInteger("WP_Leistung"));
$this->SetValue("Zustand_WP", 2);
} if($its_lock_time){
} elseif($LastPeak && $power == 0){ $this->SetValue("Zustand_WP", 2);
$this->SetValue("Zustand_WP", 2); $this->SetValue("CurrentPower", $this->ReadPropertyInteger("WP_Leistung"));
} }
elseif($LastPeak == false && $power == ($this->ReadPropertyInteger("WP_Leistung"))){ } elseif($LastPeak && $power == 0){
$this->SetValue("Zustand_WP", 3); $this->SetValue("Zustand_WP", 2);
$this->SetValue("CurrentPower", 0);
}
elseif($LastPeak == false && $power == 0){
$this->SetValue("Zustand_WP", 1); }
if($its_lock_time){ elseif($LastPeak == false && $power == ($this->ReadPropertyInteger("WP_Leistung"))){
$this->SetValue("Zustand_WP", 2); $this->SetValue("Zustand_WP", 3);
} $this->SetValue("CurrentPower", $this->ReadPropertyInteger("WP_Leistung"));
}
}
elseif($LastPeak == false && $power == 0){
$this->SetValue("Zustand_WP", 1);
$this->SetValue("CurrentPower", 0);
if($its_lock_time){
$this->SetValue("Zustand_WP", 2);
$this->SetValue("CurrentPower", 0);
}
}
}elseif($state == 3) // Erhöht }elseif($state == 3) // Erhöht
{ {
if($LastPeak && $power == ($this->ReadPropertyInteger("WP_Leistung"))) {
$this->SetValue("Zustand_WP", 1); if($LastPeak && $power == ($this->ReadPropertyInteger("WP_Leistung"))) {
} elseif($LastPeak && $power == 0){ $this->SetValue("Zustand_WP", 1);
$this->SetValue("Zustand_WP", 2); $this->SetValue("CurrentPower", $this->ReadPropertyInteger("WP_Leistung"));
} if($its_lock_time){
elseif($LastPeak == false && $power == ($this->ReadPropertyInteger("WP_Leistung"))){ $this->SetValue("Zustand_WP", 2);
$this->SetValue("Zustand_WP", 3); $this->SetValue("CurrentPower", $this->ReadPropertyInteger("WP_Leistung"));
} }
elseif($LastPeak == false && $power == 0){ } elseif($LastPeak && $power == 0){
$this->SetValue("Zustand_WP", 1); $this->SetValue("Zustand_WP", 2);
$this->SetValue("CurrentPower", 0);
}
}
elseif($LastPeak == false && $power == ($this->ReadPropertyInteger("WP_Leistung"))){
$this->SetValue("Zustand_WP", 3);
$this->SetValue("CurrentPower", $this->ReadPropertyInteger("WP_Leistung"));
}
elseif($LastPeak == false && $power == 0){
$this->SetValue("Zustand_WP", 1);
$this->SetValue("CurrentPower", 0);
if($its_lock_time){
$this->SetValue("Zustand_WP", 2);
$this->SetValue("CurrentPower", 0);
}
}
} }
else{ else{

2
library.json
View File

@@ -6,7 +6,7 @@
"compatibility": { "compatibility": {
"version": "7.1" "version": "7.1"
}, },
"version": "0.114", "version": "0.115",
"build": 0, "build": 0,
"date": 0 "date": 0
} }