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

4214 commits

Author SHA1 Message Date
Milos Kozak
ebb97be8c5 Dana pumps: better detect wrong profile in pump 2018-07-17 22:56:25 +02:00
Johannes Mockenhaupt
54be28388b
Disable history browser unless on dev-branch. 2018-07-17 21:57:06 +02:00
Milos Kozak
5f4db31e80 fix multiple code 2018-07-17 19:42:18 +02:00
Milos Kozak
7d6674267b
Merge branch 'dev' into last-2.0-something-stuff-update1 2018-07-17 19:53:43 +03:00
PoweRGbg
141bfda099 wizard is ready also 2018-07-17 15:04:07 +03:00
PoweRGbg
edbeddf8b0 carbsDialog done also 2018-07-17 14:43:34 +03:00
PoweRGbg
15b9cb5b3c removed dummy message 2018-07-17 12:19:36 +03:00
Roumen Georgiev
cd4e7c2d4f
Save & restore dialog state on screen rotate 2018-07-17 12:01:21 +03:00
AdrianLxM
6054501b5f
Merge pull request #1219 from jotomo/auto-hypo-tt 
fix #1173,newcarbsdialog: activate hypo tt if bg < 72mgdl/4mmol/l.
 2018-07-16 13:27:06 +02:00
Johannes Mockenhaupt
f5ecb9811e
fix #1173,newcarbsdialog: activate hypo tt if bg < 72mgdl/4mmol/l. 2018-07-15 22:33:42 +02:00
Milos Kozak
97d9f7866c Rv2: prevent carbs x insulin 2018-07-15 19:48:33 +02:00
Milos Kozak
357b947c1d RS: prevent carbs x insulin 2018-07-15 19:45:51 +02:00
Milos Kozak
8f641f994f RSv3 firmware error reporting 2018-07-13 18:03:04 +03:00
Milos Kozak
695997ebb9 RS: delay before reading history 2018-07-13 09:50:04 +03:00
Milos Kozak
8a3d3d580f Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-07-12 22:03:28 +03:00
AdrianLxM
5f5a2b6a0d
insight constraints 2018-07-12 20:30:19 +02:00
Milos Kozak
efefe8ed18
Merge pull request #1211 from jotomo/pluginstats 
PluginStats: used simple class named instead of translated name.
 2018-07-12 21:30:12 +03:00
Milos Kozak
35e93ffafd more debug to autosens 2018-07-12 21:28:35 +03:00
AdrianLxM
cb826da403
Revert "Fixed problem with Corr numberpicker when using Insightpump" 2018-07-12 19:37:21 +02:00
Johannes Mockenhaupt
5b9ede15ea
PluginStats: used simple class named instead of translated name. 2018-07-12 15:47:45 +02:00
Milos Kozak
e8c1dd5e3b
Merge pull request #1209 from harispoljo/CorrInsight 
Fixed problem with Corr numberpicker when using Insightpump
 2018-07-12 16:10:10 +03:00
Milos Kozak
ba945f334b
Merge pull request #1204 from jotomo/pluginstats 
Fabric-log enabled plugins once a day.
 2018-07-12 16:06:10 +03:00
Johannes Mockenhaupt
6302769652
Log app usage type daily. 2018-07-11 20:51:09 +02:00
harispoljo
8b200ba9de
Fixed bug 2018-07-11 19:53:19 +02:00
harisp
395f2313fd Implemented feedback 2018-07-11 18:17:09 +02:00
Milos Kozak
d97e195ad1 revert wrong autosens fix 2018-07-11 18:23:58 +03:00
Milos Kozak
e4e0e64eef another fix of displaying ext bolus 2018-07-11 18:02:20 +03:00
Milos Kozak
613802b12c
Merge pull request #1183 from triplem/autosens_fix 
Autosens fix
 2018-07-11 17:30:29 +03:00
harisp
b42ce70daa Fixed problem with corr numberpicker when using insight pump 2018-07-11 14:14:01 +02:00
Johannes Mockenhaupt
09a1d23bc8
Move logging of app start to Fabric class. 2018-07-10 17:55:50 +02:00
Johannes Mockenhaupt
ccaf68d043
Fabric-log enabled plugins once a day. 2018-07-10 13:00:20 +02:00
Milos Kozak
5a6b7f9dad Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-07-09 18:16:55 +03:00
Johannes Mockenhaupt
2cd3ec82de
Create note for eCarbs, so it's easier to see what amount/time was used. 
Otherwise iterating on parameters is tedious with only the generated carbs.
 2018-07-07 12:02:44 +02:00
Milos Kozak
506971292e cleanup 2018-07-05 15:36:13 +02:00
Markus M. May
afaf729df1 Try to rework the ugly fix 2018-07-04 20:42:31 +02:00
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
3a0fb59aee Merge branch 'dev' into last-2.0-something-stuff 2018-07-02 18:54:32 +02:00
Milos Kozak
60e9ea05a8 fix objectives typo 2018-07-02 15:52:20 +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
Nico Schmitz
2ce38702e2
Merge branch 'dev' into dev-wip 2018-07-01 22:44:11 +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
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
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
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
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
Johannes Mockenhaupt
e4a72c8175
Fix name of incoming profile from NS with timeshift/percentage. 2018-06-25 12:07:12 +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
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
8bdaddb389 Allow backwards compatibility to previous solution to add quotes 2018-06-23 22:41:01 +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
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
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
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
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
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
Johannes Mockenhaupt
3ed4aa468d
Combo: fix ReadQuickInfoCommand to handle empty bolus history. 2018-06-18 20:19:47 +02:00
Johannes Mockenhaupt
ef650b80a1
Combo: show notification on broken setup. 2018-06-18 20:19:30 +02:00
TebbeUbben
ef237ed378 DummyService javadoc 2018-06-18 19:43:40 +02:00
Milos Kozak
af8e1fb32f
Merge pull request #1078 from MilosKozak/AdrianLxM-patch-1 
restrict local profile DIA to min of 5 on the GUI
 2018-06-18 18:58:29 +02:00
TebbeUbben
a590a8be42 Foreground service 2018-06-17 23:33:32 +02:00
Nico Schmitz
d88b4da5a9 Don't show statuslight preferences in NSCLIENT build 2018-06-17 22:41:34 +02:00
Milos Kozak
f14ba554f0 RS ble cleanup 2018-06-16 13:18:00 +02:00
Nico Schmitz
aa4f506961 Update to current upstream/dev branch 2018-06-16 02:51:33 +02:00
Nico Schmitz
db36d6e3f5 Change colors and refactor code 2018-06-16 02:18:03 +02:00
Tebbe Ubben
1e4c7178f4
Merge branch 'dev' into dev 2018-06-15 21:10:33 +02:00
Nico Schmitz
14a17efecc Update colors 2018-06-15 19:36:49 +02:00
Milos Kozak
21b598edfa
Merge pull request #1100 from MilosKozak/rsoption 
Rsoption
 2018-06-15 00:19:08 +02:00
