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
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
AdrianLxM 938040ae6b
xDrip plugin depend filtering on source 2018-04-19 17:44:52 +02:00
AdrianLxM d810be9b6a consider absorption time for carbs - not DIA 2018-04-19 14:03:30 +02:00
AdrianLxM 8d94acb051 more cleanups 2018-04-19 13:44:06 +02:00
AdrianLxM d7bf3c563a cleanup 2018-04-19 13:35:52 +02:00
AdrianLxM 09cc8c01b6 use min5min impact actually used for SMB 2018-04-19 13:31:34 +02:00
AdrianLxM f4dea97f36 cutoff at max absorption time 2018-04-19 13:04:21 +02:00
AdrianLxM 00c05c0e23 totalMinCarbsImpact depending on sensitivty plugin 2018-04-19 12:57:13 +02:00
AdrianLxM 542cc9ac7f
Update Overview on Profile Switch 2018-04-19 01:38:27 +02:00
Markus M. May 83da3447ac Cleanup mmol/mgdl handling in Dialogs 2018-04-18 22:11:32 +02:00
AdrianLxM 38a0dc5c05
Merge branch 'carbs-gen-pr' into carbsgen0418 2018-04-18 16:55:19 +02:00
Milos Kozak 2fb199ae6c fix insulin dialog TT & TT sync from NS 2018-04-18 16:34:46 +02:00
AdrianLxM dd8d907f4f fix TT units 2018-04-18 16:23:40 +02:00
AdrianLxM 2561c3f8b6 Carbs only treatments in Queue 2018-04-18 16:13:02 +02:00
Johannes Mockenhaupt 49a836eda9
NewNSTreatmentDialog: add Hypo TT preset. 2018-04-18 16:03:23 +02:00
AdrianLxM 2cf438a064 Merge remote-tracking branch 'jotomoremote/carbs-gen-pr' into carbsgen0418 2018-04-18 16:00:00 +02:00
swissalpine ca5001e3a4
Update CareportalFragment.java 2018-04-17 14:42:41 +02:00
Milos Kozak 7063f4de8b
Merge pull request #879 from MilosKozak/temptargetfix 
NewNSTreatment dialog cleanup
 2018-04-17 07:45:08 +02:00
Milos Kozak abadcd4eaa fix test 2018-04-16 23:29:53 +02:00
swissalpine 7ef5b4fb28
More realistic colored IAGE warnings 
Normaly Insulin should be stable at least 4-5 days. So I think a warning after two days and a red alarm after three is two early. I changed the default values to 72 hours for the yellow and 86 hours for the red warning.
 2018-04-16 20:31:37 +02:00
Johannes Mockenhaupt c7c90ea919
Proper fix. 2018-04-16 10:11:48 +02:00
Johannes Mockenhaupt 0ef8af262f
NewInsulinDialog: fix botched notes field reference. 2018-04-16 01:40:52 +02:00
Johannes Mockenhaupt 58aa4f1323
Unbreak wizard xml, small fixes. 2018-04-15 19:29:23 +02:00
Johannes Mockenhaupt 5d66ecc767
NewCarbsDialog: use correct 'constraint applied' messages. 
(cherry picked from commit a9e290e)
 2018-04-14 10:43:39 +02:00
Johannes Mockenhaupt 10604299e7
Cleanups. 2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt f420491611
NewCarbsDialog: cleanups. 2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt bf7e9e4bf3
NewInsulinDialog: add notes field, use relative time, align style. 2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt 719d3d459b
NumberPicker: apply signed, decimal constraints for keyboard usage. 2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt efcc02775b
FillDialog: add missed validation, notes field, align style. 2018-04-13 21:35:25 +02:00
AdrianLxM 10b9171afe
Distribute carbs strictly within timeframe 2018-04-13 00:48:57 +02:00
Milos Kozak d9ac199559
Merge pull request #878 from triplem/fix_objectives 
Fix Objectives Issue #842
 2018-04-12 22:26:51 +02:00
Milos Kozak 54048b29c4 NewNSTreatment dialog cleanup 2018-04-12 21:45:59 +02:00
Johannes Mockenhaupt bf02edd871
Make visibility of notes field a preference. 2018-04-12 21:43:55 +02:00
Johannes Mockenhaupt 4acf0c713a
Merge remote-tracking branch 'origin/dev' into carbs-gen-pr 
* origin/dev:
  Adding notes to carbs and to wizard on overview
 2018-04-12 21:23:30 +02:00
