caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity
5457 commits 1 branch 20 tags 140 MiB
Commit graph

4611 commits

Author SHA1 Message Date
Markus M. May
c78117e356 recall getAutosensData, if it is null 2018-07-03 22:35:06 +02:00
Markus M. May
a978225428 Cleanup Imports 2018-07-03 22:11:01 +02:00
Markus M. May
5422a8bc20 Cleanup Imports, added a TODO 2018-07-03 22:10:33 +02:00
AdrianLxM
e5d8eb163b
Update Treatment.java 2018-07-03 19:25:23 +02:00
AdrianLxM
006528ae4c
Update TreatmentService.java 2018-07-03 19:24:44 +02:00
Milos Kozak
2c06a9cdf9 fixed typo 2018-07-02 19:45:38 +02:00
Milos Kozak
3a0fb59aee Merge branch 'dev' into last-2.0-something-stuff 2018-07-02 18:54:32 +02:00
Milos Kozak
375025f7f0 remove unused string 2018-07-02 15:55:52 +02:00
Milos Kozak
60e9ea05a8 fix objectives typo 2018-07-02 15:52:20 +02:00
Milos Kozak
917ddf0cbe CS translations 2018-07-02 15:04:09 +02:00
Milos Kozak
4919986dc0 setup wizard for pumpcontrol 2018-07-02 12:18:49 +02:00
Milos Kozak
bb30171777 fix typo in poctech driver 2018-07-02 10:53:09 +02:00
AdrianLxM
297fe487f7 update with data from pump 2018-07-02 06:54:02 +02:00
AdrianLxM
b39fa514c2 alarm on clashes, not on identical treatments 2018-07-02 02:11:25 +02:00
Milos Kozak
98dedf117f
Merge pull request #1167 from triplem/date_util 
Do calculations in a central place
 2018-07-01 22:43:49 +02:00
Johannes Mockenhaupt
bf3b4502bf
log origin of offending call 2018-07-01 19:15:27 +02:00
Johannes Mockenhaupt
21313bd418
obligatory format specifier fixes 2018-07-01 19:10:58 +02:00
Johannes Mockenhaupt
290effcd7c
simplyify defaulting to hypo tt. 2018-07-01 18:53:45 +02:00
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 268dec0059, reversing
changes made to ab41541c69.
 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
Milos Kozak
720e938ebf allow longer lowtemp on RS an Rv2 2018-06-28 10:30:45 +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
Nico Schmitz
49e10dcaa9 Fix wrong argument in values-cs/strings.xml 2018-06-27 18:46:49 +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
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
81ad4c54f3 fix bug when uncomplete autosens was stored to the cache 2018-06-25 22:20:00 +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
Milos Kozak
cac6297aae
Merge pull request #1155 from MilosKozak/AdrianLxM-patch-2 
swedish - removed unused string
 2018-06-25 16:01:54 +02:00
Johannes Mockenhaupt
e4a72c8175
Fix name of incoming profile from NS with timeshift/percentage. 2018-06-25 12:07:12 +02:00
AdrianLxM
e9834acf81
swedish - removed unused string 2018-06-25 00:12:29 +02:00
AdrianLxM
619ba32840
configbuilder fix 2018-06-25 00:07:43 +02:00
Milos Kozak
385f0c7bfe
Merge pull request #1148 from triplem/1133 
1133
 2018-06-24 19:32:18 +02:00
Milos Kozak
ee2d6b71d1 add delay to sms bolus command 2018-06-24 18:28:38 +02:00
Markus M. May
07f7c00d85 Move Algo to abstract class 2018-06-24 18:20:28 +02:00
Milos Kozak
15607dc9be follow autosens min/max for clearing cache 2018-06-24 17:54:23 +02:00
Milos Kozak
cf8bf419e2
Merge pull request #1147 from TebbeUbben/cb-fix 
Config builder cleanup
 2018-06-24 17:29:29 +02:00
Milos Kozak
eb9f489411
Merge pull request #1149 from jotomo/treatment-prefs 
Treatments don't have settings.
 2018-06-24 17:20:59 +02:00
