From 55320183b423c8028dd3847e7f80d702ffb35a78 Mon Sep 17 00:00:00 2001 From: Christopher Martin Date: Thu, 29 Mar 2012 11:40:14 -0400 Subject: [PATCH 1/3] dumb bug fix --- web/graph.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/web/graph.js b/web/graph.js index a6ea292..1d91d80 100644 --- a/web/graph.js +++ b/web/graph.js @@ -34,13 +34,18 @@ function update() { dataType: 'json', /*timeout: 1000,*/ success: function(data) { + + // the data comes from the server reverse-chronological + data.tmp.reverse(); + data.idle.reverse(); + $.each(data.tmp, function(i, event) { if (i != data.tmp.length - 1) return; getLine(event.id)[0].append(event.ts, event.tmp / 100); if ($.grep(data.idle, function(x) { return x.id === event.id && Math.abs(x.ts - event.ts) < 0.5; }).length) - getLine(event.id)[1].append(event.ts, event.tmp / 100); + getLine(event.id)[1].append(event.ts, event.tmp / 100); }); }, complete: function() { From 22acb902589949aa242ad8671869e5ef9350644b Mon Sep 17 00:00:00 2001 From: Christopher Martin Date: Thu, 29 Mar 2012 13:29:27 -0400 Subject: [PATCH 2/3] fix scale for temperature in purple status --- python/purple.py | 1 + 1 file changed, 1 insertion(+) diff --git a/python/purple.py b/python/purple.py index 789fa19..2aab93b 100644 --- a/python/purple.py +++ b/python/purple.py @@ -30,6 +30,7 @@ def go(self): for row in c: count += 1 sum += float(row['tmp']) + sum /= 100 if count: avg = sum / count if avg < 22.5: From 8d0556174df36cbbc1d4c4b5893d53185ee6194b Mon Sep 17 00:00:00 2001 From: Christopher Martin Date: Thu, 29 Mar 2012 14:17:50 -0400 Subject: [PATCH 3/3] clarify whitespace --- python/purple.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/python/purple.py b/python/purple.py index 2aab93b..469681d 100644 --- a/python/purple.py +++ b/python/purple.py @@ -23,8 +23,9 @@ def go(self): select tmp from tmp_event where ts > ? and id = ? """, ( - int((time.time() - 5) * 1000), self.id), - ) + int((time.time() - 5) * 1000), + self.id + )) count = 0 sum = 0 for row in c: