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

1318 commits

Author SHA1 Message Date
Milos Kozak
e91acf3fed eliminate multiple resends in nsclient 2017-05-29 10:03:55 +02:00
Milos Kozak
4dff0e3a56 rename treatment interfaace functions to be more clear 2017-05-26 15:33:42 +02:00
Milos Kozak
0371e97391 Merge branch 'dev' into history 2017-05-26 15:06:04 +02:00
Milos Kozak
60a41b7dce switch order of commands when setting superbolus 2017-05-26 15:02:59 +02:00
Milos Kozak
0973ef97ac synchronize danar and danarv2 plugins 2017-05-26 14:41:05 +02:00
Milos Kozak
b8b9827b61 synchronize danar and danarkorean plugins 2017-05-26 13:28:27 +02:00
Milos Kozak
4b39578d9c fix adding contribution from faked extended 2017-05-26 12:07:56 +02:00
Milos Kozak
559e07904c remove unneeded call 2017-05-26 10:31:05 +02:00
Milos Kozak
650b792099 mark selected tab in treatments 2017-05-26 10:05:42 +02:00
Milos Kozak
a066580896 handle faked tempbasals synchronization 2017-05-26 08:54:48 +02:00
Milos Kozak
5fb72181ee careportal cage, sage, iage 2017-05-25 20:18:29 +02:00
Milos Kozak
87993c6163 return functionality of faking by extended boluses 2017-05-25 17:26:05 +02:00
Milos Kozak
86af9eab3d stop extended bolus in actions 2017-05-24 20:37:58 +02:00
Milos Kozak
2ae30fe9b4 temptarget design 2017-05-24 19:42:23 +02:00
Milos Kozak
5208f23661 Temptargets under treatments 2017-05-23 23:56:53 +02:00
Milos Kozak
771fbdc303 sync of treatments, tempbasals, extended tested and working 2017-05-23 22:59:06 +02:00
Milos Kozak
8db1bd5ae5 tempbasal ns sync 2017-05-23 20:15:14 +02:00
Milos Kozak
7bed883368 Merge branch 'dev' into history 2017-05-22 22:13:42 +02:00
Milos Kozak
6394421017 boluses working 2017-05-22 22:10:56 +02:00
Milos Kozak
6cd046459a original treatmens plugin removed, temp basals working 2017-05-22 20:58:05 +02:00
AdrianLxM
6d90f79521 also cancel temp on disable loop plugin 2017-05-22 19:14:57 +02:00
AdrianLxM
448a420fad cancel temp on suspend loop 2017-05-22 17:39:25 +02:00
Milos Kozak
85e6375026 make all getDao private 2017-05-22 12:52:19 +02:00
Milos Kozak
6004a17594 change database structures 2017-05-21 22:05:03 +02:00
Milos Kozak
3330c6a3fd Merge branch 'dev' into history 2017-05-21 16:46:13 +02:00
Milos Kozak
6ee6eff759 fix objective 1 2017-05-19 14:15:21 +02:00
Milos Kozak
3ec08ab10f fix app crash 2017-05-16 20:02:09 +02:00
Milos Kozak
91fa355d8c remove unneeded code 2017-05-16 18:51:31 +02:00
Milos Kozak
d0ae965054 fix basal rounding for v2 2017-05-16 18:02:58 +02:00
Milos Kozak
8452c42746 fix merge 2017-05-16 18:02:01 +02:00
Milos Kozak
8d2e7a34ae same workaround for korean danar 2017-05-16 17:58:18 +02:00
Milos Kozak
a362c77afe fix temp basal netRatio display 2017-05-16 17:57:18 +02:00
Milos Kozak
8c5ce7290d more work on treatments fragment 2017-05-16 17:48:58 +02:00
AdrianLxM
44c3303e0e Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into xdripstatusline 2017-05-16 16:30:26 +02:00
AdrianLxM
3869b143c4 Workaround for DanaR truncation 2017-05-16 16:29:30 +02:00
Milos Kozak
3ee9bf5ff7 Merge branch 'dev' into history 2017-05-16 15:15:32 +02:00
Milos Kozak
1ad424a178 use Activity instead of FramgmentActivity 2017-05-16 15:15:28 +02:00
Milos Kozak
45477f96ee Merge pull request #243 from AdrianLxM/xdripstatusline 
basal and bolus step in DanaR Fragment
 2017-05-16 13:28:39 +02:00
