no message
This commit is contained in:
@@ -270,26 +270,19 @@ class Manager extends IPSModule
|
|||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
$userEnergyProv = [];
|
/* Neuer Block */
|
||||||
|
foreach ($samePriorityUsers as $entry) {
|
||||||
|
$withZero[] = $entry;
|
||||||
|
|
||||||
foreach ($samePriorityUsers as $entry) {
|
if (min($entry["PowerSteps"]) > 0) {
|
||||||
$instanceID = $entry["InstanceID"];
|
|
||||||
$minPowerStep = min($entry["PowerSteps"]);
|
$withoutZeroHigh[] = $entry;
|
||||||
$maxPowerStep = max($entry["PowerSteps"]);
|
}
|
||||||
|
if (max($entry["PowerSteps"]) < 0) {
|
||||||
if ($minPowerStep > 0) {
|
|
||||||
// Nur positive Werte -> minimaler Wert einsetzen
|
$withoutZeroLow[] = $entry;
|
||||||
$userEnergyProv[$instanceID] = $minPowerStep;
|
}
|
||||||
$remainingPower -= $minPowerStep;
|
}
|
||||||
} elseif ($maxPowerStep < 0) {
|
|
||||||
// Nur negative Werte -> maximaler Wert einsetzen
|
|
||||||
$userEnergyProv[$instanceID] = $maxPowerStep;
|
|
||||||
$remainingPower += $maxPowerStep;
|
|
||||||
} else {
|
|
||||||
// Darf 0 haben
|
|
||||||
$userEnergyProv[$instanceID] = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Verbraucher die nicht 0 annhemen können erhalten nun den minimalwert
|
// Verbraucher die nicht 0 annhemen können erhalten nun den minimalwert
|
||||||
if (!empty($withoutZeroHigh)) {
|
if (!empty($withoutZeroHigh)) {
|
||||||
@@ -319,6 +312,8 @@ foreach ($samePriorityUsers as $entry) {
|
|||||||
// Nun die verteilen, die 0 erhalten können.
|
// Nun die verteilen, die 0 erhalten können.
|
||||||
$samePriorityUsers = $withZero;
|
$samePriorityUsers = $withZero;
|
||||||
|
|
||||||
|
$userEnergyProv = [];
|
||||||
|
$userEnergyProv = array_fill_keys(array_column($samePriorityUsers, "InstanceID"), 0); // Initialisierung für jeden Benutzer auf 0 setzen
|
||||||
|
|
||||||
IPS_LogMessage("Manag", $remainingPower);
|
IPS_LogMessage("Manag", $remainingPower);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user