AdrianLxM
fb2271e758
Merge pull request #568 from MilosKozak/AdrianLxM-patch-3
...
Wear: No guard for RS
2017-12-30 22:20:37 +01:00
Johannes Mockenhaupt
220554dbd6
Add sluggishness/unresponsiveness to known issues.
...
(cherry picked from commit ea891a4)
2017-12-30 20:06:29 +01:00
Johannes Mockenhaupt
99f3fb6216
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
autofix error in profile
2017-12-30 19:59:39 +01:00
Johannes Mockenhaupt
58d5c25703
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
missing cob fix
missing inheritance
2017-12-30 19:57:53 +01:00
Milos Kozak
f3db104979
autofix error in profile
2017-12-30 19:56:37 +01:00
Johannes Mockenhaupt
5ecc0ea430
Fix crash in Combo fragment when accessing resoures.
2017-12-30 19:53:22 +01:00
Milos Kozak
8c213cbc11
missing cob fix
2017-12-30 19:42:07 +01:00
Milos Kozak
b39fe2ee5e
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-12-30 16:25:18 +01:00
Milos Kozak
cc50a6fb99
missing inheritance
2017-12-30 16:25:08 +01:00
Johannes Mockenhaupt
f658da42a7
Abort bolusing when reading initial state fails.
...
Otherwise request time is zero and and any old bolus will be regarded
as the last bolus delivered when recovery kicks in.
Also add a safety check to not count a bolus bigger than the
requested bolus as a partially delivered bolus.
2017-12-30 15:51:26 +01:00
Johannes Mockenhaupt
790d5f21e1
README: Add note on not using ruffy in parallel with AAPS.
2017-12-30 11:21:38 +01:00
Johannes Mockenhaupt
facdc51f6f
Queue: synchronize creating queue thread to avoid multiple threads.
2017-12-29 16:36:19 +01:00
Andrew Warrington
c43afd9d28
Merge remote-tracking branch 'origin/dev' into watchfaces
2017-12-28 01:03:02 +01:00
Johannes Mockenhaupt
d0f876659e
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
Ensure basal rate shown as a percentage if required according to user preferences.
Show watch basal rates, whether temporary or normal.
2017-12-28 00:15:05 +01:00
AdrianLxM
bd4e51e1f9
Merge pull request #546 from andrew-warrington/dev
...
Always show basal rates on watch, whether temporary or normal.
2017-12-27 23:17:52 +01:00
AdrianLxM
774203605f
Wear: No guard for RS
2017-12-27 21:19:57 +01:00
Johannes Mockenhaupt
f970e5e20e
Minor cleanups.
2017-12-27 21:16:03 +01:00
Johannes Mockenhaupt
0e61032dec
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
wear update
RS create bond
add scrollview
QuickWizard detailed settings
# Conflicts:
# app/src/main/res/values/strings.xml
2017-12-27 18:19:51 +01:00
Milos Kozak
3df0e8f9ce
Merge branch 'dev' into smb060
2017-12-27 18:02:06 +01:00
Milos Kozak
259c7abffd
Merge pull request #567 from MilosKozak/AdrianLxM-patch-2
...
wear update
2017-12-27 16:31:24 +01:00
Milos Kozak
b25e403215
Merge pull request #566 from MilosKozak/rs-create-bond
...
RS create bond
2017-12-27 15:01:33 +01:00
AdrianLxM
9387665df9
wear update
2017-12-27 14:57:54 +01:00
Johannes Mockenhaupt
ee1236c4e4
ComboPlugin: assume valid BR unless proven otherwise.
...
(cherry picked from commit bc93a4b)
2017-12-27 13:04:35 +01:00
Johannes Mockenhaupt
75cb44339c
Merge pull request #32 from jotomo/pump-basal-rate-sanity-and-german-translation
...
Pump basal rate sanity and german translation
2017-12-27 12:50:40 +01:00
Johannes Mockenhaupt
3333d7a6b7
Clean up all the basal rate sanity checks.
...
* Disable loop entirely if no valid basal rate is set on the pump.
Neither closed nor open loop mode makes sense without it.
* Check active BR before updating the pump profile
* Show 'loop disabled' state in Combo fragement.
* Cancel active TBR when basal profile switch to profile != 1
is detected or when an unsupported bolus is active.
2017-12-27 12:49:04 +01:00
Johannes Mockenhaupt
8089825c4c
SetBasalProfileCommand: abort if active BR is != 1.
2017-12-27 12:28:01 +01:00
Johannes Mockenhaupt
728abbe224
Clean up strings.xml, finish German translation.
2017-12-27 12:28:01 +01:00
Johannes Mockenhaupt
88b3857fb9
Clean up pump init.
2017-12-27 12:28:01 +01:00
Johannes Mockenhaupt
6af28479d6
Disable loop if unsupported basal rate profile is selected. Fixes #31 .
2017-12-27 12:28:01 +01:00
AdrianLxM
79d05488c3
RS create bond
2017-12-27 02:24:26 +01:00
Johannes Mockenhaupt
c84ba24c77
Provide message when setting basal profile fails. Fixes #29 .
2017-12-27 01:33:54 +01:00
Johannes Mockenhaupt
715ffa28d2
Remove empty Combo prefs.
2017-12-27 01:33:42 +01:00
Johannes Mockenhaupt
3266cb4944
Don't show ComboPlugin as constraints plugin.
2017-12-27 01:33:38 +01:00
Johannes Mockenhaupt
7163162743
Merge pull request #30 from jotomo/csv2-staging
...
Csv2 staging
2017-12-26 11:02:38 +01:00
Milos Kozak
0ab259f61f
Merge branch 'dev' into smb060
2017-12-26 01:22:49 +01:00
Milos Kozak
72d6c4494b
add scrollview
2017-12-26 01:22:35 +01:00
Milos Kozak
162e73e64d
Merge branch 'dev' into smb060
2017-12-26 00:35:16 +01:00
Milos Kozak
8fdd16c305
QuickWizard detailed settings
2017-12-26 00:27:34 +01:00
Johannes Mockenhaupt
a8e0a4dfe8
Merge remote-tracking branch 'origin/dev' into csv2-staging
...
* origin/dev:
don't show single connection timeouts on the watch
2017-12-25 20:52:16 +01:00
Milos Kozak
e2f6e6a450
Merge pull request #547 from MilosKozak/wear-noFakebolusProgressDismiss2
...
don't show single connection timeouts on the watch
2017-12-25 20:44:39 +01:00
AdrianLxM
e50c6fc8ed
RS BLE modifications
2017-12-25 20:39:14 +01:00
Johannes Mockenhaupt
ea5629fc86
Merge remote-tracking branch 'origin/dev' into csv2-staging
...
* origin/dev:
fix non smooth ratio graph
fix of fix
fix wrong button type
fix doubled percentage when comming from NS
proper select last used profile
when using profile percentage limit basal rate to minimal value supported by pump
SingleClickButton
RS fix crash when pairing is not confirmed on pump
Double -> double
use joda-time
Use autosensdata for wizard instead of APSResult
2017-12-25 20:29:32 +01:00
Milos Kozak
dd58952b42
Merge pull request #548 from MilosKozak/COB-Wizard-idea
...
Use autosensdata for wizard instead of APSResult
2017-12-25 19:22:02 +01:00
Milos Kozak
b0bf9b5c79
Merge branch 'dev' into smb060
2017-12-25 17:01:53 +01:00
Milos Kozak
f968ec630c
fix non smooth ratio graph
2017-12-25 17:01:31 +01:00
Johannes Mockenhaupt
d081345da2
Define lowest non-zero basal rate as minimum basal rate for the Combo.
2017-12-25 11:05:51 +01:00
Milos Kozak
ae30046c95
Merge branch 'dev' into smb060
2017-12-23 11:18:37 +01:00
Milos Kozak
3ce260dfe9
fix of fix
2017-12-23 11:18:17 +01:00
Milos Kozak
51de0f16c1
Merge branch 'dev' into smb060
2017-12-23 11:07:48 +01:00
Milos Kozak
6e09bfbbe4
fix wrong button type
2017-12-23 11:07:29 +01:00