Johannes Mockenhaupt 7e19aff121
Merge remote-tracking branch 'origin/dev' into carbs-gen-pr 
* origin/dev:
  Overview: fix rendering zero-temp covering entire displayed range.
  cleanup
  remove duplicate upload
  upload temptargets to NS properly
  fix NPE
  log profile conditional
  adding device name to AndroidAPS started note
  show tests in travis
  gradle 3.1.1
  Remove CB.getActiveLoop(), use LoopPlugin.getPlugin().
  added phone Manufacturer and model note to NS
  dummy-edit to re-trigger travis
  Fix for black number and labels on black background (aaps wear)
  Fix re-enabling the loop plugin from overview. Fixes #861.
  int to double in the isOlderThan()
  Get thresholds from NS

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java
 2018-04-12 21:18:04 +02:00
Milos Kozak 7fafd59a5e
Merge pull request #872 from triplem/notes_wizard 
Notes wizard
 2018-04-12 21:17:33 +02:00
Milos Kozak c573bcc277
Merge pull request #876 from MilosKozak/temptargetfix 
upload temptargets to NS properly
 2018-04-12 21:17:11 +02:00
Markus M. May 42e36ab818 Fix #842 2018-04-12 21:08:06 +02:00
Johannes Mockenhaupt b04eee0b52
Overview: fix rendering zero-temp covering entire displayed range. 
(cherry picked from commit 525eaef)
 2018-04-12 21:00:08 +02:00
Johannes Mockenhaupt a075d87da1
Remove help dialog. 
(cherry picked from commit b1ef8e1)
 2018-04-12 20:59:24 +02:00
Milos Kozak 0a377eb98e cleanup 2018-04-12 10:32:52 +02:00
Milos Kozak 5eee8054c4 remove duplicate upload 2018-04-12 10:21:38 +02:00
Milos Kozak dfc869ba2b upload temptargets to NS properly 2018-04-12 10:17:59 +02:00
Milos Kozak 80e81b1c25 fix NPE 2018-04-12 09:53:14 +02:00
Milos Kozak 613b8a2f30 log profile conditional 2018-04-12 09:40:12 +02:00
Johannes Mockenhaupt 5ef2502b4f
Saner types. 2018-04-12 00:50:28 +02:00
Johannes Mockenhaupt b1f66d086a
Fix overshoot on last carb record. 2018-04-12 00:42:12 +02:00
Markus M. May ca53b94498 Merge branch 'dev' into notes_wizard 2018-04-11 20:05:47 +02:00
Milos Kozak 263263daf1
Merge pull request #869 from PoweRGbg/phoneModel 
Phone model note added to Ns #841
 2018-04-11 17:57:30 +02:00
Roumen Georgiev 1acefaea3c
adding device name to AndroidAPS started note 2018-04-11 18:09:08 +03:00
Johannes Mockenhaupt d0edd89b5b
Remove CB.getActiveLoop(), use LoopPlugin.getPlugin(). 2018-04-11 15:42:51 +02:00
Johannes Mockenhaupt 61cce65947
Revert "NewCarbsDialog: prefill with carbsReq." 
This reverts commit f8d022ba87.
 2018-04-11 15:22:38 +02:00
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 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
TebbeUbben df7d93ab2a Check for TDD support in updateGUI 2018-04-08 20:33:07 +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 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 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 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 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 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 ad74a9ba9a fix errors in tests 2018-04-02 10:29:19 +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 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
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 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 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 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 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
Milos Kozak bcf71d70dc increase font size 2018-03-24 17:33:23 +01:00
Milos Kozak b2db393436 fix rendering in nsclient mode 2018-03-24 17:21:55 +01:00
Milos Kozak 1dfa8eb1a4 hide deviation slope 2018-03-24 17:10:33 +01:00
Milos Kozak 62d775b78e DEV warning only for APS builds 2018-03-24 17:09:56 +01:00
Milos Kozak 90390c91ab fix NPE when profile doesn't exists 2018-03-24 15:13:31 +01:00
Milos Kozak 3d710dcf46 fix rendering TT in mmol 2018-03-23 23:55:38 +01:00
Johannes Mockenhaupt a4e9cb4976
Fixes. 2018-03-23 23:15:38 +01:00
Johannes Mockenhaupt 8a7776fd74
Code dedup. 2018-03-23 23:07:01 +01:00
Johannes Mockenhaupt 3700ad9813
Ensure new Careportal entries don't use the same second. 2018-03-23 23:06:57 +01:00
Johannes Mockenhaupt 9838e2fabb
Rework prime/fill button. 2018-03-23 23:06:57 +01:00
Johannes Mockenhaupt e5bfa1fb1d
Show boluses with the precision the pump actually supports. 2018-03-23 23:02:35 +01:00
Milos Kozak 22f50198fc rename nsclientinternal -> nsclient 2018-03-23 22:44:37 +01:00
Milos Kozak cbd60cfdbe synchronized access to log in nsclient 2018-03-23 22:37:27 +01:00
Milos Kozak 22d617cbc0 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-03-23 20:53:44 +01:00
Milos Kozak 9f67ad6b62 synchronized access to treatment data 2018-03-23 20:52:41 +01:00