Commit graph

1139 commits

Author SHA1 Message Date
Milos Kozak
7d328f0676 do not trigger refresh too many times 2017-04-24 21:15:27 +02:00
Milos Kozak
7534f54f19 trend in wizard off by default 2017-04-24 19:24:53 +02:00
Milos Kozak
935a9366d9 fix cob in wizard 2017-04-24 17:46:20 +02:00
Milos Kozak
a20e49669a fix graph library bug 2017-04-24 16:04:31 +02:00
Milos Kozak
0942ffe0fa fix iob rendering 2 2017-04-24 14:18:54 +02:00
Milos Kozak
80305aae3a fix iob rendering 2017-04-24 13:24:16 +02:00
Milos Kozak
a07a8755b1 IOB graph 2017-04-24 13:17:14 +02:00
Milos Kozak
1a474f7983 grid gray 2017-04-23 21:14:42 +02:00
Milos Kozak
b8a8bed6c5 remove butterknife at all, remove unused code, overview graph optimalization 2017-04-23 13:45:49 +02:00
Milos Kozak
66c05d8a08 remove butterknife from overview 2017-04-23 10:55:07 +02:00
Milos Kozak
2ce08260bf do not calculate autosens when no bg data available 2017-04-23 09:47:27 +02:00
Milos Kozak
1a76809f33 more checking for null 2017-04-22 11:27:56 +02:00
Milos Kozak
1f2967e866 superbolus must be explicitly enabled 2017-04-22 11:08:57 +02:00
Milos Kozak
20f99dffe2 basals rendering redesign 2017-04-22 10:09:54 +02:00
Milos Kozak
a8146da8a8 target range with background color 2017-04-21 23:06:54 +02:00
Milos Kozak
2077b5e081 android support library bug workaround 2017-04-21 18:56:48 +02:00
Milos Kozak
55a2df470e insulin activity graph 2017-04-21 18:34:40 +02:00
Milos Kozak
7f122f7497 show dia in insulin plugin 2017-04-21 16:13:53 +02:00
Milos Kozak
90a55966b1 Fast Acting Insulin Prolonged 2017-04-21 15:36:49 +02:00
Milos Kozak
17771434aa upgrade travis & plugin packages 2017-04-21 12:15:08 +02:00
Milos Kozak
25491fbac6 Insulin interface 2017-04-21 11:45:25 +02:00
Milos Kozak
04ae55ac63 exit app after import settings 2017-04-16 13:27:01 +02:00
Milos Kozak
781aa6e657 check for null 2017-04-14 16:10:20 +02:00
Milos Kozak
7aa2aa4d24 give some time to service to start in UploadQueue 2017-04-14 16:00:21 +02:00
Milos Kozak
a5d10708e6 check for null in calibration dialog 2017-04-14 15:54:07 +02:00
Milos Kozak
402768cb87 1.33 app start logging optional 2017-04-14 15:33:39 +02:00
Milos Kozak
2413fae0a9 1.32 superbolus & trend contribution in wizard 2017-04-14 14:50:18 +02:00
Milos Kozak
d41d5f9e6b loop context menu fix 2017-04-08 20:13:30 +02:00
Milos Kozak
c5245ae5fd SMS suspend/resume loop 2017-04-06 21:22:27 +02:00
Milos Kozak
a02da220c9 CS translations 2017-04-05 22:04:55 +02:00
Milos Kozak
f596050239 loop suspend menu 2017-04-05 21:39:39 +02:00
Milos Kozak
42883a81a0 allow return GlucoseStatus with only 1 actual value 2017-04-04 10:29:46 +02:00
Milos Kozak
e5012d8633 Answers for SMS commands 2017-04-04 10:03:15 +02:00
Milos Kozak
d6f31820d9 request battery optimalization whitelisting 2017-03-31 09:21:40 +02:00
Milos Kozak
fe6ff686b1 fix pump suspended message 2017-03-27 18:37:43 +02:00
Milos Kozak
dc45d01120 changle loading initial status 2017-03-24 23:03:55 +01:00
Milos Kozak
b6016dc084 objective 0 zero days duration 2017-03-24 12:31:28 +01:00
Milos Kozak
c78adb6256 suspended status for korean pump 2017-03-24 12:22:36 +01:00
Milos Kozak
a4f302ee4a show if pump is suspended 2017-03-24 12:05:12 +01:00
Milos Kozak
32fda0f0df fix upload virtual pump status 2017-03-23 10:48:49 +01:00
Milos Kozak
8b357ac49e fix null pointer exception 2017-03-23 10:12:36 +01:00
Milos Kozak
a5b59d5092 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-03-23 10:09:55 +01:00
Milos Kozak
e8edf9eb54 Glimp support 2017-03-21 19:11:39 +01:00
Milos Kozak
f528f1cd83 fix reading glimp bg data 2017-03-18 23:35:43 +01:00
Milos Kozak
7f4db28c41 add sound 2017-03-10 10:42:12 +01:00
Milos Kozak
48d30f2da3 toast out of memory 2017-03-09 22:24:57 +01:00
Milos Kozak
86a7699d8f copy/paste mistake 2017-03-09 16:34:08 +01:00
Milos Kozak
aa46479cdb unneeded else 2017-03-09 11:00:29 +01:00
Milos Kozak
96427cf3dc use onAttach for context in CalibrationDialog 2017-03-09 10:59:11 +01:00
Milos Kozak
7c6d708d06 use onAttach for context in WizardDialog 2017-03-09 10:57:20 +01:00
Milos Kozak
2c2d837079 fix null pointer exception 2017-03-09 10:20:38 +01:00
Milos Kozak
52aa7c1bf8 fix null pointer exception 2017-03-09 09:57:24 +01:00
Milos Kozak
151baa2fb5 enable nsclient internal by default 2017-03-07 11:07:56 +01:00
Milos Kozak
be26db356d another fix 2017-03-06 18:53:43 +01:00
Milos Kozak
af8e485250 log SafeParse 2017-03-05 20:12:30 +01:00
Milos Kozak
9843f139ad fixed bugs in autosens 2017-03-05 15:22:35 +01:00
Milos Kozak
9e05c86284 Log hours in sensitivity 2017-03-05 12:12:28 +01:00
Milos Kozak
2af1ab6ac4 more Answers to user actions 2017-03-03 21:12:59 +01:00
Milos Kozak
ebf4697150 log app start 2017-03-02 23:25:55 +01:00
Milos Kozak
79d282d215 add answers 2017-03-02 23:08:40 +01:00
Milos Kozak
5a45bd3751 remove sample data 2017-03-02 21:17:24 +01:00
Milos Kozak
3d521eb75c nsclient: try to send data immediately 2017-03-02 20:59:18 +01:00
Milos Kozak
d841ff5098 prevent null pointer exception 2017-03-02 20:40:09 +01:00
Milos Kozak
73fbac1bae fix crash 2017-03-02 20:33:46 +01:00
Milos Kozak
6ecaad7d69 make sure service is running 2017-03-02 20:19:35 +01:00
Milos Kozak
d4070cf99a check for null 2017-03-01 19:14:42 +01:00
Milos Kozak
9e03087a77 nsclient tweaking 2017-02-28 14:36:44 +01:00
Milos Kozak
a9d8f3f806 queue in db 2017-02-24 13:02:44 +01:00
Milos Kozak
e25fb9845d hide unneeded labels in nsclient mode 2017-02-23 23:32:26 +01:00
Milos Kozak
ade45d5b4c hide unlock button if not needed 2017-02-23 23:13:38 +01:00
Milos Kozak
b0c828c93e nsclient build variant 2017-02-23 20:00:33 +01:00
Milos Kozak
15d6de4701 age from product flavor to prefs 2017-02-22 20:29:41 +01:00
Milos Kozak
d9225ccc8a fix null object reference 2017-02-22 15:23:16 +01:00
Milos Kozak
87ad140eb5 SMS logging and resource refactor 2017-02-22 14:11:05 +01:00
Milos Kozak
666874c6c4 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-02-22 13:54:50 +01:00
Milos Kozak
efc1988374 uploader battery fix 2017-02-21 14:12:28 +01:00
Milos Kozak
4b6276c0b1 uploader battery always in json 2017-02-21 13:45:33 +01:00
Milos Kozak
2e0f6e8914 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-02-21 13:33:59 +01:00
Milos Kozak
a508b0bbc5 do not postpone status upload 2017-02-21 13:33:52 +01:00
Milos Kozak
615af399f8 remove ping me 2017-02-21 11:17:46 +01:00
Milos Kozak
99b66ab393 connect counter 2017-02-21 10:36:29 +01:00
Milos Kozak
3f84a63213 add delta sign 2017-02-21 10:00:44 +01:00
Milos Kozak
34ed92f8aa fix displaying delta when not available 2017-02-21 10:00:08 +01:00
AdrianLxM
98edfc57e0 dismiss bolus progress via events 2017-02-20 14:49:38 +01:00
Milos Kozak
6200584268 hours to fetch fixed 2017-02-20 09:46:55 +01:00
Milos Kozak
352902438c Merge branch 'nsclient' of https://github.com/MilosKozak/AndroidAPS into nsclient 2017-02-20 08:32:25 +01:00
Milos Kozak
d84632a8a4 uploader battery in device status 2017-02-20 08:32:10 +01:00
Milos Kozak
9ea19fff9b detect last received date 2017-02-19 23:41:42 +01:00
Milos Kozak
3b1b732d8f nclient log collection 2017-02-19 20:56:12 +01:00
Milos Kozak
c9a6a44e4b adjust upload timing 2017-02-19 20:48:10 +01:00
Milos Kozak
d030427b0f adjust devicestatus upload 2017-02-19 20:41:20 +01:00
Milos Kozak
5f4eb1e4c4 pump status tweaking 2017-02-19 19:15:14 +01:00
Milos Kozak
de124b8e3e Merge branch 'nsclient' of https://github.com/MilosKozak/AndroidAPS into nsclient 2017-02-19 09:42:28 +01:00
Milos Kozak
9303bd61fd Merge branch 'dev' into nsclient 2017-02-19 09:41:16 +01:00
Milos Kozak
a2eb76a8b8 handle if bolus progress is not sent 2017-02-19 00:06:29 +01:00
Milos Kozak
e0a9a7ae81 fix carbs logging in driver 2017-02-18 23:12:45 +01:00
AdrianLxM
abaafb87eb wear show on status when loop is disabled 2017-02-18 18:52:09 +01:00
AdrianLxM
d113d39916 wear setting to show detailed IOB 2017-02-18 18:13:13 +01:00
Milos Kozak
5d795fbe33 Merge branch 'dev' into nsclient 2017-02-17 22:26:02 +01:00
Milos Kozak
29b4f0063b better handling readonly permission 2017-02-17 22:12:35 +01:00
Milos Kozak
f33ccf278b dbupdate/remove, saving queue 2017-02-17 21:24:30 +01:00
Milos Kozak
14e37246c2 nsclient gui and pausing tweaking 2017-02-17 18:14:33 +01:00
Milos Kozak
31364ff07b ignore dbaccess if nsclient not enabled 2017-02-17 16:41:28 +01:00
Milos Kozak
8a374f1b35 Shared preferences cleanup 2017-02-17 16:16:20 +01:00
Milos Kozak
3216ff636a preference keys to strings 2017-02-17 13:43:17 +01:00
Milos Kozak
71112a90e2 internal nsclient 2017-02-17 13:18:36 +01:00
LadyViktoria
92cd31a0b6 fix key for openapsama_current_basal_safety_multiplier 2017-02-15 14:42:59 +01:00
LadyViktoria
16555347e8 fix key for openapsama_current_basal_safety_multiplier 2017-02-15 13:21:38 +01:00
Milos Kozak
dda95dc275 allow to remove treatments from GUI 2017-02-14 21:13:13 +01:00
Milos Kozak
a75c62be35 show notification when aproaching daily limit 2017-02-14 19:47:45 +01:00
Milos Kozak
2e4aec9916 settings password protected 2017-02-14 19:16:34 +01:00
Milos Kozak
5992413cf9 disable quickwizard with if bg is old 2017-02-14 15:50:24 +01:00
Milos Kozak
8001796f4b virtual pump status upload optional 2017-02-14 15:41:30 +01:00
Milos Kozak
e00045155e prefill bg value in careportal dialog 2017-02-14 15:09:22 +01:00
Milos Kozak
f9ee3c547a translations 2017-02-13 21:05:57 +01:00
Milos Kozak
e3edf5cce5 calculate cob 1.5 * DIA to the past 2017-02-13 19:35:01 +01:00
Milos Kozak
c6b3fe9883 Merge pull request #178 from AdrianLxM/wear-bolus5
Wear Bolus
2017-02-13 18:13:36 +01:00
Milos Kozak
c31795d2e6 adjust devicestatus upload timings 2017-02-13 17:47:58 +01:00
AdrianLxM
05d40e4af0 wear better toasts 2017-02-13 14:18:23 +01:00
AdrianLxM
665f662f3a Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into pumpstatus2 2017-02-13 02:18:32 +01:00
AdrianLxM
5ce9d257e8 pump shortStatus String in interface 2017-02-13 02:18:25 +01:00
AdrianLxM
e85e651c56 wear full status support and product flavour with/without controls on wear 2017-02-13 01:55:35 +01:00
AdrianLxM
6fcee9ea3f pump shortStatus String in interface 2017-02-13 00:15:02 +01:00
Milos Kozak
e003ef8368 Merge pull request #175 from LadyViktoria/dev
use validation lib in cpp - layout fixes & longer snackbar duration
2017-02-12 22:29:20 +01:00
Milos Kozak
1f3aee091e manual invoke of loop in separate thread 2017-02-12 22:02:42 +01:00
viktoria
ba254f8829 Merged branch dev into dev 2017-02-12 20:01:25 +01:00
viktoria
0d02f42714 use validation lib in cpp - layout fixes & longer snackbar duration 2017-02-12 19:51:56 +01:00
Milos Kozak
4e3cc65d5d handling pump suspend, show pump actions on overview 2017-02-12 19:51:13 +01:00
AdrianLxM
c0b287ba00 wear target statusO 2017-02-12 17:32:53 +01:00
AdrianLxM
1f5dd4750a CPP dismiss info when focus is lost 2017-02-11 22:20:29 +01:00
AdrianLxM
6c5028b4be CPP dismiss info when focus is lost 2017-02-11 22:18:28 +01:00
AdrianLxM
104c146b2f Merge pull request #63 from AdrianLxM/patch-16
LadyViktoria validation lib plus safety
2017-02-11 21:12:22 +01:00
AdrianLxM
e4c529fa1f reenable safety function 2017-02-11 19:59:20 +01:00
AdrianLxM
d9103b6823 wear wizard confirm reformat, connection stability, prime not in menu per default 2017-02-11 19:51:33 +01:00
AdrianLxM
6cb192b876 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into wear-bolus5 2017-02-11 18:09:22 +01:00
AdrianLxM
b57253af5e wear add carbs to bolus-wizard confirmation 2017-02-11 17:54:47 +01:00
viktoria
06ee59b42c Merge remote-tracking branch 'refs/remotes/MilosKozak/dev'
Conflicts:
	app/build.gradle
