Merge branch 'master' of github.com:bahbka/pebble-my-data

15 files changed, 52 insertions, 8 deletions

diff --git a/README.md b/README.md
index 0b0ccdb..632ae93 100644
--- a/README.md
+++ b/README.md
@@ -14,21 +14,48 @@ Inspired by [Pebble Cards](http://keanulee.com/pebblecards).
 * No companion app required, using PebbleKit JS
 * Force update with select button
 * Append short=1 or long=1 GET param on short/long select button update
+* Append coordinates to URL (configurable)
 * Scrollable data area
 * Custom update interval, specified in JSON
 * Vibrate on update if specified in JSON
 * Change text font from JSON
 * Black/white theme switched from JSON
-* Vibrate on bluetooth connection loss
+* Turn on light from JSON
+* Blink content from JSON
+* Scroll-up content after update from JSON
+* Vibrate on bluetooth connection loss (configurable)
 * Watches battery charge status
+* Digital clock (12h/24h support), seconds dots blinking (configurable)
+
+## Changelog
+
+### 2.0.3
+
+- Append coordinates to URL (configurable)
+- Digital clock font, AM/PM support
+- Seconds dots blinking (configurable)
+- Configurable vibration on bluetooth loss
+- Turn on light (value in JSON)
+- Blink content (value in JSON)
+- Scroll-up content after update (value in JSON)
+- Improved configuration page
+- Some minor fixes
+
+### 1.1.0
+
+- Append short=1 or long=1 GET param to URL on short/long select button update 
+
+### 1.0.0
+
+- Initial release
 
 ## Screenshots
-![pebble screenshot 1](https://raw.githubusercontent.com/bahbka/pebble-my-data/master/stuff/screenshots/pebble_screenshot1.png)
-![pebble screenshot 2](https://raw.githubusercontent.com/bahbka/pebble-my-data/master/stuff/screenshots/pebble_screenshot2.png)
-![pebble screenshot 6](https://raw.githubusercontent.com/bahbka/pebble-my-data/master/stuff/screenshots/pebble_screenshot6.png)
-![pebble screenshot 4](https://raw.githubusercontent.com/bahbka/pebble-my-data/master/stuff/screenshots/pebble_screenshot4.png)
-![pebble screenshot 7](https://raw.githubusercontent.com/bahbka/pebble-my-data/master/stuff/screenshots/pebble_screenshot7.png)
-![android screenshot 1](https://raw.githubusercontent.com/bahbka/pebble-my-data/master/stuff/screenshots/android_screenshot1_small.png)
+![pebble screenshot 1](https://raw.githubusercontent.com/bahbka/pebble-my-data/master/stuff/screenshots/pebble-screenshot_2014-07-06_18-18-15.png)
+![pebble screenshot 2](https://raw.githubusercontent.com/bahbka/pebble-my-data/master/stuff/screenshots/pebble-screenshot_2014-07-06_18-19-33.png)
+![pebble screenshot 3](https://raw.githubusercontent.com/bahbka/pebble-my-data/master/stuff/screenshots/pebble-screenshot_2014-07-06_18-23-00.png)
+![pebble screenshot 4](https://raw.githubusercontent.com/bahbka/pebble-my-data/master/stuff/screenshots/pebble-screenshot_2014-07-06_18-26-22.png)
+![pebble screenshot 5](https://raw.githubusercontent.com/bahbka/pebble-my-data/master/stuff/screenshots/pebble-screenshot_2014-07-06_18-27-09.png)
+![android screenshot 1](https://raw.githubusercontent.com/bahbka/pebble-my-data/master/stuff/screenshots/Screenshot_2014-07-06-18-31-03_small.png)
 
 ## JSON
 
@@ -39,7 +66,10 @@ JSON output example (some fields are optional):
       "refresh": 300,
       "vibrate": 0,
       "font": 4,
-      "theme": 0
+      "theme": 0,
+      "scroll": 1,
+      "light": 1,
+      "blink": 3
     }
 
 GET param short=1 or long=1 added to URL on short or long select button update
@@ -66,6 +96,20 @@ GET param short=1 or long=1 added to URL on short or long select button update
 - 0 - Black
 - 1 - White
 
+### Scroll
+
+- 0 - Keep position
+- 1 - Scroll up
+
+### Light
+
+- 0 - Do nothing
+- 1 - Turn pebble light on for short time
+
+### Blink
+
+- 1..10 - Blink content count (blinks with black/white for "count" times)
+
 ## Bugs
 
 Sometime after install JS app fails to start, issue related Pebble App. Force stop Pebble App and start it again.
diff --git a/stuff/screenshots/android_screenshot1.png b/stuff/screenshots/android_screenshot1.png
deleted file mode 100644
index 65f91c9..0000000
--- a/stuff/screenshots/android_screenshot1.png
+++ /dev/null
diff --git a/stuff/screenshots/android_screenshot1_small.png b/stuff/screenshots/android_screenshot1_small.png
deleted file mode 100644
index 0a2773a..0000000
--- a/stuff/screenshots/android_screenshot1_small.png
+++ /dev/null
diff --git a/stuff/screenshots/pebble-screenshot_2014-07-06_18-18-15.png b/stuff/screenshots/pebble-screenshot_2014-07-06_18-18-15.png
new file mode 100644
index 0000000..40efee2
--- /dev/null
+++ b/stuff/screenshots/pebble-screenshot_2014-07-06_18-18-15.png
diff --git a/stuff/screenshots/pebble-screenshot_2014-07-06_18-19-33.png b/stuff/screenshots/pebble-screenshot_2014-07-06_18-19-33.png
new file mode 100644
index 0000000..c50c01f
--- /dev/null
+++ b/stuff/screenshots/pebble-screenshot_2014-07-06_18-19-33.png
diff --git a/stuff/screenshots/pebble-screenshot_2014-07-06_18-23-00.png b/stuff/screenshots/pebble-screenshot_2014-07-06_18-23-00.png
new file mode 100644
index 0000000..3a053b1
--- /dev/null
+++ b/stuff/screenshots/pebble-screenshot_2014-07-06_18-23-00.png
diff --git a/stuff/screenshots/pebble-screenshot_2014-07-06_18-26-22.png b/stuff/screenshots/pebble-screenshot_2014-07-06_18-26-22.png
new file mode 100644
index 0000000..1ca6db6
--- /dev/null
+++ b/stuff/screenshots/pebble-screenshot_2014-07-06_18-26-22.png
diff --git a/stuff/screenshots/pebble-screenshot_2014-07-06_18-27-09.png b/stuff/screenshots/pebble-screenshot_2014-07-06_18-27-09.png
new file mode 100644
index 0000000..abbbe8c
--- /dev/null
+++ b/stuff/screenshots/pebble-screenshot_2014-07-06_18-27-09.png
diff --git a/stuff/screenshots/pebble_screenshot1.png b/stuff/screenshots/pebble_screenshot1.png
deleted file mode 100644
index 6dc7bbd..0000000
--- a/stuff/screenshots/pebble_screenshot1.png
+++ /dev/null
diff --git a/stuff/screenshots/pebble_screenshot2.png b/stuff/screenshots/pebble_screenshot2.png
deleted file mode 100644
index b44ae43..0000000
--- a/stuff/screenshots/pebble_screenshot2.png
+++ /dev/null
diff --git a/stuff/screenshots/pebble_screenshot3.png b/stuff/screenshots/pebble_screenshot3.png
deleted file mode 100644
index 12beb58..0000000
--- a/stuff/screenshots/pebble_screenshot3.png
+++ /dev/null
diff --git a/stuff/screenshots/pebble_screenshot4.png b/stuff/screenshots/pebble_screenshot4.png
deleted file mode 100644
index 6d6f487..0000000
--- a/stuff/screenshots/pebble_screenshot4.png
+++ /dev/null
diff --git a/stuff/screenshots/pebble_screenshot5.png b/stuff/screenshots/pebble_screenshot5.png
deleted file mode 100644
index 2f63b21..0000000
--- a/stuff/screenshots/pebble_screenshot5.png
+++ /dev/null
diff --git a/stuff/screenshots/pebble_screenshot6.png b/stuff/screenshots/pebble_screenshot6.png
deleted file mode 100644
index 0c6e930..0000000
--- a/stuff/screenshots/pebble_screenshot6.png
+++ /dev/null
diff --git a/stuff/screenshots/pebble_screenshot7.png b/stuff/screenshots/pebble_screenshot7.png
deleted file mode 100644
index a19ce00..0000000
--- a/stuff/screenshots/pebble_screenshot7.png
+++ /dev/null