X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=loop.pl;h=b5e939dd5a3e6cdd5fc1aaafe96cd966f7e03235;hb=0fb8df3c81c404b27f96d416fd029b875495554a;hp=ef8a6734c64ef6ebf14418cf978e71964a86b885;hpb=eb43e5b8fd8bf93c8bd6a3fb5090eea8299b3368;p=dweather.git

diff --git a/loop.pl b/loop.pl
index ef8a673..b5e939d 100755
--- a/loop.pl
+++ b/loop.pl
@@ -14,6 +14,7 @@ use Debug;
 use SMGLog;
 use Math::Round qw(nearest);
 use File::Copy;
+use Data::Random qw(rand_chars);
 
 use constant pi => 3.14159265358979; 
 
@@ -155,12 +156,7 @@ write_ld();
 close $dataf if $dataf;
 
 # move all the files along one 
-copy "$datafn.oooo", "$datafn.ooooo";
-copy "$datafn.ooo", "$datafn.oooo";
-copy "$datafn.oo", "$datafn.ooo";
-copy "$datafn.o", "$datafn.oo";
-copy $datafn, "$datafn.o";
-
+cycle_loop_data_files();
 
 dbg '***';
 dbg "*** ending $0";
@@ -664,6 +660,14 @@ sub write_ld
 	print $dataf "$s\n";
 }
 
+sub cycle_loop_data_files
+{
+	rename "$datafn.oooo", "$datafn.ooooo";
+	rename "$datafn.ooo", "$datafn.oooo";
+	rename "$datafn.oo", "$datafn.ooo";
+	rename "$datafn.o", "$datafn.oo";
+	copy $datafn, "$datafn.o";
+}
 
 __DATA__
  
@@ -745,7 +749,7 @@ __DATA__
 <th>Minute Avg:<td> <span id="Wind_1m">  </span>
 
 <tr>
-<th>Rain Hour:<td> <span id="Rain_1h"> </span>
+<th>Rain 30mins:<td> <span id="Rain_1h"> </span>
 <th>Day:<td> <span id="Rain_Day"> </span>
 <th>24hrs:<td> <span id="Rain_24h"> </span>
 <th>Month:<td> <span id="Rain_Month"> </span>