use v5.10.1;
+use Mojolicious::Lite;
use Serial;
use Mojo::IOLoop;
use Mojo::IOLoop::Stream;
+use Mojo::Transaction::WebSocket;
#use Mojo::JSON qw(decode_json encode_json);
use JSON;
use Debug;
use SMGLog;
+use Math::Round qw(nearest);
+use File::Copy;
+use Data::Random qw(rand_chars);
+
+use constant pi => 3.14159265358979;
my $devname = "/dev/davis";
+my $datafn = ".loop_data";
+my $dataf;
+
+my $poll_interval = 2.5;
my $rain_mult = 0.2; # 0.1 or 0.2 mm or 0.01 inches
my $tid;
my $rid;
my $state = "ready";
my $buf;
my $dbg;
-my $last_reading;
my $ser; # the serial port Mojo::IOLoop::Stream
-our $ending = 0;
+my $last_min_h;
+my $last_hour_h;
our $json = JSON->new->canonical(1);
+our $WS = {}; # websocket connections
-our $last_min = int(time/60)*60;
-our $last_hour = 0;
-our $last_rain_hour;
-our $last_rain_min;
-our $last_rain;
+our $ld = {};
our $loop_count; # how many LOOPs we have done, used as start indicator
$SIG{TERM} = $SIG{INT} = sub {++$ending; Mojo::IOLoop->stop;};
$SIG{HUP} = 'IGNORE';
+
+# WebSocket weather service
+websocket '/weather' => sub {
+ my $c = shift;
+ my $msg = shift;
+ my $tx = $c->tx;
+
+ # Opened
+ app->log->debug('WebSocket opened.');
+ dbg 'WebSocket opened' if isdbg 'chan';
+ $WS->{$tx} = $tx;
+
+ # send historical data
+ $c->send($ld->{lasthour_h}) if exists $ld->{lasthour_h};
+ $c->send($ld->{lastmin_h}) if exists $ld->{lastmin_h};
+
+ # disable timeout
+ $c->inactivity_timeout(3615);
+
+ # Incoming message
+ $c->on(
+ message => sub {
+ my ($c, $msg) = @_;
+ dbg "websocket: text $msg" if isdbg 'chan';
+ },
+ json => sub {
+ my ($c, $msg) = @_;
+ dbg "websocket: json $msg" if isdbg 'chan';
+ }
+ );
+
+ # Closed
+ $c->on(finish => sub {
+ my ($c, $code, $reason) = @_;
+ app->log->debug("WebSocket closed with status $code.");
+ dbg 'webwocket closed with status $code' if isdbg 'chan';
+ delete $WS->{$tx};
+ });
+};
+
+get '/' => {template => 'index'};
+
+
dbginit();
if (@ARGV) {
dbgadd(@ARGV);
dbg "*** starting $0";
dbg '***';
-dbg scalar gmtime($last_min);
-dbg scalar gmtime($last_hour);
+read_ld();
+
+our $dlog = SMGLog->new("day");
+dbg "before next tick";
+Mojo::IOLoop->next_tick(sub { loop() });
+dbg "before app start";
+app->start;
+dbg "after app start";
-my $dlog = SMGLog->new("day");
-$did = Mojo::IOLoop->recurring(1 => sub {$dlog->flushall});
+write_ld();
+close $dataf if $dataf;
-do_reopen($devname);
+# move all the files along one
+cycle_loop_data_files();
dbg '***';
dbg "*** ending $0";
exit 0;
+##################################################################################
+
+sub loop
+{
+ dbg "last_min: " . scalar gmtime($ld->{last_min});
+ dbg "last_hour: " . scalar gmtime($ld->{last_hour});
+
+ $did = Mojo::IOLoop->recurring(1 => sub {$dlog->flushall});
+
+ do_reopen($devname);
+}
+
+
+
sub on_read
{
my ($ser, $d) = @_;
undef $tid;
Mojo::IOLoop->remove($rid) if $rid;
undef $rid;
- $rid = Mojo::IOLoop->recurring(2.5 => sub {
+ $rid = Mojo::IOLoop->recurring($poll_interval => sub {
start_loop() if !$state;
});
chgstate('');
}
my $tmp;
+ my $temp;
my $rain;
my %h;
- # Common ones
- $tmp = unpack("s", substr $blk,7,2) / 1000;
- $h{Pressure} = sprintf("%.0f",in2mb($tmp))+0;
-
- $tmp = unpack("s", substr $blk,9,2) / 10;
- $h{Temp_In} = sprintf("%.1f", f2c($tmp))+0;
-
- $tmp = unpack("s", substr $blk,12,2) / 10;
- $h{Temp_Out} = sprintf("%.1f", f2c($tmp))+0;
-
- $tmp = unpack("C", substr $blk,14,1);
- $h{Wind} = sprintf("%.1f",mph2mps($tmp))+0;
- $h{Dir} = unpack("s", substr $blk,16,2)+0;
-
- my $wind = {w => $h{Wind}, d => $h{Dir}};
- push @min, $wind;
-
- $h{Humidity_Out} = unpack("C", substr $blk,33,1)+0;
- $h{Humidity_In} = unpack("C", substr $blk,11,1)+0;
-
- $tmp = unpack("C", substr $blk,43,1)+0;
- $h{UV} = $tmp unless $tmp >= 255;
- $tmp = unpack("s", substr $blk,44,2)+0; # watt/m**2
- $h{Solar} = $tmp unless $tmp >= 32767;
+ my $crc_calc = CRC_CCITT($blk);
-# $h{Rain_Rate} = sprintf("%0.1f",unpack("s", substr $blk,41,2) * $rain_mult)+0;
- $rain = $h{Rain_Day} = sprintf("%0.1f", unpack("s", substr $blk,50,2) * $rain_mult)+0;
- my $delta_rain = $h{Rain} = ($rain >= $last_rain ? $rain - $last_rain : $rain) if $loop_count;
- $last_rain = $rain;
+ if ($crc_calc==0) {
- # what sort of packet is it?
+ # Common ones
+ $tmp = unpack("s", substr $blk,7,2) / 1000;
+ $h{Pressure} = nearest(1, in2mb($tmp));
- my $sort = unpack("C", substr $blk,4,1);
- if ($sort) {
+ $tmp = unpack("s", substr $blk,9,2) / 10;
+ $h{Temp_In} = nearest(0.1, f2c($tmp));
- # Newer LOOP2 packet
- $tmp = unpack("C", substr $blk,18,2);
-# $h{Wind_Avg_10} = sprintf("%.1f",mph2mps($tmp/10))+0;
- $tmp = unpack("C", substr $blk,20,2);
-# $h{Wind_Avg_2} = sprintf("%.1f",mph2mps($tmp/10))+0;
- $tmp = unpack("C", substr $blk,22,2);
-# $h{Wind_Gust_10} = sprintf("%.1f",mph2mps($tmp/10))+0;
+ $temp = nearest(0.1, f2c(unpack("s", substr $blk,12,2) / 10));
+ $h{Temp_Out} = $temp;
+ if ($temp > 75 || $temp < -75) {
+ dbg "LOOP Temperature out of range ($temp), record ignored";
+ return;
+ }
-# $h{Dir_Avg_10} = unpack("C", substr $blk,24,2)+0;
- $tmp = unpack("C", substr $blk,30,2);
- $h{Dew_Point} = sprintf("%0.1f", f2c($tmp))+0;
+ $tmp = unpack("C", substr $blk,14,1);
+ $h{Wind} = nearest(0.1, mph2mps($tmp));
+ $h{Dir} = unpack("s", substr $blk,16,2)+0;
- } else {
+ my $wind = {w => $h{Wind}, d => $h{Dir}};
+ $wind = 0 if $wind == 255;
+ push @{$ld->{wind_min}}, $wind;
- # Older LOOP packet
- $tmp = unpack("C", substr $blk,15,1);
-# $h{Wind_Avg_10} = sprintf("%.1f",mph2mps($tmp))+0;
- $h{Dew_Point} = sprintf("%0.1f", dew_point($h{Temp_Out}, $h{Humidity_Out}))+0;
- $h{Rain_Month} = sprintf("%0.1f", unpack("s", substr $blk,52,2) * $rain_mult)+0;
- $h{Rain_Year} = sprintf("%0.1f", unpack("s", substr $blk,54,2) * $rain_mult)+0;
+ $tmp = int(unpack("C", substr $blk,33,1)+0);
+ if ($tmp > 100) {
+ dbg "LOOP Outside Humidity out of range ($tmp), record ignored";
+ return;
+ }
+ $h{Humidity_Out} = $tmp;
+ $tmp = int(unpack("C", substr $blk,11,1)+0);
+ if ($tmp > 100) {
+ dbg "LOOP Inside Humidity out of range ($tmp), record ignored";
+ return;
+ }
+ $h{Humidity_In} = $tmp;
+
+
+ $tmp = unpack("C", substr $blk,43,1)+0;
+ $h{UV} = $tmp unless $tmp >= 255;
+ $tmp = unpack("s", substr $blk,44,2)+0; # watt/m**2
+ $h{Solar} = $tmp unless $tmp >= 32767;
+
+ # $h{Rain_Rate} = nearest(0.1,unpack("s", substr $blk,41,2) * $rain_mult);
+ $rain = $h{Rain_Day} = nearest(0.1, unpack("s", substr $blk,50,2) * $rain_mult);
+ my $delta_rain = $h{Rain} = nearest(0.1, ($rain >= $ld->{last_rain} ? $rain - $ld->{last_rain} : $rain)) if $loop_count;
+ $ld->{last_rain} = $rain;
+
+ # what sort of packet is it?
+ my $sort = unpack("C", substr $blk,4,1);
+ if ($sort) {
+
+ # Newer LOOP2 packet
+ $tmp = unpack("C", substr $blk,18,2);
+ # $h{Wind_Avg_10} = nearest(0.1,mph2mps($tmp/10));
+ $tmp = unpack("C", substr $blk,20,2);
+ # $h{Wind_Avg_2} = nearest(0.1,mph2mps($tmp/10));
+ $tmp = unpack("C", substr $blk,22,2);
+ # $h{Wind_Gust_10} = nearest(0.1,mph2mps($tmp/10));
+
+ # $h{Dir_Avg_10} = unpack("C", substr $blk,24,2)+0;
+ $tmp = unpack("C", substr $blk,30,2);
+ $h{Dew_Point} = nearest(0.1, f2c($tmp));
- }
+ } else {
- my $crc_calc = CRC_CCITT($blk);
+ # Older LOOP packet
+ $tmp = unpack("C", substr $blk,15,1);
+ # $h{Wind_Avg_10} = nearest(0.1,mph2mps($tmp));
+ $h{Dew_Point} = nearest(0.1, dew_point($h{Temp_Out}, $h{Humidity_Out}));
+ $h{Rain_Month} = nearest(0.1, unpack("s", substr $blk,52,2) * $rain_mult);
+ $h{Rain_Year} = nearest(0.1, unpack("s", substr $blk,54,2) * $rain_mult);
+ }
- if ($crc_calc==0) {
my $ts = time;
- my $j;
my $s;
- if ($ts >= $last_hour + 3600) {
+ my $dayno = int($ts/86400);
+ if ($dayno > $ld->{last_day}) {
+ $ld->{Temp_Out_Max} = $ld->{Temp_Out_Min} = $temp;
+ $ld->{last_day} = $dayno;
+ write_ld();
+ cycle_loop_data_files();
+ }
+ $ld->{Temp_Out_Max} = $temp if $temp > $ld->{Temp_Out_Max};
+ $ld->{Temp_Out_Min} = $temp if $temp < $ld->{Temp_Out_Min};
+
+ if ($ts >= $ld->{last_hour} + 1800) {
$h{Pressure_Trend} = unpack("C", substr $blk,3,1);
$h{Pressure_Trend_txt} = $bar_trend{$h{Pressure_Trend}};
$h{Batt_TX_OK} = (unpack("C", substr $blk,86,1)+0) ^ 1;
- $h{Batt_Console} = sprintf("%0.2f", unpack("s", substr $blk,87,2) * 0.005859375)+0;
+ $h{Batt_Console} = nearest(0.01, unpack("s", substr $blk,87,2) * 0.005859375);
$h{Forecast_Icon} = unpack("C", substr $blk,89,1);
$h{Forecast_Rule} = unpack("C", substr $blk,90,1);
$h{Sunrise} = sprintf( "%04d", unpack("S", substr $blk,91,2) );
$h{Sunrise} =~ s/(\d{2})(\d{2})/$1:$2/;
$h{Sunset} = sprintf( "%04d", unpack("S", substr $blk,93,2) );
$h{Sunset} =~ s/(\d{2})(\d{2})/$1:$2/;
+ $h{Temp_Out_Max} = $ld->{Temp_Out_Max};
+ $h{Temp_Out_Min} = $ld->{Temp_Out_Min};
if ($loop_count) { # i.e not the first
- my $a = average(scalar @hour ? @hour : {w => $h{Wind}, d => $h{Dir}});
-
- $h{Wind_1h} = sprintf("%0.1f", $a->{w})+0;
- $h{Dir_1h} = sprintf("%0.0f", $a->{d})+0;
- $h{Rain_1h} = $rain >= $last_rain_hour ? $rain - $last_rain_hour : $rain;
+ my $a = wind_average(scalar @{$ld->{wind_hour}} ? @{$ld->{wind_hour}} : {w => $h{Wind}, d => $h{Dir}});
- $h{Wind_1m} = sprintf("%0.1f", $a->{w})+0;
- $h{Dir_1m} = sprintf("%0.0f", $a->{d})+0;
- $h{Rain_1m} = $rain >= $last_rain_min ? $rain - $last_rain_min : $rain;
- }
- $last_rain_min = $last_rain_hour = $rain;
+ $h{Wind_1h} = nearest(0.1, $a->{w});
+ $h{Dir_1h} = nearest(0.1, $a->{d});
- $j = $json->encode(\%h);
+ $a = wind_average(@{$ld->{wind_min}});
+ $h{Wind_1m} = nearest(0.1, $a->{w});
+ $h{Dir_1m} = nearest(1, $a->{d});
- $s = qq|{"t":$ts,"h":$j}|;
- $last_hour = int($ts/3600)*3600;
- $last_min = int($ts/60)*60;
- @hour = ();
- @min = ();
- } elsif ($ts >= $last_min + 60) {
- my $a = average(@min);
+ ($h{Rain_1m}, $h{Rain_1h}, $h{Rain_24h}) = calc_rain($rain);
+ }
+ $ld->{last_rain_min} = $ld->{last_rain_hour} = $rain;
+
+ $last_hour_h = {%h};
+ $s = genstr($ts, 'h', \%h);
+ $ld->{lasthour_h} = $s;
+
+ $ld->{last_hour} = int($ts/1800)*1800;
+ $ld->{last_min} = int($ts/60)*60;
+ @{$ld->{wind_hour}} = ();
+ @{$ld->{wind_min}} = ();
+
+ output_str($s, 1) if $s;
+ write_ld();
+
+ } elsif ($ts >= $ld->{last_min} + 60) {
+ my $a = wind_average(@{$ld->{wind_min}});
my %save;
- push @hour, $a;
+ push @{$ld->{wind_hour}}, $a;
if ($loop_count) { # i.e not the first
- $h{Wind_1m} = sprintf("%0.1f", $a->{w})+0;
- $h{Dir_1m} = sprintf("%0.0f", $a->{d})+0;
- $h{Rain_1h} = $rain >= $last_rain_hour ? $rain - $last_rain_hour : $rain; # this is the rate for this hour, so far
- $h{Rain_1m} = $rain >= $last_rain_min ? $rain - $last_rain_min : $rain;
+ my $rm;
+
+ $h{Wind_1m} = nearest(0.1, $a->{w});
+ $h{Dir_1m} = nearest(1, $a->{d});
+ ($h{Rain_1m}, $h{Rain_1h}, $h{Rain_24h}) = calc_rain($rain);
}
- $last_rain_min = $rain;
+ $ld->{last_rain_min} = $rain;
+
+ $h{Temp_Out_Max} = $ld->{Temp_Out_Max};
+ $h{Temp_Out_Min} = $ld->{Temp_Out_Min};
- $j = $json->encode(\%h);
+ $last_min_h = {%h};
+ $s = genstr($ts, 'm', \%h);
+ $ld->{lastmin_h} = $s;
+
+ $ld->{last_min} = int($ts/60)*60;
+ @{$ld->{wind_min}} = ();
+
+ output_str($s, 1) if $s;
+ write_ld();
- $s = qq|{"t":$ts,"m":$j}|;
- $last_min = int($ts/60)*60;
- @min = ();
} else {
- my $o = gen_hash_diff($last_reading, \%h);
+ my $o = gen_hash_diff($ld->{last_h}, \%h);
if ($o) {
- $j = $json->encode($o);
- $s = qq|{"t":$ts,"r":$j}|;
- } else {
+ $s = genstr($ts, 'r', $o);
+ }
+ else {
dbg "loop rec not changed" if isdbg 'chan';
}
+ output_str($s, 0) if $s;
}
- output_str($s) if $s;
- $last_reading = \%h;
+ $ld->{last_h} = \%h;
++$loop_count;
} else {
dbg "CRC check failed for LOOP data!";
return;
}
+sub genstr
+{
+ my $ts = shift;
+ my $let = shift;
+ my $h = shift;
+
+ my $j = $json->encode($h);
+ my ($sec,$min,$hr) = (gmtime $ts)[0,1,2];
+ my $tm = sprintf "%02d:%02d:%02d", $hr, $min, $sec;
+
+ return qq|{"tm":"$tm","t":$ts,"$let":$j}|;
+}
+
sub output_str
{
my $s = shift;
+ my $logit = shift;
+
dbg $s;
# say $s;
- $dlog->writenow($s);
+ $dlog->writenow($s) if $logit;
+ foreach my $ws (keys $WS) {
+ my $tx = $WS->{$ws};
+ if ($tx) {
+ $tx->send($s);
+ } else {
+ delete $WS->{$tx};
+ }
+ }
}
sub gen_hash_diff
return $_[0] * 33.8637526;
}
-sub average
+sub wind_average
{
- my %out;
+ my ($sindir, $cosdir, $wind);
my $count;
foreach my $r (@_) {
- while (my ($k, $v) = each %$r) {
- $out{$k} += $v;
- }
+ $wind += $r->{w};
+ $sindir += sin(d2r($r->{d})) * $r->{w};
+ $cosdir += cos(d2r($r->{d})) * $r->{w};
++$count;
}
- while (my ($k, $v) = each %out) {
- $out{$k} /= $count;
+
+ my $avhdg = r2d(atan2($sindir, $cosdir));
+ $avhdg += 360 if $avhdg < 0;
+ return {w => nearest(0.1,$wind / $count), d => nearest(0.1,$avhdg)};
+}
+
+# radians to degrees
+sub r2d
+{
+ my $n = shift;
+ return ($n / pi) * 180;
+}
+
+# degrees to radians
+sub d2r
+{
+ my $n = shift;
+ return ($n / 180) * pi;
+}
+
+sub calc_rain
+{
+ my $rain = shift;
+
+ $ld->{rain24} ||= [];
+
+ my $Rain_1h = nearest(0.1, $rain >= $ld->{last_rain_hour} ? $rain - $ld->{last_rain_hour} : $rain); # this is the rate for this hour, so far
+ my $rm = nearest(0.1, $rain >= $ld->{last_rain_min} ? $rain - $ld->{last_rain_min} : $rain);
+ my $Rain_1m = nearest(0.1, $rm);
+ push @{$ld->{rain24}}, $Rain_1m;
+ $ld->{rain_24} += $rm;
+ while (@{$ld->{rain24}} > 24*60) {
+ $ld->{rain_24} -= shift @{$ld->{rain24}};
+ }
+ my $Rain_24h = nearest(0.1, $ld->{rain_24});
+ return ($Rain_1m, $Rain_1h, $Rain_24h);
+}
+
+sub read_ld
+{
+ unless ($dataf) {
+ open $dataf, "+>>", $datafn or die "cannot open $datafn $!";
+ $dataf->autoflush(1);
}
- return \%out;
+ seek $dataf, 0, 0;
+ my $s = <$dataf>;
+ chomp $s;
+ dbg "read loop data: $s" if isdbg 'json';
+ $ld = $json->decode($s) if length $s;
+
+ # sort out rain stats
+ my $c;
+ if ($ld->{rain24} && ($c = @{$ld->{rain24}}) < 24*60) {
+ my $diff = 24*60 - $c;
+ unshift @{$ld->{rain24}}, 0 for 0 .. $diff;
+ }
+ my $rain;
+
+ if ($ld->{rain24}) {
+ $rain += $_ for @{$ld->{rain24}};
+ }
+
+ $ld->{rain_24} = nearest(0.1, $rain);
+ delete $ld->{hour};
+ delete $ld->{min};
}
+
+sub write_ld
+{
+ unless ($dataf) {
+ open $dataf, "+>>", $datafn or die "cannot open $datafn $!";
+ $dataf->autoflush(1);
+ }
+
+ seek $dataf, 0, 0;
+ truncate $dataf, 0;
+ $ld->{ts} = time;
+ my $s = $json->encode($ld);
+ dbg "write loop data: $s" if isdbg 'json';
+ print $dataf "$s\n";
+}
+
+sub cycle_loop_data_files
+{
+ close $dataf if $dataf;
+
+ 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__
+
+@@ index.html.ep
+% my $url = url_for 'weather';
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>DWeather</title>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+
+ <!-- Latest compiled and minified CSS -->
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
+
+ <!-- Optional theme -->
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap-theme.min.css">
+
+ </head>
+ <body>
+ <center><h1>High View Weather</h1></center>
+
+
+ <script>
+ var ws;
+
+ function process(key,value) {
+ var d = document.getElementById(key);
+ if (d !== null) {
+ d.innerHTML = value;
+ }
+ }
+
+ function traverse(o) {
+ console.log(o);
+ for (var i in o) {
+ process(i, o[i]);
+ if (o[i] !== null && typeof(o[i])=="object") {
+ traverse(o[i]);
+ }
+ }
+ }
+
+ window.onload = function() {
+
+ ws = new WebSocket('<%= $url->to_abs %>');
+
+ if (typeof(ws) === 'object') {
+ ws.onmessage = function (event) {
+ var js = JSON.parse(event.data);
+ if (js !== null && typeof(js) === 'object') {
+ traverse(js);
+ }
+ };
+ ws.onopen = function (event) {
+ document.getElementById("wsconnect").innerHTML = 'ws connected to: <%= $url->to_abs %>';
+ ws.send('WebSocket support works! ♥');
+ };
+ ws.onclose = function(event) {
+ document.getElementById("wsconnect").innerHTML = 'ws disconnected, refresh to restart';
+ }
+ } else {
+ document.body.innerHTML += 'Webserver only works with Websocket aware browsers';
+ }
+ }
+ </script>
+
+<div id="container">
+<div id="start-template">
+<br><br>
+<table border=1 width=80% align="center">
+<tr>
+<th>Time:<td><span id="tm"> </span>
+<th>Sunrise:<td><span id="Sunrise"> </span>
+<th>Sunset:<td><span id="Sunset"> </span>
+<th>Console Volts:<td><span id="Batt_Console"> </span>
+<th>TX Battery OK:<td><span id="Batt_TX_OK"> </span>
+
+<tr>
+<th>Pressure:<td><span id="Pressure"> </span>
+<th>Trend:<td><span id="Pressure_Trend_txt"> </span>
+
+<tr>
+<th>Temperature in:<td> <span id="Temp_In"> </span>
+<th>Humidity:<td> <span id="Humidity_In"> </span>
+
+<tr>
+<th>Temperature out:<td> <span id="Temp_Out"> </span>
+<th>Min:<td> <span id="Temp_Out_Min"> </span>
+<th>Max:<td> <span id="Temp_Out_Max"> </span>
+<th>Humidity:<td> <span id="Humidity_Out"> </span>
+<th>Dew Point:<td> <span id="Dew_Point"> </span>
+
+<tr>
+<th>Wind Direction:<td> <span id="Dir"> </span>
+<th>Minute Avg:<td> <span id="Dir_1m"> </span>
+<th>Speed:<td> <span id="Wind"> </span>
+<th>Minute Avg:<td> <span id="Wind_1m"> </span>
+
+<tr>
+<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>
+<th>Year:<td> <span id="Rain_Year"> </span>
+</table>
+<br>
+<div id="wsconnect" align="center"> </div>
+</div>
+</div>
+ <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+ <!-- Latest compiled and minified JavaScript -->
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script>
+</body>
+</html>