Permalink
Browse files

Merge pull request #148 from bitopen/master

get values as on hardware display, responsive website
  • Loading branch information...
jpuigsegur committed Jan 8, 2017
2 parents 2fd48ac + 3a5dc4c commit 0177041d19aaa828caa2c1d52e24c29a6fd14f9e
Showing with 8 additions and 5 deletions.
  1. +1 −1 wfcommon/config.py
  2. +2 −2 wfdriver/station/wh1080.py
  3. +5 −2 wfrender/templates/default/main.html
View
@@ -25,7 +25,7 @@
import copy
from Cheetah.Template import Template
wfrog_version = "0.8.2-svn"
wfrog_version = "0.8.2.99-git"
class Configurer(object):
@@ -51,7 +51,7 @@ def run(self, generate_event, send_event, context={}):
try:
if data['abs_pressure'] is not None:
e = generate_event('press')
e.value = (10*(4.5+(data['abs_pressure'])))/10
e.value = data['abs_pressure']
send_event(e)
if data['temp_in'] is not None:
@@ -80,7 +80,7 @@ def run(self, generate_event, send_event, context={}):
if data['rain'] is not None:
e = generate_event('rain')
e.total = (136*(data['rain']))/100
e.total = data['rain']
e.rate = 0
send_event(e)
@@ -6,8 +6,11 @@
$u
#end if
#end def
<html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset='utf-8'>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Weather Dashboard - wfrog $version</title>
#if $getVar('http', False)
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/prototype/1.7.0.0/prototype.js"></script>
@@ -856,7 +859,6 @@
</div>
</div>
<div style="width:100%;clear:both;"><br></div>
</body>
<script type="text/javascript">
// Highlight the correct tab according to the url
@@ -882,4 +884,5 @@
move_forward = function() { move(12, 'h') }
}
</script>
</body>
</html>

0 comments on commit 0177041

Please sign in to comment.