Johannes Mockenhaupt
5df054a999
more fixes
2018-07-01 18:32:52 +02:00
Johannes Mockenhaupt
9b7d36ffed
bugfix
2018-07-01 18:25:32 +02:00
Johannes Mockenhaupt
6ebb13d28d
alarm on failure to add treatment to db.
2018-07-01 17:31:54 +02:00
Johannes Mockenhaupt
658af4bcfd
combo: don't attempt to add a bolus record if it already exists in db.
2018-07-01 17:31:54 +02:00
Johannes Mockenhaupt
f12db81f96
treatmentservice: add method to check if record with pump id exists.
2018-07-01 17:31:54 +02:00
Johannes Mockenhaupt
780a4dda36
fix #1173,newcarbsdialog: activate hypo tt if bg < 72mgdl/4mmol/l.
2018-07-01 17:21:40 +02:00
AdrianLxM
86ef6a155c
Merge pull request #1171 from jotomo/revert-901
...
Revert "Merge pull request #1131 from jotomo/901"
2018-07-01 17:02:26 +02:00
Markus M. May
6bc60cd8a8
Rework to use already existing method
2018-07-01 13:50:37 +02:00
Johannes Mockenhaupt
33b66e2ce7
Revert "Merge pull request #1131 from jotomo/901"
...
This reverts commit 268dec0059ab41541c69
2018-06-29 22:43:54 +02:00
Milos Kozak
a3862aca2a
Merge pull request #1161 from schmitzn/refactor-strings
...
Use positional format strings in translations
2018-06-29 22:22:44 +02:00
Milos Kozak
2291472b01
Merge pull request #1168 from MilosKozak/milosremote/dev
...
ask user if he switches to a HW pump for the first time
2018-06-29 15:43:48 +02:00
AdrianLxM
dccb675198
anrdoid -> android
2018-06-29 14:15:30 +02:00
AdrianLxM
4af7e6c1e6
update warning text
2018-06-29 14:13:33 +02:00
AdrianLxM
5a1d696ab1
ask user if he switches to a HW pump for the first time
2018-06-29 03:52:58 +02:00
Milos Kozak
268dec0059
Merge pull request #1131 from jotomo/901
...
Don't loop for values from non-active BG sources
2018-06-28 22:51:56 +02:00
Markus M. May
468b645486
Do calculations in a central place
2018-06-28 22:36:08 +02:00
Milos Kozak
ab41541c69
fix NPE
2018-06-28 22:31:42 +02:00
AdrianLxM
7d4eec6c99
Merge pull request #1163 from MilosKozak/wear-confirm
...
For testing: Wear confirm dialog
2018-06-28 20:51:49 +02:00
Milos Kozak
720e938ebf
allow longer lowtemp on RS an Rv2
2018-06-28 10:30:45 +02:00
AdrianLxM
d8603f07be
remove debug clause and smaller fonts
2018-06-27 20:22:19 +02:00
Milos Kozak
a99b478eea
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-06-27 20:13:37 +02:00
Milos Kozak
29032e658f
show predictions in nsclient mode
2018-06-27 20:13:25 +02:00
AdrianLxM
15d373f273
vibrate again
2018-06-27 19:03:29 +02:00
AdrianLxM
f160a49ef6
only start one confirm activity
2018-06-27 18:48:09 +02:00
Nico Schmitz
49e10dcaa9
Fix wrong argument in values-cs/strings.xml
2018-06-27 18:46:49 +02:00
AdrianLxM
815c3c17a9
cleanup.
2018-06-27 18:06:27 +02:00
AdrianLxM
a283586a3c
autodismissing confirm activity.
2018-06-27 18:06:16 +02:00
AdrianLxM
0fe26fda27
confirm activity working
2018-06-27 18:06:07 +02:00
AdrianLxM
aad2b94c8e
first confirm activity
2018-06-27 18:05:55 +02:00
Nico Schmitz
44eaa2d2f2
Use positional format strings in translations
2018-06-26 22:52:25 +02:00
Milos Kozak
2b799d9f71
SW: ask for import after storage permission
2018-06-26 13:15:50 +02:00
Milos Kozak
4df3561b4b
setup wizard cleanup
2018-06-26 12:53:43 +02:00
Milos Kozak
520f2e1518
plugin descritpions to setup wizard
2018-06-26 12:28:53 +02:00
Milos Kozak
77245c027e
prevent NPE
2018-06-26 10:45:56 +02:00
Milos Kozak
f7f4385d5d
cleanup
2018-06-26 00:20:43 +02:00
Milos Kozak
d55612b290
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-06-26 00:16:31 +02:00
Milos Kozak
44cf82abde
fix iob graph axis labels
2018-06-26 00:16:26 +02:00
Milos Kozak
81b1331659
Merge pull request #1160 from jotomo/uam-ratio
...
Autosens: show 'u's for UAM in output.
2018-06-26 00:14:09 +02:00
Johannes Mockenhaupt
b6a621528a
Autosens: show 'u's for UAM in output.
2018-06-26 00:01:31 +02:00
Johannes Mockenhaupt
50ffebc679
BgReading.copyFrom: don't update local data.
...
Like the 'valid' flag, which is not copied and is not synced with
NS, don't sync sourcePlugin or isFiltered.
Otherwise there might be a race condition if the NS-roundtrip of a
locally received BG updates the sourcePlugin field to null,
thus leaving no values for the loop to loop with.
2018-06-25 23:02:58 +02:00
Johannes Mockenhaupt
069f0fb7b1
Fix method name.
2018-06-25 22:51:59 +02:00
Milos Kozak
30c6ed3f8b
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-06-25 22:20:14 +02:00
Milos Kozak
81ad4c54f3
fix bug when uncomplete autosens was stored to the cache
2018-06-25 22:20:00 +02:00
Milos Kozak
0d86331aa4
Merge pull request #1157 from jotomo/readthedocs
...
Remove images (moved to RTD).
2018-06-25 20:05:06 +02:00
Milos Kozak
6d1fa2ffda
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-06-25 20:04:03 +02:00
Milos Kozak
4b777f8dcc
fix extendedBolusView
2018-06-25 20:03:54 +02:00
Johannes Mockenhaupt
222c2a244f
Remove images (moved to RTD).
2018-06-25 17:03:13 +02:00
Milos Kozak
cac6297aae
Merge pull request #1155 from MilosKozak/AdrianLxM-patch-2
...
swedish - removed unused string
2018-06-25 16:01:54 +02:00
Milos Kozak
acbfe371fb
Merge pull request #1156 from jotomo/properly-strip-incoming-cpp-profile-from-ns
...
Fix name of incoming profile from NS with timeshift/percentage.
2018-06-25 16:01:41 +02:00
Johannes Mockenhaupt
e4a72c8175
Fix name of incoming profile from NS with timeshift/percentage.
2018-06-25 12:07:12 +02:00
