no message
This commit is contained in:
@@ -69,51 +69,13 @@ class Bat_EV_SDL extends IPSModule
|
||||
$batteries = [];
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
|
||||
//--------------------------------------------------
|
||||
/*
|
||||
=======
|
||||
>>>>>>> parent of 2eab6b6 (no message)
|
||||
$sdlTotalW = (float)$this->ReadPropertyInteger("SDL_Leistung"); // W
|
||||
if ($sdlTotalW < 0) $sdlTotalW = 0;
|
||||
|
||||
$sdlTotalkW = $sdlTotalW / 1000.0;
|
||||
<<<<<<< HEAD
|
||||
"""
|
||||
*/
|
||||
|
||||
|
||||
//---------------------------------------------
|
||||
|
||||
$sdlTotalLadeW = (float)$this->ReadPropertyInteger("SDL_Lade_Leistung"); // W
|
||||
if ($sdlTotalLadeW < 0) $sdlTotalLadeW = 0;
|
||||
|
||||
$sdlTotalLadekW = $sdlTotalLadeW / 1000.0;
|
||||
|
||||
|
||||
$sdlTotalEntladeW = (float)$this->ReadPropertyInteger("SDL_Entlade_Leistung"); // W
|
||||
if ($sdlTotalEntladeW < 0) $sdlTotalEntladeW = 0;
|
||||
|
||||
$sdlTotalEntladekW = $sdlTotalEntladeW / 1000.0;
|
||||
|
||||
|
||||
|
||||
if ($sdlTotalLadekW > $sdlTotalEntladekW) {
|
||||
$sdlTotalkW = $sdlTotalLadekW;
|
||||
$mode = 'charge';
|
||||
} elseif ($sdlTotalLadekW < $sdlTotalEntladekW) {
|
||||
$sdlTotalkW = $sdlTotalEntladekW;
|
||||
$mode = 'discharge';
|
||||
} else {
|
||||
$sdlTotalkW = $sdlTotalEntladekW;
|
||||
$mode = 'equal';
|
||||
}
|
||||
|
||||
//---------------------------------------------
|
||||
=======
|
||||
>>>>>>> parent of 2eab6b6 (no message)
|
||||
|
||||
// 30 Minuten Fenster
|
||||
$hours = 0.5;
|
||||
|
||||
@@ -199,39 +161,14 @@ class Bat_EV_SDL extends IPSModule
|
||||
$underKWh = $sdlShareKW * $hours;
|
||||
$underKWh = max(0.0, min($underKWh, $capKWh / 2.0));
|
||||
|
||||
<<<<<<< HEAD
|
||||
if ($mode == 'charge') {
|
||||
$ver = $sdlTotalLadekW / $sdlTotalEntladekW;
|
||||
$underKWh = ($sdlShareKW * $hours) / $ver;
|
||||
$upKWh = $capKWh - ($sdlShareKW * $hours);
|
||||
|
||||
$SDL_kWh = $underKWh + $upKWh;
|
||||
$EV_kWH = max(0.0, $capKWh - $SDL_kWh);
|
||||
} elseif ($mode == 'discharge' ) {
|
||||
|
||||
$ver = $sdlTotalEntladekW / $sdlTotalLadekW;
|
||||
$underKWh = ($sdlShareKW * $hours) ;
|
||||
$upKWh = $capKWh - ($sdlShareKW * $hours) / $ver;
|
||||
|
||||
$SDL_kWh = $underKWh + $upKWh;
|
||||
$EV_kWH = max(0.0, $capKWh - $SDL_kWh);
|
||||
}else {
|
||||
// untere Grenze für SDL (wichtig: zuerst setzen, dann clamp)
|
||||
$underKWh = $sdlShareKW * $hours;
|
||||
$underKWh = max(0.0, min($underKWh, $capKWh / 2.0));
|
||||
|
||||
$upKWh = $capKWh - $underKWh;
|
||||
$SDL_kWh = 2.0 * $underKWh;
|
||||
$EV_kWH = max(0.0, $capKWh - $SDL_kWh);
|
||||
}
|
||||
|
||||
|
||||
|
||||
=======
|
||||
|
||||
$upKWh = $capKWh - $underKWh;
|
||||
$SDL_kWh = 2.0 * $underKWh;
|
||||
$EV_kWH = max(0.0, $capKWh - $SDL_kWh);
|
||||
>>>>>>> parent of 2eab6b6 (no message)
|
||||
|
||||
|
||||
$real_kWh = $capKWh / 100.0 * $socPct;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user