Commit graph

2112 commits

Author SHA1 Message Date
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
a60afbceb9 typo 2017-05-12 16:08:48 +02:00
AdrianLxM
a9e093ad0d some German translations 2017-05-12 16:06:14 +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
b782a5b8dc Merge branch 'dev' into history 2017-05-12 00:39:20 +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
Radoslav Radev
d58ddf48c6 Update strings.xml 2017-05-11 17:01:49 +03:00
Milos Kozak
7e99ce416a move buttons back to bottom 2017-05-11 10:59:05 +02:00
Milos Kozak
6b9048cd61 Merge pull request #234 from warstar2187/korean
Korean translation update
2017-05-11 09:27:58 +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
a03b5be189 v 1.43 2017-05-09 21:34:00 +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
554fb51a75 profile layout 2017-05-09 19:06:59 +02:00
Milos Kozak
84a6554e07 smaller font size on careportal buttons 2017-05-09 18:36:13 +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
8d3be5e958 colors on danar fragment 2017-05-08 23:19:11 +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
344144d88a pump status equal size 2017-05-04 21:11:51 +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
289ad394ce Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-05-03 22:30:12 +02:00
Milos Kozak
6d5f2514d0 remove duplicated string 2017-05-03 18:45:29 +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
c30977bfd8 Merge pull request #230 from AdrianLxM/adridev3
typo insuin->insulin
2017-05-03 08:31:04 +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
AdrianLxM
9cef4c5a01 typo insuin->insulin 2017-05-01 18:09:53 +02:00
Milos Kozak
1b69771893 report autosens to NS 2017-05-01 14:28:45 +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
Milos Kozak
c44ea83165 1.42 bump 2017-04-30 21:36:47 +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
AdrianLxM
01fe3cacc1 Making dialogs scrollable 2017-04-30 20:57:07 +02:00
AdrianLxM
d8fb53de69 Making dialogs scrollable 2017-04-30 20:54:35 +02:00
Milos Kozak
3279c297dc equal weight 2017-04-30 13:22:16 +02:00
Milos Kozak
2cb6e275c0 allign design of status pills 2017-04-30 13:17:59 +02:00
Milos Kozak
1abdadceca ver 1.41 2017-04-30 10:24:09 +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
974e5e0098 pump fragment redesign 2017-04-29 18:11:15 +02:00
Milos Kozak
f641d40722 virtual pump layout 2017-04-29 17:48:45 +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
warstar2187
dac969b381 Update strings.xml 2017-04-25 10:14:06 +09: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
3b34e55fda CS translations 2017-04-22 10:21:24 +02:00
Milos Kozak
c18fcfda62 revert sdk to 23 2017-04-22 10:18:31 +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
51439bbf33 upgrade libraries 2017-04-21 12:03:54 +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
6e90b425f7 ver 1.31 bump 2017-04-09 21:50:53 +02:00
Milos Kozak
3b5ba29489 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-04-09 21:50:11 +02:00
Milos Kozak
387defbfc7 fix sms pref key 2017-04-09 21:50:05 +02:00
Milos Kozak
a203591d44 ver 1.3 bump 2017-04-09 11:47:20 +02:00
Milos Kozak
d41d5f9e6b loop context menu fix 2017-04-08 20:13:30 +02:00
Radoslav Radev
5fe22eac65 Update strings.xml 2017-04-07 13:53:47 +03: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
5f0de38dfe 1.3rc2 2017-04-01 12:47:18 +02:00
Milos Kozak
d6f31820d9 request battery optimalization whitelisting 2017-03-31 09:21:40 +02:00
Milos Kozak
0cb4ace052 glimp broadcast to manifest 2017-03-28 22:49:56 +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
aa8fa729ad update fabric 2017-03-09 10:25:13 +01:00
Milos Kozak
2c2d837079 fix null pointer exception 2017-03-09 10:20:38 +01:00
Milos Kozak
79ef93a839 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-03-09 09:57:32 +01:00
Milos Kozak
52aa7c1bf8 fix null pointer exception 2017-03-09 09:57:24 +01:00
warstar2187
242428e2cb Update strings.xml 2017-03-09 04:20:40 +09:00
Milos Kozak
151baa2fb5 enable nsclient internal by default 2017-03-07 11:07:56 +01:00
Milos Kozak
02b90fa6c7 update gradle to 2.3 2017-03-07 10:52:25 +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
ccca820a95 Merge pull request #205 from slavidex/patch-32
Update strings.xml
2017-03-05 15:22:32 +01:00
Milos Kozak
9843f139ad fixed bugs in autosens 2017-03-05 15:22:35 +01:00
Radoslav Radev
3b129dc7f6 Update strings.xml 2017-03-05 15:58:37 +02:00
Radoslav Radev
a0f2e4f663 Update strings.xml 2017-03-05 15:42:01 +02:00
Radoslav Radev
54f376330a Update strings.xml 2017-03-05 15:28:20 +02:00
Milos Kozak
9e05c86284 Log hours in sensitivity 2017-03-05 12:12:28 +01:00
Milos Kozak
de9dbf9243 CS translations 2017-03-04 20:55:13 +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
c79ccf7ccb update crashlytics 2017-03-02 23:02:07 +01:00
Milos Kozak
5a45bd3751 remove sample data 2017-03-02 21:17:24 +01:00
Milos Kozak
8c8af1755b 1.3rc1 2017-03-02 21:14:08 +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
2fceb0b891 1.1h 2017-02-25 20:59:46 +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
AdrianLxM
686e16de8d scrollview match parent in width 2017-02-20 13:31:47 +01:00
AdrianLxM
1f464bdae0 Merge remote-tracking branch 'milosremote/dev' into adridev 2017-02-20 13:11:35 +01:00
AdrianLxM
18e2dcffcf make things scrollable 2017-02-20 13:10:07 +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
2e15c8b138 add permissions to manifest 2017-02-18 10:41:42 +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
Radoslav Radev
09880f029a Update strings.xml 2017-02-16 16:46:47 +02: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
1a3d3eb97c 1.1g 2017-02-14 21:41:39 +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
ac82e2b044 1.1f 2017-02-13 21:06:20 +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
f6ae267bb5 CS translations 2017-02-12 22:28:42 +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
Milos Kozak
351a624b83 small string change 2017-02-12 13:48:03 +01:00
Milos Kozak
dc85bc26fc typo 2017-02-12 13:45:08 +01:00
AdrianLxM
5e96124a2d mmol/l fix 2017-02-11 22:27:04 +01:00
AdrianLxM
2e6d754c86 mmol/l fix 2017-02-11 22:26:16 +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
40d166cb7d CS translations 2017-02-10 21:39:51 +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
LadyViktoria
4857259eda ko translation 2017-02-10 07:59:26 +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
715d15b51f CS translations 2017-02-09 22:44:42 +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
9d7ac0ce81 1.1e 2017-02-09 17:17:40 +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
LadyViktoria
1f3b425c44 Remove careportal_temptarget string 2017-01-31 20:28:32 +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
90924e607f 1.1d 2017-01-30 14:36:04 +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
AdrianLxM
3d6be15306 update determine-basal.js to current Oref0 dev 2017-01-30 04:23:18 +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
viktoria
75ff6867bc Add prefernces.json make settings work with validator lib 2017-01-29 13:00:52 +01:00
viktoria
7d68b50a56 Add prefernces.json validator lib 2017-01-29 13:00:21 +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
4d4630ca1a Add prefernces.json rename some Strings to match OpenAPS docs 2017-01-27 09:56:32 +01:00
LadyViktoria
f510b0a8cc Add prefernces.json errer message translations
attention the characters are limited.
maybe its caused by old libs
com.android.support:appcompat-v7:23.4.0
'com.android.support:support-v4:23.4.0
2017-01-27 09:52:16 +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
2f8b2a382d Merged branch dev into dev 2017-01-26 00:39:28 +01:00
viktoria
74cfa08b81 Change some Prefernces names to match names in OpenAPS docs 2017-01-26 00:35:46 +01:00
Heiner1
5c43c66163 Update strings.xml 2017-01-25 23:35:31 +01:00
viktoria
88d6178a1b Add prefernces.json small fix 2017-01-25 22:20:56 +01:00
viktoria
9d2b645d8c Add prefernces.json default values 2017-01-25 22:11:17 +01:00
viktoria
fd6432f808 Add prefernces.json put hyperlink and warning there 2017-01-25 20:41:33 +01:00
viktoria
8e095fefaf Add prefernces.json layout changes 2017-01-25 20:20:39 +01:00
viktoria
0838ede6a3 Add prefernces.json change secondary text color to white 2017-01-25 20:19:53 +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
9ef4f4d9ad cleanup unused round-basal.js 2017-01-25 11:34:09 +01:00
AdrianLxM
805f23fe59 directly pass round-basal to V8 2017-01-25 10:02:35 +01:00
AdrianLxM
53c63f0f48 simplify round-basal.js 2017-01-25 09:43:54 +01:00
Milos Kozak
044547b594 Merge pull request #143 from AdrianLxM/deltasx
Settings for deltas
2017-01-24 10:59:10 +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
viktoria
bd588af1ba DanaR Stats small Layout fixes 2017-01-23 21:52:24 +01:00
Milos Kozak
da2739f7b7 Merge pull request #140 from PitBeckh/patch-1
Update strings.xml
2017-01-23 20:23:30 +01:00
PitBeckh
dc12ef3fec Update strings.xml 2017-01-23 16:26:59 +01:00
PitBeckh
2f72471915 Update strings.xml 2017-01-23 16:24:53 +01:00
Milos Kozak
5c216e5cec Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-01-23 15:56:55 +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
d62105b6c6 Merge pull request #139 from slavidex/patch-27
Update strings.xml
2017-01-23 12:03:47 +01:00
Radoslav Radev
fbceeec5b0 Update strings.xml 2017-01-23 11:01:42 +02:00
Milos Kozak
22f9817f8e upload cpp setting to NS 2017-01-23 09:31:14 +01:00
Radoslav Radev
106bfe4f1c Update strings.xml 2017-01-23 07:14:12 +02:00
Radoslav Radev
2d02449a87 Update strings.xml 2017-01-22 21:44:49 +02:00
PitBeckh
d995910384 Update strings.xml 2017-01-22 20:34:54 +01:00
Milos Kozak
ceaf4f7f78 Merge branch 'dev' into adjusttargetsse 2017-01-22 11:30:59 +01:00
ecorman
24b86a0b99 Update: Perfil->Objetivo 2017-01-22 00:07:10 +01:00
AdrianLxM
f418152059 sorten tab titles active 2017-01-21 23:48:05 +01:00
ecorman
3a2549d0b6 Update Spanish Translation 2017-01-21 23:08:23 +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
88a1dcde51 remove empty language translation 2017-01-19 21:32:09 +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
2754e23c08 CS translations 2017-01-19 19:52:14 +01:00
Milos Kozak
98a95fb16e 1.1c 2017-01-19 19:22:04 +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
452edd5771 1.1b 2017-01-18 21:41:10 +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
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
Milos Kozak
10d30571a9 fix IC and ISF in DanaR profile 2016-12-06 23:14:25 +01:00
Milos Kozak
d897b778a0 Merge pull request #84 from MilosKozak/notifications
basic notification functionality
2016-12-06 23:05:23 +01:00
Milos Kozak
3a3fc5d508 one more ICF with 1 decimal 2016-12-06 23:03:45 +01:00
Milos Kozak
86755599df show IC and ICF with 1 decimal 2016-12-06 23:00:57 +01:00
Milos Kozak
0af894aa56 change info color to green 2016-12-06 22:57:49 +01:00
Milos Kozak
b61108eb2b remove test data 2016-12-06 22:55:49 +01:00
AdrianLxM
1a20b637b6 limit readings to values above 38 2016-12-05 17:47:03 +01:00
Milos Kozak
abfb832a10 basic notification functionality 2016-12-05 15:20:44 +01:00
Milos Kozak
4b389c2cad dana drivers switching working 2016-12-03 17:42:08 +01:00
AdrianLxM
1af28d007f wear make sendData() private 2016-12-01 12:10:58 +01:00
AdrianLxM
7eb8702a9c wear profile-null fix Toasts from strings.xml the second 2016-12-01 10:54:19 +01:00
AdrianLxM
68f4a2db50 wear profile-fix toast from strings.xml 2016-12-01 10:47:39 +01:00
AdrianLxM
0d8fd9df5c wear profile may be null 2016-12-01 09:30:39 +01:00
Milos Kozak
db2fd55f7c copy files for Korean DanaR 2016-11-29 20:52:40 +01:00
Milos Kozak
97a22344e3 CZ translations 2016-11-29 19:07:09 +01:00
Milos Kozak
36d5f1dc29 proper danar errors detection 2016-11-29 18:28:36 +01:00
AdrianLxM
896503918c wear extract strings 2016-11-29 15:01:00 +01:00
AdrianLxM
1eacf35e47 Merge pull request #25 from AdrianLxM/wear-prepare-final
wear merge current master
2016-11-29 13:17:21 +01:00
Milos Kozak
ee408ada79 Merge pull request #80 from warstar2187/master
Fix Insulin Activity and Korean update
2016-11-29 07:44:58 +01:00
warstar2187
7f97b232da Update Treatment.java 2016-11-29 12:08:45 +09:00
Milos Kozak
2912d1cce1 Merge pull request #79 from AdrianLxM/viktoria-permissions
Viktoria permissions
2016-11-28 19:02:28 +01:00
AdrianLxM
70338ac158 wear PoweRGbg fixes 2016-11-28 18:42:19 +01:00
AdrianLxM
87d49c03c8 wear product flavors 2016-11-26 07:10:22 +01:00
AdrianLxM
b2d2f462f6 first check if element exist, then access it 2016-11-25 13:35:53 +01:00
LadyViktoria
39be1bb4c7 Android 6+ Permissions #6 2016-11-25 13:35:34 +01:00
AdrianLxM
ff29a795db SMS permission crashfix 2016-11-25 13:32:27 +01:00
LadyViktoria
33d783e9b0 Android 6+ Permissions #4 2016-11-25 13:32:17 +01:00
LadyViktoria
1967602c70 Android 6+ Permissions #3 2016-11-25 13:32:07 +01:00
viktoria
dd02fcaa85 Android 6+ Permissions #2 2016-11-25 13:31:52 +01:00
LadyViktoria
f25715d87c Android 6+ Permissions 2016-11-25 13:31:43 +01:00
AdrianLxM
12e78656b7 wear settings 2016-11-24 16:23:31 +01:00
AdrianLxM
c633904e8c wear fragment and reset button 2016-11-24 16:23:31 +01:00
AdrianLxM
b306de49dc wear Emma 2016-11-24 16:23:31 +01:00
AdrianLxM
ef0e30b2b3 wear big chart avgDelta working 2016-11-24 16:23:31 +01:00
AdrianLxM
5e3fddcc05 wear arrows working 2016-11-24 16:23:31 +01:00
AdrianLxM
95432e35e0 wear yet again current situation tweaks 2016-11-24 16:23:31 +01:00
AdrianLxM
663a865595 wear intent to express current situation better 2016-11-24 16:23:31 +01:00
AdrianLxM
8af4ac0daf wear bigchart fully functional 2016-11-24 16:23:31 +01:00
AdrianLxM
afa5faf834 wear basal live 2016-11-24 16:23:31 +01:00
AdrianLxM
2b17fc5155 wear painting temps 2016-11-24 16:23:31 +01:00
AdrianLxM
70c3969f85 wear something is painting 2016-11-24 16:23:31 +01:00
AdrianLxM
b93273d706 wear status working 2016-11-24 16:23:31 +01:00
AdrianLxM
e2c3069374 resend(), bigchart watchface layout overhaul, fix nullpointer exception, only send when enabled 2016-11-24 16:23:31 +01:00
AdrianLxM
2e0ac569eb wear first bg and delta on watch 2016-11-24 16:23:31 +01:00
AdrianLxM
761077e8ae wear fix overeager refactoring and plugin pluggable 2016-11-24 16:23:31 +01:00
AdrianLxM
2fd93a8e31 wear installing on watch 2016-11-24 16:23:31 +01:00
ecorman
da861a7108 Note basal start / end to see note in Xdrip+ with data 2016-11-23 23:59:11 +01:00
AdrianLxM
ef847a7cc2 Make bolus progress dialog not cancalable 2016-11-21 19:50:27 +01:00
AdrianLxM
b97920b3ef Integer: comparison by value not by reference
Why is there no compiler warning for this?
2016-11-18 15:21:07 +01:00
Radoslav Radev
8b5ee91c95 Update strings.xml 2016-11-17 22:40:51 +02:00
Radoslav Radev
56c83aac2f bg translation
1
2016-11-17 22:12:19 +02:00
Milos Kozak
41acb2d022 Merge pull request #70 from AdrianLxM/cpp_sum
Add sum to the overview of the basal profile.
2016-11-17 20:09:54 +01:00
AdrianLxM
505a135ac8 CPP add sum to basal rate representation 2016-11-17 13:35:38 +01:00
AdrianLxM
b74c29d202 zip logfiles on daily rollover 2016-11-17 00:23:20 +01:00
AdrianLxM
ade27a9460 CPP proper dialog handling 2016-11-15 18:59:38 +01:00
AdrianLxM
127c85effb CPP delete images that are not used 2016-11-15 17:40:16 +01:00
AdrianLxM
3da9a8c45c CPP limits 50 to 200 percent 2016-11-15 17:25:23 +01:00
AdrianLxM
b01fb6ee6e CPP hard limits for percentage 2016-11-15 07:52:59 +01:00
AdrianLxM
513b2966c9 CPP cleanup and i18n 2016-11-14 18:19:17 +01:00
AdrianLxM
74ea6c4011 CPP working 2016-11-14 18:19:17 +01:00
AdrianLxM
85b052efda CPP copyprev buttons working 2016-11-14 18:19:17 +01:00
AdrianLxM
c2d1fdb39e CPP edit base basal gui - without function yet 2016-11-14 18:19:17 +01:00
AdrianLxM
dba81ede2a calculation for isf and ic. Tooltips. 2016-11-14 18:19:17 +01:00
AdrianLxM
0e5d18ec86 keep basal in order as required when writing to dana 2016-11-14 18:19:17 +01:00
AdrianLxM
3fe7c7a0fa CPP shiftfix and base profile view 2016-11-14 18:19:17 +01:00
AdrianLxM
2c5b20a721 CPP html-ify and send to pump button 2016-11-14 18:19:17 +01:00
AdrianLxM
a57a864c24 CPP icons 2016-11-14 18:19:17 +01:00
AdrianLxM
4dbb20b8c5 CPP small redesign 2016-11-14 18:19:17 +01:00
AdrianLxM
f815f7fce6 CPP ic and isf data 2016-11-14 18:19:17 +01:00
AdrianLxM
8c93925865 CPP simple representation string 2016-11-14 18:19:17 +01:00
AdrianLxM
364b3d6710 CPP percentage and shift working on hard coded basal rate 2016-11-14 18:19:17 +01:00
AdrianLxM
be556cf388 CPP copy simple profile 2016-11-14 18:19:17 +01:00
AdrianLxM
d94136bc95 overview dymanic height 2016-11-12 20:39:11 +01:00
warstar2187
2365dbac86 Update strings.xml 2016-11-13 01:54:28 +09:00
AdrianLxM
12fc454fe1 divisions with doubles to not do whole minute jumps 2016-11-12 13:16:11 +01:00
AdrianLxM
68acc3aca3 deltas per 5 minutes 2016-11-12 13:05:18 +01:00
Milos Kozak
0b56b7554c Merge pull request #64 from AdrianLxM/fill-presets2
Fill presets
2016-11-12 10:41:54 +01:00
Milos Kozak
dce6acba54 Merge pull request #65 from AdrianLxM/german-update
German update
2016-11-12 10:28:01 +01:00
AdrianLxM
2fef497ce9 German updates 02 2016-11-11 17:59:23 +01:00
AdrianLxM
75889c24b3 German updates 01 2016-11-11 17:59:10 +01:00
Milos Kozak
b5bd6749ae fix app crash when no profile set 2016-11-11 16:40:31 +01:00
AdrianLxM
401be6dd5b add U to buttons 2016-11-11 16:29:28 +01:00
AdrianLxM
1568f77229 fill preset buttons 2016-11-11 16:24:00 +01:00
warstar2187
2d54a068ad Update strings.xml 2016-11-11 23:07:32 +09:00
Milos Kozak
c034f77b71 fix merge conflict 2 2016-11-11 13:09:50 +01:00
Milos Kozak
a341fa4343 fix merge conflict 2016-11-11 13:09:11 +01:00
Milos Kozak
ad475ace90 Merge pull request #63 from AdrianLxM/profileLongpress
profile switch dialog on long press on profile pill
2016-11-11 12:57:00 +01:00
Milos Kozak
753fb4664d Merge pull request #61 from AdrianLxM/fill-action
Fill action
2016-11-11 12:56:21 +01:00
AdrianLxM
4a23d4ce0d profile switch dialog on long press on profile pill 2016-11-11 12:29:13 +01:00
AdrianLxM
41e68a03a2 SimpleProfile as profile name 2016-11-11 01:45:41 +01:00
AdrianLxM
4b27c9212a DanaR as part of profile name 2016-11-11 01:45:28 +01:00
AdrianLxM
a6d5d68938 fill action 2016-11-11 00:56:15 +01:00
Milos Kozak
e8d169f078 allow automated actions only whem pump is initialized 2016-11-10 23:33:12 +01:00
Milos Kozak
86a3df1996 lower allowed diff to perform action from 0.1 to 0.05 2016-11-10 23:33:12 +01:00
AdrianLxM
7b4b4f7cfc Overview profile redesign 2016-11-10 23:20:23 +01:00
AdrianLxM
4ee87d1cca basal profile on overview 2016-11-10 21:03:26 +01:00
AdrianLxM
a6ae92bb2f Receive profile updates on uploadOnly when NS-Profiles are used 2016-11-10 18:53:01 +01:00
AdrianLxM
c900d6611c Warn on "refresh treatments from NS" button in upload only mode. 2016-11-10 18:52:42 +01:00
AdrianLxM
f85f04d33f NS upload only 2016-11-10 18:33:50 +01:00
Milos Kozak
21f732b378 report app start/restart to NS 2016-11-10 16:42:59 +01:00
Milos Kozak
a5778b4916 Merge pull request #58 from AdrianLxM/loadmorehightemps
Load more "extended bolus" high temps
2016-11-10 13:54:11 +01:00
AdrianLxM
5088b84417 Receive profile updates on uploadOnly when NS-Profiles are used 2016-11-10 13:50:13 +01:00
Milos Kozak
156f42da5f always report active profile 2016-11-10 13:15:23 +01:00
Milos Kozak
770f44118b Merge pull request #56 from AdrianLxM/hapticFeedback
Haptic feedback
2016-11-10 10:02:26 +01:00
Milos Kozak
8d360f837d Merge pull request #57 from warstar2187/master
kr translation update
2016-11-10 10:02:01 +01:00
AdrianLxM
3ee1cf5023 haptic feedback for loop pill on overview 2016-11-10 00:02:51 +01:00
Milos Kozak
8707b42526 Merge pull request #54 from AdrianLxM/confirm_reset_db
Confirm reset db
2016-11-08 23:02:03 +01:00
AdrianLxM
aaba503cd0 Fix crash due to not found theme 2016-11-08 22:57:56 +01:00
Milos Kozak
bad7e5d7c4 gradle fix 2016-11-08 22:55:08 +01:00
AdrianLxM
341d7222e5 Strings for reset DB 2016-11-08 22:36:47 +01:00
AdrianLxM
218ccc803b Ask before resetting DB 2016-11-08 22:35:57 +01:00
Milos Kozak
a2d4f22bd7 added git HEAD and version to pump status and logs 2016-11-08 19:10:25 +01:00
Milos Kozak
94a7033e0c always upload current basal rate 2016-11-08 17:55:39 +01:00
Milos Kozak
a4a9efd812 TAB_VIEW_PADDING_DIPS = 9 2016-11-08 14:24:02 +01:00
warstar2187
1f35018148 Update strings.xml 2016-11-08 20:04:19 +09:00
warstar2187
9ae3d88f9c Update DanaRPlugin.java 2016-11-08 19:59:54 +09:00
Milos Kozak
4a4dc04865 fix iob reporting to NS 2016-11-08 10:29:24 +01:00
AdrianLxM
ff66edf064 Add TDD to DanaR daily view
... also don't show the time for the day. It is always 00:00 anyways.
2016-11-08 06:11:50 +01:00
AdrianLxM
ede982c8c5 Update danar_history_item.xml 2016-11-08 06:08:12 +01:00
AdrianLxM
93accc0d9f Add in basalIOB.activity 2016-11-07 15:18:48 +01:00
AdrianLxM
8bdc86f359 Calculate activityContrib for TempBasal 2016-11-07 15:17:16 +01:00
AdrianLxM
2e6a37dcbd Add base basal rate to Overview when temp is running
Now that there is more space with less buttons, it should fit ;)
2016-11-07 10:18:16 +01:00
Milos Kozak
d67ae5df78 version bump 1.0.20 2016-11-07 10:16:13 +01:00
Milos Kozak
925b5612fc Merge pull request #49 from AdrianLxM/disableLoopLongpress
Disable loop on Longpress on Loop-Status in Overview
2016-11-07 10:14:14 +01:00
Milos Kozak
3533ec16ba Merge pull request #50 from AdrianLxM/patch-7
fix for net IOB
2016-11-07 09:36:16 +01:00
Milos Kozak
6263b98683 Merge pull request #39 from warstar2187/master
Update strings.xml
2016-11-07 09:13:21 +01:00
AdrianLxM
e948a6f955 fix for net IOB 2016-11-07 07:55:41 +01:00
AdrianLxM
686593986c Update PreferencesActivity.java 2016-11-07 01:02:08 +01:00
AdrianLxM
c851aefc8e Update MainActivity.java 2016-11-07 01:01:33 +01:00
AdrianLxM
68be6179f8 Update EventRefreshGui.java 2016-11-07 01:00:50 +01:00
AdrianLxM
be39a35d68 Update ConfigBuilderFragment.java 2016-11-07 00:59:47 +01:00
AdrianLxM
c93322f2da Overview Loopdisable on longclick 1 2016-11-07 00:58:44 +01:00
Milos Kozak
f84777bf00 Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2016-11-06 12:10:55 +01:00
Milos Kozak
95ffb03a26 fix resources crash 2016-11-06 12:10:24 +01:00
AdrianLxM
3f02c8fc8c Show decimal place
The time since last bolus has one decimal place but it was shown as zero.
2016-11-06 02:01:22 +01:00
Milos Kozak
65b8ca00db looper to profile switch 2016-11-05 20:32:47 +01:00
Milos Kozak
45ffc18d25 move set temp and set extended buttons to actions 2016-11-05 20:12:58 +01:00
Milos Kozak
3ac9811d9a Actions page & offline profile switch 2016-11-05 15:46:11 +01:00
Radoslav Radev
b9d4a5fc0a Update strings.xml 2016-11-03 07:47:24 +02:00
Milos Kozak
15ca64e218 Merge pull request #43 from ecorman/master
Basal % rate
2016-11-02 23:37:17 +01:00
Milos Kozak
57b032065f Merge pull request #45 from AdrianLxM/disableLoopLabel
Disable loop label
2016-11-02 22:20:48 +01:00
AdrianLxM
b7f4dd3366 borders again on loopmode label 2016-11-02 18:27:46 +01:00
AdrianLxM
b1f3bb17bb Show in Overview when loop is disabled 2016-11-02 18:04:14 +01:00
AdrianLxM
80e8ac465a Update German translation 2016-11-02 14:33:41 +01:00
AdrianLxM
b265be3536 Some updates on German translation 2016-11-02 14:17:16 +01:00
AdrianLxM
2294093aab Show current total
The total of the calculation in the wizard was showing the value from the previous calculation when you enable/disable to include Bolus-IOB or Basal-IOB into the calculation.