Johannes Mockenhaupt
dcdbe7791f
Treatments don't have settings. 
Before this, treatments preferences opened preferencs of the
oref0 sensitivity plugin.
 2018-06-24 16:39:56 +02:00
AdrianLxM
87d24b6e6e
re-initialize on time sync Rv2 2018-06-24 15:46:31 +02:00
AdrianLxM
54e647bbe1
re-initialize after time-sync 2018-06-24 15:43:42 +02:00
Markus M. May
faca79d13e Add unit test to PR 2018-06-24 15:43:25 +02:00
TebbeUbben
2b5631e1e7 Config builder cleanup 2018-06-24 15:13:06 +02:00
AdrianLxM
02eceef134
De-initialize Rv2 if time is off by more than 1.5h 2018-06-24 15:03:46 +02:00
AdrianLxM
78949a34ab
De-initialize RS if time is off by more than 1.5h 2018-06-24 15:03:03 +02:00
Milos Kozak
c5841063a2
Merge branch 'dev' into rs-sync-warn 2018-06-24 14:03:12 +02:00
Milos Kozak
8c695255d6
Merge pull request #1143 from jotomo/strings 
Rename "Lock screen" -> "Keep screen on".
 2018-06-24 13:58:35 +02:00
AdrianLxM
6a96b546ec
Merge pull request #1127 from MilosKozak/AdrianLxM-patch-5 
Please Review: update determine-basal
 2018-06-24 13:40:46 +02:00
AdrianLxM
5f2f0fff40 time sync in Rv2 as in RS 2018-06-24 13:32:19 +02:00
AdrianLxM
3e53c66365 don't set time on large diff, just warn 2018-06-24 13:27:55 +02:00
AdrianLxM
d72cb96d2b
Oref0 sensitivity 24 hours 2018-06-24 13:12:15 +02:00
Johannes Mockenhaupt
a8d783874c
Rename "Lock screen" -> "Keep screen on". 2018-06-24 12:50:11 +02:00
Milos Kozak
f7609317ba
Merge branch 'dev' into rs-sync-warn 2018-06-24 11:45:33 +02:00
Milos Kozak
2963f0a698
Merge pull request #1140 from triplem/issue_1130_backwards 
Issue 1130 backwards
 2018-06-24 11:44:41 +02:00
Johannes Mockenhaupt
784c071f53
Small oref1 sens corrections. 2018-06-24 01:03:38 +02:00
Markus M. May
7f9c459a4a Merge branch 'issue_1130' into issue_1130_backwards 2018-06-23 22:42:34 +02:00
Markus M. May
8bdaddb389 Allow backwards compatibility to previous solution to add quotes 2018-06-23 22:41:01 +02:00
Milos Kozak
cbdd0699ec
Merge pull request #1139 from triplem/issue_1130 
fixes #1130
 2018-06-23 22:20:13 +02:00
Milos Kozak
a3fafa521b nsclient for phones layout 2018-06-23 22:17:54 +02:00
Markus M. May
e32f33a8d3 fixes #1130 2018-06-23 21:36:18 +02:00
Milos Kozak
de2273836e OpenAPS Offline visualization fix 2018-06-23 21:16:08 +02:00
Milos Kozak
a4b3b7b2e9 Clean AndroidAPS started button 2018-06-23 20:28:20 +02:00
AdrianLxM
11b8587768
Warn on long time diffs on Rv2 2018-06-23 20:05:59 +02:00
AdrianLxM
1b047bba69
Warn on large time offsets RS 2018-06-23 20:05:05 +02:00
AdrianLxM
9c0665124d
Update strings.xml 2018-06-23 20:04:09 +02:00
Milos Kozak
0d48cc8770 fix parsing SSID 2018-06-23 19:59:11 +02:00
Milos Kozak
fb94c93ba6
Merge pull request #1110 from TebbeUbben/foreground-service 
Use a foreground service for the ongoing notification and enforce using it on Oreo and up
 2018-06-23 19:37:33 +02:00