2017-02-11 16:06:37 +01:00
Milos Kozak
e1341e79bf Merge pull request #161 from warstar2187/master
Fix ExtendedBolusStep
2017-02-11 16:03:31 +01:00
viktoria
56f15a3cf7 Deprecation DataBaseHelper - use Long for .limit 2017-02-11 14:33:22 +01:00
Milos Kozak
c5081c378b Merge pull request #169 from LadyViktoria/wip-deprecation-danarStats
Deprecation DanaR Stats
2017-02-11 14:23:45 +01:00
viktoria
0ffddcdefa Deprecation TimeListEdit - add design support libraries 2017-02-11 14:01:37 +01:00
viktoria
a4591af392 Deprecation colors 2017-02-11 14:00:44 +01:00
viktoria
1217c22b43 Deprecation DanaR Stats 2017-02-11 13:44:43 +01:00
AdrianLxM
5ea7913a41 wear actionstringhandler use correct actualBG() 2017-02-11 02:58:22 +01:00
AdrianLxM
638b9c263c Merge pull request #61 from MilosKozak/dev
Dev
2017-02-11 02:55:14 +01:00
viktoria
580a296177 use validation lib in cpp - small changes 2017-02-11 00:47:14 +01:00
AdrianLxM
9dae8b4e56 wear don't enact 0carbs/0bolus on wizard result 2017-02-11 00:32:45 +01:00
viktoria
7877235972 Merged branch dev into dev 2017-02-11 00:16:55 +01:00
viktoria
279c67bb70 use validation lib in cpp - add snackbar 2017-02-11 00:16:25 +01:00
Milos Kozak
1e4fa1b93e fix not enacting extended 2017-02-10 21:45:46 +01:00
Milos Kozak
2e40c7b605 sms calibrations 2017-02-10 21:20:55 +01:00
LadyViktoria
49e08f3357 use validation lib in cpp - add counter 2017-02-10 18:00:10 +01:00
LadyViktoria
e0627bd815 use validation lib in cpp - add a timer 2017-02-10 17:39:09 +01:00
LadyViktoria
48a158b036 use validation lib in cpp - better event handling 2017-02-10 17:29:59 +01:00
Milos Kozak
83667be8cc extract sending intent to a function 2017-02-10 17:25:32 +01:00
Milos Kozak
8db3f258cd xdrip calibration 2017-02-10 16:53:39 +01:00
LadyViktoria
11d0f1aebf better keyboard handling in fragments 2017-02-10 14:24:56 +01:00
warstar2187
9458e0effa Update DanaRKoreanPlugin.java 2017-02-10 20:59:44 +09:00
warstar2187
61f1acdcb0 Update DanaRPlugin.java 2017-02-10 20:59:06 +09:00
AdrianLxM
384e36a1f3 wear remove bolus enaction for testing 2017-02-10 12:52:54 +01:00
LadyViktoria
80de9c0cd8 use validation lib in cpp 2017-02-10 11:34:05 +01:00
AdrianLxM
4220d7712a wear wizard working 2017-02-10 06:07:31 +01:00
AdrianLxM
9785d507a8 wear temp targets working 2017-02-10 02:36:38 +01:00
AdrianLxM
8ece312b6a Merge pull request #60 from MilosKozak/dev
Dev
2017-02-09 23:47:12 +01:00
AdrianLxM
aff82642af wear multiple watch situation and disable fillbolus for wider testing 2017-02-09 23:39:23 +01:00
Milos Kozak
90061c6f25 Show log 2017-02-09 22:29:21 +01:00
AdrianLxM
3ff41af939 wear bolus activity and refactoring 2017-02-09 20:54:41 +01:00
Milos Kozak
ed7dd48612 remove TODOs 2017-02-09 20:18:22 +01:00
AdrianLxM
dc476a6600 wear menu restructuring and status 2017-02-09 17:40:26 +01:00
Milos Kozak
8a2846c516 Merge branch 'dev' into dev 2017-02-09 17:01:05 +01:00
Milos Kozak
9e9637d70b accept temp button visible only if loop selected 2017-02-09 16:51:14 +01:00
Milos Kozak
3aff89acdc fix not attached to activity in bolus progress dialog 2017-02-09 16:45:54 +01:00
Milos Kozak
806cc4a3a7 fix nullpointerexception in reading temp basal status 2017-02-09 16:43:27 +01:00
Milos Kozak
a39416d876 fix nullpointerexception in reading temp basal status 2017-02-09 16:39:07 +01:00
Milos Kozak
caa109dbfd use SafeParse in DanaRStartsActivity 2017-02-09 16:32:44 +01:00
Milos Kozak
b9b08c1528 fix crash when pump status not loaded yet 2017-02-09 16:29:02 +01:00
Milos Kozak
3d3e849d8a fix null pointer exception in persistentnotification 2017-02-09 16:23:28 +01:00
AdrianLxM
b8c3fe2933 wear wizard including bg and iob toggles 2017-02-09 16:16:31 +01:00
Milos Kozak
7f123e4208 warn on wrong entered sms phone number 2017-02-09 16:14:09 +01:00
Milos Kozak
c015862239 fix crash: not attached to Activity 2017-02-09 16:04:57 +01:00
LadyViktoria
7fc6de17c1 Add prefernces.json changes 2 2017-02-09 10:41:02 +01:00
LadyViktoria
886c1ea359 Add prefernces.json changes 2017-02-09 09:36:51 +01:00
AdrianLxM
bf7a96b3e7 bolus progress dialog without activity context 2017-02-09 03:15:13 +01:00
AdrianLxM
74107f58fe wear first fill bolus working 2017-02-09 01:53:28 +01:00
viktoria
0bf51710d1 Merged branch dev into dev 2017-02-08 21:23:47 +01:00
Milos Kozak
698ab31d71 show temp targets only if APS enabled in config 2017-02-08 21:04:26 +01:00
Milos Kozak
a43677e4b0 fix pumpcontrol build crash 2017-02-08 20:36:30 +01:00
AdrianLxM
d2d0d4b51a wear confirm roundtrip working 2017-02-08 15:15:22 +01:00
AdrianLxM
8e9d73e3a3 wear sending confirmation requests 2017-02-08 11:53:26 +01:00
AdrianLxM
20d32d042f wear bolusprogress cleanup 2017-02-07 12:08:13 +01:00
AdrianLxM
e261fa3ec8 wear re-disable fill bolus for virtual pump 2017-02-07 12:02:02 +01:00
AdrianLxM
650111d1b7 wear event for bolus requests to show card early on 2017-02-07 11:09:16 +01:00
AdrianLxM
f4b553fe52 Wear added bolusprogress and dismiss when finished 2017-02-07 09:17:19 +01:00
AdrianLxM
8c37809751 Wear cancel bolus via content intent to progress card 2017-02-06 19:35:27 +01:00
AdrianLxM
7ec3ff2a17 Wear bolus progress as card 2017-02-06 16:52:39 +01:00
AdrianLxM
379e3f8ab1 rounding minutesago instead of truncating it 2017-02-05 02:18:13 +01:00
viktoria
b0a9d74b49 Merge remote-tracking branch 'refs/remotes/MilosKozak/dev'
Conflicts:
	app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/Autosens.java
	app/src/main/res/values/strings.xml
