Merge pull request #45 from nightscout/release/7.0.0

Update all files to 7.0
nightscout · Feb 27, 2015 · 3742bab · 3742bab
2 parents d452608 + 78f53bd
commit 3742bab
Show file tree

Hide file tree

Showing 40 changed files with 789 additions and 588 deletions.
diff --git a/appinfo.json b/appinfo.json
@@ -1,9 +1,12 @@
 {
     "appKeys": {
         "bg": 1,
+        "clrw": 8,
         "dlta": 4,
         "icon": 0,
         "name": 6,
+        "noiz": 10,
+        "rwuf": 9,
         "tapp": 3,
         "tcgm": 2,
         "ubat": 5,
@@ -18,84 +21,13 @@
     "resources": {
         "media": [
             {
-                "file": "images/up.png",
-                "name": "IMAGE_UP",
-                "type": "png"
-            },
-            {
-                "file": "images/upup.png",
-                "name": "IMAGE_UPUP",
-                "type": "png"
-            },
-            {
-                "file": "images/up45.png",
-                "name": "IMAGE_UP45",
-                "type": "png"
-            },
-            {
-                "file": "images/flat.png",
-                "name": "IMAGE_FLAT",
-                "type": "png"
-            },
-            {
-                "file": "images/down.png",
-                "name": "IMAGE_DOWN",
-                "type": "png"
-            },
-            {
-                "file": "images/downdown.png",
-                "name": "IMAGE_DOWNDOWN",
-                "type": "png"
-            },
-            {
-                "file": "images/down45.png",
-                "name": "IMAGE_DOWN45",
-                "type": "png"
-            },
-            {
-                "file": "images/none.png",
-                "name": "IMAGE_NONE",
-                "type": "png"
-            },
-            {
-                "file": "images/club100.png",
-                "name": "IMAGE_CLUB100",
-                "type": "png"
-            },
-            {
-                "file": "images/club55.png",
-                "name": "IMAGE_CLUB55",
-                "type": "png"
-            },
-            {
-                "file": "images/logo.png",
-                "name": "IMAGE_LOGO",
-                "type": "png"
-            },
-            {
-                "file": "images/menuicon.png",
-                "menuIcon": true,
-                "name": "IMAGE_MENU_ICON",
-                "type": "png"
-            },
-            {
-                "file": "images/brokenantenna.png",
-                "name": "IMAGE_BROKEN_ANTENNA",
-                "type": "png"
-            },
-            {
-                "file": "images/blooddrop.png",
-                "name": "IMAGE_BLOOD_DROP",
-                "type": "png"
-            },
-            {
-                "file": "images/stoplight.png",
-                "name": "IMAGE_STOP_LIGHT",
+                "file": "images/rcvroff.png",
+                "name": "IMAGE_RCVROFF",
                 "type": "png"
             },
             {
-                "file": "images/hourglass.png",
-                "name": "IMAGE_HOURGLASS",
+                "file": "images/rcvron.png",
+                "name": "IMAGE_RCVRON",
                 "type": "png"
             },
             {
@@ -104,96 +36,97 @@
                 "type": "png"
             },
             {
-                "file": "images/battfull.png",
-                "name": "IMAGE_BATTFULL",
+                "file": "images/hourglass.png",
+                "name": "IMAGE_HOURGLASS",
                 "type": "png"
             },
             {
-                "file": "images/batt90.png",
-                "name": "IMAGE_BATT90",
+                "file": "images/stoplight.png",
+                "name": "IMAGE_STOP_LIGHT",
                 "type": "png"
             },
             {
-                "file": "images/batt80.png",
-                "name": "IMAGE_BATT80",
+                "file": "images/blooddrop.png",
+                "name": "IMAGE_BLOOD_DROP",
                 "type": "png"
             },
             {
-                "file": "images/batt70.png",
-                "name": "IMAGE_BATT70",
+                "file": "images/brokenantenna.png",
+                "name": "IMAGE_BROKEN_ANTENNA",
                 "type": "png"
             },
             {
-                "file": "images/batt60.png",
-                "name": "IMAGE_BATT60",
+                "file": "images/logo.png",
+                "name": "IMAGE_LOGO",
                 "type": "png"
             },
             {
-                "file": "images/batt50.png",
-                "name": "IMAGE_BATT50",
+                "file": "images/specvaluenone.png",
+                "name": "IMAGE_SPECVALUE_NONE",
                 "type": "png"
             },
             {
-                "file": "images/batt40.png",
-                "name": "IMAGE_BATT40",
+                "file": "images/rcvrnone.png",
+                "name": "IMAGE_RCVRNONE",
                 "type": "png"
             },
             {
-                "file": "images/batt30.png",
-                "name": "IMAGE_BATT30",
+                "file": "images/down45.png",
+                "name": "IMAGE_DOWN45",
                 "type": "png"
             },
             {
-                "file": "images/batt20.png",
-                "name": "IMAGE_BATT20",
+                "file": "images/downdown.png",
+                "name": "IMAGE_DOWNDOWN",
                 "type": "png"
             },
             {
-                "file": "images/phoneon.png",
-                "name": "IMAGE_PHONEON",
+                "file": "images/down.png",
+                "name": "IMAGE_DOWN",
                 "type": "png"
             },
             {
-                "file": "images/batt10.png",
-                "name": "IMAGE_BATT10",
+                "file": "images/flat.png",
+                "name": "IMAGE_FLAT",
                 "type": "png"
             },
             {
-                "file": "images/phoneoff.png",
-                "name": "IMAGE_PHONEOFF",
+                "file": "images/up45.png",
+                "name": "IMAGE_UP45",
                 "type": "png"
             },
             {
-                "file": "images/battempty.png",
-                "name": "IMAGE_BATTEMPTY",
+                "file": "images/upup.png",
+                "name": "IMAGE_UPUP",
                 "type": "png"
             },
             {
-                "file": "images/rcvron.png",
-                "name": "IMAGE_RCVRON",
+                "file": "images/up.png",
+                "name": "IMAGE_UP",
                 "type": "png"
             },
             {
-                "file": "images/battnone.png",
-                "name": "IMAGE_BATTNONE",
+                "file": "images/club55.png",
+                "name": "IMAGE_CLUB55",
                 "type": "png"
             },
             {
-                "file": "images/rcvroff.png",
-                "name": "IMAGE_RCVROFF",
+                "file": "images/club100.png",
+                "name": "IMAGE_CLUB100",
                 "type": "png"
             },
             {
-                "file": "images/err.png",
-                "name": "IMAGE_ERR",
+                "file": "images/menuicon.png",
+                "menuIcon": true,
+                "name": "IMAGE_MENU_ICON",
                 "type": "png"
             }
         ]
     },
     "shortName": "Nightscout",
     "uuid": "4bfa0b46-b9fa-4e1a-b2ba-a2ba7168f897",
     "versionCode": 12,
-    "versionLabel": "6.4",
+    "versionLabel": "7.0",
     "watchapp": {
         "watchface": true
     }

diff --git a/jshintrc b/jshintrc
@@ -12,7 +12,8 @@
     "XMLHttpRequest": true,
     "navigator": true, // For navigator.geolocation
     "localStorage": true,
-    "setTimeout": true
+    "setTimeout": true,
+    "setInterval": true
   },
 
   // Do not mess with standard JavaScript objects (Array, Date, etc)

diff --git a/resources/images/batt10.png b/resources/images/batt10.png
diff --git a/resources/images/batt20.png b/resources/images/batt20.png
diff --git a/resources/images/batt30.png b/resources/images/batt30.png
diff --git a/resources/images/batt40.png b/resources/images/batt40.png
diff --git a/resources/images/batt50.png b/resources/images/batt50.png
diff --git a/resources/images/batt60.png b/resources/images/batt60.png
diff --git a/resources/images/batt70.png b/resources/images/batt70.png
diff --git a/resources/images/batt80.png b/resources/images/batt80.png
diff --git a/resources/images/batt90.png b/resources/images/batt90.png
diff --git a/resources/images/battempty.png b/resources/images/battempty.png
diff --git a/resources/images/battfull.png b/resources/images/battfull.png
diff --git a/resources/images/battnone.png b/resources/images/battnone.png
diff --git a/resources/images/blooddrop.png b/resources/images/blooddrop.png
diff --git a/resources/images/brokenantenna.png b/resources/images/brokenantenna.png
diff --git a/resources/images/club100.png b/resources/images/club100.png
diff --git a/resources/images/club55.png b/resources/images/club55.png
diff --git a/resources/images/down.png b/resources/images/down.png
diff --git a/resources/images/down45.png b/resources/images/down45.png
diff --git a/resources/images/downdown.png b/resources/images/downdown.png
diff --git a/resources/images/flat.png b/resources/images/flat.png
diff --git a/resources/images/hourglass.png b/resources/images/hourglass.png
diff --git a/resources/images/logo.png b/resources/images/logo.png
diff --git a/resources/images/menuicon.png b/resources/images/menuicon.png
diff --git a/resources/images/none.png b/resources/images/none.png
diff --git a/resources/images/phoneoff.png b/resources/images/phoneoff.png
diff --git a/resources/images/phoneon.png b/resources/images/phoneon.png
diff --git a/resources/images/questionmarks.png b/resources/images/questionmarks.png
diff --git a/resources/images/rcvrnone.png b/resources/images/rcvrnone.png
diff --git a/resources/images/rcvroff.png b/resources/images/rcvroff.png
diff --git a/resources/images/rcvron.png b/resources/images/rcvron.png
diff --git a/resources/images/err.png → resources/images/specvaluenone.png b/resources/images/err.png → resources/images/specvaluenone.png
diff --git a/resources/images/stoplight.png b/resources/images/stoplight.png
diff --git a/resources/images/up.png b/resources/images/up.png
diff --git a/resources/images/up45.png b/resources/images/up45.png
diff --git a/resources/images/upup.png b/resources/images/upup.png