Merge remote-tracking branch 'origin/master'

_data/wearables.csv

@@ -3,6 +3,7 @@ Wear OS devices,"Android Wear 1.0<br> Wear OS 2.0<br >Wear OS 3.0",YES (↝❤),
 Wear OS devices <br> SpO2 support,"Ticwatch Pro 3 💟/◌<br> TicWatch Pro 3 Ultra GPS <br> Ticwatch E 3<br> Ticwatch 5<br> Fossil Gen 6",YES (↝❤◌),↝❤◌, ,"If you have a Wear OS-based wearable with Spo2 sensor, that is not on the list, please let us know. We can adjust the parameters and integrate the sensor on other watches too. </br> <br> <a href=""wearos.html"">Details here</a>."
 Wear OS devices <br> HRV support,"Ticwatch Pro 3<br>",YES (↝❤💟/◌),↝❤💟/◌, ,"Ticwatch devices do not allow <a href=""/sleep/breath_rate.html"">SpO2 reading</a> and HRV data at once. </br> </br>If you have a Wear OS-based wearable with HRV sensor, that is not on the list, please let us know. We can check the logs if the wearable provides the required data we could read. </br> <br> <a href=""wearos.html"">Details here</a>."
 Xiaomi Mi Bands <br> Notify,"Mi Band 1, Mi Band 2, Mi Band 3, Mi Band 4, Mi Band 5, Mi Band 6, Mi Band 7",YES (↝❤),↝❤,~5%,"You need:</br>- <a href=""https://play.google.com/store/apps/details?id=com.mc.miband1"">Notify for Mi Band companion app</a>. </br> </br> <a href=""notify.html"">Details here</a>."
+Xiaomi Mi Bands <br> Notify,"Mi Band 8 (PRO), XiaoMi Watch S1, Mi Band 7 Pro, Redmi Band 2, Redmi Watch 2, Redmi Watch 3",YES (↝❤),↝❤,~5%,"You need:</br>- <a href=""https://play.google.com/store/apps/details?id=com.mc.xiaomi1"">Notify for Xiaomi & Mi Fitness companion app</a>. </br> </br> <a href=""notify.html"">Details here</a>."
 Xiaomi Mi Bands <br> Tools,"Mi Band 1 (except 1S), Mi Band 2, Mi Band 3, Mi Band 4, Mi Band 5, Mi Band 6, Mi Band 7",YES (↝❤),↝❤,~5%,"You need:</br>- <a href=""https://play.google.com/store/apps/details?id=cz.zdenekhorak.mibandtools"">Tools & MiBand companion app</a>. </br> </br> <a href=""tools.html"">Details here</a>."
 Huami Amazfits <br> Tools,"Amazfit GTS, Amazfit GTS 2 Amazfit GTS 3, Amazfit GTS 2E, Amazfit GTS 2 Mini, Amazfit GTR, Amazfit GTR 2, Amazfit GTR 2E, Amazfit GTR 3, Amazfit GTR 3 PRO, Amazfit T-Rex, Amazfit Bip, Amazfit Bip S, Amazfit Bip Lite, Amazfit Arc, Amazfit Cor, Amazfit Cor 2",YES (↝❤),↝❤,,"You need:<br>- <a href=""https://play.google.com/store/apps/details?id=cz.zdenekhorak.amazfittools"">Tools & Amazfit companion app</a> <br> <br> Also see <a href=""http://help.amazfittools.com/knowledge_base/topics/sleep-as-android-amazfit"">T&A help</a>. </br> </br> <a href=""tools.html"">Details here</a>."
 Huami Amazfits <br> Notify,"Amazfit T-Rex, Amazfit GTS, Amazfit GTR (47mm & 42mm), Amazfit GTR Lite (47mm & 42mm), Amazfit Verge Lite, Amazfit Bip Lite, Amazfit Bip & Amazfit Bip S, Amazfit Bip 3, Amazfit Mi Dong Cor, Amazfit Arc)",YES (↝❤),↝❤,,"You need:<br>- <a href=""https://play.google.com/store/apps/details?id=com.mc.amazfit1"">Notify & Fitness for Amazfit companion app</a>. </br> </br> <a href=""notify.html"">Details here</a>."

_faqs/purchase_not_unlocked.adoc