Milos Kozak
a3c3c52249 Merge branch 'dev' into sens-cutoff 2018-06-23 18:59:33 +02:00
Milos Kozak
bbfe1d2f83 fix NPE in #1136 2018-06-23 18:52:58 +02:00
Milos Kozak
f7309c9ff1 Merge branch 'dev' into sens-cutoff 2018-06-23 18:34:46 +02:00
Milos Kozak
d59c3c567b
Merge pull request #1132 from jotomo/1129 
Combo: update error message. Fixes #1129.
 2018-06-23 18:32:59 +02:00
Milos Kozak
470487375d
Merge pull request #1136 from TebbeUbben/profile-invalid-fix 
Mark profile as invalid if high target < low target
 2018-06-23 18:24:40 +02:00
Milos Kozak
586665e19f nsclient table mode improvements 2018-06-23 18:24:04 +02:00
TebbeUbben
8adc333ade Mark profile as invalid if high target < low target 2018-06-23 16:02:10 +02:00
AdrianLxM
064a8915a0 downweight Autosens if not enough data 2018-06-23 14:05:12 +02:00
Johannes Mockenhaupt
5c95b785bb
Combo: update error message. Fixes #1129. 2018-06-23 13:33:17 +02:00
Johannes Mockenhaupt
eac1d5ffdb
(Hopefully) fix iob(AMA|SMB)shouldBeLimited tests. 
By making sure there is exactly one APS plugin enabled.
 2018-06-23 13:12:29 +02:00
Johannes Mockenhaupt
b2a60e2fac
Disable unfinished noise tests. 2018-06-23 12:52:07 +02:00
Milos Kozak
53ba6d46d5 fix adding zero deviations 2018-06-23 12:27:18 +02:00
Milos Kozak
9c5e389afb move sensitivity plugins to one package 2018-06-23 12:19:55 +02:00
Johannes Mockenhaupt
6cb09d4fcb
Remove BgReading.noise for now, clashes with existing NS data. 
I believe NS uses 'noise' to store the noise level (1 through 3?).
 2018-06-23 11:41:03 +02:00
Johannes Mockenhaupt
73e8a0c876
Rename BgReading.filtered to BgReading.isFiltered and add to NS. 
Avoids collision with 'filtered' value in NS data.
 2018-06-23 11:36:23 +02:00
Johannes Mockenhaupt
6d437b4afa
Test stubs. 2018-06-23 11:35:01 +02:00
Johannes Mockenhaupt
c18effd893
Fix detecting BG source from NS entry. 2018-06-23 11:27:56 +02:00
Johannes Mockenhaupt
b4db98fa1d
Process xDrip noise data if provided (engineering mode only). 2018-06-23 11:21:05 +02:00
Johannes Mockenhaupt
34ee125666
Add message to constraints if BG is not filtered. 2018-06-23 11:07:16 +02:00
Johannes Mockenhaupt
79dec2e871
Fixes. 2018-06-23 02:59:11 +02:00
Johannes Mockenhaupt
986d9fb01c
Detect source from NSClient BG. 2018-06-23 01:33:13 +02:00
Johannes Mockenhaupt
906cc8a76a
Clean up assigning sourcePlugin, filtered properties. 2018-06-23 01:27:37 +02:00
Johannes Mockenhaupt
940d58fc79
Tests. 2018-06-23 01:27:37 +02:00
Johannes Mockenhaupt
53b9d5cae3
Fix column type. 2018-06-23 01:27:37 +02:00
Johannes Mockenhaupt
aab171932c
Have Bgsource.processNewData return added BGs. 2018-06-23 01:27:37 +02:00
Johannes Mockenhaupt
922f9ff83d
Refactor DataService to delegate BG processing to BgSources. 2018-06-23 01:26:36 +02:00
Johannes Mockenhaupt
7a331e0c94
Don't loop with readings coming from non-active BG source. 2018-06-23 01:26:36 +02:00
Johannes Mockenhaupt
6abad56b1f
Replace BgSourceInterface.advancedFilteringSupported. 
Replaced by 'filtered' property on BgReading.
 2018-06-23 01:26:36 +02:00
