From 1fb79230ac9e6e49df4f33fe70f3d47d29cb69a5 Mon Sep 17 00:00:00 2001
From: Jason Calabrese <jason@cbrese.com>
Date: Sat, 14 Mar 2015 10:13:58 -0700
Subject: [PATCH 1/2] fixed issue with delta always being 0 in /pebble

---
 lib/pebble.js        |  4 ++--
 tests/pebble.test.js | 26 +++++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/lib/pebble.js b/lib/pebble.js
index fac7b3cfb..f8c31bf54 100644
--- a/lib/pebble.js
+++ b/lib/pebble.js
@@ -51,7 +51,7 @@ function pebble (req, res) {
         }
     }
 
-    var result = { status: [ {now: now} ], bgs: sgvData, cals: calData };
+    var result = { status: [ {now: now} ], bgs: sgvData.slice(0, req.count), cals: calData };
     res.setHeader('content-type', 'application/json');
     res.write(JSON.stringify(result));
     res.end( );
@@ -108,7 +108,7 @@ function pebble (req, res) {
             }
         }
         , entries: function(callback) {
-            var q = { count: req.count, find: { "sgv": { $exists: true }} };
+            var q = { count: req.count + 1, find: { "sgv": { $exists: true }} };
 
             req.entries.list(q, function(err, results) {
                 results.forEach(function(element, index) {
diff --git a/tests/pebble.test.js b/tests/pebble.test.js
index e9dd57d1e..030be48a2 100644
--- a/tests/pebble.test.js
+++ b/tests/pebble.test.js
@@ -117,7 +117,31 @@ describe('Pebble Endpoint without Raw', function ( ) {
     pebble.should.be.ok;
   });
 
-  it('/pebble', function (done) {
+  it('/pebble default(1) count', function (done) {
+    request(this.app)
+      .get('/pebble')
+      .expect(200)
+      .end(function (err, res)  {
+        var bgs = res.body.bgs;
+        bgs.length.should.equal(1);
+        var bg = bgs[0];
+        bg.sgv.should.equal('82');
+        bg.bgdelta.should.equal(-2);
+        bg.trend.should.equal(4);
+        bg.direction.should.equal('Flat');
+        bg.datetime.should.equal(1422727301000);
+        should.not.exist(bg.filtered);
+        should.not.exist(bg.unfiltered);
+        should.not.exist(bg.noise);
+        should.not.exist(bg.rssi);
+        bg.battery.should.equal('100');
+
+        res.body.cals.length.should.equal(0);
+        done( );
+      });
+  });
+
+  it('/pebble?count=2', function (done) {
     request(this.app)
       .get('/pebble?count=2')
       .expect(200)

From 5b526a1f9286aa33485f33edcc38fd308b4c5d48 Mon Sep 17 00:00:00 2001
From: Jason Calabrese <jason@cbrese.com>
Date: Sat, 14 Mar 2015 10:33:07 -0700
Subject: [PATCH 2/2] don't removed urgent/warning when based on BG range when
 there is an alarm, since it could be a predictive alarm

---
 static/js/client.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/static/js/client.js b/static/js/client.js
index 2d5e06c5e..2e302388d 100644
--- a/static/js/client.js
+++ b/static/js/client.js
@@ -325,9 +325,11 @@ var app = {}, browserSettings = {}, browserStorage = $.localStorage;
                 currentBG.text(scaleBg(value));
             }
 
-            bgButton.removeClass('urgent warning inrange');
-            if (!inRetroMode()) {
+            if (!alarmingNow()) {
+              bgButton.removeClass('urgent warning inrange');
+              if (!inRetroMode()) {
                 bgButton.addClass(sgvToColoredRange(value));
+              }
             }
 
             currentBG.toggleClass('error-code', value < 39);