AdrianLxM
572e726678 basal and bolus step in DanaR Fragment 2017-05-16 13:10:02 +02:00
Milos Kozak
6fff6f63a4 bolus dialog redesign 2017-05-16 12:09:32 +02:00
Milos Kozak
4201709e2a finish careportal dialog redesign 2017-05-16 11:47:33 +02:00
Milos Kozak
54758d08d8 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-05-16 09:47:23 +02:00
Milos Kozak
894923664e Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into history 2017-05-16 09:46:59 +02:00
Milos Kozak
fd62c572af more treatments plugin tweaking 2017-05-16 09:46:09 +02:00
Milos Kozak
704ad383e9 careportal layout part1 2017-05-15 21:10:43 +02:00
Milos Kozak
25110cfea4 move database actions from pump to treatments plugin 2017-05-15 18:44:40 +02:00
Milos Kozak
85744548d8 typo in log 2017-05-14 11:48:59 +02:00
Milos Kozak
b1d9e647c6 Merge branch 'dev' into history 2017-05-12 23:14:07 +02:00
Milos Kozak
b19bf628b8 Merge pull request #241 from AdrianLxM/xdripstatusline 
Get correct calibration value if entered with (onboard) keyboard
 2017-05-12 23:12:49 +02:00
Milos Kozak
6a6a02f212 Merge branch 'dev' into history 2017-05-12 23:04:39 +02:00
Milos Kozak
3f4cf57bbc make all Spiners centered 2017-05-12 23:04:14 +02:00
Milos Kozak
7bbd2cff2d consolidate DanaR code 2017-05-12 22:40:22 +02:00
Milos Kozak
d641b0edd9 move rest of PumpInterface to TreatmentInterface 2017-05-12 21:21:31 +02:00
Milos Kozak
52177cead1 move part of PumpInterface to TreatmentInterface 2017-05-12 21:07:29 +02:00
AdrianLxM
bb35f58eab Get correct calibration value if entered with (onboard) keyboard 2017-05-12 18:31:52 +02:00
Milos Kozak
22bb49aa60 hide DanaRv2 constraints 2017-05-12 18:05:22 +02:00
Milos Kozak
863e6454eb calculate iob based on insulin stored with treatment 2017-05-12 17:57:57 +02:00
Milos Kozak
9fc1d59bd0 allow to enforce Treatment plugin 2017-05-12 17:30:52 +02:00
Milos Kozak
c6830baf8f Merge branch 'dev' into history 2017-05-12 16:35:07 +02:00
Milos Kozak
abdc1022bf merge bolus & basal into one plugin 2017-05-12 16:27:33 +02:00
AdrianLxM
c88b8eaa9a make buttons scrollable for small heights 2017-05-12 15:26:16 +02:00
Milos Kozak
eddd8ac56d Merge branch 'DanaRv2' into history 2017-05-12 13:06:05 +02:00
Milos Kozak
e005d6bd69 Merge branch 'dev' into history 2017-05-12 13:05:57 +02:00
Milos Kozak
831b45fac5 DanaRv2 mod7 2017-05-12 13:05:29 +02:00
Milos Kozak
df424ea5ff overview buttons 2017-05-12 11:06:33 +02:00
Milos Kozak
19c23a3c02 Merge pull request #238 from AdrianLxM/xdripstatusline 
No permission to read statusline
 2017-05-12 09:22:09 +02:00
AdrianLxM
7517ee4930 No permission to read statusline 2017-05-12 03:54:24 +02:00
Milos Kozak
be4aa1131e Merge branch 'DanaRv2' into history 2017-05-12 00:39:08 +02:00
Milos Kozak
2610edae55 DanaRv2 Modify 6 2017-05-12 00:38:26 +02:00
Milos Kozak
a0d31b2118 rename identical functions 2017-05-11 18:54:50 +02:00
Milos Kozak
72f3efc39a disable danarv2 temporary 2017-05-10 21:58:46 +02:00
Milos Kozak
51d52f6b3d Merge branch 'DanaRv2' into history 2017-05-10 21:53:31 +02:00
Milos Kozak
15127dc4c6 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-05-10 21:37:42 +02:00
Milos Kozak
878e3e0921 use SP 2017-05-10 21:37:34 +02:00
AdrianLxM
201d2df16b cleanup imports 2017-05-10 16:37:11 +02:00
AdrianLxM
b247b81428 use helper class to query settings 2017-05-10 16:33:41 +02:00
Milos Kozak
5b25d28f42 Merge branch 'dev' into DanaRv2 2017-05-10 14:05:43 +02:00
Milos Kozak
23fd6a6c44 overlappingintervals 2017-05-10 14:00:46 +02:00
AdrianLxM
fc85deb62d move evaluation of always_use_shortavg setting to the OAPS plugins 
For the overview and the watch we still may use the standard delta, even if this setting is enabled. (Also good to check that it is the same as in xDrip e.g.)
 2017-05-10 01:18:27 +02:00
