Merge pull request #58 from pachi81/develop

pre-release 0.8
pachi81 · Mar 23, 2023 · a4f29f6 · a4f29f6
2 parents 3030d1d + 46fefe3
commit a4f29f6
Show file tree

Hide file tree

Showing 15 changed files with 44 additions and 31 deletions.
diff --git a/INSTALLATION.md b/INSTALLATION.md
@@ -13,17 +13,13 @@ Download and install `GlucoDataHandler.apk` (allow install from unknown source i
 
 <img src='images/download.png' width=350>
 
-Open the app, it will look like this:
-
-<img src='images/installed.png' width=400>
-
-Open Juggluco and enable `Glucodata broadcast` in Settings. Save and Ok.
+Open Juggluco and enable `Glucodata broadcast` and select `de.michelinside.glucodatahandler` in Settings. Save and Ok.
 
 <img src='images/broadcast.png' width=700>
 
-You should now also see your BG display in the GlucoDataHandler app.
+Open the app, you should now also see your BG display in the GlucoDataHandler app.
 
-<img src='images/broadcast_ok.png' width=300>
+<img src='images/installed.png' width=400>
 
 ## 2 - Install GlucoDataHandler on your watch
 

diff --git a/README.md b/README.md
@@ -12,34 +12,48 @@ The wear version is a standalone version, you don´t need the mobile version, if
 
 -> [Installation instruction](./INSTALLATION.md)
 
-## Configuration
-In Juggluco activate "Glucodata broadcast" in the settings menu.
+## Settings
 
 ### Wear
 
-#### Settings
-
 <img src='images/settings_wear.png' width=200>
 
 * Target range: set your target glucose range needed for yellow color of the rate image (red color is set for an alarm)
 * Vibration: the watch vibrate if the target range is left and repeat it as long as the target range is left
 * Foreground: only if you have trouble with updating complications (also try deactivating Play Protect as this kills non Playstore apps)
 
+### Phone
+
+<img src='images/installed.png' width=400>
+
+* Send to xDrip: forward all received glucodata broadcasts to xDrip+
+* Forward glucodata broadcast: forward all received glucodata broadcasts to specified receiver
+  * you can select a receiver, if you do not select a receiver, a global broadcast is send and each app which has been registered for this glucodata broadcast can receive it 
+
 #### Complications
 There are several complications for the different types of wear OS complications, which provides:
 * Glucose value (used also for range circle)
 
 <img src='images/complications_glucose1.png' width=200>
 <img src='images/complications_glucose2.png' width=200>
 
+* Glucose value as background image (if supported by watch face and it seems to be only available in Wear OS 3)
+
+<img src='images/complications_large_1.png' width=200>
+<img src='images/complications_large_2.png' width=200>
+
 * Delta value (per minute)
 
 <img src='images/complications_delta.png' width=200>
 
-* Rate (trend) as value and arrow
+* Rate (trend) as value and arrow (the arrow rotate dynamically between +2.0 (↑) and  -2.0 (↓) and shows double arrows from +3.0 (⇈) and -3.0 (⇊) )
 
 <img src='images/complications_rate.png' width=200>
 
+* Battery level from wear and phone (if connected)
+
+<img src='images/complications_battery.png' width=200>
+
 **IMPORTANT:** Not all complications are fully supported by any watchface. For example the SHORT_TEXT type supports an icon, a text and a title, but the most watchfaces only show icon and text or text and title, but there are some, showing all 3 types in one.
 Also the RANGE_VALUE complication is handled different in each watchface.
 

diff --git a/TASKER.md b/TASKER.md
@@ -6,17 +6,17 @@ The phone application supports [Tasker](https://play.google.com/store/apps/detai
 
 The event contains these variables:
 
-| Tasker Variable | glucodata.Minute Variable | Description                                                                            |
-| ----------------- | --------------------------- | ---------------------------------------------------------------------------------------- |
-| %alarm          | Alarm                     | Alarm value set by Juggluco (0: no value, 6: high glucose value, 7: low glucose value) |
-| %arrow          | -                         | Calculate unicode arrow for the current rate value                                     |
-| %delta          | -                         | Delta per minute between the current and the last value (mg/dl or mmol/l)              |
-| %dexcomlabel    | -                         | Calculated dexcom specific label for the current rate value                            |
-| %glucose        | glucose                   | Glucose value in the unit, defined in Juggluco app (mg/dl or mmol/l)                   |
-| %rate           | Rate                      | Rate of change of the glucose value                                                    |
-| %ratelabel      | -                         | Calculated label for the current rate value                                            |
-| %rawvalue       | mgdl                      | Glucose value in mg/dl                                                                 |
-| %sensorid       | SerialNumber              | Serial number of the current used sensor                                               |
-| %time           | Time                      | Timestamp in ms since 1.1.1970                                                         |
-| %timediff       | -                         | Duration in ms between the current and the previous received value                     |
-| %unit           | -                         | Unit of the glucose value, either mg/dl or mmol/l                                      |
+| Tasker Variable | glucodata.Minute Variable | Description                                                                                                                                                   |
+| ----------------- | --------------------------- |---------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| %alarm          | Alarm                     | Alarm value set by Juggluco (0: no value, 6/14: high glucose value, 7/15: low glucose value)<br/>Alarm levels 14 and 15 are set, if Juggluco raises an alert. |
+| %arrow          | -                         | Calculate unicode arrow for the current rate value                                                                                                            |
+| %delta          | -                         | Delta per minute between the current and the last value (mg/dl or mmol/l)                                                                                     |
+| %dexcomlabel    | -                         | Calculated dexcom specific label for the current rate value                                                                                                   |
+| %glucose        | glucose                   | Glucose value in the unit, defined in Juggluco app (mg/dl or mmol/l)                                                                                          |
+| %rate           | Rate                      | Rate of change of the glucose value                                                                                                                           |
+| %ratelabel      | -                         | Calculated label for the current rate value                                                                                                                   |
+| %rawvalue       | mgdl                      | Glucose value in mg/dl                                                                                                                                        |
+| %sensorid       | SerialNumber              | Serial number of the current used sensor                                                                                                                      |
+| %time           | Time                      | Timestamp in ms since 1.1.1970                                                                                                                                |
+| %timediff       | -                         | Duration in ms between the current and the previous received value                                                                                            |
+| %unit           | -                         | Unit of the glucose value, either mg/dl or mmol/l                                                                                                             |
diff --git a/TODO.md b/TODO.md
@@ -3,10 +3,13 @@
 ## Phone app
 
 - [x] Glucodata Receiver
-- [x] Tasker Event
+- [x] Tasker Glucodata Event
 - [x] Wear connection
-- [ ] Send to xdrip
-- [x] Re-send glucodata intent (received from wear)
+- [x] Send to xdrip
+- [x] Forward glucodata intent
+- [ ] Phone widget
+- [ ] Tasker wear connection event
+- [ ] Change settings using tasker
 
 ## Wear app
 

diff --git a/images/complications_battery.png b/images/complications_battery.png
diff --git a/images/complications_glucose1.png b/images/complications_glucose1.png
diff --git a/images/complications_glucose2.png b/images/complications_glucose2.png
diff --git a/images/complications_large_1.png b/images/complications_large_1.png
diff --git a/images/complications_large_2.png b/images/complications_large_2.png
diff --git a/images/installed.png b/images/installed.png
diff --git a/images/settings_wear.png b/images/settings_wear.png
diff --git a/images/watch.png b/images/watch.png
diff --git a/images/watch_setup.png b/images/watch_setup.png
diff --git a/mobile/build.gradle b/mobile/build.gradle
@@ -12,7 +12,7 @@ android {
         minSdk 26
         targetSdk 33
         versionCode 1
-        versionName "0.7.9"
+        versionName "0.8"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/wear/build.gradle b/wear/build.gradle
@@ -12,7 +12,7 @@ android {
         minSdk 26
         targetSdk 33
         versionCode 1
-        versionName "0.7.9"
+        versionName "0.8"
     }
 
     buildTypes {