Nico Schmitz
bf3ce735bc Set colors of profile view 2018-06-14 23:22:15 +02:00
Nico Schmitz
1604b53327 Fix bugs, refactor code and add preferences 2018-06-14 20:49:58 +02:00
Nico Schmitz
d7db19bf2d Merge branch 'fix-careportalevent' into dev-wip 2018-06-14 13:01:14 +02:00
Nico Schmitz
43d787ff88 Simplify isOlderThan() 2018-06-14 12:38:15 +02:00
Nico Schmitz
f82240a724 Fix bug in getHoursFromStart() 2018-06-14 12:34:42 +02:00
Nico Schmitz
217583d601 Use getBatteryLevel() for BAT status. Refactor code and layout. 2018-06-13 19:58:52 +02:00
Roumen Georgiev
904957d0d2
removing unneeded methods 2018-06-13 18:24:50 +03:00
PoweRGbg
a64364de4e removed excessive debugging and unneeded source 2018-06-13 16:17:10 +03:00
PoweRGbg
5a197676fb IT WORKS!!! 2018-06-13 15:57:42 +03:00
PoweRGbg
faab8fbc67 setting full userOptions 2018-06-13 11:43:44 +03:00
Milos Kozak
4d2e166620 try to fix crash 2018-06-13 10:41:15 +02:00
PoweRGbg
56651691a5 more more 2018-06-13 11:08:47 +03:00
PoweRGbg
64b5783e4a more 2018-06-13 11:07:03 +03:00
PoweRGbg
71c474ef5f danaR changes 2018-06-13 11:04:32 +03:00
PoweRGbg
5634aabd9f more 2018-06-13 11:02:52 +03:00
PoweRGbg
2cb3c15d61 more update 2018-06-13 11:01:43 +03:00
PoweRGbg
cd337ecdc8 update to latest changes from Milos 2018-06-13 10:51:06 +03:00
PoweRGbg
434db333b1 reverting changes 2018-06-13 09:56:30 +03:00
PoweRGbg
87bc6ed798 Revert "more debugging output" 
This reverts commit 1adf8718ae.
 2018-06-13 09:49:58 +03:00
PoweRGbg
0f067ef3a7 Revert "more debugging output" 
This reverts commit f1f8bae2d1.
 2018-06-13 09:49:45 +03:00
PoweRGbg
90a3a66c30 Revert "Merge remote-tracking branch 'upstream/rsoption' into dev" 
This reverts commit 233fb33659, reversing
changes made to f1f8bae2d1.
 2018-06-13 09:49:37 +03:00
PoweRGbg
0e40d1e7ef Revert "Revert "more debugging output"" 
This reverts commit 209fb79396.
 2018-06-13 09:49:35 +03:00
PoweRGbg
209fb79396 Revert "more debugging output" 
This reverts commit f1f8bae2d1.
 2018-06-13 09:34:57 +03:00
PoweRGbg
233fb33659 Merge remote-tracking branch 'upstream/rsoption' into dev 2018-06-13 09:14:46 +03:00
Roumen Georgiev
f1f8bae2d1 more debugging output 2018-06-13 09:00:04 +03:00
Milos Kozak
082918c776 remove unneded code 2018-06-13 07:44:26 +02:00
Milos Kozak
6fa759a395 remove unneded code 2018-06-13 07:42:57 +02:00
Nico Schmitz
a7aa4c2b5a Implement getBatteryLevel() in PumpInterface and for all pump plugins 2018-06-13 00:28:17 +02:00
Nico Schmitz
f28fca668f Integrate info fields from swissalpine/dev-work 2018-06-13 00:07:13 +02:00
Milos Kozak
ecdbe2ac37 setUserOptions cleanup 2018-06-12 23:43:04 +02:00
Nico Schmitz
5ba6f02b93 Remove reservoir TextView 2018-06-12 23:31:46 +02:00
Nico Schmitz
4ebc149783 Add changes of schmitzn/reservoir-view 2018-06-12 23:28:11 +02:00
Milos Kozak
d051e081e2 Merge branch 'dev' into rsoption 2018-06-12 21:59:20 +02:00
Milos Kozak
d4ed6539d8 poctech units mmol/L 2018-06-12 21:57:33 +02:00
Roumen Georgiev
1adf8718ae more debugging output 2018-06-12 13:30:07 +03:00
Roumen Georgiev
06507bab2c update method names 2018-06-12 12:41:40 +03:00
Roumen Georgiev
978d94499f update method names 2018-06-12 11:03:23 +03:00
Roumen Georgiev
f044ab15c0 setting swithces in activity 2018-06-12 10:39:47 +03:00
Roumen Georgiev
01012d817c getting userOptions from v2 2018-06-12 10:29:47 +03:00
Milos Kozak
e7eec8fe69 Poctech BG source 2018-06-11 17:26:31 +02:00
TebbeUbben
41a7f57b75 Update Objective views every minute 2018-06-11 16:35:47 +02:00
TebbeUbben
3ac10f4f7a Improved MinimumDurationTask visualization 2018-06-11 16:24:46 +02:00
TebbeUbben
31cb68240b Automatically scroll to currently active objective 2018-06-11 15:45:28 +02:00
Roumen Georgiev
2441214bb8 added SetUserOptions for DanaR 2018-06-11 11:36:32 +03:00
TebbeUbben
97984f8ef3 Improved leftover time display 2018-06-09 23:15:46 +02:00
TebbeUbben
6bc13d9cc0 Don't return false in isStarted if objective has been accomplished 2018-06-09 23:10:54 +02:00
TebbeUbben
0d21a0ab62 Fixed tests 2018-06-09 23:03:31 +02:00
TebbeUbben
005039effc Objectives styling 2018-06-09 22:07:41 +02:00
TebbeUbben
531a926d00 Close navigation drawer on click 2018-06-09 13:17:26 +02:00
Milos Kozak
30dbbb12a8
Merge pull request #1081 from MilosKozak/AdrianLxM-patch-3 
Wizard: fully undo "ok" on constraints violation
 2018-06-09 11:46:41 +02:00
TebbeUbben
f7597c93d7 Merge remote-tracking branch 'milos/AdrianLxM-patch-4' into dev 
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalPlugin.java
#	app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java
 2018-06-08 23:30:39 +02:00
TebbeUbben
2d94133175 Plugin descriptions 2018-06-08 21:19:46 +02:00
AdrianLxM
bbf09a62f1
synchronize onDestroyView 2018-06-08 06:20:35 +02:00
AdrianLxM
97bbc00dcf
Don't set text onunbound gui elements 2018-06-08 06:19:02 +02:00
TebbeUbben
38526d64c6 These should not be changed 2018-06-07 23:24:10 +02:00
TebbeUbben
e25ebbdafa Protection against callback looping 2018-06-07 23:23:10 +02:00
TebbeUbben
aa86a49339 Use real plugin descriptions 2018-06-07 22:55:13 +02:00
TebbeUbben
13cb4c28ed ConfigBuilder styling 2018-06-07 22:54:27 +02:00
AdrianLxM
d6184cc151
Wizard: fully undo "ok" on constraints violation 
Fixes https://github.com/MilosKozak/AndroidAPS/issues/1056
 2018-06-07 22:44:09 +02:00
