From a0442b1c36fd14483edf50977a00d79698d34ec1 Mon Sep 17 00:00:00 2001
From: borisneubert <borisneubert@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Fri, 5 Oct 2012 09:15:31 +0000
Subject: [PATCH] RpiUtils support now Fritz!Box on Freetz

git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@1926 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/contrib/99_RpiUtils.pm | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/fhem/contrib/99_RpiUtils.pm b/fhem/contrib/99_RpiUtils.pm
index 7b2458edc..5c9b36152 100644
--- a/fhem/contrib/99_RpiUtils.pm
+++ b/fhem/contrib/99_RpiUtils.pm
@@ -16,7 +16,7 @@ sub
 ShowRpiValues ()
 {
 
-my @uptime = explode(" ", qx(cat /proc/uptime));
+my @uptime = split(/ /, qx(cat /proc/uptime));
 my $seconds = @uptime[0];
 my $y = floor($seconds / 60/60/24/365);
 my $d = floor($seconds/60/60/24) % 365;
@@ -73,19 +73,33 @@ my $totalRxTx = $rx + $tx;
 
 my $network = "Received: " . $rx . " MB" . "<br>" . "Sent: " . $tx . " MB" . "<br>" . "Total: " . $totalRxTx . " MB";
 
-my @speicher = qx(free -mo);
+my @speicher = qx(free);
 shift @speicher;
-my ($fs_desc, $total, $used, $free, $shared, $buffers, $cached) = split(/\s+/, @speicher[0]);
+my ($fs_desc, $total, $used, $free, $shared, $buffers, $cached) = split(/\s+/, trim(@speicher[0]));
 
 shift @speicher;
-my ($fs_desc, $total2, $used2, $free2, $shared2, $buffers2, $cached2) = split(/\s+/, @speicher[0]);
+my ($fs_desc2, $total2, $used2, $free2, $shared2, $buffers2, $cached2) = split(/\s+/, trim(@speicher[0]));
+if($fs_desc2 ne "Swap:"){
+   shift @speicher;
+   ($fs_desc2, $total2, $used2, $free2, $shared2, $buffers2, $cached2) = split(/\s+/, trim(@speicher[0]));
+}
+
+$used = $used / 1000;
+$buffers = $buffers / 1000;
+$cached = $cached / 1000;
+$total = $total / 1000;
+$free = $free / 1000;
+
+$used2 = $used2 / 1000;
+$total2 = $total2 / 1000;
+$free2 = $free2 / 1000;
 
 my $percentage = sprintf ("%.2f", (($used - $buffers - $cached) / $total * 100), 0);
-my $ram = "RAM: " . $percentage . "%" . "<br>" . "Free: " . ($free + $buffers + $cached) . " MB" . "<br>" . "Used: " . ($total - $buffers - $cached) . " MB" . "<br>" . "Total: " . $total . " MB";
+my $ram = "RAM: " . $percentage . "%" . "<br>" . "Free: " . ($free + $buffers + $cached) . " MB" . "<br>" . "Used: " . ($used - $buffers - $cached) . " MB" . "<br>" . "Total: " . $total . " MB";
+ 
 $percentage = sprintf ("%.2f", ($used2 / $total2 * 100), 0);
 my $swap = "Swap: " . $percentage . "%" . "<br>" . "Free: " . $free2 . " MB" . "<br>" . "Used: " . $used2 . " MB" . "<br>" . "Total: " . $total2 . " MB";
 
-
 my $Temperatur=sprintf ("%.2f", qx(cat /sys/class/thermal/thermal_zone0/temp) / 1000);
 
 my @filesystems = qx(df /dev/root);