diff --git a/docs/EN/Maintenance/ReleaseNotes.md b/docs/EN/Maintenance/ReleaseNotes.md index f6924738b985..6011faacf4c2 100644 --- a/docs/EN/Maintenance/ReleaseNotes.md +++ b/docs/EN/Maintenance/ReleaseNotes.md @@ -85,6 +85,7 @@ Version 4.0.0.0 is currently available as **4.0.0-beta1**, a test version, not t - Accessibility: the phone app works with a screen reader - named controls, spoken status, graph descriptions and headings to skim @MilosKozak - [Settings import](../Maintenance/ExportImportSettings.md): can keep the pump settings @MilosKozak - Persistent notification uses Android live updates, with Samsung Now bar support and the delta @premnirmal +- BG graph: [press and hold](#aaps-screens-graph-press-and-hold) to see the values at a reading, on every graph of the overview @t1dude @olorinmaia - Performance improvements @MilosKozak ### New devices @@ -104,9 +105,11 @@ Version 4.0.0.0 is currently available as **4.0.0-beta1**, a test version, not t - [Watch app](../WearOS/WearOsSmartwatch.md) rebuilt in Compose, new tiles and complications, automatic watch face install (Watch Face Push) on Wear OS 6+ @olorinmaia @Philoul - CustomWatchface available for WearOS 6.0 (GW7, GW8, GW9...) with a WFF dedicated watchface @Philoul @olorinmaia - CustomWatchface can now include 5 Complication slots you can customize (new feature only available for older watches) @Philoul -- New WFF watchface based on AAPS complications @olorinmaia +- New [WFF watchface based on AAPS complications](#wearos-complications-watchface-setup) @olorinmaia - Corrections in Bolus wizard and Quick wizard result @olorinmaia - New BG graph and Running mode activity in main menu @olorinmaia +- Bolus wizard: [meal type](#WearOsSmartwatch-wizard-meal-type) page that splits the carbs like the phone wizard, and [carb time](#WearOsSmartwatch-wizard-carb-time) with the *time to eat* reminder on the watch @olorinmaia +- [Phone alarms on the watch](#WearOsSmartwatch-phone-alarms): the watch shows the alarm and offers Silence and Mute 5 min @olorinmaia ### Build - CI workflows for tag/branch builds, JDK version mapping @Angus-repo diff --git a/docs/EN/RemoteFeatures/RemoteControlWearOS.md b/docs/EN/RemoteFeatures/RemoteControlWearOS.md index 526d29366b6c..653e9e562b47 100644 --- a/docs/EN/RemoteFeatures/RemoteControlWearOS.md +++ b/docs/EN/RemoteFeatures/RemoteControlWearOS.md @@ -75,16 +75,28 @@ A small scene icon next to a running mode, a temporary target or a profile switc Open **Calculator** from the **AAPS** main menu, from the [Actions tile](#WearOsSmartwatch-wear-os-tiles) or from a complication set to open the wizard. It walks through a few pages, swipe from right to left to go on: -| Carbs | Meal type | Request | Result | Calculation | Confirm | -| --- | --- | --- | --- | --- | --- | -| ![Carbs page](../images/wearos/calculator/calculator_carbs.png) | ![Meal type page](../images/wearos/calculator/calculator_meal_type.png) | ![Request page](../images/wearos/calculator/calculator_request.png) | ![Result page](../images/wearos/calculator/calculator_result.png) | ![Calculation details](../images/wearos/calculator/calculator_result_details.png) | ![Confirm page](../images/wearos/calculator/calculator_confirm.png) | +| Carbs | Request | Result | Calculation | Confirm | +| --- | --- | --- | --- | --- | +| ![Carbs page](../images/wearos/calculator/calculator_carbs.png) | ![Request page](../images/wearos/calculator/calculator_request.png) | ![Result page](../images/wearos/calculator/calculator_result.png) | ![Calculation details](../images/wearos/calculator/calculator_result_details.png) | ![Confirm page](../images/wearos/calculator/calculator_confirm.png) | 1. **Carbs**: enter the carbs with the **+10**, **+5**, **−** and **+** buttons. -2. **Meal type**: only with **Calculator Meal Type** turned on in the watch settings, see [Choosing the meal type](#WearOsSmartwatch-wizard-meal-type). -3. **Percentage**: only with **Calculator Percentage** turned on, see the note below. -4. **Request**: the last page shows what you entered, the carbs and the percentage. Tap the check mark to send it to the phone, which runs the calculation. -5. **Result**: the bolus **AAPS** proposes, with the carbs now and the eCarbs later under it. Adjust the dose with **−** and **+**, see below. Scroll down for the **Calculation** card: tap it to see every line of the calculation, the same as on the phone. -6. **Confirm**: swipe to the second page and tap the check mark. The phone delivers the bolus and records the carbs. +2. **Request**: the last page before the phone takes over. It shows what you entered: the carbs, and the meal type, carb time and percentage when you use them, see [Optional pages](#WearOsSmartwatch-calculator-optional-pages). Tap the check mark to send it to the phone, which runs the calculation. +3. **Result**: the bolus **AAPS** proposes, with the carbs under it: the carbs now and the eCarbs later, the carb time and the bell of the eat reminder. Adjust the dose with **−** and **+**, see below. Scroll down for the **Calculation** card: tap it to see every line of the calculation, the same as on the phone. +4. **Confirm**: swipe to the second page and tap the check mark. The phone delivers the bolus and records the carbs. + +(WearOsSmartwatch-calculator-optional-pages)= + +### Optional pages + +Three watch settings each add a page after **Carbs**. They are off by default. Open the **AAPS** main menu, then **Settings** > **Interface**, and turn on the ones you want; when more than one is on, the pages come in the order **Meal type**, **Carb time**, **Percentage**. The dots at the bottom of the calculator show how many pages it has. + +| Settings | Meal type | Carb time | Percentage | +| --- | --- | --- | --- | +| ![Calculator settings on the watch](../images/wearos/calculator/calculator_settings.png) | ![Meal type page](../images/wearos/calculator/calculator_meal_type.png) | ![Carb time page](../images/wearos/calculator/calculator_carb_time.png) | ![Percentage page](../images/wearos/calculator/calculator_percentage.png) | + +* **Calculator Meal Type**: **Bread**, **Cake** or **Pizza**, which splits the carbs of a slow meal into carbs now and eCarbs later, see [Choosing the meal type](#WearOsSmartwatch-wizard-meal-type). +* **Calculator Carb Time**: the minutes until you eat, with a **Set alarm** bell for the eat reminder, see [Carb time and the eat reminder](#WearOsSmartwatch-wizard-carb-time). +* **Calculator Percentage**: a percentage of the calculated bolus, for example 70 % when you want a smaller dose. It starts at the **Bolus percentage** of the phone's [Bolus wizard settings](#Preferences-deliver-this-part-of-bolus-wizard-result), 100 % unless you changed it. See also the note under [Adjusting the bolus on the result page](#WearOsSmartwatch-wizard-result). (WearOsSmartwatch-wizard-result)= @@ -92,11 +104,15 @@ Open **Calculator** from the **AAPS** main menu, from the [Actions tile](#WearOs The result page shows the bolus **AAPS** proposes, together with a **−** and a **+** button. Use them to adjust the dose before you confirm it, without going back to the phone. +| Proposed | More | Less | +| --- | --- | --- | +| ![The proposed bolus](../images/wearos/calculator/calculator_result_proposed.png) | ![The bolus raised by 0.20 U](../images/wearos/calculator/calculator_result_up.png) | ![The bolus lowered by 0.10 U](../images/wearos/calculator/calculator_result_down.png) | + * Each press changes the bolus by **one step of your pump**, so the amounts offered always match what your pump can actually deliver. * **Press and hold** a button to keep changing the value. The longer you hold, the faster it goes. * You cannot go below **0 U**, nor above your **max bolus** setting. -The running total is shown on the result page, so you always see the amount you are about to confirm. +The running total is shown on the result page, so you always see the amount you are about to confirm. The change is shown after the carbs, for example *(+0.20 U)*, and the button you used turns green for more or red for less. If **AAPS** had to limit the dose, for example because the calculated bolus is above your **max bolus** setting, a warning line in amber below the total says so (for example *"Bolus constraint applied"*). The same applies to a limited carbs amount. @@ -115,6 +131,26 @@ The watch calculator can split the carbs of a slow meal into carbs now and eCarb * The request and confirm pages show the carbs in the same way (*52+22 g*). The result page also shows when the eCarbs start and how long they last. * The bolus is calculated only for the carbs eaten now. The split uses the same numbers as the phone wizard. +(WearOsSmartwatch-wizard-carb-time)= + +### Carb time and the eat reminder + +With **Calculator Carb Time** turned on in the watch's **Settings** > **Interface**, a **Carb time** page follows the carbs: the minutes until you eat, like the [carb time](#aaps-screens-bolus-wizard) of the phone wizard. **Now** is the default. **−** and **+** move it in steps of 5 minutes, up to an hour before or after now. A time in the past is for carbs you have eaten already. + +With a time in the future, a **Set alarm** bell appears under the value. It is on by default, tap it to turn it off. The request and result pages show the carb time, for example *+30 min*, and the bell. The phone records the carbs at that time, moves the eCarbs of the meal type with it, and starts its **time to eat** reminder. + +| Result | BG graph | Running | Time to eat | +| --- | --- | --- | --- | +| ![Result page with a carb time](../images/wearos/calculator/calculator_result_carb_time.png) | ![The reminder in the BG graph](../images/wearos/eat_reminder/eat_reminder_graph.png) | ![The running reminder](../images/wearos/eat_reminder/eat_reminder_running.png) | ![The reminder rings](../images/wearos/eat_reminder/eat_reminder_ringing.png) | + +The reminder also lives on the watch, so it rings when the phone is out of reach too: + +* The **BG Graph** screen, the **BG Graph** tile and the graph of the **Complications watchface** draw a dashed orange line where the reminder rings, with the minutes left next to it. +* While it runs, a silent **Time to eat** notification with **Stop** and **+5 min** sits in the notification stream. It comes back when you swipe it away, until the reminder is over. +* When the time has come, the watch vibrates, and again every half minute for five minutes until you answer. The notification offers **Silence** and **+5 min**, and swiping it away silences it too. + +**Stop**, **Silence** and **+5 min** do the same on the watch, on the phone and on an **AAPSClient**, and all of them show the same reminder. + (Watchfaces-complications)= ## Complications @@ -333,9 +369,27 @@ Note: not all displays can handle always-on very well. It can cause screen burn- ![Simplified UI](../images/Watchface_simplified_ui.png) +(WearOsSmartwatch-phone-alarms)= + +## Phone alarms on the watch + +![A phone alarm on the watch](../images/wearos/alarm/phone_alarm_ringing.png) + +The watch shows the alarms of the phone, so you see why the phone makes a sound and can answer from the wrist. The watch vibrates, and again every half minute for five minutes until you answer. A notification shows the title and the text of the alarm, with the same answers as the [time to eat](#WearOsSmartwatch-wizard-carb-time) reminder: + +* **Silence**, or a swipe: the alarm stops, and the alarm screen on the phone closes. +* **Mute 5 min**: the alarm stops and rings again after five minutes, on the phone and on the watch. + +Two kinds of alarm reach the watch: + +* The alarm screen of the phone (pump errors, automation alarms, BG alarms): **Silence** and **Mute 5 min**. +* Urgent notifications with a sound, like *Pump unreachable* or a Nightscout alarm: **Silence** only. The phone has only **Dismiss** for those, and they come back by themselves while their cause lasts. + +The *time to eat* reminder is not sent this way: the watch rings that one by itself. + ## Snooze Alert shortcut -It is possible to create a shortcut to snooze the alerts/alarm of AAPS. Muting the sound via your watch is convenient and faster without reaching for your phone. Note; you still have to check your alarm message on your phone and handle it accordingly, but you can check that later. When your watch has two buttons, you can assign a key to the `AAPS Snooze Alert` program. +The watch [shows the alarm](#WearOsSmartwatch-phone-alarms) itself; the shortcut is a second way to silence it, with one press. It is possible to create a shortcut to snooze the alerts/alarm of AAPS. Muting the sound via your watch is convenient and faster without reaching for your phone. Note; you still have to check your alarm message on your phone and handle it accordingly, but you can check that later. When your watch has two buttons, you can assign a key to the `AAPS Snooze Alert` program. To link the button on the Samsung Watch 4 go to `Settings > Advanced Features > Customize Buttons > Double press > AAPS Snooze Alert` diff --git a/docs/EN/images/wearos/alarm/phone_alarm_ringing.png b/docs/EN/images/wearos/alarm/phone_alarm_ringing.png new file mode 100644 index 000000000000..1e8866f260a8 Binary files /dev/null and b/docs/EN/images/wearos/alarm/phone_alarm_ringing.png differ diff --git a/docs/EN/images/wearos/calculator/calculator_carb_time.png b/docs/EN/images/wearos/calculator/calculator_carb_time.png new file mode 100644 index 000000000000..e42a998a6fae Binary files /dev/null and b/docs/EN/images/wearos/calculator/calculator_carb_time.png differ diff --git a/docs/EN/images/wearos/calculator/calculator_confirm.png b/docs/EN/images/wearos/calculator/calculator_confirm.png index 4ab0d682d27e..24b11126d0cf 100644 Binary files a/docs/EN/images/wearos/calculator/calculator_confirm.png and b/docs/EN/images/wearos/calculator/calculator_confirm.png differ diff --git a/docs/EN/images/wearos/calculator/calculator_percentage.png b/docs/EN/images/wearos/calculator/calculator_percentage.png new file mode 100644 index 000000000000..5eb402bedf0e Binary files /dev/null and b/docs/EN/images/wearos/calculator/calculator_percentage.png differ diff --git a/docs/EN/images/wearos/calculator/calculator_request.png b/docs/EN/images/wearos/calculator/calculator_request.png index 06230e693964..679933b3e052 100644 Binary files a/docs/EN/images/wearos/calculator/calculator_request.png and b/docs/EN/images/wearos/calculator/calculator_request.png differ diff --git a/docs/EN/images/wearos/calculator/calculator_result.png b/docs/EN/images/wearos/calculator/calculator_result.png index d714a55a9883..9cfa1aa15e20 100644 Binary files a/docs/EN/images/wearos/calculator/calculator_result.png and b/docs/EN/images/wearos/calculator/calculator_result.png differ diff --git a/docs/EN/images/wearos/calculator/calculator_result_carb_time.png b/docs/EN/images/wearos/calculator/calculator_result_carb_time.png new file mode 100644 index 000000000000..f9813925de50 Binary files /dev/null and b/docs/EN/images/wearos/calculator/calculator_result_carb_time.png differ diff --git a/docs/EN/images/wearos/calculator/calculator_result_details.png b/docs/EN/images/wearos/calculator/calculator_result_details.png index 63def4b1737e..d307ead974f9 100644 Binary files a/docs/EN/images/wearos/calculator/calculator_result_details.png and b/docs/EN/images/wearos/calculator/calculator_result_details.png differ diff --git a/docs/EN/images/wearos/calculator/calculator_result_down.png b/docs/EN/images/wearos/calculator/calculator_result_down.png new file mode 100644 index 000000000000..2f47482c9ca7 Binary files /dev/null and b/docs/EN/images/wearos/calculator/calculator_result_down.png differ diff --git a/docs/EN/images/wearos/calculator/calculator_result_proposed.png b/docs/EN/images/wearos/calculator/calculator_result_proposed.png new file mode 100644 index 000000000000..799c6fc99386 Binary files /dev/null and b/docs/EN/images/wearos/calculator/calculator_result_proposed.png differ diff --git a/docs/EN/images/wearos/calculator/calculator_result_up.png b/docs/EN/images/wearos/calculator/calculator_result_up.png new file mode 100644 index 000000000000..206553192a42 Binary files /dev/null and b/docs/EN/images/wearos/calculator/calculator_result_up.png differ diff --git a/docs/EN/images/wearos/calculator/calculator_settings.png b/docs/EN/images/wearos/calculator/calculator_settings.png new file mode 100644 index 000000000000..70ff438006b7 Binary files /dev/null and b/docs/EN/images/wearos/calculator/calculator_settings.png differ diff --git a/docs/EN/images/wearos/eat_reminder/eat_reminder_graph.png b/docs/EN/images/wearos/eat_reminder/eat_reminder_graph.png new file mode 100644 index 000000000000..1a2c261ca53f Binary files /dev/null and b/docs/EN/images/wearos/eat_reminder/eat_reminder_graph.png differ diff --git a/docs/EN/images/wearos/eat_reminder/eat_reminder_ringing.png b/docs/EN/images/wearos/eat_reminder/eat_reminder_ringing.png new file mode 100644 index 000000000000..7960ad070391 Binary files /dev/null and b/docs/EN/images/wearos/eat_reminder/eat_reminder_ringing.png differ diff --git a/docs/EN/images/wearos/eat_reminder/eat_reminder_running.png b/docs/EN/images/wearos/eat_reminder/eat_reminder_running.png new file mode 100644 index 000000000000..72469552fef8 Binary files /dev/null and b/docs/EN/images/wearos/eat_reminder/eat_reminder_running.png differ