2017-02-02 19:00:17 +01:00
AdrianLxM
bd75015a58 Correct error for tempbasals 2017-02-01 14:38:55 +01:00
Milos Kozak
78fb6f934e measure execution time of every part 2017-01-31 09:52:33 +01:00
Milos Kozak
1b2500dc6c calculate only needed data in AMA 2017-01-31 09:40:05 +01:00
Milos Kozak
9722130299 move all treatments db actions to DatabaseHelper 2017-01-30 20:00:46 +01:00
Milos Kozak
8d0c1dcacf do not calculate autosens for MA 2017-01-30 15:19:50 +01:00
Milos Kozak
d98c6b125e Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-01-30 14:31:15 +01:00
Milos Kozak
607ac8b897 AMA execution time 2017-01-30 14:30:46 +01:00
AdrianLxM
dce0c378b9 round durations 2017-01-30 05:02:49 +01:00
AdrianLxM
9f74b0083b Add minutesrunning in determine-basal Adapter 2017-01-30 04:25:03 +01:00
Milos Kozak
179511a833 fix conflicts 2017-01-29 22:41:01 +01:00
Milos Kozak
907de4da7b execution profiler 2017-01-29 22:37:25 +01:00
Milos Kozak
762b561abb CS translations 2017-01-29 21:15:05 +01:00
Milos Kozak
d6a22be184 remove absorption rate from everywhere 2017-01-29 20:19:02 +01:00
Milos Kozak
4e14865054 remove unneeded carbs_hr from AMA 2017-01-29 19:29:26 +01:00
Milos Kozak
331598b7fa display danar profile preferences only if selected 2017-01-29 19:22:49 +01:00
Milos Kozak
e608bf4095 fix profile test in keep alive & korean driver switching 2017-01-29 19:17:28 +01:00
Milos Kozak
3a17ed19c4 prevent null pointer exception 2017-01-29 18:48:42 +01:00
Milos Kozak
ed29302547 status outdated first 2017-01-29 11:24:11 +01:00
Milos Kozak
c48e147a68 remove forgotten code 2017-01-29 11:21:15 +01:00
Milos Kozak
55f99ee28e connect when outdated basal 2017-01-29 11:11:07 +01:00
Milos Kozak
3f90ad6a5c sync profile to pump 2017-01-28 23:45:14 +01:00
viktoria
c64d45b758 Merged MilosKozak/dev into dev
Conflicts:
	app/src/main/res/values/strings.xml
