Commit graph

3742 commits

Author SHA1 Message Date
Roumen Georgiev
564e87d782 added phone Manufacturer and model note to NS 2018-04-11 15:44:53 +03:00
Johannes Mockenhaupt
f8d022ba87
NewCarbsDialog: prefill with carbsReq. 2018-04-11 13:05:54 +02:00
Johannes Mockenhaupt
9b3b228aad
Color active/scheduled bolus/carbs and TT entries in treatment tab. 2018-04-11 13:05:54 +02:00
Johannes Mockenhaupt
d2491ca429
NewCarbsDialog: add duration, help. 2018-04-11 13:05:54 +02:00
Johannes Mockenhaupt
80be7fb586
Fix re-enabling the loop plugin from overview. Fixes #861.
Note that enabling a loop plugin is hardcoded against the only
impl currently available LoopPlugin. Support for multiple loop
plugins is incomplete (and not needed at this point), since
there's no LoopInterface, but immediately LoopPlugin (as compared
to APSInterface with OpenAPS* impls).
When adding support, the last activated loop plugin must be remembered
so the correct one is re-enabled.
2018-04-10 12:10:19 +02:00
Markus M. May
99c8bbc6c2 Adding notes to carbs and to wizard on overview 2018-04-09 22:10:08 +02:00
Milos Kozak
e9ac979a1b fix NPE in TempBasal treatments tab 2018-04-09 19:52:01 +02:00
AdrianLxM
d1d46849ee
Merge pull request #832 from MilosKozak/lp-edit
LocalProfile reset/save button
2018-04-09 14:08:22 +02:00
Milos Kozak
b2129fa48e
Merge pull request #857 from TebbeUbben/disable-tdd-load-button
Hide TDD buttons
2018-04-09 00:36:48 +02:00
Milos Kozak
0f0d68e46a
Merge pull request #855 from TebbeUbben/automatic-careportal-events
Automatic careportal events
2018-04-09 00:35:23 +02:00
Milos Kozak
82bb65560b QuickWizardTest part1 2018-04-09 00:37:23 +02:00
Milos Kozak
9b91b4ab93
Merge branch 'dev' into automatic-careportal-events 2018-04-08 23:53:04 +02:00
Milos Kozak
05591cd762 missing conditional logging 2018-04-08 22:28:05 +02:00
Milos Kozak
44e923dd09 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-04-08 22:24:51 +02:00
Milos Kozak
4663bb3cf6 extended boluses NS sync fix 2018-04-08 22:24:04 +02:00
Milos Kozak
a609d806d1 fix tests 2018-04-08 20:37:05 +02:00
TebbeUbben
df7d93ab2a Check for TDD support in updateGUI 2018-04-08 20:33:07 +02:00
TebbeUbben
851cec7240 Renamed alerts.xml to insight_alerts.xml 2018-04-08 20:27:23 +02:00
Milos Kozak
d9279eed2a split MaxIOB for SMB 2018-04-08 20:17:15 +02:00
TebbeUbben
42541fc7e3 Switched back to custom careportal code 2018-04-08 18:57:29 +02:00
TebbeUbben
b488e30459 Use uploadError for pump alarms 2018-04-08 18:46:29 +02:00
TebbeUbben
56b2799785 Added insight_real_tbr_cancel option again 2018-04-08 18:32:11 +02:00
TebbeUbben
50458d1fbc log.error("Unhandled exception", e); 2018-04-08 18:15:27 +02:00
TebbeUbben
b3c1bf6e7d Hide TDD button if pump doesn't support them
Hide reload button if pump doesn't need it
2018-04-08 17:54:16 +02:00
TebbeUbben
d3342d13f5 Added ACTION_OCCURENCE_OF_ALERT to IntentFilter 2018-04-08 17:28:48 +02:00
TebbeUbben
f8d4dbf6a1 Add pump alerts as notes 2018-04-08 17:22:53 +02:00
AdrianLxM
5c6e598cd6
Merge branch 'dev' into lp-edit 2018-04-08 16:14:43 +02:00
TebbeUbben
5022a77711 Automatic careportal events 2018-04-08 14:31:24 +02:00
TebbeUbben
ba83f7f499 Correct lastDataTime handling 2018-04-08 13:43:37 +02:00
Milos Kozak
7a74364af6 remove unused catch 2018-04-07 16:43:20 +02:00
Milos Kozak
2fee7f3186 fix NPE in Simulator 2018-04-07 16:33:37 +02:00
Milos Kozak
485bbd5d68
Merge pull request #850 from TebbeUbben/dev
Insight - Support for TDDs
2018-04-06 21:50:01 +02:00
TebbeUbben
1d2cd4b9cf Support for TDDs 2018-04-06 21:39:42 +02:00
Milos Kozak
78ffae6e47
Merge pull request #849 from jotomo/combo-cleanup
Combo cleanup
2018-04-06 21:14:50 +02:00
Milos Kozak
35decd0e53 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-04-06 21:12:14 +02:00
Milos Kozak
74edadd1e5 fix detailedbolusinfo for DanaRS 2018-04-06 21:07:29 +02:00
Milos Kozak
7cf2505276 Better time synchronization for DanaRS 2018-04-06 19:07:47 +02:00
Milos Kozak
fc56af7add Fix detailedbolusinfo for DanaRv2 2018-04-06 18:58:13 +02:00
Milos Kozak
c94d01f22b better time synchronization for danarv2 2018-04-06 18:30:36 +02:00
Johannes Mockenhaupt
623a5e3da1
Combo: remove unused strings, minor code cleanups. 2018-04-06 11:42:33 +02:00
Johannes Mockenhaupt
344d9c1f49
Combo: remove 'read history' button.
History and basal rate profile are permanently checked and updated. This
functionality would only be needed if driver was fundamentally broken.
2018-04-06 11:35:35 +02:00
Johannes Mockenhaupt
db4439f1cc
Combo: remove half-backed alerts dialog. 2018-04-06 11:35:34 +02:00
Johannes Mockenhaupt
e937a777ba
Combo: remove superseeded TDD button and dialog. 2018-04-06 11:35:34 +02:00
Milos Kozak
828b20e358 optimize notifications & overview, fix reporting profile update 2018-04-05 23:42:27 +02:00
Milos Kozak
a3811b503f catch the thread 2018-04-05 23:28:17 +02:00
Milos Kozak
f2a7876466
Merge pull request #846 from swissalpine/patch-1
Overview fragment: Show "Disconnected" when disconnected not "Suspended"
2018-04-05 23:22:44 +02:00
Milos Kozak
e5bf36bfe3 code cleanup 2018-04-05 23:21:08 +02:00
Milos Kozak
36d94ecdef Merge branch 'dev' into PoweRGbg/patch-15 2018-04-05 22:14:26 +02:00
Milos Kozak
b520a077f8 Merge branch 'dev' into PoweRGbg/patch-15 2018-04-05 22:05:47 +02:00
swissalpine
afebf30bc0
Add string loopdisconnectedfor 2018-04-05 21:55:07 +02:00
swissalpine
4ec959b0c4
Show "Disconnected (2d m)" on overview fragment 2018-04-05 21:53:09 +02:00
Markus M. May
a5a0a27db6 Xchange activity and eating soon temp target mgdl 2018-04-05 20:38:49 +02:00
Milos Kozak
ee133f87ae fix test 2018-04-05 10:56:55 +02:00
Milos Kozak
ba7d0aebaa show message ragarding closed loop mode only if closed mode is enabled in preferences 2018-04-05 10:46:23 +02:00
Milos Kozak
a615553047 check for profile already set before notification 2018-04-05 10:02:57 +02:00
Milos Kozak
aebaa76864 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-04-05 09:39:34 +02:00
Milos Kozak
f6cd1201e3 Treatments refactor 2018-04-05 09:39:18 +02:00
Roumen Georgiev
934fedaa73
added determineTextColor() to shorten source 2018-04-05 10:01:16 +03:00
Roumen Georgiev
6ace7080b2
changed isOlderThan() parameter to hours not days 2018-04-05 09:58:55 +03:00
Roumen Georgiev
269382f5ff
Default values of CAGE, SAGE .. like in NS 2018-04-05 09:37:20 +03:00
Milos Kozak
d235fc0bfb show build flavor in about dialog 2018-04-05 00:08:59 +02:00
Milos Kozak
16319aeb52 logging options 2018-04-04 17:51:39 +02:00
AdrianLxM
8c303fd447 notifications for oreo quickfix 2018-04-04 14:55:25 +02:00
Roumen Georgiev
5e418c5916
adding color for warn levels of cage,sage... 2018-04-04 14:55:29 +03:00
Roumen Georgiev
29bbc9dfec
added method to get iage,cage,sage 2018-04-04 14:52:52 +03:00
Roumen Georgiev
2c42bad48d
change name of threshold to days to clarify 2018-04-04 12:22:54 +03:00
Roumen Georgiev
5e56e2afa0
Get thresholds from NS
thresholds in NS are in hours
2018-04-04 12:16:01 +03:00
Roumen Georgiev
5e045264d5
changed isOlderThan(int) to double 2018-04-04 12:14:19 +03:00
Roumen Georgiev
f284483500
used isOlderThan 2018-04-04 09:37:08 +03:00
Roumen Georgiev
d50f31e7a6
change age(int) to boolean isOldetThan() 2018-04-04 09:35:45 +03:00
AdrianLxM
009f5dfa38 reset -> strings.xml 2018-04-03 18:37:34 +02:00
AdrianLxM
933b1acd7e lp save button 2018-04-03 18:33:13 +02:00
AdrianLxM
f17deaedfb lp isValid 2018-04-03 17:54:29 +02:00
AdrianLxM
b4c3c3f216 no lazy-loading of converted profile 2018-04-03 16:53:22 +02:00
AdrianLxM
75a91997b7 lp reset 2018-04-03 14:34:15 +02:00
Roumen Georgiev
ddf39e8d55
added color when values are old
harcoded values fo SAGE, CAGE ...
2018-04-03 09:18:01 +03:00
Roumen Georgiev
f800d695ff
SAGE, CAGE ... change color if old - second try
requested in #811
2018-04-03 09:15:28 +03:00
Milos Kozak
149818a902
Merge pull request #821 from triplem/g44
Gradle Update to 4.4
2018-04-02 10:28:13 +02:00
Milos Kozak
ad74a9ba9a fix errors in tests 2018-04-02 10:29:19 +02:00
Markus M. May
6d6dee6f0b Use org.junit instead of junit.framework, use static imports 2018-04-01 23:01:37 +02:00
Milos Kozak
3cfc9c16fe check 3min timeout SMB right before execution 2018-04-01 22:33:32 +02:00
Milos Kozak
0e9366c6fe log existing db record 2018-04-01 22:21:46 +02:00
Milos Kozak
5a192d82d0 read pump status after pump driver change 2018-04-01 20:04:54 +02:00
Milos Kozak
5e2fdebc07 fix travis 2018-04-01 20:02:22 +02:00
Milos Kozak
5ce184e67d fix time in dialogs during DST change 2018-04-01 18:44:58 +02:00
Milos Kozak
89ee73ef7d fix state when new thread was not started during waiting for pump disconnection 2018-04-01 12:34:41 +02:00
Milos Kozak
5fa56b22c9 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-04-01 11:10:24 +02:00
Milos Kozak
0a03798de9 move treatments interface out of ConfigBuilder 2018-04-01 11:09:58 +02:00
Johannes Mockenhaupt
280ed14c6b
Unbreak WearPlugin. 2018-04-01 02:20:36 +02:00
Milos Kozak
8d35a89870
Merge pull request #818 from MilosKozak/insulin-plugins
remove old insulin plugins
2018-03-31 22:51:18 +02:00
Milos Kozak
e9c7bdc7f4 add necessity of profile switch to objectives 2018-03-31 22:30:42 +02:00
Milos Kozak
34ec1225c6 fix NSCLIENT after plugin refactor 2018-03-31 21:41:14 +02:00
Milos Kozak
a91aeec144 fix nsclient layout 2018-03-31 20:32:47 +02:00
AdrianLxM
45c7753175 remove old insulin plugins 2018-03-31 19:36:44 +02:00
Milos Kozak
c57d14aa05 MainAppTest 2018-03-31 15:00:32 +02:00
Milos Kozak
6e69b25d8a Merge branch 'wip' into dev 2018-03-31 12:41:43 +02:00
Milos Kozak
66f6ddf052 Subscribe fix 2018-03-31 12:12:49 +02:00
Milos Kozak
364364f205 ConfigBuilderTest 2018-03-31 11:31:09 +02:00
Milos Kozak
1c6c5f85f7 DanaR pumps lifecycle 2018-03-31 10:36:57 +02:00
Milos Kozak
a30334f5d5 PluginDescriptionTest 2018-03-31 10:09:29 +02:00
Milos Kozak
3b3662af80 Merge branch 'dev' into wip 2018-03-31 00:39:35 +02:00
Milos Kozak
bcb733e42c Plugins refactor 2018-03-31 00:36:03 +02:00
Markus M. May
314275d4b4 Remove unnecessary imports, rename method 2018-03-30 20:02:04 +02:00
Milos Kozak
e4f2049405 PumpEnactTestResult 2018-03-29 18:44:16 +02:00
Johannes Mockenhaupt
a36a9b0746
Move check for running setProfile command to KeepAlive. 2018-03-28 22:49:43 +02:00
Johannes Mockenhaupt
014864f0db
Trigger fabric event on user request, not queuing time. 2018-03-28 22:12:14 +02:00
Johannes Mockenhaupt
52c6d209af
Clean up initial profile push to pump. 2018-03-28 21:20:56 +02:00
Milos Kozak
259b5fa818
Merge pull request #809 from MilosKozak/tdds-again-merged
Tdds again merged
2018-03-28 17:35:23 +02:00
Milos Kozak
fc2da20743 fix conflict 2018-03-28 10:25:58 +02:00
Milos Kozak
e9b499314d PUMP SMS command, connect to pump before reporting SMS STATUS 2018-03-28 10:22:10 +02:00
Milos Kozak
7b43971618 fix NPE 2018-03-27 21:49:10 +02:00
Milos Kozak
27c4fe3309 fix NPE 2018-03-27 21:43:35 +02:00
Milos Kozak
e49d430a50 revert DetailedBulusInflo cloning 2018-03-27 20:16:33 +02:00
Milos Kozak
cb4b117152 fix extended bolus NS upload 2018-03-27 20:00:34 +02:00
Milos Kozak
3567320788 fix test 2018-03-27 19:45:44 +02:00
Milos Kozak
eaecf48577 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-03-27 16:41:44 +02:00
Milos Kozak
95f2e5d913 IobTotalTest 2018-03-27 16:41:37 +02:00
Milos Kozak
6aa568a03e
Merge pull request #812 from jotomo/cleanups
Cleanups
2018-03-27 16:38:49 +02:00
Johannes Mockenhaupt
dffdc49c3b
SMB fragement: trim superflous newlines. 2018-03-27 14:52:36 +02:00
Johannes Mockenhaupt
da6f6dfe72
Clean up missed spots w.r.t. to FabricPrivacy transition. 2018-03-27 14:52:31 +02:00
Milos Kozak
689fda5969 IobTest 2018-03-27 14:36:43 +02:00
Milos Kozak
1b9b20cd41 1st ProfileSwitch must be with zero duration, ProfileIntervalsTest 2018-03-27 14:19:52 +02:00
Milos Kozak
0a87b0ede7 MealDataTest 2018-03-26 22:59:04 +02:00
Milos Kozak
f8c9fac7b1 NonOverlapingIntervalsTest 2nd 2018-03-26 22:55:38 +02:00
Milos Kozak
cc436a09d9 TempBasal, TempTarget refactor; NonOverlapingIntervalsTest 2018-03-26 22:37:53 +02:00
Milos Kozak
a4cb4cbbd5 OverlapingIntervalsTest 2018-03-26 19:46:18 +02:00
Milos Kozak
21c6827cf4 more GlucoseStatusTests 2018-03-26 17:47:25 +02:00
Milos Kozak
d071ca5b88 GlucoseStatusTest & fix 2018-03-26 16:51:25 +02:00
Milos Kozak
5c5b8ee2f0 DetailedBolusInfo test & fix 2018-03-26 13:25:53 +02:00
Milos Kozak
cf619aa1fa nicer scale on basal graph 2018-03-26 11:07:16 +02:00
Milos Kozak
d357b00ca6 display activate button properly 2018-03-26 10:56:56 +02:00
Milos Kozak
f0e779cb1f set axisWidth based on dpi 2018-03-26 10:53:14 +02:00
Milos Kozak
8e6953cc92 activate button on NSProfile fragment 2018-03-26 09:25:57 +02:00
AdrianLxM
6c20d9b6c6 TDD 13 mergeconflict AbstractDanaPlugin 2018-03-26 08:51:17 +02:00
AdrianLxM
4a4982f6b8 TDD 12 mergeconflict Insight renaming 2018-03-26 08:47:44 +02:00
Milos Kozak
545debde92 fix displaying nsprofile 2018-03-26 08:46:26 +02:00
AdrianLxM
a5d0ec45cc Merge remote-tracking branch 'milosremote/dev' into tdds-again-merged 2018-03-26 08:39:24 +02:00
Milos Kozak
d5e60fa16f fix negative correction in wizard 2018-03-26 07:49:09 +02:00
Milos Kozak
afe3d68a10 display SMB reasons 2018-03-25 23:56:52 +02:00
Milos Kozak
4d6d7941ac try to catch getProfile errors 2018-03-25 18:51:16 +02:00
Milos Kozak
afb0249072 try to catch iobcalculation error 2018-03-25 18:03:55 +02:00
Milos Kozak
ca12124c10 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-03-25 17:33:17 +02:00
Milos Kozak
f939994afa more synchronized access in treatments 2018-03-25 17:33:03 +02:00
Milos Kozak
8c5a2ab524
Merge pull request #799 from jotomo/prime-fill-refresh
Prime/fill button refresh and some drive-by improvements
2018-03-25 16:10:39 +02:00
Johannes Mockenhaupt
7c959ce335
Create careportal events with explicit time. 2018-03-25 15:43:48 +02:00
Johannes Mockenhaupt
593174d6d2
Revert all changes to NSUpload. 2018-03-25 15:39:34 +02:00
Milos Kozak
51e0774021 prevent creating careportal event of the same time 2018-03-25 15:02:51 +02:00
Johannes Mockenhaupt
8a2d49b833
Fix the correct method. 2018-03-24 20:13:50 +01:00
Johannes Mockenhaupt
5a6af7f6d5
Unbreak NSUpload.updateProfileSwitch methods. 2018-03-24 20:03:45 +01:00
Milos Kozak
2cfa2ae8cf overview graph rendering update 2018-03-24 18:10:57 +01:00