The button to send to the pump showed the current amount of units.
2016-10-31 13:01:50 +01:00
ecorman
f2baa32e40 Basal % rate 2016-10-31 13:01:38 +01:00
ecorman
cf3bb52c7b Add percent to result to allow manual adjust 2016-10-31 02:29:19 +01:00
warstar2187
46fd0c87dd Update strings.xml 2016-10-27 08:16:19 +09:00
warstar2187
e4e2ea3aac Update strings.xml 2016-10-27 02:53:23 +09:00
warstar2187
5443bb4fba Update SmsCommunicatorPlugin.java 2016-10-27 02:23:47 +09:00
warstar2187
79a6b65bb9 Update SmsCommunicatorPlugin.java 2016-10-26 19:38:36 +09:00
warstar2187
a49afea27c Update strings.xml 2016-10-26 15:57:21 +09:00
warstar2187
58591514f7 Update strings.xml 2016-10-26 15:34:26 +09:00
warstar2187
02c231a236 Update strings.xml 2016-10-26 12:36:15 +09:00
warstar2187
f39b009ca3 Update strings.xml 2016-10-26 10:10:33 +09:00
warstar2187
70249c7e3e Update strings.xml 2016-10-26 09:49:46 +09:00
Milos Kozak
8f17ecdd89 version bump 1.0.19 2016-10-25 23:40:03 +02:00
Milos Kozak
4c3d67535c Korean language template 2016-10-25 23:38:44 +02:00
Milos Kozak
861c24fc45 distinguish between meal and correction bulus 2016-10-25 23:33:02 +02:00
Milos Kozak
8614469a35 test activity for null 2016-10-23 23:34:14 +02:00
Milos Kozak
1597ee77b5 typo 2016-10-22 18:04:26 +02:00
AdrianLxM
d2906e8fd4 overview_quickwizardentry translated but does not exist 2016-10-21 22:18:17 +02:00
AdrianLxM
e2956db141 don't complain on missing translations 2016-10-21 22:16:20 +02:00
Milos Kozak
05f8c2d1ba default constructor only in WizardDialog 2016-10-21 22:00:14 +02:00
Milos Kozak
8d05845c4f default constructor only in BolusProgressDialog 2016-10-21 21:50:21 +02:00
Milos Kozak
f167174151 version bump 1.0.18 2016-10-21 00:04:54 +02:00
Milos Kozak
38cf01eb62 more build types with maxbolus: full fullteenage fullchild 2016-10-21 00:03:52 +02:00
Milos Kozak
6f8d828ec2 QuickWizard 2016-10-20 23:50:31 +02:00
Milos Kozak
6bfaec375f use sResources 2016-10-17 21:23:37 +02:00
Milos Kozak
7a3f7098b0 DanaR hardcoded bolus limit 10 -> 17 2016-10-17 09:31:06 +02:00
Milos Kozak
a829a506f2 check for null on getDialog() 2016-10-17 08:57:21 +02:00
Milos Kozak
2354e60f31 allow high temps in open loop mode 2016-10-17 08:44:01 +02:00
Milos Kozak
744a4143f4 retrieve device status with xdrip too 2016-10-16 21:11:16 +02:00
Milos Kozak
af31ca804f correct width on more dialogs on Andriod 6 2016-10-15 11:31:15 +02:00
Milos Kozak
8ff675e8a4 Constant instead of string in profile 2016-10-11 23:55:53 +02:00
Milos Kozak
5ec339e987 fix BolusProgessDialog size on Android 6 2016-10-11 23:49:26 +02:00
Milos Kozak
9cd8602f83 normalize mg/dl mg/dL 2016-10-11 23:30:13 +02:00
Milos Kozak
9f1bbd35bd wizard calculation to extra file 2016-10-11 22:47:48 +02:00
Milos Kozak
b7dfabbe11 version bump 1.0.17 2016-10-10 12:11:34 +02:00
Milos Kozak
777b6cdb0d catch errors on load profile 2016-10-10 12:11:12 +02:00
Milos Kozak
cf65b3f865 version bump 1.0.16 2016-10-09 11:18:24 +02:00
Milos Kozak
2e02521eae Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2016-10-09 11:17:56 +02:00
Milos Kozak
174d6019ff fix carbs limit in wizard 2016-10-09 11:17:41 +02:00
Milos Kozak
cbb316b599 check for null in NS treatment dialog 2016-10-07 22:35:17 +02:00
Milos Kozak
960cde06cf version bump 1.0.15 2016-10-06 20:57:57 +02:00
Milos Kozak
34c6329b6f fix context in newextendedbolusdialog 2016-10-06 20:57:12 +02:00
Milos Kozak
331d94c78e version bump 1.0.14 2016-10-02 16:13:37 +02:00
Milos Kozak
4f07fea8b2 SafeParse in SimpleProfile 2016-10-02 16:12:44 +02:00
Milos Kozak
b5ecbc11e8 check if pump info is loaded before invoking loop 2016-10-01 19:47:18 +02:00
Milos Kozak
163ccf2d0a hard limits on base basal rate 2016-09-19 15:09:35 +02:00
Milos Kozak
a3721f8932 do set bg on init in careportal dialog 2016-09-18 03:09:53 +02:00
Milos Kozak
4378c9af14 more SMS commands 2016-09-16 14:08:26 +02:00
Milos Kozak
84efccb392 version 1.0.13 bump 2016-09-14 22:03:37 +02:00
Milos Kozak
514fb569e9 show base basal rate and profile in ns pump plugin 2016-09-14 22:02:49 +02:00
Milos Kozak
57db26443e Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2016-09-13 22:40:55 +02:00
Milos Kozak
5ac2cd5cca try to fix random crash 2016-09-13 22:34:40 +02:00
Milos Kozak
ecb685f7f6 hard limits on openaps params 2016-09-13 22:15:17 +02:00
ecorman
83c4214710 Reduce width, + sign was not visible 2016-09-12 00:34:31 +02:00
ecorman
52525b69f4 Updated Translation 2016-09-12 00:33:14 +02:00
ecorman
0221a14f7c Updated translation 2016-09-12 00:07:50 +02:00
Milos Kozak
e23be121a5 workaround for missing unit in nsprofile 2016-09-11 15:17:33 +02:00
Milos Kozak
841141cd20 recheck pump status if older than 30 min before aplly basal 2016-09-11 13:32:21 +02:00
Milos Kozak
81e82143fc fix treatment dialog in careportal 2016-09-10 21:20:01 +02:00
Milos Kozak
f1564519d3 show icon in toolbar 2016-09-10 16:08:29 +02:00
Milos Kozak
23e8220b12 initialize current profile in careportal 2016-09-10 15:51:07 +02:00
Milos Kozak
87055bef0b show danar prefs only if pump is enabled 2016-09-10 15:37:37 +02:00
Milos Kozak
05831c75a6 SMS LOOP commands 2016-09-10 15:33:00 +02:00
Milos Kozak
61134a550f Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2016-09-10 12:20:58 +02:00
Milos Kozak
b15fe7541e objectives fix 2016-09-10 12:20:32 +02:00
Radoslav Radev
9c82350c1e Update strings.xml 2016-09-10 10:37:33 +03:00
Milos Kozak
bdeb7d6061 Merge pull request #30 from slavidex/patch-11
too long
2016-09-09 13:08:37 +02:00
Milos Kozak
26c09093d1 version bump 1.0.12 2016-09-09 13:07:32 +02:00
Milos Kozak
a3ea0b5316 Merge branch 'master' of https://github.com/ecorman/AndroidAPS into ecorman-master 2016-09-09 11:08:04 +02:00
Milos Kozak
f48faccdd8 Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2016-09-09 11:05:07 +02:00
Milos Kozak
77916ec4ae fix double carbs when carbtime != 0 2016-09-09 11:04:50 +02:00
Radoslav Radev
829beb5c8f too long 2016-09-09 07:54:16 +03:00
ecorman
5878cbbb75 Change plugins order to have fast access to careportal 2016-09-08 23:37:44 +02:00
ecorman
b7402aa9ea Correction Input negative improvement 2016-09-08 23:29:14 +02:00
ecorman
e5c1c1df4d Improve Spanish Translation 2016-09-08 23:19:07 +02:00
ecorman
fcdd07a182 Reduce size to better fit screen 2016-09-08 23:18:15 +02:00
Milos Kozak
e8467ec75f check for null 2016-09-08 16:53:48 +02:00
Milos Kozak
2c10ade944 try catch on load settings 2016-09-08 13:15:07 +02:00
Milos Kozak
ae9b03f1ae fix newtempbasaldialogcontext 2016-09-08 12:53:06 +02:00
Milos Kozak
933e081fc5 Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2016-09-08 10:08:24 +02:00
Milos Kozak
7fd59246af use locale string in extended status of DanaR pump 2016-09-08 10:07:55 +02:00
ecorman
96a0d25183 Merge pull request #1 from MilosKozak/master
Update from original repo
2016-09-08 00:04:02 +02:00
ecorman
b4f9fca50d Modificaciones en gradle 2016-09-07 23:47:33 +02:00
ecorman
dd032b19e0 Spanish translation update strings.xml 2016-09-07 23:40:37 +02:00
ecorman
b3857f7794 Spanish translation 2016-09-07 23:39:06 +02:00
ecorman
581f053e53 Allow negative correction in bolus 2016-09-07 23:38:29 +02:00
Milos Kozak
47bff5ad5e limit requests on openloop mode 2016-09-05 15:27:53 +02:00
Milos Kozak
34d2178878 fix newextendedbolusdialog context 2016-09-05 09:14:39 +02:00
Milos Kozak
b5d2d8d931 danarcontrol build variant 2016-09-05 09:11:30 +02:00
Milos Kozak
b56d3223ab fix passing date in careportal 2016-09-02 14:12:05 +02:00
Milos Kozak
3d238e3adb reset flag when pump is changed 2016-09-02 13:35:10 +02:00
Milos Kozak
ff32764375 remove accents in SMS 2016-09-02 09:43:38 +02:00
Milos Kozak
9f9d348c11 check for null context in wizarddialog 2016-08-27 12:32:18 +02:00
Milos Kozak
65ea11d9a8 v 1.0.11 2016-08-21 22:20:17 +02:00
Milos Kozak
7b82b60324 vars optimalization 2016-08-21 22:14:33 +02:00
Milos Kozak
e46aab8948 updateguiifvisible on resume 2016-08-21 22:06:36 +02:00
Milos Kozak
08d940b2fb temp fix of bolus progress crash 2016-08-18 09:10:32 +02:00
Milos Kozak
38ee1402a4 simple profile fix 2016-08-16 08:32:31 +02:00
Milos Kozak
ced974e96d Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2016-08-15 10:05:00 +02:00
Milos Kozak
d78d0be270 danar history context fix 2016-08-15 10:04:52 +02:00
Milos Kozak
451a455d3d longer wait in comm after bolus 2016-08-14 20:35:00 +02:00
Milos Kozak
8864886702 more dialogs tweaking 2016-08-14 20:33:29 +02:00
Milos Kozak
bb041b1c06 more progress dialog tweaking 2016-08-14 20:19:47 +02:00
Milos Kozak
e95650d54d Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2016-08-14 10:14:16 +02:00
Milos Kozak
be8c1c2a83 change to screen lock, better context handling 2016-08-14 10:13:26 +02:00
Milos Kozak
6a6ed7b87a Merge pull request #24 from jotomo/case-sensitive-filesystem
Align class name with file name to fix error on case-sensitive filesy…
2016-08-14 09:44:21 +02:00
Milos Kozak
9c3b8dc2b9 typo 2016-08-13 23:00:10 +02:00
Milos Kozak
b77bbd5bc6 static options in careportal dialog 2016-08-13 22:16:36 +02:00
Milos Kozak
d11f0b1ea1 wakelock on bolusing 2016-08-13 22:16:04 +02:00
Johannes Mockenhaupt
4793561f7c
Align class name with file name to fix error on case-sensitive filesystems/OSs. 2016-08-13 21:01:47 +02:00
Milos Kozak
129c88478f empty constructor in progressdialog 2016-08-13 15:07:57 +02:00
Milos Kozak
d85bb7db4d fix double treatment upload from wizard 2016-08-13 12:47:15 +02:00
Milos Kozak
6c9c0d8223 hide danar profile option when pump disabled 2016-08-13 12:36:33 +02:00
Milos Kozak
609f99dc1c fix danar show in prefs 2016-08-13 12:33:20 +02:00
Milos Kozak
a55a4ba6eb upload only fresh pump status 2016-08-13 12:30:10 +02:00
Milos Kozak
3fb84636db fix objectives import/export 2016-08-13 11:30:43 +02:00
Milos Kozak
40aada0eb4 ajdust some danar pump comm params 2016-08-12 20:22:44 +02:00
Milos Kozak
b1d5b12f55 fix npe 2016-08-11 22:52:26 +02:00
Milos Kozak
ebee1cdeca scrollview in careportal dialog 2016-08-11 15:36:59 +02:00
Milos Kozak
6228f01bdf initialize treatment inzulin and carbs value 2016-08-11 15:26:23 +02:00
Milos Kozak
4da0f345cf fix wizard gui 2016-08-11 09:54:03 +02:00
Radoslav Radev
9bbc1e97a5 BG translation 2016-08-11 07:45:35 +03:00
Milos Kozak
565e2a831b more static members 2016-08-11 00:15:50 +02:00
Milos Kozak
0e6185064a fix casting after refactor 2016-08-10 23:48:44 +02:00
Milos Kozak
39894cdc40 dataservice optimalization 2016-08-10 23:43:08 +02:00
Milos Kozak
a3e656dc6f make completed objectives static 2016-08-10 23:32:11 +02:00
Milos Kozak
d023e4ae32 move targets from fragment to plugin 2016-08-10 23:27:26 +02:00
Milos Kozak
d2b01dcc32 fix BG lang 2016-08-10 18:25:49 +02:00
Radoslav Radev
098aa22da6 BG translation
fix
2016-08-10 16:44:13 +03:00
Milos Kozak
acbd028465 bolus progress in virtual pump 2016-08-10 14:50:53 +02:00
Milos Kozak
0ad856bed1 detect socket closed error 2016-08-09 15:46:08 +02:00
Milos Kozak
49d6690450 OpenAPS MA target value 2016-08-09 15:40:12 +02:00
Milos Kozak
a284f2fc38 accept single devicestatus, dynamic basal scale 2016-08-09 15:09:51 +02:00
Milos Kozak
77222a6c0a switch basal colors 2016-08-09 08:39:45 +02:00
Milos Kozak
9591aed93c fix wizard not showing progress 2016-08-08 16:54:46 +02:00
Milos Kozak
1ced97ced6 progressive plusminus element 2016-08-08 16:03:03 +02:00
Milos Kozak
2e72e18c62 send carbs and insulin in one connect 2016-08-08 15:49:13 +02:00
Milos Kozak
267e0220c0 overview scroll, determinebasal fix 2016-08-08 14:47:24 +02:00
Milos Kozak
88698576a2 plusminis edit shows toast when hit limit 2016-08-08 10:08:30 +02:00
Milos Kozak
294f9d6c99 fixing bugs after refactoring 2016-08-07 23:21:08 +02:00
Milos Kozak
12b014afd4 autostart 2016-08-07 15:14:18 +02:00
Milos Kozak
6f1bb28600 fix bus register 2016-08-07 15:10:08 +02:00
Milos Kozak
ff2e9a82bc fix some crashes 2016-08-07 13:07:13 +02:00
Milos Kozak
b711648bee plugins refactoring 2016-08-05 23:54:03 +02:00
Milos Kozak
7cc0fb593d IOB display & upload fix 2016-08-05 00:32:48 +02:00
Milos Kozak
abe04502c7 1.0.10 bump 2016-08-04 23:41:28 +02:00
Milos Kozak
b42644de39 objectives finalization, some todos 2016-08-04 23:38:43 +02:00
Milos Kozak
4df4a22997 profileviewer cleanup 2016-08-04 19:33:09 +02:00
Milos Kozak
7d4260b36f danar connection improvement 2016-08-04 18:01:17 +02:00
Milos Kozak
a7d3dca752 Bolusing dialog 2016-08-04 09:17:26 +02:00
Milos Kozak
3e5eb85b88 synchronize on final object 2016-08-03 18:34:24 +02:00
Milos Kozak
c20026c15a lowsuspend cleanup 2016-08-03 14:40:47 +02:00
Milos Kozak
be71ef15db add hardcoded limits to danar driver 2016-08-02 19:35:28 +02:00
Milos Kozak
2f47f2a048 loop fragment cleanup 2016-08-02 19:03:02 +02:00
Milos Kozak
6b75dd3dc9 error.mp3 2016-08-02 18:39:56 +02:00
Milos Kozak
dbb0a6a659 danar fragment update, danar pump password, toast with sound 2016-08-02 18:39:14 +02:00
Milos Kozak
62bb4d640f config builder code cleanup 2016-08-02 15:55:23 +02:00
Milos Kozak
6bee16919e optimize keepalive pump connection 2016-08-02 15:43:21 +02:00
Milos Kozak
da26ea5995 optimize overview fragment 2016-08-02 15:28:34 +02:00
Milos Kozak
e94fe1f647 danar history translation support 2016-07-28 13:40:32 +02:00
Milos Kozak
a9218c20d5 Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2016-07-27 17:50:04 +02:00
Milos Kozak
61e8ffeebd DanaR history loader 2016-07-27 17:49:56 +02:00
Ulrich Kopp
4e2d97d42d DE translation 2016-07-24 17:36:54 +02:00
Milos Kozak
978770d70a icon 2016-07-21 15:11:17 +02:00
Milos Kozak
73ef2d7684 danar history db support 2016-07-21 15:10:42 +02:00
Milos Kozak
1c0edb151e DanaR NS history sync class 2016-07-21 00:18:45 +02:00
Milos Kozak
7d568f2c24 cz translation 2016-07-20 23:19:49 +02:00
Milos Kozak
fd91348eba fix bg translation 2016-07-20 23:14:19 +02:00
Milos Kozak
1a90746bed added danar history messages 2016-07-20 23:12:25 +02:00
Milos Kozak
cd5f9f44a4 Merge pull request #20 from slavidex/patch-4
translation bg
2016-07-20 23:10:32 +02:00
Milos Kozak
789521c9db allow rounding on setting extended bolus 2016-07-20 21:43:29 +02:00
Radoslav Radev
9007d25e7e translation bg 2016-07-20 22:37:22 +03:00
Milos Kozak
5e6b77ec02 broadcast danar timeout too 2016-07-20 12:09:03 +02:00
Milos Kozak
788289c757 remove alert mp3 2016-07-19 11:40:22 +02:00
Milos Kozak
e00c01ebee remove alert service 2016-07-19 11:31:58 +02:00
viktoria
5afe78cf2a German Translation #6 2016-07-18 23:49:25 +02:00
viktoria
11d26b9815 typo 2016-07-18 23:32:12 +02:00
Milos Kozak
b361d99f03 refresh treatments over SMS 2016-07-18 22:17:40 +02:00
Milos Kozak
6147a71dd7 adjust timing on bolus and carbs 2016-07-18 21:55:01 +02:00
Milos Kozak
1aa1af3d0c adjust timing on setting profile 2016-07-18 21:48:43 +02:00
Milos Kozak
4aad8c1310 use class name of fragment for saving preferences 2016-07-18 21:44:14 +02:00
Milos Kozak
87dd8712b4 bind service to application context, adjust messages timing 2016-07-18 21:20:53 +02:00
Milos Kozak
3e3ad1d515 move plugins to MainApp, improve dataservice 2016-07-18 20:19:55 +02:00
Milos Kozak
fe72300790 typo 2016-07-18 14:17:24 +02:00
Milos Kozak
fdbfa16e40 remove TODOs and comments 2016-07-18 13:18:45 +02:00
Milos Kozak
a1a64873fd DanaR driver as a service 2016-07-18 12:02:33 +02:00
Milos Kozak
d82a696bfb show treatments in overview graph 2016-07-17 15:04:33 +02:00
Milos Kozak
c5736b6bf3 remove todos 2016-07-16 23:05:31 +02:00
Milos Kozak
82a16efcc2 bolus wizard full functionality 2016-07-16 22:37:10 +02:00
Milos Kozak
489037df1a fix dialog crash 2016-07-15 23:58:09 +02:00
Milos Kozak
9bd807ea0d productFlavors 2016-07-15 23:53:14 +02:00
Milos Kozak
ce7cddc1da fix null object reference 2016-07-15 23:27:42 +02:00
Milos Kozak
b69dc35716 upload pump status without loop too 2016-07-15 23:18:31 +02:00
Milos Kozak
cd86476d6a design of virtual pump 2016-07-15 21:06:39 +02:00
Milos Kozak
7f661b7fa6 danar profile dia&car configurable in preferences 2016-07-15 20:56:07 +02:00
Milos Kozak
f01b03979d todos clean 2016-07-15 20:36:45 +02:00
Milos Kozak
1f696691d0 configbuilder logging 2016-07-15 19:59:24 +02:00
Milos Kozak
c5d40b3a6c careportal eventtypes translations 2016-07-15 19:45:03 +02:00