Roumen Georgiev
4b7f8615bf
Merge pull request #26 from MilosKozak/rsoption 
update
 2018-06-07 09:30:22 +03:00
Roumen Georgiev
9e2074433e remove button if pump is DanaR Korean 2018-06-07 09:26:33 +03:00
Milos Kozak
1d13712aec nsclient setup wizard tweaking 2018-06-06 22:58:50 +02:00
Milos Kozak
f94d1e85e1 cleanup 2018-06-06 18:32:19 +02:00
Milos Kozak
04fffae811 addd setUserOption to Queue (Dana pumps) 2018-06-06 18:29:40 +02:00
Milos Kozak
d2830d1938 DanaRUserOptionActivity update on pump load 2018-06-06 17:13:58 +02:00
Milos Kozak
bbeca6b83e cleanup 2018-06-06 16:57:00 +02:00
AdrianLxM
5ec828e16f
restrict local profile DIA to min of 5 on the GUI 2018-06-06 15:18:03 +02:00
Milos Kozak
4adcb88d12
Merge pull request #1067 from jotomo/fill-one-shot-guard 
One-short guards for Fill/Prime dialog.
 2018-06-06 08:47:08 +02:00
Milos Kozak
65c8cb22ef check for null context 2018-06-05 14:38:00 +02:00
Milos Kozak
7e7e921853 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-06-05 14:37:47 +02:00
Milos Kozak
5df51e8a6e check for NPE 2018-06-05 14:35:18 +02:00
Roumen Georgiev
4a481bf294
Merge branch 'dev' into dev 2018-06-05 12:45:00 +03:00
Roumen Georgiev
c1b69404d0 files renamed and added icon 2018-06-05 12:19:47 +03:00
AdrianLxM
171209503e
remove unneeded log statement 2018-06-05 00:04:03 +02:00
AdrianLxM
4998ebae89
Merge pull request #1071 from TebbeUbben/new-design 
TabLayout + NavigationDrawer
 2018-06-04 23:53:42 +02:00
TebbeUbben
f7b19e37a1 Button for plugin preferences 2018-06-04 21:56:31 +02:00
TebbeUbben
80e9d769e4 Compact version of toolbar 2018-06-04 21:34:21 +02:00
Roumen Georgiev
19e7d507b2 shutdown value can be 0 2018-06-04 10:24:20 +03:00
Roumen Georgiev
1147c28f04 use numberPicker instead of editText 2018-06-04 10:23:01 +03:00
TebbeUbben
9cf9da0d22 MINIMUM_BASAL_VALUE_REPLACED -> MAXIMUM_BASAL_VALUE_REPLACED 2018-06-03 23:33:49 +02:00
TebbeUbben
263275659a TabLayout + NavigationDrawer 2018-06-03 23:28:04 +02:00
TebbeUbben
a86c654f8d Use real TBR cancels and dismiss their alerts 2018-06-03 10:56:29 +02:00
Johannes Mockenhaupt
ef6ee43c32
One-short guards for Fill/Prime dialog. 2018-06-02 18:06:04 +02:00
TebbeUbben
f151cbb0bf TBR emulation 2018-06-02 16:37:53 +02:00
Roumen Georgiev
054003460c push new settings to pump 2018-06-01 16:42:56 +03:00
Roumen Georgiev
75dbf71a70 Merge remote-tracking branch 'origin/dev' into dev 2018-06-01 12:11:29 +03:00
Roumen Georgiev
861f9bdd8d Timeformat reverse 2018-06-01 12:10:08 +03:00
Roumen Georgiev
9569fbf183
Merge branch 'dev' into dev 2018-06-01 12:02:41 +03:00
Roumen Georgiev
85bef0036b back to original 2018-06-01 11:45:31 +03:00
Roumen Georgiev
4581733cd7 some debugging output and forced getting user options 2018-06-01 11:41:37 +03:00
Roumen Georgiev
319e786988 display 666 in backlightontime if no settings read 2018-06-01 10:08:13 +03:00
Roumen Georgiev
f3d19aa6f4 convert int values to strings 2018-06-01 09:38:18 +03:00
swissalpine
dd60cadd5a
Fix broken cage age 2018-05-31 22:22:22 +02:00
Roumen Georgiev
bbb9c681e6 filling in some data 2018-05-31 17:16:30 +03:00
Roumen Georgiev
41af503104 filling in some data 2018-05-31 17:10:09 +03:00
Roumen Georgiev
da89ea1643 some formatting 2018-05-31 16:47:58 +03:00
Roumen Georgiev
39e704645b create userOptionsActivity class 2018-05-31 14:45:26 +03:00
Markus M. May
a587f72de2 Fix wrong usage of event in refactored source 2018-05-30 18:09:41 +02:00
Milos Kozak
418f68153e
Merge pull request #1058 from MilosKozak/NSC-no-advancedfiltering 
NSClient as source without advanced filtering
 2018-05-30 08:08:04 +02:00
Markus M. May
0fe744c3e6 Remove unnecessary assignment 2018-05-29 21:44:33 +02:00
Markus M. May
41503800e8 Remove some duplicate code lines 2018-05-29 20:57:55 +02:00
AdrianLxM
de1196f34b
NSClient as source without advanced filtering 2018-05-29 12:57:07 +02:00
Milos Kozak
35c07d1e60 SW scroll to the top on activity create 2018-05-24 00:13:59 +02:00
Milos Kozak
d642418e02 resolve NPE 2018-05-23 23:43:41 +02:00
Milos Kozak
683caf78f8 SW configure insulin button 2018-05-23 13:47:16 +02:00
Milos Kozak
a7cfcd56e3 SW fix return to 1st page 2018-05-23 13:20:24 +02:00
Milos Kozak
fa2c0ab003
Merge pull request #994 from MilosKozak/startupwizard 
Startupwizard
 2018-05-22 23:07:04 +02:00
Milos Kozak
53bdb0bf09 asking permissions to notifications 2018-05-22 23:06:17 +02:00
Milos Kozak
5d27a28dc9 SW eula 2018-05-22 20:02:38 +02:00
Milos Kozak
250f9f74a0 move askForStoragePermission 2018-05-22 18:59:34 +02:00
Milos Kozak
2626e5bb63 SW android permissions 2018-05-22 17:34:09 +02:00
Milos Kozak
4fa24fb009 SW add more texts 2018-05-20 23:44:09 +02:00
Milos Kozak
c723deaf02 SW patient age screen finalization 2018-05-20 22:01:32 +02:00
Milos Kozak
b57683eaf5 SW rename package 2018-05-20 21:55:53 +02:00
Milos Kozak
f24d296836 SW nsclient screen finalizing 2018-05-20 21:36:17 +02:00
AdrianLxM
953128ffe5
UAM without advanced filtering 2018-05-20 19:17:46 +02:00
Milos Kozak
52a4f9af14 SW loop screen update 2018-05-20 16:29:15 +02:00
Milos Kozak
d079052944 Merge branch 'startupwizard' of https://github.com/MilosKozak/AndroidAPS into startupwizard 2018-05-20 16:18:10 +02:00
Milos Kozak
de8557a115 SW sensitivity plugin 2018-05-20 16:17:53 +02:00
Milos Kozak
5b9594bdbb SW create elements package 2018-05-20 15:09:32 +02:00
Milos Kozak
d0ed4bd717 SWString fix 2018-05-20 15:01:03 +02:00
Milos Kozak
7714aa9138 Merge branch 'dev' into startupwizard 2018-05-20 14:18:58 +02:00
Milos Kozak
53cbe05436
Merge pull request #1019 from McHoffi/obj.7-add-info 
Obj.7 add info about using SMB/maxIOB
 2018-05-20 14:14:11 +02:00
