Commit graph

855 commits

Author SHA1 Message Date
Milos Kozak 8586ed5adb show autosens result 2017-01-18 21:40:43 +01:00
AdrianLxM 480b832efe temptarget zero-duration cleanup 2017-01-18 16:49:48 +01:00
AdrianLxM b79743588d temptarget sort and allow for zero-duration to cancel predated ones 2017-01-18 15:52:20 +01:00
Milos Kozak ba370b3cf3 ver 1.1a 2017-01-18 08:05:46 +01:00
viktoria b70e895b95 DanaR Stats fixes 2017-01-18 04:31:47 +01:00
viktoria 9ba24b4ffd DanaR Stats Beautify 2017-01-18 03:08:19 +01:00
viktoria 678fbedcbf Merge branch 'dev'
Conflicts:
	app/src/main/res/values/strings.xml
2017-01-18 03:03:58 +01:00
Milos Kozak 9f4cc28c0f allow removing temp target records with null _id 2017-01-17 23:43:50 +01:00
AdrianLxM d36a515d45 temp target overview 2017-01-17 21:32:30 +01:00
Milos Kozak f9ed2ed4b4 temp targets to AMA 2017-01-17 18:56:08 +01:00
Milos Kozak 0e21b67a42 fix merge conflicts 2017-01-17 18:00:44 +01:00
Milos Kozak 432c937a46 Merge branch 'dev' into AMA 2017-01-17 17:49:21 +01:00
Milos Kozak 08c078466a Merge pull request #127 from MilosKozak/temptarget
Temptarget
2017-01-17 17:47:14 +01:00
Milos Kozak b0392b997e fix crash 2017-01-17 17:02:57 +01:00
Milos Kozak 1b385c10e3 fix iob calculation in the past 2017-01-17 16:19:34 +01:00
Milos Kozak 12eec7108a detect oldest data available 2017-01-17 15:19:02 +01:00
Milos Kozak 7c90dfe03c confirm dialog on removing temptarget 2017-01-16 23:54:46 +01:00
Milos Kozak b6714ae254 use notification instead of toast 2017-01-16 23:37:58 +01:00
Milos Kozak 87c84da3d9 minimal NSClient version 1.21 2017-01-16 23:25:31 +01:00
Milos Kozak 218190e92f support for removing temp targets from GUI 2017-01-16 23:23:20 +01:00
Milos Kozak 8c38090031 apply temp targets to MA 2017-01-16 21:03:31 +01:00
Milos Kozak eaa16402a7 show running temp target on overview 2017-01-16 20:47:57 +01:00
Milos Kozak 61b1ee781f temp target treatment dialog & sync fix 2017-01-16 16:59:12 +01:00
viktoria 61a1e5bc04 Korean DanaR Stats Activity 2017-01-16 13:23:41 +01:00
viktoria e851d15aff DanaR Stats Activity 2017-01-16 13:23:41 +01:00
Milos Kozak 262dae3ab3 Merge pull request #129 from slavidex/patch-26
Update pref_others.xml
2017-01-14 16:37:57 +01:00
Milos Kozak 61a8cad4e8 allow refrest temp targets from NS & fix bugs 2017-01-14 16:36:42 +01:00
Radoslav Radev 8f0a28419d Update pref_others.xml 2017-01-14 15:25:06 +02:00
Radoslav Radev cbd7aa74eb Update strings.xml 2017-01-14 15:21:47 +02:00
Milos Kozak a96bc52e01 handle temp targets data from NS 2017-01-14 00:37:35 +01:00
Milos Kozak 458bee4538 display temptargets 2017-01-13 23:43:17 +01:00
Milos Kozak 339e62c120 temptarget db support 2017-01-13 22:36:47 +01:00
Milos Kozak 1b53cde2bf plain temptarget plugin 2017-01-13 21:14:04 +01:00
Milos Kozak dcc6acdf31 Merge branch 'AMA' of https://github.com/MilosKozak/AndroidAPS into AMA 2017-01-13 20:31:20 +01:00
Milos Kozak d9fffc5625 refactor IOB calculation & fix iob_array.time 2017-01-13 20:30:48 +01:00
Milos Kozak 6015930b41 Merge pull request #126 from AdrianLxM/patch-12
Extended restricted by MAXBOLUS DanaR-plugin
2017-01-13 19:41:49 +01:00
AdrianLxM 916ab35be1 Extended restricted by MAXBOLUS Dana 2017-01-13 19:33:37 +01:00
Milos Kozak 9d8d925f75 better check for null 2017-01-12 21:55:17 +01:00
Milos Kozak ea15659050 Merge pull request #122 from AdrianLxM/patch-11
Typo German (Ereignis with one s)
2017-01-10 08:30:29 +01:00
AdrianLxM dfc176d1bd Typo German (Ereignis with one s) 2017-01-10 02:39:16 +01:00
AdrianLxM 856c025e2b typo spanish 2017-01-10 02:37:20 +01:00
viktoria f5f60bcd30 fix autosens adjust BG targets
regarding to that: 
https://openaps.readthedocs.io/en/latest/docs/walkthrough/phase-3/beyond-low-glucose-suspend.html
the autosens_adjust_targets setting is only for allow autosens to adjust the BG target not for enabling or disabling the wohle autosens feature
2017-01-10 01:01:11 +01:00
Milos Kozak 97431e5b94 show base basal line 2017-01-09 23:19:25 +01:00
Milos Kozak 8a4678bb8f make now-line more visible 2017-01-09 22:13:45 +01:00
Milos Kozak bb76fa9d20 need of 14 days run to enable AMA 2017-01-09 19:54:23 +01:00
Milos Kozak 74afdb6874 Merge branch 'dev' into AMA 2017-01-09 17:34:49 +01:00
Milos Kozak 18a1927204 better optimize space of prediction in overview 2017-01-09 17:34:37 +01:00
Milos Kozak 26a76217bf Greek language 2017-01-09 17:23:56 +01:00
Milos Kozak e03de6cb63 use mgdl in autosens 2017-01-09 11:29:54 +01:00
Milos Kozak c62e498aac ensure we are loading 24h + dia data 2017-01-09 10:57:15 +01:00
Milos Kozak 5f146f90de fix merge conflict 2017-01-09 10:17:27 +01:00
viktoria 4fe06e4ee1 refactor cpp
add safety values to constans class
2017-01-09 02:28:27 +01:00
Milos Kozak e9b900d74a show predictions in graph 2017-01-08 23:10:27 +01:00
Milos Kozak 93b80746c6 optimize determine basal 2017-01-08 17:02:33 +01:00
Milos Kozak aa24a592fa better detect meal bolus 2017-01-08 16:57:05 +01:00
Milos Kozak 68a127d804 make autosens configurable in settings, determinebasaladapter refactoring 2017-01-08 14:21:29 +01:00
Milos Kozak e71b478941 show both deltas on overview 2017-01-08 12:04:42 +01:00
Milos Kozak 4303cd2982 Merge branch 'master' into AMA 2017-01-08 00:46:11 +01:00
Milos Kozak 7b5a289fc1 run aps only on interested treatments 2017-01-08 00:45:43 +01:00
Milos Kozak 66bd06076e log invoke() source 2017-01-08 00:38:53 +01:00
Milos Kozak 6621c2f610 log script debug in fragment 2017-01-08 00:27:13 +01:00
Milos Kozak 28c329dc01 log script params separately 2017-01-08 00:19:48 +01:00
Milos Kozak 9c93d3ad7d log autosens input data in fragment 2017-01-08 00:07:18 +01:00
Milos Kozak f707029560 fix conflict 2017-01-07 23:45:41 +01:00
Milos Kozak f704090eac version bump 1.1 2017-01-07 23:39:29 +01:00
Milos Kozak 75192f0372 prevent logging exception 2017-01-07 23:38:59 +01:00
Milos Kozak 89db232375 Merge pull request #110 from MilosKozak/dateformat
use android.text.format.DateUtils
2017-01-07 23:27:47 +01:00
Milos Kozak 38f397cd59 revert formating date 2017-01-07 23:26:28 +01:00
Milos Kozak e5fc19a785 better arrange code lines 2017-01-07 23:04:12 +01:00
Milos Kozak 8456f87de1 Merge remote-tracking branch 'origin/master' into AMA 2017-01-07 00:04:26 +01:00
Milos Kozak 25a3b678e9 most new AMA code added 2017-01-06 22:42:37 +01:00
Milos Kozak 6dc3d38a2f fix passing carb ratio 2017-01-06 09:52:17 +01:00
Milos Kozak 26102848f5 refactor MealData 2017-01-04 23:03:13 +01:00
Milos Kozak ebb3e90587 extract MealData 2017-01-04 22:47:21 +01:00
Milos Kozak e585ab4030 Merge branch 'AMA' of https://github.com/MilosKozak/AndroidAPS into AMA 2017-01-04 22:37:10 +01:00
Milos Kozak 3eee917979 add sample data 2017-01-04 22:37:03 +01:00
Milos Kozak 724a041341 refactor classes 2017-01-04 22:33:17 +01:00
Milos Kozak 8aad003311 copy basic files oref0 dev 2017/01/04, make it running without crash 2017-01-04 22:21:46 +01:00
Milos Kozak 9d5c2e5dac fix visibility of aps plugin at start 2017-01-03 22:13:25 +01:00
Milos Kozak 50f75e3404 upload AMA result to NS too 2017-01-03 21:42:32 +01:00
Milos Kozak 05911be4e0 remove parcelable code from determinebasaladapter 2017-01-03 21:37:23 +01:00
Milos Kozak 3dfac49b82 duplicate MA -> AMA 2017-01-03 21:15:40 +01:00
Milos Kozak faf8e07248 renaming before adding AMA 2017-01-03 21:01:01 +01:00
Milos Kozak f3f6a911ae use android.text.format.DateUtils 2017-01-03 19:06:35 +01:00
Milos Kozak fe75298263 safer display values in openapsma fragment 2017-01-03 10:24:08 +01:00
viktoria f3551dda7f german translation 2017-01-02 16:44:20 +01:00
Milos Kozak 952a2342a8 Merge pull request #104 from MilosKozak/mm640g
MM640g bg source
2017-01-02 13:58:56 +01:00
Milos Kozak 8637e99afe Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2017-01-02 00:05:57 +01:00
AdrianLxM 9c40e4af34 Dismiss editing when fragment is paused 2017-01-01 21:46:25 +01:00
Milos Kozak fded515ac1 fix TimeListEdit when fragment is restored 2017-01-01 20:22:23 +01:00
Milos Kozak 4408146f23 disable entering basals in profiles only if pump is not tempbasal capable 2017-01-01 14:34:57 +01:00
Milos Kozak ef2e7b1a62 show basal line only if pump is tempbasal capable 2017-01-01 14:19:35 +01:00
Milos Kozak 9edb5c9a66 draw basals only if pump is tempbasal capable 2017-01-01 14:00:59 +01:00
Milos Kozak 86f5aec0bb disable visible control when plugin is not enabled 2017-01-01 13:45:03 +01:00
Milos Kozak 38a9c94258 Local Profile 2016-12-31 20:10:36 +01:00
Milos Kozak 6b18336fa2 LocalProfile plugin 2016-12-31 15:06:45 +01:00
Milos Kozak 0458ad65ce handle arrays separately 2016-12-31 14:52:23 +01:00
Milos Kozak 2e6c168adc TimeListEdit most work done 2016-12-31 13:11:32 +01:00
Milos Kozak e1c2e4c492 TimeListEdit initial work 2016-12-30 16:43:43 +01:00
Milos Kozak 2f52091b67 show upload profile button only when pump is capable to this 2016-12-29 23:10:39 +01:00
Milos Kozak b2be49e631 simple profile layout 2016-12-29 22:40:30 +01:00
Milos Kozak 1e99c00626 allow sms string to be translated separately 2016-12-29 16:22:40 +01:00
Milos Kozak 8e46a55e48 allow better translation of min ago 2016-12-29 16:06:00 +01:00
Milos Kozak 0059266791 loop status font size 2016-12-29 14:23:05 +01:00
Milos Kozak 24c5bb9303 Merge branch 'master' into mm640g 2016-12-29 14:01:24 +01:00
Milos Kozak 83f4dbf9ca Merge pull request #103 from AdrianLxM/patch-8
remove mm640g translation again
2016-12-29 13:51:24 +01:00
Milos Kozak c06d25b235 more rearrangements 2016-12-29 00:12:52 +01:00
Milos Kozak f127e7bec1 better allign bg arrows 2016-12-28 23:48:43 +01:00
AdrianLxM 834398b8f0 remove mm640g translation again 2016-12-28 23:31:02 +01:00
Milos Kozak 6b86818464 Merge pull request #102 from AdrianLxM/avgdelta
Avgdelta
2016-12-28 23:15:23 +01:00
Milos Kozak c8a58808e0 more logging on setting extended bolus 2016-12-28 23:13:11 +01:00
AdrianLxM d70c9673d5 average delta 2016-12-28 22:39:40 +01:00
Milos Kozak 9a47e521d2 show result in loop plugin when correct basal settoo 2016-12-28 22:30:38 +01:00
Milos Kozak d6f4135d6e travis 2016-12-28 15:58:44 +01:00
Milos Kozak d2d3e024a2 Merge branch 'ongoingnotif' of https://github.com/AdrianLxM/AndroidAPS 2016-12-28 15:15:24 +01:00
Milos Kozak e2c2f49f6f MM640g bg source 2016-12-28 14:57:11 +01:00
Radoslav Radev 71461e38ca Update strings.xml 2016-12-28 12:17:17 +02:00
warstar2187 804cdba7cf Update strings.xml 2016-12-28 18:22:50 +09:00
AdrianLxM 6ac889cecd ongoing notification integration 2016-12-28 00:03:08 +01:00
Milos Kozak 26b260a85a use bolus step from pump description 2016-12-27 23:46:39 +01:00
AdrianLxM 4afd2295f8 Ongoing Notification 2 2016-12-27 23:39:47 +01:00
AdrianLxM d597be71de ongoing notification 2016-12-27 23:39:16 +01:00
Milos Kozak 405ae28e38 cz translations 2016-12-27 23:39:00 +01:00
Milos Kozak 29327aef01 MDI pump driver 2016-12-27 23:35:50 +01:00
Milos Kozak fdb252b62d show direction next to BG 2016-12-27 20:41:28 +01:00
Milos Kozak 13f2fce31e product flavors dimensions update 2016-12-27 18:47:48 +01:00
Milos Kozak 34fce81563 fix build warning 2016-12-27 16:21:04 +01:00
Milos Kozak ecd787bdb3 detect broken communication during bolusing 2016-12-27 16:06:49 +01:00
Milos Kozak 42b581ec29 log bolus start 2016-12-27 15:13:27 +01:00
Milos Kozak cd41bff2bb SMS command BG 2016-12-27 12:17:26 +01:00
Milos Kozak a109bb9853 handle switching profiles in correct order 2016-12-25 23:18:46 +01:00
Milos Kozak 463a913cd1 add debug to profile comparation 2016-12-25 15:08:40 +01:00
Milos Kozak 46be73d187 send sms notification when profile received from NS 2016-12-25 14:26:41 +01:00
Milos Kozak 61720a74ec do not return error if not initialized 2016-12-25 13:34:48 +01:00
Milos Kozak 94cb506d20 Merge branch 'koreandanar' into smsnotify 2016-12-25 11:51:52 +01:00
Milos Kozak 381de0a5f5 function to send notification 2016-12-25 11:51:46 +01:00
Milos Kozak 02b3da97e0 send important confirmations to all phone numbers 2016-12-25 11:29:13 +01:00
Milos Kozak 273993f995 Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS into smsnotify 2016-12-25 09:53:43 +01:00
Milos Kozak 3bd7568d34 dismiss button not hardcoded 2016-12-24 23:56:47 +01:00
Milos Kozak 052ac47595 Better profile handling 2016-12-24 23:53:17 +01:00
Milos Kozak edcfebfd41 fix displaying missing carbs in wizard 2016-12-24 15:05:44 +01:00
Milos Kozak 5c506faa65 proper reaction to pump error 2016-12-24 14:53:37 +01:00
Milos Kozak 2b0c74c56f CZ translations 2016-12-24 14:21:24 +01:00
Milos Kozak 79aee157e3 redundant code cleanup 2016-12-24 14:13:35 +01:00
Milos Kozak 7719e2ac63 use notifications for profile update 2016-12-22 12:17:38 +01:00
Milos Kozak 132f82b484 fix showing objectives 2016-12-22 12:04:17 +01:00
Milos Kozak d72a3cbf36 Merge branch 'koreandanar' of https://github.com/MilosKozak/AndroidAPS into koreandanar 2016-12-21 14:50:22 +01:00
Milos Kozak d8696412b1 temporary disable korean danar 2016-12-21 14:48:36 +01:00
AdrianLxM 5e2302ed68 start KeepAlive at app start 2 2016-12-16 02:00:53 +01:00
AdrianLxM 4f3c9baf0b start KeepAlive at app start 1 2016-12-16 01:57:18 +01:00
Milos Kozak 37d539ce3e remove duplicated function 2016-12-15 19:10:07 +01:00
Milos Kozak 368652670c Merge branch 'master' into koreandanar 2016-12-15 18:58:16 +01:00
Milos Kozak d34e4579fc clear aps result before new calculation 2016-12-15 18:55:23 +01:00
Milos Kozak 889c75f3ee Merge branch 'koreandanar' of https://github.com/MilosKozak/AndroidAPS into koreandanar 2016-12-14 11:17:15 +01:00
Milos Kozak 5626c621ff fix loop 2016-12-14 11:16:28 +01:00
AdrianLxM d461a4b2c4 Set fragmentVisible instead of fragmentEnabled 2016-12-14 08:23:22 +01:00
Milos Kozak 49453e10df fix x axis on overview when no data displayed 2016-12-13 23:18:02 +01:00
Milos Kozak 738d4c1c2a hide pump control buttons when pump is not initialized 2016-12-13 22:50:51 +01:00
Milos Kozak cb4330ddcd notify when pump settings is wrong 2016-12-13 22:10:13 +01:00
Milos Kozak 407ea423cb detect if extended bolus is enabled, detect easy ui mode 2016-12-13 21:35:49 +01:00
Milos Kozak 9454e7e6e2 Merge branch 'koreandanar' of https://github.com/MilosKozak/AndroidAPS into koreandanar 2016-12-11 22:56:46 +01:00
Milos Kozak 4a2a15d394 smarter plugin selection and handling 2016-12-11 22:55:45 +01:00
AdrianLxM d33629e5d4 Korean Dana history Activity in Manifest 2016-12-11 16:28:18 +01:00
Milos Kozak 8f6f6e326d Disable profile control for pump profiles if pump is not enabled 2016-12-11 13:46:27 +01:00
Milos Kozak 0d6787a744 force enabled if only 1 plugin exists 2016-12-11 13:36:32 +01:00
Milos Kozak be1ec7f3e3 fix processing plugins in configbuilder 2016-12-11 13:08:20 +01:00
Milos Kozak 7aaa15dd3b Merge branch 'koreandanar' of https://github.com/MilosKozak/AndroidAPS into koreandanar 2016-12-11 11:15:34 +01:00
Milos Kozak 80a463a56d parse allowed phone numbers 2016-12-11 10:52:50 +01:00
AdrianLxM c8ac855219 also switch profiles 2016-12-10 23:51:57 +01:00
AdrianLxM e1dc624a47 fully remove mm640g 2016-12-10 22:58:31 +01:00
Milos Kozak 5b6e85f5c9 Merge branch 'master' into koreandanar 2016-12-10 18:14:39 +01:00
Milos Kozak 82f4c8ffac better handling of non existing profiles 2016-12-10 18:14:12 +01:00
Milos Kozak 617192dc3a hide buttons based on pump description 2016-12-10 00:18:20 +01:00
Milos Kozak cf4851250d enable loop only when pump is temp basals capable 2016-12-09 21:47:58 +01:00
Milos Kozak 2a10d4789e virtual pump description 2016-12-09 21:30:34 +01:00
Milos Kozak b824cc28c9 korean danar description 2016-12-09 20:37:56 +01:00
Milos Kozak bd6ee0f213 add duration to description 2016-12-09 20:20:21 +01:00
Milos Kozak 199c6b5e2c fix curentBasal rouding 2016-12-09 19:32:59 +01:00
Milos Kozak 3acabd792c basic danar description 2016-12-09 19:28:48 +01:00
Milos Kozak 6ba532d178 notify about setting basal profile 2016-12-09 16:04:07 +01:00
Milos Kozak 4103e4bf4a allow set profile to pump from simpleprofile plugin 2016-12-09 12:40:15 +01:00
Milos Kozak e9d639c979 fix read basal profile on korean pump 2016-12-09 12:00:44 +01:00
Milos Kozak a01c15f8f7 miminum basal rate in description 2016-12-09 11:46:46 +01:00
Milos Kozak 56eb347b84 Merge remote-tracking branch 'origin/master' into koreandanar 2016-12-09 11:33:33 +01:00
Milos Kozak 8c00e08574 Merge pull request #87 from AdrianLxM/dbfix
lazy initialization of optional plugins
2016-12-09 11:32:22 +01:00
Milos Kozak f75c2f8f91 check if plugin is enabled before accepting message 2016-12-09 11:31:45 +01:00
AdrianLxM f4e82ec022 lazy loading on optional plugins 2016-12-09 09:56:16 +01:00
Milos Kozak 064de0f64e synchronize pump time 2016-12-09 09:31:51 +01:00
Milos Kozak ccda992161 remove unused MM640g plugin 2016-12-08 15:23:37 +01:00
Milos Kozak 073cc84368 added PumpDescription 2016-12-08 15:21:16 +01:00
Milos Kozak 0044b8b41a Merge remote-tracking branch 'origin/master' into koreandanar 2016-12-08 14:29:38 +01:00
Milos Kozak e0f0ee0cbb Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2016-12-08 14:28:53 +01:00
Milos Kozak fdd594358c fix removeExpired in notifications 2016-12-08 14:28:21 +01:00
Milos Kozak 8f98ad1b15 do not process remote profile if not selected 2016-12-07 22:12:48 +01:00
AdrianLxM fa4cf31cf4 Correct db query 2016-12-07 01:48:53 +01:00
Milos Kozak 1db9ce287c fix basal rates decoding 2016-12-07 00:15:42 +01:00
Milos Kozak 2dea4615c0 basal rates set 2016-12-06 23:46:36 +01:00
Milos Kozak f2928c3d39 fix IC and ISF in DanaR Korean profile 2016-12-06 23:19:48 +01:00
Milos Kozak be8003da4b Merge branch 'master' into koreandanar 2016-12-06 23:18:02 +01:00
Milos Kozak 64de2fd736 Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2016-12-06 23:15:23 +01:00