From 12c6b34b7cba99706dea101960f6e980f356c68e Mon Sep 17 00:00:00 2001 From: nasseeder1 Date: Mon, 29 Apr 2019 22:47:50 +0000 Subject: [PATCH] 76_SMAPortal: contrib 1.6.0 git-svn-id: https://svn.fhem.de/fhem/trunk@19294 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/contrib/DS_Starter/76_SMAPortal.pm | 98 +++++++++++++------------ 1 file changed, 50 insertions(+), 48 deletions(-) diff --git a/fhem/contrib/DS_Starter/76_SMAPortal.pm b/fhem/contrib/DS_Starter/76_SMAPortal.pm index 5cca55746..24245a673 100644 --- a/fhem/contrib/DS_Starter/76_SMAPortal.pm +++ b/fhem/contrib/DS_Starter/76_SMAPortal.pm @@ -1327,55 +1327,57 @@ sub PortalAsHtml ($) { my $pvRe = ReadingsNum($name,"L3_RestOfDay-PV", ""); my $pvTo = ReadingsNum($name,"L3_Tomorrow-PV", ""); - my $pv00 = ReadingsNum($name,"L2_ThisHour_PvMeanPower", ""); - my $pv01 = ReadingsNum($name,"L4_NextHour01_PvMeanPower", ""); - my $pv02 = ReadingsNum($name,"L4_NextHour02_PvMeanPower", ""); - my $pv03 = ReadingsNum($name,"L4_NextHour03_PvMeanPower", ""); - my $pv04 = ReadingsNum($name,"L4_NextHour04_PvMeanPower", ""); - my $pv05 = ReadingsNum($name,"L4_NextHour05_PvMeanPower", ""); - my $pv06 = ReadingsNum($name,"L4_NextHour06_PvMeanPower", ""); - my $pv07 = ReadingsNum($name,"L4_NextHour07_PvMeanPower", ""); - my $pv08 = ReadingsNum($name,"L4_NextHour08_PvMeanPower", ""); - my $pv09 = ReadingsNum($name,"L4_NextHour09_PvMeanPower", ""); - my $pv10 = ReadingsNum($name,"L4_NextHour10_PvMeanPower", ""); - my $pv11 = ReadingsNum($name,"L4_NextHour11_PvMeanPower", ""); - my $pv12 = ReadingsNum($name,"L4_NextHour12_PvMeanPower", ""); - my $pv13 = ReadingsNum($name,"L4_NextHour13_PvMeanPower", ""); - my $pv14 = ReadingsNum($name,"L4_NextHour14_PvMeanPower", ""); - my $pv15 = ReadingsNum($name,"L4_NextHour15_PvMeanPower", ""); - my $pv16 = ReadingsNum($name,"L4_NextHour16_PvMeanPower", ""); - my $pv17 = ReadingsNum($name,"L4_NextHour17_PvMeanPower", ""); - my $pv18 = ReadingsNum($name,"L4_NextHour18_PvMeanPower", ""); - my $pv19 = ReadingsNum($name,"L4_NextHour19_PvMeanPower", ""); - my $pv20 = ReadingsNum($name,"L4_NextHour20_PvMeanPower", ""); - my $pv21 = ReadingsNum($name,"L4_NextHour21_PvMeanPower", ""); - my $pv22 = ReadingsNum($name,"L4_NextHour22_PvMeanPower", ""); - my $pv23 = ReadingsNum($name,"L4_NextHour23_PvMeanPower", ""); + my $pv00 = ReadingsNum($name,"L2_ThisHour_PvMeanPower", undef); + my $pv01 = ReadingsNum($name,"L4_NextHour01_PvMeanPower",undef); + my $pv02 = ReadingsNum($name,"L4_NextHour02_PvMeanPower",undef); + my $pv03 = ReadingsNum($name,"L4_NextHour03_PvMeanPower",undef); + my $pv04 = ReadingsNum($name,"L4_NextHour04_PvMeanPower",undef); + my $pv05 = ReadingsNum($name,"L4_NextHour05_PvMeanPower",undef); + my $pv06 = ReadingsNum($name,"L4_NextHour06_PvMeanPower",undef); + my $pv07 = ReadingsNum($name,"L4_NextHour07_PvMeanPower",undef); + my $pv08 = ReadingsNum($name,"L4_NextHour08_PvMeanPower",undef); + my $pv09 = ReadingsNum($name,"L4_NextHour09_PvMeanPower",undef); + my $pv10 = ReadingsNum($name,"L4_NextHour10_PvMeanPower",undef); + my $pv11 = ReadingsNum($name,"L4_NextHour11_PvMeanPower",undef); + my $pv12 = ReadingsNum($name,"L4_NextHour12_PvMeanPower",undef); + my $pv13 = ReadingsNum($name,"L4_NextHour13_PvMeanPower",undef); + my $pv14 = ReadingsNum($name,"L4_NextHour14_PvMeanPower",undef); + my $pv15 = ReadingsNum($name,"L4_NextHour15_PvMeanPower",undef); + my $pv16 = ReadingsNum($name,"L4_NextHour16_PvMeanPower",undef); + my $pv17 = ReadingsNum($name,"L4_NextHour17_PvMeanPower",undef); + my $pv18 = ReadingsNum($name,"L4_NextHour18_PvMeanPower",undef); + my $pv19 = ReadingsNum($name,"L4_NextHour19_PvMeanPower",undef); + my $pv20 = ReadingsNum($name,"L4_NextHour20_PvMeanPower",undef); + my $pv21 = ReadingsNum($name,"L4_NextHour21_PvMeanPower",undef); + my $pv22 = ReadingsNum($name,"L4_NextHour22_PvMeanPower",undef); + my $pv23 = ReadingsNum($name,"L4_NextHour23_PvMeanPower",undef); + return "Awaiting level 4 data ... " if(!defined $pv01); - my $is00 = ReadingsVal($name,"L2_ThisHour_IsConsumptionRecommended", ""); - my $is01 = ReadingsVal($name,"L4_NextHour01_IsConsumptionRecommended", ""); - my $is02 = ReadingsVal($name,"L4_NextHour02_IsConsumptionRecommended", ""); - my $is03 = ReadingsVal($name,"L4_NextHour03_IsConsumptionRecommended", ""); - my $is04 = ReadingsVal($name,"L4_NextHour04_IsConsumptionRecommended", ""); - my $is05 = ReadingsVal($name,"L4_NextHour05_IsConsumptionRecommended", ""); - my $is06 = ReadingsVal($name,"L4_NextHour06_IsConsumptionRecommended", ""); - my $is07 = ReadingsVal($name,"L4_NextHour07_IsConsumptionRecommended", ""); - my $is08 = ReadingsVal($name,"L4_NextHour08_IsConsumptionRecommended", ""); - my $is09 = ReadingsVal($name,"L4_NextHour09_IsConsumptionRecommended", ""); - my $is10 = ReadingsVal($name,"L4_NextHour10_IsConsumptionRecommended", ""); - my $is11 = ReadingsVal($name,"L4_NextHour11_IsConsumptionRecommended", ""); - my $is12 = ReadingsVal($name,"L4_NextHour12_IsConsumptionRecommended", ""); - my $is13 = ReadingsVal($name,"L4_NextHour13_IsConsumptionRecommended", ""); - my $is14 = ReadingsVal($name,"L4_NextHour14_IsConsumptionRecommended", ""); - my $is15 = ReadingsVal($name,"L4_NextHour15_IsConsumptionRecommended", ""); - my $is16 = ReadingsVal($name,"L4_NextHour16_IsConsumptionRecommended", ""); - my $is17 = ReadingsVal($name,"L4_NextHour17_IsConsumptionRecommended", ""); - my $is18 = ReadingsVal($name,"L4_NextHour18_IsConsumptionRecommended", ""); - my $is19 = ReadingsVal($name,"L4_NextHour19_IsConsumptionRecommended", ""); - my $is20 = ReadingsVal($name,"L4_NextHour20_IsConsumptionRecommended", ""); - my $is21 = ReadingsVal($name,"L4_NextHour21_IsConsumptionRecommended", ""); - my $is22 = ReadingsVal($name,"L4_NextHour22_IsConsumptionRecommended", ""); - my $is23 = ReadingsVal($name,"L4_NextHour23_IsConsumptionRecommended", ""); + my $is00 = ReadingsVal($name,"L2_ThisHour_IsConsumptionRecommended",undef); + my $is01 = ReadingsVal($name,"L4_NextHour01_IsConsumptionRecommended",undef); + my $is02 = ReadingsVal($name,"L4_NextHour02_IsConsumptionRecommended",undef); + my $is03 = ReadingsVal($name,"L4_NextHour03_IsConsumptionRecommended",undef); + my $is04 = ReadingsVal($name,"L4_NextHour04_IsConsumptionRecommended",undef); + my $is05 = ReadingsVal($name,"L4_NextHour05_IsConsumptionRecommended",undef); + my $is06 = ReadingsVal($name,"L4_NextHour06_IsConsumptionRecommended",undef); + my $is07 = ReadingsVal($name,"L4_NextHour07_IsConsumptionRecommended",undef); + my $is08 = ReadingsVal($name,"L4_NextHour08_IsConsumptionRecommended",undef); + my $is09 = ReadingsVal($name,"L4_NextHour09_IsConsumptionRecommended",undef); + my $is10 = ReadingsVal($name,"L4_NextHour10_IsConsumptionRecommended",undef); + my $is11 = ReadingsVal($name,"L4_NextHour11_IsConsumptionRecommended",undef); + my $is12 = ReadingsVal($name,"L4_NextHour12_IsConsumptionRecommended",undef); + my $is13 = ReadingsVal($name,"L4_NextHour13_IsConsumptionRecommended",undef); + my $is14 = ReadingsVal($name,"L4_NextHour14_IsConsumptionRecommended",undef); + my $is15 = ReadingsVal($name,"L4_NextHour15_IsConsumptionRecommended",undef); + my $is16 = ReadingsVal($name,"L4_NextHour16_IsConsumptionRecommended",undef); + my $is17 = ReadingsVal($name,"L4_NextHour17_IsConsumptionRecommended",undef); + my $is18 = ReadingsVal($name,"L4_NextHour18_IsConsumptionRecommended",undef); + my $is19 = ReadingsVal($name,"L4_NextHour19_IsConsumptionRecommended",undef); + my $is20 = ReadingsVal($name,"L4_NextHour20_IsConsumptionRecommended",undef); + my $is21 = ReadingsVal($name,"L4_NextHour21_IsConsumptionRecommended",undef); + my $is22 = ReadingsVal($name,"L4_NextHour22_IsConsumptionRecommended",undef); + my $is23 = ReadingsVal($name,"L4_NextHour23_IsConsumptionRecommended",undef); + return "Awaiting level 4 data ... " if(!defined $is01); my $time00 = strftime("%H",localtime); my $time01 = strftime("%H",localtime(time+1*60*60));