Roumen Georgiev
764e035666
remove wizard from backstack and fix the Exit -> returning to SW 2018-05-16 15:35:17 +03:00
Milos Kozak
66e50f5b62
Merge pull request #1038 from jotomo/upstreaming 
[Polish] Dialog/color consistency, translations and other small stuff
 2018-05-15 13:09:50 +02:00
Milos Kozak
e58149379a
Merge pull request #1043 from jotomo/issue-646 
[Bugfix] On bolus cancel request, cancel all boluses. Partially addresses #646.
 2018-05-15 10:55:04 +02:00
Johannes Mockenhaupt
25aa6f859f
On bolus cancel request, cancel all boluses. Partially addresses #646. 2018-05-13 23:57:40 +02:00
Johannes Mockenhaupt
29efe11ece
Combo: always send out progress updates (SMB or not). 
Without this, showing SMB progress on wear is broken.

(cherry picked from commit 5ebff72)
 2018-05-13 23:20:29 +02:00
TebbeUbben
3103a0f276 Some styling for SW 2018-05-13 13:40:34 +02:00
Johannes Mockenhaupt
d80fecc390
Add T.now, plus, minus methods. 2018-05-13 12:44:47 +02:00
Johannes Mockenhaupt
1883ac06dd
Use TT color for TT confirmations in dialogs. 2018-05-13 12:14:49 +02:00
Milos Kozak
4fae6c703c SW autostart SetupWizard 2018-05-11 13:14:59 +02:00
Milos Kozak
ff2cc04408 SW warn if exported configuration is missing 2018-05-11 13:04:17 +02:00
Milos Kozak
337a3d9776 SW show ObjectivesFragment 2018-05-11 08:30:21 +02:00
Milos Kozak
0a51c86afb SW Configure APS button 2018-05-11 00:09:35 +02:00
Milos Kozak
376fffa6ec SW Import settings, Skip wizard 2018-05-10 23:59:20 +02:00
Milos Kozak
8d7df64050
Merge pull request #1016 from MilosKozak/pump-notifications 
Pump notifications
 2018-05-10 23:24:45 +02:00
Milos Kozak
e105e5149e
Merge pull request #1032 from jotomo/wear-wizard-tt 
Wear wizard: add TT config option.
 2018-05-10 16:53:34 +02:00
Andy Rozman
347d210d06 Merge branch 'virtual_pump_Bug863' of https://github.com/andyrozman/AndroidAPS into virtual_pump_Bug863 2018-05-10 12:42:06 +01:00
Andy Rozman
6f19ad1407 Wrong handling of specialBasalDurations (Duration15 and Duartion30 flags), and added some logging. 2018-05-10 12:40:31 +01:00
Roumen Georgiev
91c0b1a2ec make Objectives visible 2018-05-10 14:36:05 +03:00
Milos Kozak
d5137a061b
Merge branch 'dev' into virtual_pump_Bug863 2018-05-10 13:19:44 +02:00
Roumen Georgiev
016aa1c069 Added insulin descriptions to SW screen 2018-05-10 13:56:50 +03:00
Roumen Georgiev
2fa77d2a8c Added insulin descriptions to SW screen 2018-05-10 13:49:13 +03:00
Roumen Georgiev
33a6135e75 Added insulin descriptions to SW screen 2018-05-10 13:48:18 +03:00
Roumen Georgiev
06180e3bbd Merge branch 'startupwizard' of https://github.com/MilosKozak/AndroidAPS into dev 2018-05-10 12:51:12 +03:00
Milos Kozak
71b44edea6 SW enable loop 2018-05-09 19:34:15 +02:00
Milos Kozak
fb7067b207 SW profile switch 2018-05-09 19:24:20 +02:00
Milos Kozak
1ba828d20a SWFragment 2018-05-09 18:49:42 +02:00
Roumen Georgiev
e3153230e0 added NSClient followup 2018-05-09 17:11:07 +03:00
Milos Kozak
0060a2ba7f SW show pump status 2018-05-09 15:10:47 +02:00
Roumen Georgiev
50f8bf2d18 fix for screens adding up 2018-05-09 15:55:02 +03:00
Roumen Georgiev
bfd61a65a0 fix for screens adding up 2018-05-09 15:44:40 +03:00
Roumen Georgiev
41d736e176 updated to latest from Milos 2018-05-09 15:06:34 +03:00
Roumen Georgiev
a7bbf93599
Merge pull request #19 from MilosKozak/startupwizard 
Startupwizard
 2018-05-09 14:49:17 +03:00
Roumen Georgiev
0e8f0669c5
Update SWDefinition.java 2018-05-09 14:48:35 +03:00
Milos Kozak
bacb3fb337 SW pump screen 2018-05-09 13:38:17 +02:00
Roumen Georgiev
1f2f2f54fc added SWCheckbox item 2018-05-09 14:15:53 +03:00
Milos Kozak
ed43eddc83 SWInfotext 2018-05-09 11:55:21 +02:00
Milos Kozak
61a7d69a65 Merge branch 'dev' into startupwizard 2018-05-09 11:41:05 +02:00
Milos Kozak
8c2d0d80ee
Merge pull request #1017 from MilosKozak/notification-height 
Tests required: Notification height
 2018-05-09 10:16:29 +02:00
Roumen Georgiev
d5a3177c35 trying pump followup screen -NOT WORKING 2018-05-09 11:06:52 +03:00
Milos Kozak
e29a590cad
Merge pull request #1020 from MilosKozak/dia-refactor 
default DIA
 2018-05-08 23:43:54 +02:00
Roumen Georgiev
85d4ef4419 trying pump followup screen 2018-05-08 17:09:37 +03:00
Roumen Georgiev
e357c7fd1b adding pump selection 2018-05-08 15:14:36 +03:00
Johannes Mockenhaupt
ce6e53e9c6
Wear wizard: add TT config option. 2018-05-08 13:28:01 +02:00
Markus M. May
b0d8d547d8 Add isConnected, enable NSClient only, if really connected to internet 2018-05-07 20:43:13 +02:00
Johannes Mockenhaupt
785c402848
LP: Don't notify about invalid values during editing. 2018-05-07 02:11:59 +02:00
AdrianLxM
cdc8e45f32
Merge pull request #1015 from jotomo/lemming-treatment 
Fix finding BG in graph for treatments before the first displayed BG.
 2018-05-06 19:51:01 +02:00
