diff --git a/FHEM/98_WeekdayTimer.pm b/FHEM/98_WeekdayTimer.pm index 300d117be..53558be36 100644 --- a/FHEM/98_WeekdayTimer.pm +++ b/FHEM/98_WeekdayTimer.pm @@ -27,7 +27,6 @@ package main; use strict; use warnings; -use POSIX; use Time::Local 'timelocal_nocheck'; diff --git a/FHEM/lib/AttrTemplate/httpmod.template b/FHEM/lib/AttrTemplate/httpmod.template index 23ee50667..2cd5f2730 100644 --- a/FHEM/lib/AttrTemplate/httpmod.template +++ b/FHEM/lib/AttrTemplate/httpmod.template @@ -642,7 +642,7 @@ attr DEVICE stateFormat { my $ret ="";;\ $ret .= sprintf("%-32s",AttrVal($dev,"alias",$dev));;\ $ret .= ' | ';;\ $ret .= '';;\ - $ret .= '';;\ + $ret .= '';;\ $ret .= sprintf("%7s",$old);;\ $ret .= ' | ';;\ $ret .= '';;\ diff --git a/FHEM/lib/AttrTemplate/mqtt2.template b/FHEM/lib/AttrTemplate/mqtt2.template index 5de215e1d..7db60b66f 100644 --- a/FHEM/lib/AttrTemplate/mqtt2.template +++ b/FHEM/lib/AttrTemplate/mqtt2.template @@ -1486,6 +1486,9 @@ filter:TYPE=MQTT2_DEVICE:FILTER=readingList=.*shellies.* order:A_10b desc:Applies to single relay Shelly devices offering energy meassuring like Shelly 1PM or Shelly Plug S par:DEVNAME;Shelly1 name in the topic;{ AttrVal("DEVICE","readingList","") =~ m,shellies/([^/]*)/, ? $1 : undef } +par:RADIO_SETUSERREADING;Set userreading for total energy consumption;{ undef } +par:RADIO_DONOTSETUSERREADING;Do not set userreading for total energy consumption;{ undef } +par:NEWUSERREADINGS;NEWUSERREADINGS as set if relay_0_energy_total is included, otherwise it will be added;{ my $old = AttrVal("DEVICE","userReadings",undef);; !defined $old ? 'relay_0_energy_total:relay_0_energy:.* monotonic {ReadingsNum("$name","relay_0_energy",0)}' : $old =~ m,relay_0_energy_total:relay_0_energy.*, ? $old : $old.', relay_0_energy_total:relay_0_energy:.* monotonic {ReadingsNum("$name","relay_0_energy",0)}' } attr DEVICE setList\ relay0:on,off,toggle shellies/DEVNAME/relay/0/command $EVTPART1\ off:noArg shellies/DEVNAME/relay/0/command off\ @@ -1513,6 +1516,10 @@ deletereading -q DEVICE (?!associatedWith).* set DEVICE x_mqttcom announce set DEVICE attrTemplate speechcontrol_type_switch attr DEVICE model shelly1_w_energy_meassuring +option:{ RADIO_SETUSERREADING } +attr DEVICE userReadings NEWUSERREADINGS + + name:shelly1_w_energy_meassuring_washer_example filter:TYPE=MQTT2_DEVICE:FILTER=readingList=.*shellies.* diff --git a/contrib/98_Heating_Control.pm b/contrib/98_Heating_Control.pm index 3a5e8a0eb..6c94842cb 100644 --- a/contrib/98_Heating_Control.pm +++ b/contrib/98_Heating_Control.pm @@ -24,7 +24,6 @@ package main; use strict; use warnings; -use POSIX; ######################################################################## sub Heating_Control_Initialize($) { diff --git a/contrib/AttrTemplate/99_attrTmqtt2_ebus_Utils.pm b/contrib/AttrTemplate/99_attrTmqtt2_ebus_Utils.pm index 39387343f..e973b5730 100644 --- a/contrib/AttrTemplate/99_attrTmqtt2_ebus_Utils.pm +++ b/contrib/AttrTemplate/99_attrTmqtt2_ebus_Utils.pm @@ -6,7 +6,6 @@ package main; use strict; use warnings; -use POSIX; sub attrTmqtt2_ebus_Utils_Initialize($$) diff --git a/contrib/AttrTemplate/99_attrTmqtt2_roborock_Utils.pm b/contrib/AttrTemplate/99_attrTmqtt2_roborock_Utils.pm index cb7371267..2b6048d10 100644 --- a/contrib/AttrTemplate/99_attrTmqtt2_roborock_Utils.pm +++ b/contrib/AttrTemplate/99_attrTmqtt2_roborock_Utils.pm @@ -6,7 +6,6 @@ package main; use strict; use warnings; -use POSIX; sub attrTmqtt2_roborock_Utils_Initialize($$)