Johannes Mockenhaupt
98c933af57
BgReading: add sourcePlugin and filtered fields. 2018-06-23 01:24:26 +02:00
Milos Kozak
4efb115209 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-06-22 22:52:23 +02:00
Milos Kozak
8e08a293c1 detect bg source in nsclient 2018-06-22 22:30:03 +02:00
Milos Kozak
8a74646b67 set positive deviations to zero if bg < 80 2018-06-22 21:18:59 +02:00
AdrianLxM
5f6a6dbbbc
update determine-basal 2018-06-22 21:00:59 +02:00
Milos Kozak
c139942981 reset autosens on site change (AAPS,WA) 2018-06-22 20:11:45 +02:00
Milos Kozak
8237456030 reset autosens on site change 2018-06-22 20:05:49 +02:00
Milos Kozak
9360151100 Merge branch 'dev' into oref1 2018-06-22 17:55:38 +02:00
Milos Kozak
7bed827f4b
Merge pull request #1119 from jotomo/delete-future-treatments 
Treatments tab: add button (if applicable) to delete future treatments.
 2018-06-22 17:47:37 +02:00
Milos Kozak
9dc667817b
Merge pull request #1120 from schmitzn/sync-butterknife-eventbus 
Synchronize Butterknife / Eventbus (#1090)
 2018-06-22 17:45:55 +02:00
Milos Kozak
a3cf7622b6
Merge pull request #1121 from jotomo/tt-context-menu 
TT context menu
 2018-06-22 17:28:20 +02:00
Johannes Mockenhaupt
9b4f3f6e0e
Don't apply loop result if a bolus is in progress. 
While an SMB is rejected by the queue in this scenario, a temp basal
would still be applied, so don't apply loop results if a bolus is
progress or queued at this point.
 2018-06-21 22:58:15 +02:00
Johannes Mockenhaupt
3eed0afe61
Move 'eating soon' TT to top (ordering of dialog). 2018-06-21 22:29:16 +02:00
Johannes Mockenhaupt
58d79892ed
Overview: TT context menu. 2018-06-21 22:06:39 +02:00
Nico Schmitz
4d853c1435 Check for unbound variables 2018-06-21 21:58:12 +02:00
Johannes Mockenhaupt
41ce9677df
Remove duplicate string. 2018-06-21 09:57:35 +02:00
Milos Kozak
bd846e7526
Merge pull request #1117 from jotomo/1068-bolus-after-smb 
WIP: Reject SMB if bolus is queued/running or outdated. Fixes 1068.
 2018-06-21 09:30:56 +02:00
AdrianLxM
809ad97cb9
Merge pull request #1118 from jotomo/1096 
Disable slope deviation unless on dev branch, fixes #1096.
 2018-06-21 06:00:17 +02:00
Johannes Mockenhaupt
6002c747e6
Treatments tab: add button (if applicable) to delete future treatments. 2018-06-21 00:38:22 +02:00
Johannes Mockenhaupt
49b84fb550
Reject SMB if bolus is queued/running or outdated. Fixes 1068. 2018-06-21 00:32:23 +02:00
Johannes Mockenhaupt
8036f8bcde
Disable slope deviation unless on dev branch, fixes #1096. 2018-06-21 00:31:35 +02:00
Milos Kozak
5292e09535 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-06-20 23:56:50 +02:00
Milos Kozak
a02961da61 check for NPE 2018-06-20 23:56:38 +02:00
Nico Schmitz
c3050740a8 Synchronize Butterknife / Eventbus 2018-06-20 22:57:31 +02:00
Milos Kozak
3ed11f9002 oref1 autosens: count with extra deviations 2018-06-20 20:49:16 +02:00
Milos Kozak
6eef71c4c0
Merge pull request #1116 from TebbeUbben/cb-fix 
Fix for #1115
 2018-06-20 20:43:29 +02:00
TebbeUbben
ed10c8cadc Fix for #1115 2018-06-20 20:12:22 +02:00
Milos Kozak
370008f41e oref 0.6.0 sens 2018-06-20 18:39:47 +02:00
Milos Kozak
e913cfe454 prepare oref1 plugin 2018-06-19 20:41:40 +02:00
Milos Kozak
df021a2dd2
Merge pull request #1111 from jotomo/combo-setup-notification 
Combo setup notification
 2018-06-19 18:41:43 +02:00