McHoffi
9d367c1fa1
Update ObjectivesFragment.java 2018-05-06 18:18:34 +02:00
AdrianLxM
f0351834ff default DIA 2018-05-06 12:49:03 +02:00
Johannes Mockenhaupt
56cbac3b4d
Leftover MainApp.gs rewrite. 2018-05-06 11:49:16 +02:00
Johannes Mockenhaupt
ef70c1f244
MainApp.sResources.getColor -> MainApp.gc. 2018-05-06 11:47:15 +02:00
Johannes Mockenhaupt
b9c649bd68
Uso blue/orange for carbs/insulin in confirmation dialogs. 
Aligns with the graph's use of using blueish colors insulin and
orange for carbs stuff.
 2018-05-06 11:46:09 +02:00
AdrianLxM
1ac41323e6 fix notification last line cutoff 2018-05-05 21:55:49 +02:00
AdrianLxM
116222858e update lastApproachingDailyLimit 2018-05-05 21:12:09 +02:00
AdrianLxM
d99fafe375 restrict aproaching daily limit to once every 30 minutes RS 2018-05-05 21:10:15 +02:00
AdrianLxM
5458df0907 restrict aproaching daily limit to once every 30 minutes Rv2 2018-05-05 21:08:17 +02:00
AdrianLxM
c2315b7bea restrict aproaching daily limit to once every 30 minutes R-Korean 2018-05-05 21:03:35 +02:00
AdrianLxM
b43eff8e55 restrict aproaching daily limit to once every 30 minutes R 2018-05-05 21:02:31 +02:00
AdrianLxM
70b2b1502f restrict wrong password notification to once every 30 seconds 2018-05-05 20:59:11 +02:00
AdrianLxM
c8c7e12056 Wrong password notification 2018-05-05 20:54:10 +02:00
AdrianLxM
246c8922df Korean wrong password notification 2018-05-05 20:51:46 +02:00
Johannes Mockenhaupt
1e0b7d331a
Fix finding BG in graph for treatments before the first displayed BG. 
(cherry picked from commit 8bdafe3)
 2018-05-05 19:13:38 +02:00
Johannes Mockenhaupt
d15ada5cd9
Combo: Fix visual glitch in fragment. 2018-05-04 21:27:54 +02:00
Milos Kozak
f5a23b2921
Merge branch 'dev' into virtual_pump_Bug863 2018-05-04 19:18:52 +02:00
AdrianLxM
f511b9ed39
Merge pull request #1000 from MilosKozak/bolusprogress-dismiss 
IDEA: dismiss bolus progress dialog when Queue is empty
 2018-05-04 19:03:11 +02:00
Andy Rozman
4fb8e899c2 Feature Request/Bug #863 
- merged with dev
- extended PumpType with new setting in PumpDescription
- added Insight pump settings for VirtualPump
 2018-05-04 15:48:46 +01:00
Milos Kozak
57973d4d3a
Merge pull request #1001 from jotomo/carbs-gen-refactor 
Extract and deduplicate eCarbs generation
 2018-05-04 16:10:23 +02:00
Milos Kozak
61e6404bbe
Merge pull request #995 from MilosKozak/wear-wizard 
Wear eCarbs
 2018-05-04 14:33:55 +02:00
Johannes Mockenhaupt
35a6bbb6a7
Set CareportalEvent.MEALBOLUS for eCarbs. 2018-05-04 14:22:43 +02:00
Johannes Mockenhaupt
43cc3c4908
Extract CarbsGenerator class. 2018-05-04 14:18:55 +02:00
Milos Kozak
963f1e1abf
Merge branch 'dev' into startupwizard 2018-05-04 13:26:40 +02:00
swissalpine
10b67a0c11
Update GraphData.java 2018-05-04 12:31:11 +02:00
AdrianLxM
5c8e99b191 dismiss bolus progress dialog when Queue is empty 2018-05-04 12:24:37 +02:00
Andy Rozman
f2df13dbfb Merge branch 'dev' into virtual_pump_Bug863 2018-05-04 10:06:18 +01:00
Milos Kozak
91f3db782d SWButton rename option to text 2018-05-04 10:20:22 +02:00
Milos Kozak
55661ca7a0 SWButton 2018-05-04 10:17:50 +02:00
swissalpine
010a2f3fd8 Make deviation bars transparent 2018-05-04 10:04:45 +02:00
Milos Kozak
88d964f135 SW reuse save, cleanup 2018-05-04 09:35:57 +02:00
AdrianLxM
c34cc73b1e fix wear wizard 2018-05-03 23:08:16 +02:00
AdrianLxM
8d6997f519 ecarb ignore 0 carbs 2018-05-03 22:08:54 +02:00
AdrianLxM
61f07da1a2 ecarb doECarb 2018-05-03 22:08:43 +02:00
AdrianLxM
c69a541b75 ecarb ash first response 2018-05-03 22:08:27 +02:00
Milos Kozak
d1958a3e2d
Merge branch 'dev' into startupwizard 2018-05-03 21:31:55 +02:00
Milos Kozak
02590ddd72 SW remove unneeded code 2018-05-03 21:29:34 +02:00
Milos Kozak
cc532b9107 SWRadioButton cleanup 2018-05-03 20:13:27 +02:00
Milos Kozak
94db444acb SW validator, language, cleanup 2018-05-03 20:06:13 +02:00
Milos Kozak
36265ab1c6 SWPlugin 2018-05-03 18:41:47 +02:00
AdrianLxM
62a38ed537 wearwizard fix NPE when CobInfo not available - missing part 2018-05-03 17:49:22 +02:00
AdrianLxM
b37b892eea wearwizard fix NPE when CobInfo not available 2018-05-03 17:49:17 +02:00
AdrianLxM
fe0f2e3ce6 wearwizard settings on phone 2018-05-03 17:49:13 +02:00
AdrianLxM
c394c045c9 wearwizard reduced watch settings 2018-05-03 17:49:09 +02:00
AdrianLxM
bdfce784c0 wearwizard ensure watch apk is up to date 2018-05-03 17:49:05 +02:00
AdrianLxM
ec106726a7 wearwizard trend 2018-05-03 17:49:01 +02:00
AdrianLxM
24dd4e1710 wearwizard cob 2018-05-03 17:48:54 +02:00
Andy Rozman
5b8779f8a7 Feature Request/Bug #863 
- added PumpCapability (to set boolean values)
- added Dana Pumps to PumpType and to VirtulaPumps array
 2018-05-03 15:10:34 +01:00