AdrianLxM
298d7a7d9c Merge branch 'dev' into xdripstatusline 2017-05-09 23:26:31 +02:00
AdrianLxM
1fa3a2a697 bgi on watch status (optional) 2017-05-09 23:23:37 +02:00
Milos Kozak
77181f6f7f Handle exceptions in StatusLinePlugin 2017-05-09 21:32:24 +02:00
Milos Kozak
cd16b71759 upload OpenAPS Offline 2017-05-09 21:29:08 +02:00
Milos Kozak
d313df0d19 removing treatments 2017-05-09 20:47:02 +02:00
Milos Kozak
d781c69b94 invalidate autosens on new profile 2017-05-09 16:51:08 +02:00
Milos Kozak
09fea02ed2 Allow to disable NS upload while client is connected 2017-05-09 16:24:53 +02:00
Milos Kozak
ee16fabdfc DanaRv2 modify 3 2017-05-09 15:53:11 +02:00
Milos Kozak
b30d79c4cb fix conflicts 2017-05-09 10:46:04 +02:00
Milos Kozak
0048366dcf fix conflict 2017-05-09 10:14:21 +02:00
Milos Kozak
6e5d3635c8 using bolus amount from history if comm is interrupted 2017-05-08 23:13:43 +02:00
AdrianLxM
63b9a06431 Send empty status to xDrip when disabled. Send status immediately when enabling plugin. 2017-05-08 16:34:45 +02:00
AdrianLxM
da0334eb19 xdrip statusline reformat 2017-05-08 16:23:59 +02:00
AdrianLxM
67f21537ea send status to xDrip 2017-05-06 15:18:19 +02:00
Milos Kozak
14a56842ee allow to change x axis scale 2017-05-04 23:51:04 +02:00
Milos Kozak
05d9f16031 hide label too 2017-05-04 23:22:16 +02:00
Milos Kozak
bd0ff991dd remember graph settings fix 2017-05-04 21:33:26 +02:00
Milos Kozak
645bcdbb8a deviations < 2 as equal 2017-05-04 21:09:17 +02:00
Milos Kozak
db5dcc0064 different color for carbs deviations 2017-05-04 20:40:43 +02:00
Milos Kozak
aabcee8ea7 fix conflicts 2017-05-04 19:53:45 +02:00
Milos Kozak
352a2a7475 deviations graph 2017-05-04 19:51:58 +02:00
Milos Kozak
070867af28 menu on top 2017-05-04 19:13:56 +02:00
Milos Kozak
a83ff12ca8 remove unneeded code 2017-05-04 16:30:01 +02:00
Milos Kozak
d145ef907f Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-05-04 15:25:48 +02:00
Milos Kozak
194fd7f0a6 check for null 2017-05-04 15:25:41 +02:00
Milos Kozak
10d5b914f3 check for finished activity 2017-05-03 18:37:00 +02:00
Milos Kozak
573256d7d4 catch missing sms permission 2017-05-03 18:30:18 +02:00
Milos Kozak
37edc19509 check for null 2017-05-03 18:23:33 +02:00
Milos Kozak
037bb09d23 check for null 2017-05-03 18:15:10 +02:00
Milos Kozak
b80c382512 fix exception in sms comm 2017-05-02 22:49:17 +02:00
Milos Kozak
602310b70a DanaRv2 1st rev 2017-05-02 17:02:30 +02:00
Milos Kozak
34f83e6b09 fix null pointer exception 2017-05-01 09:18:10 +02:00
Milos Kozak
2fabee85b4 Merge pull request #229 from AdrianLxM/adridev3 
adaptions to small screen
 2017-04-30 22:20:21 +02:00
AdrianLxM
0069f320f8 config builder smallscreen 2017-04-30 21:57:55 +02:00
AdrianLxM
5dc07012d2 overview smallscreen 2017-04-30 21:34:30 +02:00
Milos Kozak
9ff714ea2d try to fix cob graph 2017-04-30 21:27:40 +02:00
Milos Kozak
0f1c2bb193 DanaRv2 1st rev 2017-04-30 21:08:00 +02:00
Milos Kozak
2cb6e275c0 allign design of status pills 2017-04-30 13:17:59 +02:00
Milos Kozak
76993e17e5 handle calculation properly when historical data changed 2017-04-30 10:23:26 +02:00
Milos Kozak
4dd9281276 remove actionbar 2017-04-29 20:16:50 +02:00
Milos Kozak
66d011665d configbuilder UI improvement 2017-04-29 16:59:44 +02:00
Milos Kozak
686d6635d3 remove unused code 2017-04-29 15:27:24 +02:00
Milos Kozak
3add216584 more work on autosens 2017-04-29 09:04:25 +02:00
Milos Kozak
5fe3c50171 copy paste bug 2017-04-28 08:27:05 +02:00
Milos Kozak
3552d6aa40 bg value colored 2017-04-27 21:26:53 +02:00
Milos Kozak
0aad00808c fix temp basal iob calculation 2017-04-27 20:22:04 +02:00
Milos Kozak
5ef034b4fc cob display 2017-04-26 23:45:40 +02:00
Milos Kozak
638f6bc291 IobCobCalculationPlugin 2017-04-25 16:37:27 +02:00
Milos Kozak
0232229020 fix history iob calculation 2017-04-25 10:48:30 +02:00
Milos Kozak
5a3eb0cc25 refresh on context menu 2017-04-24 22:17:45 +02:00
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