@@ -22,11 +22,11 @@ NOTE: After the initial purchase, you need to wait for a while (maximum a few ho
 
 . Make sure the Google account you did purchase the app with is the primary account on all your devices in the Play Store app,
 go to “My apps” in the Play Store app in order to refresh, then restart your phone. This is super important.
-. If the app doesn’t seem to unlock, please reinstall the app, this has solved the problem for many users recently.
+. If the app doesn’t seem to unlock, please reinstall the app, this has solved the problem for many users recently. Do not forget to backup your data - see <</services/backup_data#, details here>>.
 
 Another way that seemingly helped recently:
 
-. Uninstall Sleep as Android.
+. Uninstall Sleep as Android (<</services/backup_data#, backup your data first!>>).
 . In a BROWSER on your desktop: Log in to the web interface of Google Play with the account you used to purchase.
 . Install Sleep as Android from the web interface to your device.
 . Don’t let it open the Play Store app, but use the install button and choose your device in the browser.

devices/notify.adoc

@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Notify for Mi Band and Amazfit
+title: Notify for Mi Band and Amazfit and Xiaomi & Mi Fitness
 nav_order: 8
 parent: /devices/wearables.html
 tags:
@@ -13,12 +13,14 @@ tags:
 
 Sleep as Android does not have direct integration with Mi Bands and Amazfit, because the API necessary for integration is not open.
 But thanks to the Notify app, you can use some devices with Sleep app.
-https://play.google.com/store/apps/details?id=com.mc.miband1&hl=en[Notify app for Mi Band] and https://play.google.com/store/apps/details?id=com.mc.amazfit1&hl=en[Notify app for Amazfit & Zepp] are developed by https://play.google.com/store/apps/developer?id=OneZeroBit&hl=en[OneZerobit].
+https://play.google.com/store/apps/details?id=com.mc.miband1&hl=en[Notify for Mi Band], https://play.google.com/store/apps/details?id=com.mc.xiaomi1&hl=en[Notify for Xiaomi & Mi Fitness] and https://play.google.com/store/apps/details?id=com.mc.amazfit1&hl=en[Notify for Amazfit & Zepp] are developed by https://play.google.com/store/apps/developer?id=OneZeroBit&hl=en[OneZerobit].
 
 You can visit Notify app page for http://forum.mibandnotify.com/discussion/20117/sleep-as-android-integration[Sleep as Android integration here].
 
 == Supported Mi Bands[[supported_wearables]]
 
+=== Notify for Mi Band
+
 - Mi Band 1, 1S and 1A
 - Mi Band HRX
 - Mi Band 2
@@ -28,6 +30,15 @@ You can visit Notify app page for http://forum.mibandnotify.com/discussion/20117
 - Mi Band 6
 - Mi Band 7
 
+=== Notify for Xiaomi and Mi Fitness
+
+- Mi Band 7 PRO
+- Mi Band 8
+- Mi Band 8 PRO
+- Xiaomi Watch S1
+- Redmi Band 2
+- Redmi Watch 2+3
+
 == Supported Amazfits[[supported_wearables]]
 
 - Amazfit T-Rex

devices/one_ui.adoc

@@ -9,7 +9,7 @@ tags:
 ---
 
 
-Sleep tracking with Galaxy Watch 4 and Galaxy Watch 5 (running the ONE UI Watch OS) requires a companion app installed from the Play Store on the watch.
+Sleep tracking with Galaxy Watch model 4 and newer models (running the ONE UI Watch OS) requires a companion app installed from the Play Store on the watch.
 
 NOTE: Unfortunately due to limit put for non-Samsung apps, we cannot read SpO2 or HRV from those watches at the moment.
 

general/release_notes.adoc

@@ -7,7 +7,27 @@ nav_order: 206
 
 You can download any older version from https://sleep.urbandroid.org/more/download/[our web here].
 
-== Latest version 20231001
+== Latest version 20231023
+
+*Features*
+
+* Sleep Regularity Index (SRI) now accounts for any awake intervals withing sleep records
+* You can choose start day for non-weekly Alarm schedules
+* Support for HRV calculation from RR intervals on supported Wear OS watches, tested on TicWatch 5 (Wear OS app update needed)
+* Now you can get HR, HRV and SPO2 tracking at the same time on TicWatch 5 see https://bit.ly/46YZBnp
+
+*Bug fixes*
+
+* Fix for sleep time estimated notification being shown with automatic save mode
+* Fix for disabled Snooze after alarm time
+* Fix for Jumping sheep CAPTCHA speed on new phones (CAPTCHA pack update needed)
+* Fix for a resent regression in noise record batch delete
+* Fix for Alarm repeat mode sync when taping on weekdays
+* Fix for starred recordings not shown on sleep graph
+* More Sleep Regularity Index fixes
+
+
+== 20231001
 
 *NEWS*
 

services/backup_data.adoc

@@ -118,4 +118,19 @@ image:system_backup.png[Google One backup]
 If you tap on the CSV or ZIP file that was exported from Sleep (anywhere - in your email attachment, Drive, Dropbox, file manager), the system will offer to open it with Sleep as Android. This will import the included sleep records.
 
 [[manual_import]]
-image:import.png[Importing]
+image:import.png[Importing]
+
+== Import sleep noise files
+
+If you wish to import sleep noise files to a new phone, you need to do this manually by copying the folder to the storage on the new phone.
+
+. Save the content of the folder you have as your storage path on the first phone - you can find the storage path at _Settings → Sleep Noise recording → Storage path_.
+. On the new phone, decide a location for your new storage path.
+. If you copied the whole folder with *sleep-data* folder, copy the whole folder to the chosen location on the new phone.
+. If you copied only the sound files, create folder *sleep-data* in your chosen location, and inside this folder, create a sub-folder *rec*. And copy the files to this *rec* folder.
+. Choose the storage path on the new phone in _Settings → Sleep Noise recording → Storage path_ to *your_chosen_folder* (not to the *your_chosen_folder\sleep-data\rec\* subfolder).
+. Sync the backup file - the sound meta-data will pair with the files copied.
+
+NOTE: The actual sound files should be in *your_chosen_folder\sleep-data\rec\*.
+
+

sleep/advice.adoc

@@ -18,7 +18,7 @@ toc::[]
 :toclevels: 3
 
 == General description
-Advice watches recent trends in the main sleep dimensions (Duration, Irregularity, Deep sleep %, Snoring, Social jet-lag...).
+Advice watches recent trends in the main sleep dimensions (Duration, Regularity, Deep sleep %, Snoring, Social jet-lag...).
 
 In most cases it compares your last 60 days aggregates to the last 7 days aggregates and look for significant recent worsening or improvements.
 
@@ -43,11 +43,15 @@ a|* Has it recently improved or worsened? (last 7 days compared to last 60 days)
 * How does it compare to others in your country?
 
 
-|Irregularity
+|Regularity
 a|* Has it recently improved or worsened? (last 7 days compared to last 60 days)
 * Is it in healthy bounds for last 60 days average (1 hour - 20 minutes)?
 * How does it compare to others in your country?
 
+|Regularity index
+a|* Has it recently improved or worsened? (5-point change in last 7 days compared to the last month)
+* Is it in healthy bounds (over 80) or unhealthy bounds (less then 60) for the last month ?
+
 |Deep sleep %
 a|* Has it recently improved or worsened? (last 7 days compared to last 60 days).
 * Is it in healthy bounds for last 60 days average (25% - 75%)?

sleep/charts.adoc

@@ -68,19 +68,50 @@ The point at 4 May is the average of sleep duration from 5 April through 4 May.
 The chart should not have many extremes (regular, periodic chart is normal).
 |===
 
-=== Irregularity
+=== Regularity
 [cols="1,2"]
 |===
 a|image:charts/trend/trend_irregularity.png[]
-a|*Irregularity* chart shows you how much is your sleep irregular. The higher the line is, the more irregular your sleep is.
+a|*Regularity* chart shows you how much is your sleep irregular. The higher the line is, the more irregular your sleep is.
 
-* *Blue line*: Shows the irregularity for each day.
 
 *How should it look?*
 
 While some irregularity is normal, you should strive to keep it to minimum - keep the line at low values.
 |===
 
+
+[[chart_sri]]
+
+=== Regularity index
+[cols="1,2"]
+|===
+a|image:charts/trend/charts_sri.png[]
+a|*Regularity Index* chart shows you the Sleep regularity Index - The <</sleep/chrono_jetlag#sri,SRI explained here>>.
+
+*How should it look?*
+
+Ideally, your SRI is kept high close to 100%. The SRI of 100 means your asleep and awake times where absolutely identical between two consecutive days. Values above 80 are considered as regular sleep.
+
+|===
+
+
+[[chart_sri_dif]]
+
+=== Regularity index (+/-)
+[cols="1,2"]
+|===
+a|image:charts/trend/chart_sri_dif.png[]
+a|*Regularity Index (+/-)* chart shows you the increase/decrease of the Sleep regularity Index from your average <</sleep/chrono_jetlag#sri,see details about SRI here>>.
+
+* *Blue columns*: Increase
+* *Red columns*: Decrease
+
+*How should it look?*
+
+Your ideal graph shows minimum fluctuations, no significant increases or decreases.
+|===
+
 === Deep sleep %
 [cols="1,2"]
 |===

sleep/chrono_jetlag.adoc

@@ -69,16 +69,19 @@ image::chrono_weekdays.png[]
 [[regularity]]
 
 == Sleep Regularity
-To get maximum of your sleep time, it is crucial to sleep regularly – go to sleep at the same time every day and sleep for a fixed period of time.
+Sleep regularity is a key to healthy sleep - ideally you go to sleep at the same time every day and sleep for the same period of time. You can read about https://www.sciencedirect.com/science/article/abs/pii/S2352721823001687[how sleep regularity affects the speed of your aging].
 
-Sleep as Android tracks your sleep irregularity and shows you in <</sleep/charts#,Charts>> how irregular your sleep is.
-
-The irregularity shown is the https://en.wikipedia.org/wiki/Variance[variance] of your mid sleep hour.
+The regularity shown is the https://en.wikipedia.org/wiki/Variance[variance] of your mid sleep hour and as Sleep regularity index.
 
+Sleep as Android tracks your sleep regularity and shows you in <</sleep/charts#,Charts>> how regular your sleep is.
 
 [[sri]]
 
 === Sleep Regularity Index
-SRI is a metric calculated as the probability of an individual being in the same state (asleep or awake) at any two time points 24 hours apart, averaged over 7-days (range 0–100, with 100 being perfectly regular).
-This index can be used for monitoring your risk of health issues - read about the link  https://www.ncbi.nlm.nih.gov/pmc/articles/PMC10153326/[between SRI and mortality], or the link https://www.nature.com/articles/s41598-017-03171-4[between SRI and academic performance].
+https://sleep.urbandroid.org/sleep-regularity-index/[SRI] is a metric calculated as the probability of an individual being in the same state (asleep or awake) at any two time points 24 hours apart (range 0–100, with 100 being perfectly regular).
+
+It is accounting for awakes, naps, and works well even for polyphasic sleep patterns.
+
+This index can be used for monitoring your risk of health issues - read about the link  https://www.ncbi.nlm.nih.gov/pmc/articles/PMC10153326/[between SRI and mortality], the link https://www.nature.com/articles/s41598-017-03171-4[between SRI and academic performance].
+
 You can also read how https://academic.oup.com/sleep/article/44/10/zsab103/6232042[SRI compares to other sleep metrics].

sleep/goals.adoc

@@ -20,7 +20,7 @@ In the Goal screen, tap on the icon:plus[] button.
 .Adding a new goal
 image::goal_progress_succesful.png[]
 
-. Select area in which you’d like to improve over the next 1 month (Duration, Fall asleep hour, Irregularity, Awake, Deep sleep, Snoring, Snooze)
+. Select area in which you’d like to improve over the next 1 month (Duration, Fall asleep hour, Regularity, Awake, Deep sleep, Snoring, Snooze)
 . Choose your motivation. You can try the goal for free, or you can bet a few bucks on yourself.
   * You can bet a smaller wager or a bigger wager. In the US, a small wager is around $2, big wager around $4. When you select the wager and confirm the goal, you will see the exact price and then you can confirm or decline the payment.
 

sleep/sleepscore.adoc

@@ -71,11 +71,11 @@ Unfavourable: over 20
 
 a|image::irregularity_pie.png[]
 *Regularity*
-|How regular your sleep is. Variance of your mid-sleep hour.
+|How regular your sleep is. https://en.wikipedia.org/wiki/Variance[Variance] of your mid-sleep hour and Sleep Regularity Index.
 |Deviation of sleep duration and mid sleep hour.
 |SRI, <</sleep/chrono_jetlag#sri,more details here>>
-|Healthy: under 0.5 hours for regularity, as close to 100 for SRI as possible.
-Unfavourable: over 1 hour
+|Healthy: under 0.5 hours for regularity, over 80 for SRI.
+Unfavourable: over 1 hour, less then 60 for SRI
 
 a|image::deepsleep_pie.png[]
 *Deep Sleep*