Roumen Georgiev
515590cdf6 other screens 2018-05-03 17:04:56 +03:00
Roumen Georgiev
425ba77200 other screens 2018-05-03 16:59:23 +03:00
AdrianLxM
012593a480
Update NotificationStore.java 2018-05-03 12:18:48 +02:00
Roumen Georgiev
083730f476 WIP: BGSOURCE screen 2018-05-03 09:02:16 +03:00
Andy Rozman
416bd2ff41 Feature Request/Bug #863 
- added package PumpCommon for common pump files
- added DoseSettings, DoseStepSize, PumpTempBasalType which are needed for PumpType
- added PumpType which contains all definitions for pumps
- extended fragement to display Pump Type and Pump Type definitions
- extended plugin to read configuration and set pumpDescription object
- extended pref_virtualpump to add pump type selection
 2018-05-02 23:59:33 +01:00
Milos Kozak
e5ed63a46f fix name on future profile switches 2018-05-03 00:13:49 +02:00
Milos Kozak
a35c925930
Merge pull request #983 from jotomo/issue-939 
WIP: Fix bolus progress dialog not closing with onPause/onResume cycle
 2018-05-02 23:20:29 +02:00
Johannes Mockenhaupt
396268d9c8
Send invalid boluses (prime boluses) to watch. 2018-05-02 22:49:31 +02:00
Johannes Mockenhaupt
599c87f794
Combo: better error message when initialization fails. 2018-05-02 22:48:57 +02:00
Milos Kozak
a64bfe7a39
Merge pull request #977 from MilosKozak/persistent-text 
show bg missing not no profile
 2018-05-02 22:38:07 +02:00
Milos Kozak
f9bbb72831
Merge pull request #979 from MilosKozak/lp-ps-always 
LP: Allow ProfileSwitch before pump is connected.
 2018-05-02 22:37:23 +02:00
Johannes Mockenhaupt
79458a1c73
Ignore harmless errors (un)subscribing to the message bus. 2018-05-02 22:36:52 +02:00
Milos Kozak
28430cc757 fix cob calculation 2018-05-02 22:35:51 +02:00
Milos Kozak
e2f28e0ae4 fix rounding on bolus delivery 2018-05-02 22:20:27 +02:00
AdrianLxM
a3421316ac
Allow ProfileSwitch before pump is connected. 
https://github.com/MilosKozak/AndroidAPS/issues/969
 2018-05-02 21:38:45 +02:00
Johannes Mockenhaupt
3b19db14fd
Clean up. 2018-05-02 21:25:04 +02:00
Johannes Mockenhaupt
22e90743aa
Fix #939. 2018-05-02 21:24:06 +02:00
AdrianLxM
eb594c1867
show bg missing not no profile 2018-05-02 21:09:04 +02:00
Milos Kozak
4cc952900d show progress reason from iobcobthread 2018-05-02 18:39:37 +02:00
Johannes Mockenhaupt
c51635dba4
Watch: colored preds. 2018-05-02 16:01:40 +02:00
Milos Kozak
e562d0f437
Merge pull request #957 from triplem/charging_merged 
Charging merged
 2018-05-02 15:04:00 +02:00
AdrianLxM
926ee535d5 use MainApp.gs instead of context 2 2018-05-02 14:28:16 +02:00
AdrianLxM
d289c5c7d7 use MainApp.gs instead of context 2018-05-02 14:27:23 +02:00
AdrianLxM
3f3959f785 use MainApp.gs instead of getString from Activity/Dialog 2 2018-05-02 14:21:53 +02:00
AdrianLxM
611d761a41 use MainApp.gs instead of getString from Activity/Dialog 2018-05-02 14:16:40 +02:00
AdrianLxM
4a22fd355d Merge remote-tracking branch 'milosremote/dev' into use-gs 2018-05-02 14:11:45 +02:00
AdrianLxM
5aa3a88c7f remove direct access to sResources 9 2018-05-02 13:59:27 +02:00
AdrianLxM
166f2843df remove direct access to sResources 8 2018-05-02 13:58:52 +02:00
AdrianLxM
de4643d16f remove direct access to sResources 8 2018-05-02 13:57:28 +02:00
AdrianLxM
74d0c71712 remove direct access to sResources 7 2018-05-02 13:51:24 +02:00
AdrianLxM
545d1d1586 remove direct access to sResources 6 2018-05-02 13:50:31 +02:00
AdrianLxM
0e4e36f2b1 remove direct access to sResources 5 2018-05-02 13:49:24 +02:00
AdrianLxM
3979913a6d remove direct access to sResources 4 2018-05-02 13:46:38 +02:00
AdrianLxM
2af62d8e4e remove direct access to sResources 3 2018-05-02 13:42:50 +02:00
AdrianLxM
a8382daefd remove direct access to sResources 2 2018-05-02 13:36:56 +02:00
AdrianLxM
81ad2779bc remove direct access to sResources 1 2018-05-02 13:32:41 +02:00
AdrianLxM
cfaa26d337 remove one more gs helper 2018-05-02 13:28:58 +02:00
AdrianLxM
20263c9fe4 remove other gs helper methods 2018-05-02 13:17:57 +02:00
AdrianLxM
73b41a7162 some more gs 2018-05-02 13:12:08 +02:00
AdrianLxM
7b6402de09 use gs function in MainApp to get strings 2018-05-02 13:05:22 +02:00
AdrianLxM
2749c1c853 refactor cob string 2018-05-02 11:19:03 +02:00
AdrianLxM
24bd509ec6 COB in ongoing notification 2018-05-02 08:30:37 +02:00
AdrianLxM
c445c078e1 add g to default COB as well 2018-05-02 08:30:34 +02:00
AdrianLxM
915dac8ef3 COB in external status 2018-05-02 08:30:28 +02:00
AdrianLxM
f75329f5dc move COB string representation to CobInfo 2018-05-02 08:30:23 +02:00
Roumen Georgiev
15f4f64c4f using View.generateId() instead of fixed value 2018-05-02 09:22:26 +03:00
Markus M. May
2d3d39d1dc Use common helper method for day calculation 2018-05-01 23:43:18 +02:00
Markus M. May
a46b038381 use correct number format 2018-05-01 23:34:40 +02:00
Markus M. May
de92125967 Fixes wrong algo 2018-05-01 22:49:44 +02:00
Markus M. May
306d45bb3e Fix Boolean thingy 2018-05-01 22:15:22 +02:00
Markus M. May
02e9ce105c Add boolean thingie from Adrian ;-) 2018-05-01 22:01:08 +02:00
Markus M. May
12d80e96ef Merge latest dev version 2018-05-01 21:56:33 +02:00
Markus M. May
e91fd00836 Add Unit-Test, as well as fixtures for SSID handling 2018-05-01 21:46:37 +02:00
Milos Kozak
dbca668afd
Merge pull request #952 from jotomo/rainbow 
Fix missing predictions in graph, color them.
 2018-05-01 20:10:59 +02:00
Milos Kozak
537be09493
Merge pull request #950 from jotomo/oreo-persistent-notification-annoyance 
Make persistent notification not peak on every update on Oreo.
 2018-05-01 20:08:17 +02:00
Milos Kozak
eb7b67781c
Merge pull request #947 from jotomo/issue-940 
Don't create empty future carbs records. Fixes #940.
 2018-05-01 20:07:46 +02:00
Milos Kozak
c991673de1
Merge pull request #948 from MilosKozak/zerotempiob 
fix zeroTempIOB
 2018-05-01 20:06:32 +02:00