2017-01-28 22:35:54 +01:00
Milos Kozak
b9b9e21dcb fix merge conflicts 2017-01-28 21:37:51 +01:00
Milos Kozak
926a26a724 the same for korean danar 2017-01-28 21:17:27 +01:00
Milos Kozak
538e8fd2fa better detect & display old pump firmware 2017-01-28 20:48:32 +01:00
AdrianLxM
4ced11819c fix autosens
bgi's most of the time where 0 or got truncated to full integers.

Example from tonight: autosens result factor from 1.0 before and 1.09 after this.
2017-01-28 01:20:36 +01:00
LadyViktoria
24e6f42ac2 Merged branch dev into dev 2017-01-27 09:11:45 +01:00
Milos Kozak
1e8defb884 Merge pull request #144 from AdrianLxM/deltasx
remove round-basal.js
2017-01-26 22:43:57 +01:00
viktoria
3fcf52aa02 Merged MilosKozak/dev into dev 2017-01-26 18:39:30 +01:00
Milos Kozak
08880b8032 Merge branch 'master' into dev 2017-01-26 18:31:31 +01:00
Milos Kozak
e78de8b622 fix static func 2017-01-26 18:27:09 +01:00
Milos Kozak
0c289bfb6e Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2017-01-26 18:23:47 +01:00
Milos Kozak
87ba28136a log new firmware pump 2017-01-26 18:23:30 +01:00
Milos Kozak
72fc4ec096 Merge branch 'master' into dev 2017-01-26 17:00:10 +01:00
Milos Kozak
750cea7bcf Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2017-01-26 16:57:11 +01:00
Milos Kozak
5c5468b55b use minimal basal rate from description 2017-01-26 16:56:29 +01:00
LadyViktoria
1d2f98abf4 Add prefernces.json remove openapsama_skip_neutral_temps 2017-01-26 15:32:44 +01:00
LadyViktoria
0ddc26ce89 Add prefernces.json small import fixes 2017-01-26 12:10:50 +01:00
LadyViktoria
4702a87d8e Add prefernces.json add safety limits 2017-01-26 12:07:25 +01:00
viktoria
c01488e7a9 Add prefernces.json switch to SafeParse 2017-01-25 20:19:00 +01:00
LadyViktoria
2a0968eba9 Add prefences.Json show summary 2017-01-25 20:17:16 +01:00
AdrianLxM
b588211658 prevent nullpointer exception when BG <39 2017-01-25 15:37:05 +01:00
LadyViktoria
b898fc044e Add prefernces.json to advanced settings 2017-01-25 15:18:01 +01:00
AdrianLxM
1328c32bb8 remove duplicate setTempBasal function declaration 2017-01-25 13:18:54 +01:00
AdrianLxM
805f23fe59 directly pass round-basal to V8 2017-01-25 10:02:35 +01:00
AdrianLxM
950b638e50 Advanced Settings 2017-01-24 10:28:42 +01:00
AdrianLxM
3a43858948 Settings for deltas 2017-01-24 02:21:25 +01:00
Milos Kozak
df0af4da94 fix uploading profile 2017-01-23 15:56:32 +01:00
Milos Kozak
750ac19b41 upload data for temp target only if needed 2017-01-23 14:47:14 +01:00
Milos Kozak
22f9817f8e upload cpp setting to NS 2017-01-23 09:31:14 +01:00
Milos Kozak
ceaf4f7f78 Merge branch 'dev' into adjusttargetsse 2017-01-22 11:30:59 +01:00
AdrianLxM
f418152059 sorten tab titles active 2017-01-21 23:48:05 +01:00
AdrianLxM
ea78dd5bc1 Shorten tabs first 2017-01-21 19:44:58 +01:00
Milos Kozak
404a4de916 Merge pull request #136 from AdrianLxM/adjusttargetsse
Preference Switches for Autosens
2017-01-21 11:22:34 +01:00
Milos Kozak
53f9b30b3e temp target display update 2017-01-21 11:22:03 +01:00
AdrianLxM
50b7e619fc Preference switches for Autosens 2017-01-21 01:35:15 +01:00
Milos Kozak
ea37d9eaa8 Merge pull request #131 from AdrianLxM/tempt-pill
Tempt pill
2017-01-21 00:11:07 +01:00
viktoria
5a09c3df70 DanaR Stats Korean react on touch elsewwhere 2017-01-20 22:43:02 +01:00
AdrianLxM
377a55c69f DanaR Stats react on touch elsewhere 2017-01-20 20:47:31 +01:00
viktoria
33bb7d80a6 DanaR Stats small fixes and move Listeners 2017-01-20 16:45:01 +01:00
viktoria
722976f6b0 DanaR Stats beautify layout and add some listeners 2017-01-20 14:51:16 +01:00
viktoria
d2acad1942 Korean DanaR Stats some improvements 2017-01-20 03:19:17 +01:00
viktoria
2d966c9feb DanaR Stats some improvements 2017-01-20 03:13:41 +01:00
viktoria
62853326ed Merged branch dev into danarstats 2017-01-20 00:10:56 +01:00
AdrianLxM
3f3d519c84 Merge branch 'dev' into tempt-pill 2017-01-19 21:57:42 +01:00
AdrianLxM
992d95744d remove duplicate code 2017-01-19 21:53:08 +01:00
AdrianLxM
0c11f78ed3 cleanup after merge 2017-01-19 21:15:08 +01:00
LadyViktoria
1597f74bd0 Merge branch 'dev' into danarstats 2017-01-19 20:52:01 +01:00
AdrianLxM
6c3a07cc62 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into MilosKozak-dev 2017-01-19 20:47:53 +01:00
viktoria
6120add315 Add very Hard Limits to constants 2017-01-19 20:36:19 +01:00
Milos Kozak
c701b5d125 waiting for pump message 2017-01-19 19:21:25 +01:00
Milos Kozak
f8feaf565b show how is value hard limited 2017-01-19 18:40:08 +01:00
Milos Kozak
649cab63fc allow some diff on profile check 2017-01-19 18:07:16 +01:00
Milos Kozak
e808bcedee remove logging 2017-01-19 15:17:43 +01:00
Milos Kozak
75b53cfc0d iob calc fix 2017-01-19 14:35:16 +01:00
Milos Kozak
07c9a21ff9 autosens log 2017-01-19 13:54:56 +01:00
Milos Kozak
e8dcf73c83 remove carbsAbsorbed from debug 2017-01-18 21:45:27 +01:00
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
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
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
61a8cad4e8 allow refrest temp targets from NS & fix bugs 2017-01-14 16:36:42 +01: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
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
18a1927204 better optimize space of prediction in overview 2017-01-09 17:34:37 +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
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
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