From cf2f0abfd1902f5b10dc8a25ab9c1533c236ac12 Mon Sep 17 00:00:00 2001 From: hexenmeister Date: Thu, 7 Aug 2014 11:48:01 +0000 Subject: [PATCH] Added Power Infos to the Text-Output-Method git-svn-id: https://svn.fhem.de/fhem/trunk@6372 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/42_SYSMON.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fhem/FHEM/42_SYSMON.pm b/fhem/FHEM/42_SYSMON.pm index 3b523e4aa..3acb57acb 100644 --- a/fhem/FHEM/42_SYSMON.pm +++ b/fhem/FHEM/42_SYSMON.pm @@ -1769,7 +1769,8 @@ sub SYSMON_ShowValuesFmt ($$;@) CPU_TEMP.":".$cur_readings_map->{+CPU_TEMP}.": ".$deg."C", CPU_FREQ.":".$cur_readings_map->{+CPU_FREQ}.": "."MHz", CPU_BOGOMIPS, - UPTIME_TEXT, FHEMUPTIME_TEXT, LOADAVG, RAM, SWAP); + UPTIME_TEXT, FHEMUPTIME_TEXT, LOADAVG, RAM, SWAP, + "power_ac_text", "power_usb_text", "power_battery_text"); # network-interfaces my $networks = AttrVal($name, "network-interfaces", undef); @@ -1789,8 +1790,8 @@ sub SYSMON_ShowValuesFmt ($$;@) my($fName, $fDef, $fComment) = split(/:/, $_); push(@dataDescription, $fName); } - } - + } + # User defined my $userdefined = AttrVal($name, "user-defined", undef); if(defined $userdefined) {