Johannes Mockenhaupt
af563474d5
Skip predictions below 40. 2018-05-01 19:33:27 +02:00
Johannes Mockenhaupt
1e80ca22c6
Don't draw invalidated SMBs. 2018-05-01 19:33:27 +02:00
Johannes Mockenhaupt
ee61a71181
Sort predictions so they're properly displayed in the graph. 
GraphView library requires a series to be ordered by the x-value.
 2018-05-01 19:33:27 +02:00
Johannes Mockenhaupt
5ef7506e5f
Clean up prediction colors. 2018-05-01 19:16:28 +02:00
TebbeUbben
60d3cde0d3 Compat for SR 1.6.0 2018-05-01 17:29:21 +02:00
Johannes Mockenhaupt
4d1515769f
Make persistent notification not peak on every update on Oreo. 2018-05-01 14:59:40 +02:00
AdrianLxM
3d5fb96d7d fix zeroTempIOB 2018-05-01 13:47:26 +02:00
Johannes Mockenhaupt
8c3df40fdf
Don't create empty future carbs records. Fixes #940. 
When very few carbs are stretched out (e.g. 10g over 4h), there are
gaps, so that 1g is generated only every 30m. Don't create empty
records in between.
 2018-05-01 12:22:01 +02:00
Roumen Georgiev
3f0c2958c7 WIP: change of language works 2018-04-30 16:41:40 +03:00
Markus M. May
099cb6c4e4 add battery charging state 2018-04-29 22:49:43 +02:00
AdrianLxM
81037cde5c
Merge pull request #935 from jotomo/calculator-carb-only 
Calculator: carb-only handling.
 2018-04-28 19:29:13 +02:00
Johannes Mockenhaupt
4813c9c163
Combo: minor cleanup. 2018-04-27 19:51:12 +02:00
Johannes Mockenhaupt
5746e37553
Enable Combo & extended carbs without engineering mode as well. 2018-04-27 19:50:59 +02:00
Johannes Mockenhaupt
21f231e2b3
Calculator: carb-only handling. 
If only carbs where entered/calculated, send them to the pump only
 if the pump supports it, otherwise just add it to the DB.
 2018-04-27 19:49:50 +02:00
Roumen Georgiev
a0463742fa WIP: language set and validation 2018-04-27 17:04:08 +03:00
Roumen Georgiev
bb38d7644b move onClick in SWRadioButton 2018-04-27 13:30:45 +03:00
Milos Kozak
8577a94571
Merge pull request #925 from MilosKozak/safety-loop 
Safety loop
 2018-04-27 11:00:18 +02:00
Milos Kozak
e951a924c4
Merge pull request #931 from MilosKozak/cobchart 
align failoverToMinAbsorbtionRate to cobtime
 2018-04-27 10:54:39 +02:00
AdrianLxM
3631f685e2 cleanup 2018-04-27 00:03:08 +02:00
AdrianLxM
9889d34512 Treat future IOB as if the current TBR was cancelled 2018-04-26 23:59:04 +02:00
AdrianLxM
5df59d8fe3
Merge pull request #927 from MilosKozak/lastBolusTime 
lastBolusTime  - only treatments with insulin
 2018-04-26 23:57:54 +02:00
Roumen Georgiev
11dc20faca code cleanup 2018-04-26 16:59:56 +03:00
Roumen Georgiev
ef171dbccd get SP value and check if it is already set 2018-04-26 16:13:08 +03:00
Roumen Georgiev
67ed699ca5 save() before showing next 2018-04-26 15:59:08 +03:00
Roumen Georgiev
59f654f918 show "NEXT" only when isValid() == true 2018-04-26 15:28:23 +03:00
Roumen Georgiev
d75de2f645 show "NEXT" only when isValid() == true 2018-04-26 15:18:01 +03:00
AdrianLxM
3356004065 don't hide IOB behind COB 2018-04-26 03:43:43 +02:00
AdrianLxM
c045a0a41e align failoverToMinAbsorbtionRate to cobtime 2018-04-26 03:17:57 +02:00
Johannes Mockenhaupt
f3bc59003e
Space-optimize COB on watch. 2018-04-26 01:33:09 +02:00
Johannes Mockenhaupt
8d4e9f0043
Add future carbs on watch. 2018-04-26 01:16:31 +02:00
Johannes Mockenhaupt
2f846bc417
WatchUpdaterService: use IobCob.getCobInfo(). 2018-04-26 01:10:27 +02:00
AdrianLxM
1eb2e59043 lastBolusTime - only treatments with insulin 2018-04-26 00:16:15 +02:00
AdrianLxM
3ec5eaea63 don't trigger loop on treatment 2018-04-26 00:14:51 +02:00
AdrianLxM
b6cd56b90a cleanup logs 2018-04-25 23:31:15 +02:00
Markus M. May
55ea10e88f Catch NetworkState changes correctly 2018-04-25 22:22:37 +02:00
Markus M. May
3fb17e6869 First step to use network activity receiver 2018-04-25 20:49:03 +02:00
AdrianLxM
e79ef7f018 always call callback on TBR-Request 2018-04-25 16:28:54 +02:00
AdrianLxM
a14345bb1a synchronized loop invoke 2018-04-25 16:14:21 +02:00
Roumen Georgiev
dc91e3a544 currentScreen not updating - fixed & center fields 2018-04-25 17:02:10 +03:00
Roumen Georgiev
8333fe8975 get radiobutton values from arrays.xml & no header 2018-04-25 16:45:15 +03:00
Roumen Georgiev
ddf3c44928 rename show() to generateDialog() 2018-04-25 15:34:07 +03:00
Roumen Georgiev
7fb1b32188 moved show() method to SWItem classes 2018-04-25 15:29:20 +03:00
AdrianLxM
18fc03ec78 Merge remote-tracking branch 'milosremote/safety-loop' into safety-loop 2018-04-25 12:54:35 +02:00
AdrianLxM
85bb085188 rename safety to tempBasalFallback 2018-04-25 12:51:27 +02:00
AdrianLxM
b5a6ef2ecc
make now part of the past 2018-04-25 12:15:29 +02:00
AdrianLxM
ac23750942
lastBolusTime - only treatments with insulin 2018-04-25 11:52:01 +02:00
Roumen Georgiev
dda7ca3f95 radio group is generated dynamically 2018-04-25 11:03:33 +03:00
AdrianLxM
2a50248ba5
travis re-invoke commit with cleanup 2018-04-25 01:37:48 +02:00
AdrianLxM
a6a4a8837d safety run if SMB fails 2018-04-25 01:18:40 +02:00
Johannes Mockenhaupt
da96b2d87c
Round up to be sure. 2018-04-24 23:09:07 +02:00
Johannes Mockenhaupt
60fbb1eeba
Fix another NPE. 2018-04-24 23:09:07 +02:00
Johannes Mockenhaupt
f4bafc6260
Add IobCobCalculatorPlugin.getCobInfo(). 2018-04-24 23:09:07 +02:00
Milos Kozak
4217e82e0a
Merge pull request #884 from swissalpine/patch-1 
More generous values for colored iage warnings (careportal)
 2018-04-24 09:13:34 +02:00
