Batteriemodul Peak erweitert

This commit is contained in:
mh
2025-03-05 10:39:44 +01:00
parent 2cc63d34ed
commit 3a9da82421
2 changed files with 64 additions and 61 deletions
+63 -60
View File
@@ -28,8 +28,9 @@ class Batterie extends IPSModule
$this->RegisterVariableInteger("PV_Prio", "PV_Prio"); $this->RegisterVariableInteger("PV_Prio", "PV_Prio");
$this->RegisterVariableInteger("Power", "Power"); $this->RegisterVariableInteger("Power", "Power");
$this->RegisterVariableBoolean("Is_Peak_Shaving", "Is_Peak_Shaving"); $this->RegisterVariableBoolean("Is_Peak_Shaving", "Is_Peak_Shaving");
$this->RegisterVariableBoolean("Hysterese_solar", "Hysterese_solar","",0); $this->RegisterVariableBoolean("Hysterese", "Hysterese","",0);
$this->RegisterVariableBoolean("Hysterese_peak", "Hysterese_peak","",0); $this->RegisterVariableBoolean("Hysterese_Netz", "Hysterese_Netz","",0);
$this->RegisterVariableFloat("Bezogene_Energie", "Bezogene_Energie", "", 0); $this->RegisterVariableFloat("Bezogene_Energie", "Bezogene_Energie", "", 0);
@@ -150,24 +151,20 @@ public function RequestAction($Ident, $Value)
public function GetCurrentData(bool $Peak) public function GetCurrentData(bool $Peak)
{ {
$array_powersteps = $this->GeneratePowerSteps(); $array_powersteps = $this->GeneratePowerSteps();
$aufdasnachladen = $this->ReadPropertyInteger("AufdasNachladen"); $aufdasnachladen = $this->ReadPropertyInteger("AufdasNachladen");
$minimumentladen = $this->ReadPropertyInteger("MinimumEntladen"); $minimumentladen = $this->ReadPropertyInteger("MinimumEntladen");
$maxleistung = $this->ReadPropertyInteger("MaxBatterieleistung"); $maxleistung = $this->ReadPropertyInteger("MaxBatterieleistung");
$dummy_array = []; $dummy_array = [];
$inhystere_solar = $this->GetValue("Hysterese_solar"); $inhystere = $this->GetValue("Hysterese");
$inhystere_peak = $this->GetValue("Hysterese_peak"); $inhystere_netz = $this->GetValue("Hysterese_Netz");
$batterieManagement = $this->ReadPropertyInteger("Batteriemanagement"); $batterieManagement = $this->ReadPropertyInteger("Batteriemanagement");
if ($batterieManagement == 1) { if ($batterieManagement == 1) {
$dummy_array[] = 0; $dummy_array[] = 0;
return $this->SetValue("PowerSteps", json_encode($dummy_array)); return $this->SetValue("PowerSteps", json_encode($dummy_array));
} }
$batterieladezustandID = $this->ReadPropertyInteger("Batterieladezustand"); $batterieladezustandID = $this->ReadPropertyInteger("Batterieladezustand");
if ($batterieladezustandID > 0) { if ($batterieladezustandID > 0) {
$batterieladezustand = GetValue($batterieladezustandID); $batterieladezustand = GetValue($batterieladezustandID);
@@ -175,85 +172,90 @@ public function RequestAction($Ident, $Value)
IPS_LogMessage("Batterie", "Fehler: Ungültige Batterieladezustand-ID."); IPS_LogMessage("Batterie", "Fehler: Ungültige Batterieladezustand-ID.");
return; return;
} }
if ($Peak) { if ($Peak) {
if ($batterieladezustand >= 5 + $aufdasnachladen) {
if($batterieladezustand >= $aufdasnachladen){ $this->SetValue("Hysterese", false);
$this->SetValue("Hysterese_peak", false); $this->SetValue("Hysterese_Netz", true);
} }
if ($batterieladezustand < $aufdasnachladen) {
$this->SetValue("Hysterese_Netz", false);
}
if ($batterieladezustand <= $minimumentladen) { if ($batterieladezustand <= $minimumentladen) {
$filtered_powersteps = array_filter($array_powersteps, function ($value) use ($maxleistung) { $filtered_powersteps = array_filter($array_powersteps, function ($value) {
return $value >= 0; // Hochpass filtern return $value >= 0;
}); });
$filtered_powersteps_laden = array_values($filtered_powersteps); $filtered_powersteps_laden = array_values($filtered_powersteps);
$this->SetValue("PowerSteps", json_encode($filtered_powersteps_laden)); $this->SetValue("PowerSteps", json_encode($filtered_powersteps_laden));
$this->SetValue("Hysterese_peak", true); $this->SetValue("Hysterese", true);
IPS_LogMessage("Batterie", "Peak: unter minimum" ); IPS_LogMessage("Batterie", "Peak: unter minimum");
} elseif ($batterieladezustand > $minimumentladen) { } elseif ($batterieladezustand > $minimumentladen) {
if ($inhystere_peak == true){ if ($inhystere == true && $inhystere_netz == false) {
$filtered_powersteps = array_filter($array_powersteps, function ($value) use ($maxleistung) { $filtered_powersteps = array_filter($array_powersteps, function ($value) {
return $value >= 0; return $value >= 0;
}); });
$filtered_powersteps_laden = array_values($filtered_powersteps); $filtered_powersteps_laden = array_values($filtered_powersteps);
$this->SetValue("PowerSteps", json_encode($filtered_powersteps_laden)); $this->SetValue("PowerSteps", json_encode($filtered_powersteps_laden));
IPS_LogMessage("Batterie", ": peak: Hysterese " ); IPS_LogMessage("Batterie", ": peak: Hysterese");
}else{
} elseif ($inhystere_netz == true && $inhystere == false) {
$netzbezug = GetValue($this->ReadPropertyInteger("Netzbezug")); $netzbezug = GetValue($this->ReadPropertyInteger("Netzbezug"));
if (abs($netzbezug)>$maxleistung){ if (abs($netzbezug) > $maxleistung) {
$dummy_array[] = $maxleistung*(-1); $dummy_array[] = $maxleistung * (-1);
} else{ } else {
$dummy_array[] = $netzbezug; $dummy_array[] = $netzbezug;
} }
$this->SetValue("PowerSteps", json_encode($dummy_array)); $this->SetValue("PowerSteps", json_encode($dummy_array));
IPS_LogMessage("Batterie", "Peak: netzbezug, keine hysterese" ); IPS_LogMessage("Batterie", "Peak: netzbezug, keine hysterese");
}
} } elseif ($inhystere_netz == false && $inhystere == false) {
$this->SetValue("PowerSteps", json_encode($array_powersteps));
else { IPS_LogMessage("Batterie", "Peak: alle Werte, keine hysterese");
$dummy_array[] = 0; } else {
$this->SetValue("PowerSteps", json_encode($dummy_array)); $dummy_array[] = 0;
IPS_LogMessage("Batterie", ": peak: Keine Hysterese " ); $this->SetValue("PowerSteps", json_encode($dummy_array));
IPS_LogMessage("Batterie", ": peak: Keine Hysterese");
}
} }
} else { // Solar } else { // Solar
if ($batterieladezustand >= 5 + $aufdasnachladen) {
if($batterieladezustand >= 5 + $aufdasnachladen){ $this->SetValue("Hysterese", false);
$this->SetValue("Hysterese_solar", false); $this->SetValue("Hysterese_Netz", true);
} }
if ($batterieladezustand < $aufdasnachladen) { if ($batterieladezustand < $aufdasnachladen) {
$this->SetValue("Hysterese_solar", true); $this->SetValue("Hysterese", true);
$this->SetValue("Hysterese_Netz", false);
$nachladen = $this->ReadPropertyInteger("MaxNachladen"); $nachladen = $this->ReadPropertyInteger("MaxNachladen");
$dummy_array[] = $nachladen; $dummy_array[] = $nachladen;
IPS_LogMessage("Batterie", ": MaxNachladen " .json_encode($dummy_array)); IPS_LogMessage("Batterie", ": MaxNachladen " . json_encode($dummy_array));
$this->SetValue("PowerSteps", json_encode($dummy_array)); $this->SetValue("PowerSteps", json_encode($dummy_array));
}elseif ($batterieladezustand >= $aufdasnachladen) { } elseif ($batterieladezustand >= $aufdasnachladen) {
if ($inhystere == true) {
if ($inhystere_solar == true){ $filtered_powersteps = array_filter($array_powersteps, function ($value) {
$filtered_powersteps= array_filter($array_powersteps, function ($value) use ($maxleistung) { return $value >= 0;
return $value >= 0;
}); });
$filtered_powersteps_laden = array_values($filtered_powersteps); $filtered_powersteps_laden = array_values($filtered_powersteps);
$this->SetValue("PowerSteps", json_encode($filtered_powersteps_laden)); $this->SetValue("PowerSteps", json_encode($filtered_powersteps_laden));
IPS_LogMessage("Batterie", ": solar: Hysterese " ); IPS_LogMessage("Batterie", ": solar: Hysterese");
}else{ } else {
$this->SetValue("PowerSteps", json_encode($array_powersteps)); $this->SetValue("PowerSteps", json_encode($array_powersteps));
IPS_LogMessage("Batterie", ": solar: Keine Hysterese " ); IPS_LogMessage("Batterie", ": solar: Keine Hysterese");
} }
}elseif ($batterieladezustand >= 100) { } elseif ($batterieladezustand >= 100) {
$filtered_powersteps_entladen = array_filter($array_powersteps, function ($value) use ($maxleistung) { $filtered_powersteps_entladen = array_filter($array_powersteps, function ($value) {
return $value < 0; // Tiefpass filtern return $value < 0;
}); });
$this->SetValue("PowerSteps", json_encode($filtered_powersteps_entladen)); $this->SetValue("PowerSteps", json_encode($filtered_powersteps_entladen));
} else { } else {
$dummy_array[] = 0; $dummy_array[] = 0;
$this->SetValue("PowerSteps", json_encode($dummy_array)); $this->SetValue("PowerSteps", json_encode($dummy_array));
@@ -263,6 +265,7 @@ public function RequestAction($Ident, $Value)
private function CheckIdle($power) private function CheckIdle($power)
{ {
$lastpower = GetValue("Aktuelle_Leistung"); $lastpower = GetValue("Aktuelle_Leistung");
+1 -1
View File
@@ -6,7 +6,7 @@
"compatibility": { "compatibility": {
"version": "7.1" "version": "7.1"
}, },
"version": "1.230", "version": "1.231",
"build": 0, "build": 0,
"date": 0 "date": 0
} }