stand ab hauptmanager wieder hergestellt

This commit is contained in:
mh
2025-02-26 14:26:10 +01:00
parent 392f0eb677
commit 69881a45db
+21 -46
View File
@@ -28,7 +28,6 @@ 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("In_Hystere", "In_Hystere");
$this->RegisterVariableFloat("Bezogene_Energie", "Bezogene_Energie", "", 0); $this->RegisterVariableFloat("Bezogene_Energie", "Bezogene_Energie", "", 0);
@@ -104,8 +103,9 @@ public function RequestAction($Ident, $Value)
return; return;
} }
if($this->GetValue("Is_Peak_Shaving")==true){ if($this->GetValue("Is_Peak_Shaving")==true){
if ($power > 0) { if ($power >= 0) {
$this->SetValue("Ladeleistung", $power); $this->SetValue("Ladeleistung", $power);
$this->SetValue("Entladeleistung", 0); $this->SetValue("Entladeleistung", 0);
$this->SetValue("Laden3_Entladen4", 3); $this->SetValue("Laden3_Entladen4", 3);
@@ -116,7 +116,7 @@ public function RequestAction($Ident, $Value)
} }
}else{ }else{
if ($power > 0) { if ($power >= 0) {
$this->SetValue("Ladeleistung", $power); $this->SetValue("Ladeleistung", $power);
$this->SetValue("Entladeleistung", 0); $this->SetValue("Entladeleistung", 0);
$this->SetValue("Laden3_Entladen4", 3); $this->SetValue("Laden3_Entladen4", 3);
@@ -155,7 +155,7 @@ public function RequestAction($Ident, $Value)
$minimumentladen = $this->ReadPropertyInteger("MinimumEntladen"); $minimumentladen = $this->ReadPropertyInteger("MinimumEntladen");
$maxleistung = $this->ReadPropertyInteger("MaxBatterieleistung"); $maxleistung = $this->ReadPropertyInteger("MaxBatterieleistung");
$dummy_array = []; $dummy_array = [];
$inhystere = $this->GetValue("In_Hystere");
$batterieManagement = $this->ReadPropertyInteger("Batteriemanagement"); $batterieManagement = $this->ReadPropertyInteger("Batteriemanagement");
@@ -176,79 +176,54 @@ public function RequestAction($Ident, $Value)
if ($Peak) { if ($Peak) {
if ($batterieladezustand < $minimumentladen) { if ($batterieladezustand <= $minimumentladen) {
$filtered_powersteps = array_filter($array_powersteps, function ($value) use ($maxleistung) { $filtered_powersteps = array_filter($array_powersteps, function ($value) use ($maxleistung) {
return $value >= 0; // Hochpass filtern return $value >= 0; // Hochpass filtern
}); });
$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("In_Hystere", 1);
IPS_LogMessage("Batterie", "Peak: unter minimum" );
} elseif ($batterieladezustand <= $aufdasnachladen && $batterieladezustand >= $minimumentladen && $inhystere == true) {
$filtered_powersteps = array_filter($array_powersteps, function ($value) use ($maxleistung) {
return $value >= 0; // Hochpass filtern
});
$filtered_powersteps_laden = array_values($filtered_powersteps);
$this->SetValue("PowerSteps", json_encode($filtered_powersteps_laden));
$this->SetValue("In_Hystere", 1);
IPS_LogMessage("Batterie", "Peak: hysterese" );
} elseif ($batterieladezustand <= $aufdasnachladen && $batterieladezustand >= $minimumentladen && $inhystere == false) { } elseif ($batterieladezustand < $aufdasnachladen && $batterieladezustand > $minimumentladen) {
$this->SetValue("PowerSteps", json_encode($array_powersteps)); $this->SetValue("PowerSteps", json_encode($array_powersteps));
$this->SetValue("In_Hystere", 0); }
IPS_LogMessage("Batterie", "Peak: normal" );
} elseif ($batterieladezustand > $aufdasnachladen) {
// Hier Modul auf Wechselrichter 1 stellen
elseif ($batterieladezustand >= $aufdasnachladen) {
$netzbezug = GetValue($this->ReadPropertyInteger("Netzbezug")); $netzbezug = GetValue($this->ReadPropertyInteger("Netzbezug"));
if (abs($netzbezug)>$maxleistung){ $dummy_array[] = $netzbezug*(-1);
$dummy_array[] = $maxleistung*(-1); IPS_LogMessage("Batterie", "Dummy Array: " . json_encode($dummy_array));
} else{
$dummy_array[] = $netzbezug;
}
$this->SetValue("PowerSteps", json_encode($dummy_array)); $this->SetValue("PowerSteps", json_encode($dummy_array));
$this->SetValue("In_Hystere", 0);
IPS_LogMessage("Batterie", "Peak: netzbezug" );
} else { } else {
$dummy_array[] = 0; $dummy_array[] = 0;
$this->SetValue("PowerSteps", json_encode($dummy_array)); $this->SetValue("PowerSteps", json_encode($dummy_array));
IPS_LogMessage("Batterie", "Peak: Kein Fall");
} }
} else { // Solar } else { // Solar
////Hysterese
if ($batterieladezustand <= $aufdasnachladen ) {
$nachladen = $this->ReadPropertyInteger("MaxNachladen");
$dummy_array[] = $nachladen;
$this->SetValue("PowerSteps", json_encode($dummy_array));
$this->SetValue("In_Hystere", 1);
IPS_LogMessage("Batterie", "Solar: unter aufdasladen" );
} elseif ($batterieladezustand <= $aufdasnachladen + 5 && $batterieladezustand >= $aufdasnachladen && $inhystere == true ) {
if ($batterieladezustand < $aufdasnachladen) {
$nachladen = $this->ReadPropertyInteger("MaxNachladen"); $nachladen = $this->ReadPropertyInteger("MaxNachladen");
$dummy_array[] = $nachladen; $dummy_array[] = $nachladen;
IPS_LogMessage("Batterie", ": MaxNachladen " .json_encode($dummy_array));
$this->SetValue("PowerSteps", json_encode($dummy_array)); $this->SetValue("PowerSteps", json_encode($dummy_array));
$this->SetValue("In_Hystere", 1);
IPS_LogMessage("Batterie", "Solar: in hysterese" );
}elseif ($batterieladezustand > $aufdasnachladen + 5) {
$this->SetValue("PowerSteps", json_encode($array_powersteps));
$this->SetValue("In_Hystere", 0);
IPS_LogMessage("Batterie", "Solar: hystere laden abgeschlossen" );
////Hysterese Ende
}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) use ($maxleistung) {
return $value <= 0; // Tiefpass filtern return $value < 0; // Tiefpass filtern
}); });
$this->SetValue("PowerSteps", json_encode($filtered_powersteps_entladen)); $this->SetValue("PowerSteps", json_encode($filtered_powersteps_entladen));
}else { }elseif ($batterieladezustand >= $aufdasnachladen) {
$this->SetValue("PowerSteps", json_encode($array_powersteps));
} else {
$dummy_array[] = 0; $dummy_array[] = 0;
$this->SetValue("PowerSteps", json_encode($dummy_array)); $this->SetValue("PowerSteps", json_encode($dummy_array));
IPS_LogMessage("Batterie", "Solar: Kein Fall" );
} }
} }
} }