Milos Kozak
c490499d03 preferences cleanup 2018-04-24 00:11:52 +02:00
Roumen Georgiev
eef4423109 basic navigation works 2018-04-23 17:03:22 +03:00
Milos Kozak
c15a4b5efe fix wrong error dialog when only carbs are delivered (R,KoreanR) 2018-04-23 15:24:32 +02:00
Roumen Georgiev
76685c3cff WIP: initial work 2018-04-23 15:58:27 +03:00
Milos Kozak
545b4a51ee
Merge pull request #914 from jotomo/overview-extended-bolus-display 
Overview: hide ext. bolus line if none running; spacings, alignments.
 2018-04-22 23:13:10 +02:00
Milos Kozak
a0036bfb79
Merge pull request #906 from jotomo/loop-invocations 
Don't loop with old BG value, don't loop twice for the same value.
 2018-04-22 22:43:37 +02:00
Johannes Mockenhaupt
896f919f37
Disable roaming (pref) when wifi-only is enabled. 2018-04-22 21:43:31 +02:00
Johannes Mockenhaupt
47770e9c6c
Overview: hide ext. bolus line if none running; spacings, alignments. 2018-04-22 21:31:53 +02:00
Milos Kozak
6851adbfd3 NSClient connection settings 2018-04-22 18:24:06 +02:00
Milos Kozak
b81d2ec6da
Merge pull request #909 from TebbeUbben/dev 
Don't create TBR record when pump has been paused
 2018-04-22 15:42:30 +02:00
TebbeUbben
2844be85b5 Don't create TBR record when pump has been paused 2018-04-22 13:44:12 +02:00
Milos Kozak
be5a989c5e
Merge pull request #908 from jotomo/fresh-cob 
Fix delay in COB calculation.
 2018-04-22 09:13:13 +02:00
Johannes Mockenhaupt
89a29d150f
Fix delay in COB calculation. 2018-04-22 00:08:41 +02:00
Tebbe Ubben
f4e02a4862
Merge branch 'dev' into dev 2018-04-21 23:22:02 +02:00
TebbeUbben
fd776a2a0e Add 0%-TBR to history when pump has been started or stopped 2018-04-21 23:20:33 +02:00
Milos Kozak
c4db1c5e2d move quickwizard preferences under overview 2018-04-21 21:58:07 +02:00
Milos Kozak
cab592efb5 overview preferences cleanup 2018-04-21 21:31:42 +02:00
Milos Kozak
6ad0c1f1d3 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-04-21 20:47:15 +02:00
Milos Kozak
ea59458383 nsclient preferences cleanup 2018-04-21 20:46:55 +02:00
Milos Kozak
3d7cdd3819 fix ns backfill bug 2018-04-21 19:51:52 +02:00
Milos Kozak
209623f9ea
Merge pull request #905 from jotomo/no-future-for-you 
Don't send future carbs to pumps.
 2018-04-21 18:13:33 +02:00
Johannes Mockenhaupt
e4a4e07d21
Add javadoc. 2018-04-21 15:28:37 +02:00
Johannes Mockenhaupt
d0405014b2
Don't loop with old BG value, don't loop twice for the same value. 
Loop is potentially triggered twice when BG reading sent to NS comes back.
This should also deal with backfilled data coming in, since any previous
reading will be older than 9m, for which DatabaseHelper.actualBg()
returns null.

The previous approach to solve multiple invocations for the same value
added a isNew flag to EventNewBG, but since
DatabaseHelper.scheduleBgChange() drops excessive updates the event
carrying that flag is not guarantued to be delivered, resulting in
missed loop invocations. The approach taken now lets the receiver
of the event fully decide how to deal with it.

Should fix, or at least improve, #901, #671.
 2018-04-21 14:28:47 +02:00
Johannes Mockenhaupt
9c6ee32586
Don't send future carbs to pumps. 2018-04-21 14:08:42 +02:00
Milos Kozak
c40aaed52f allow to show dev slope in dev 2018-04-21 12:09:09 +02:00
Milos Kozak
c0250dd62c show calculation cob progress on graph 2018-04-21 10:50:55 +02:00
Milos Kozak
cb65bed0a7 alling code to xdrip changes 2018-04-21 10:20:49 +02:00
Milos Kozak
c27ceb0a72 better bolus error handling for Dana pumps 2018-04-21 00:02:15 +02:00
Milos Kozak
870d23c08c fix bolus step for Dana pumps 2018-04-20 22:13:20 +02:00
Milos Kozak
2f299bc670
Merge pull request #898 from MilosKozak/cob-rework 
Please review: Cob rework
 2018-04-20 20:53:50 +02:00
AdrianLxM
69c8eea53b
Enforce TBRs on enforceNew 2018-04-20 18:05:37 +02:00
Milos Kozak
b554d641a7 setupwizard template 2018-04-20 17:27:31 +02:00
Milos Kozak
41b5636c13 clear autosens cache on new preferences change 2018-04-20 12:44:19 +02:00
Milos Kozak
fb71b64922 Merge branch 'cob-rework' of https://github.com/MilosKozak/AndroidAPS into cob-rework 2018-04-20 12:28:18 +02:00
Milos Kozak
0ab04c4d95 fix cob scaling 2018-04-20 12:28:07 +02:00
AdrianLxM
d8180cc52b Merge remote-tracking branch 'milosremote/dev' into cob-rework 2018-04-19 23:54:36 +02:00
Milos Kozak
645e83b6e6 dismiss notification if pump is reachable 2018-04-19 23:42:37 +02:00
Milos Kozak
51530fbcf8 fix temptarget NS sync 2018-04-19 23:18:19 +02:00
Milos Kozak
e1dc69cd4d visualize min carbs absorption 2018-04-19 22:31:07 +02:00
Milos Kozak
4f4f92ff76
Merge pull request #895 from triplem/mgdl_mmol_handling 
Cleanup mmol/mgdl TT handling in Dialogs
 2018-04-19 21:00:47 +02:00
AdrianLxM
11b88c7947 Merge remote-tracking branch 'milosremote/dev' into cob-rework 2018-04-19 20:22:14 +02:00
AdrianLxM
dfa05711d3
Merge pull request #892 from MilosKozak/carbs-gen-pr 
Carbs gen pr
 2018-04-19 20:19:10 +02:00
AdrianLxM
9e9270bff7 cleanups 2018-04-19 19:34:38 +02:00
AdrianLxM
6df614e7c6 Merge remote-tracking branch 'milosremote/dev' into cob-rework 2018-04-19 19:29:27 +02:00
AdrianLxM
eac6f15881
XDrip source description extra 2018-04-19 17:49:18 +02:00
AdrianLxM
572b308f6c
cleanup 2018-04-19 17:47:34 +02:00
AdrianLxM
a227a8b601
Push source to xDrip plugin 2018-04-19 17:45:52 +02:00