Milos Kozak
c728174858
Merge branch 'dev' into newautosens
2017-06-19 23:13:29 +02:00
Milos Kozak
745f9270ee
one more null check
2017-06-19 23:08:56 +02:00
Milos Kozak
b185733859
more checks for null
2017-06-19 22:55:56 +02:00
Milos Kozak
df3dff1940
revert magic constant
2017-06-19 22:32:54 +02:00
Milos Kozak
4b1263e2e0
small simplify
2017-06-19 16:28:36 +02:00
Milos Kozak
150ef1a8bc
Merge branch 'dev' into newautosens
2017-06-19 15:03:35 +02:00
Milos Kozak
6eed701310
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-06-19 14:52:54 +02:00
Milos Kozak
7e1c435374
fix loading danar history
2017-06-19 14:52:46 +02:00
PoweRGbg
dcc7112fd8
Update Profile.java
2017-06-19 14:39:49 +03:00
PoweRGbg
6293e89be2
fixed getICList() returning bg units/U to g/hr
2017-06-19 13:10:32 +03:00
Milos Kozak
e90812634b
work from old autosens branch
2017-06-16 14:37:43 +02:00
Milos Kozak
b67d8be1ef
dia as primitive
2017-06-16 09:14:57 +02:00
Milos Kozak
c78399ded0
cache created objects in profilestore
2017-06-16 09:06:35 +02:00
Milos Kozak
49ef46936b
optimize refreshing gui
2017-06-16 08:37:07 +02:00
Milos Kozak
43231cc362
use System.currentTimeMillis()
2017-06-15 23:12:12 +02:00
Milos Kozak
26daffa692
use primitives in inner loops
2017-06-15 22:55:07 +02:00
Milos Kozak
a2aa8d8bc6
bucketed data for non 5min interval
2017-06-15 00:34:42 +02:00
Milos Kozak
2642a12829
schedule correct scheduleExtendedBolusChange
2017-06-14 22:18:01 +02:00
Milos Kozak
9ce78881fb
log initiator in loop
2017-06-14 22:12:36 +02:00
Milos Kozak
b14cf480cf
add duration to profile switch dialogs
2017-06-14 20:41:55 +02:00
Milos Kozak
0b322e53fc
nsclient plugin tweaking
2017-06-13 21:25:50 +02:00
Milos Kozak
745a3cf874
reuse profile object
2017-06-13 19:37:31 +02:00
Milos Kozak
2c2b6c21a1
cancel temp basal in the same connection
2017-06-13 18:47:54 +02:00
Milos Kozak
3a95325039
fix sms reply text
2017-06-13 16:51:59 +02:00
Milos Kozak
d3de51cc88
optimize dia
2017-06-13 15:06:41 +02:00
Milos Kozak
2a1fe205ee
optimize nsclient logging
2017-06-13 12:17:54 +02:00
Milos Kozak
afca896f23
optimize getUnits() & detecting faked extended
2017-06-13 12:08:30 +02:00
Milos Kozak
1de64f06c2
simplify danar activities, fix profiles
2017-06-12 23:31:50 +02:00
Milos Kozak
6fca923275
fix profileswitch reloads
2017-06-12 13:11:16 +02:00
Milos Kozak
0f40670c24
create singleton from NSstatus
2017-06-12 11:15:03 +02:00
Milos Kozak
b41a942d11
update supported NS & NSclient versions
2017-06-12 09:30:04 +02:00
Milos Kozak
148f4d43f9
detect faking by extended boluses in nsclient mode
2017-06-12 09:15:51 +02:00
Milos Kozak
77659e20e7
ns alarms & getBasal fix
2017-06-11 17:22:54 +02:00
Milos Kozak
bf953f1240
fix maxdailybasal calculation
2017-06-11 14:29:02 +02:00
Milos Kozak
39224f421a
fix extended bolus step
2017-06-11 13:37:38 +02:00
Milos Kozak
b603fce8c7
do not add empty iob series
2017-06-11 12:44:42 +02:00
Milos Kozak
f6650e33e4
remove test buttons
2017-06-10 22:04:59 +02:00
Milos Kozak
723c90c32d
optimize rendering
2017-06-10 21:51:58 +02:00
Milos Kozak
e6f173f305
fix merge conflict
2017-06-10 13:43:02 +02:00
Milos Kozak
6ce35bc36a
Merge branch 'history' of https://github.com/MilosKozak/AndroidAPS into history
2017-06-10 13:41:36 +02:00
Milos Kozak
f65d75e553
specify source at detailedbolusinfo
2017-06-10 13:39:51 +02:00
Milos Kozak
dfaf3a07c2
typo
2017-06-08 23:22:43 +02:00
Milos Kozak
4231557c9f
fix axis
2017-06-08 23:18:38 +02:00
Milos Kozak
96d760ba62
fix adding basals to database in danar driver
2017-06-08 22:26:32 +02:00
Milos Kozak
74268675af
optimize overview graph drawing
2017-06-08 22:14:55 +02:00
Milos Kozak
a39f61284a
profileswitch sync & v2 bolus fix
2017-06-08 20:52:33 +02:00
Milos Kozak
e09fba93cb
update graph properly
2017-06-08 20:08:02 +02:00
Milos Kozak
e8be720138
temptarget sync
2017-06-08 19:34:46 +02:00
Milos Kozak
1153c33200
tempbasal & extendedbolus 3way sync
2017-06-08 18:15:17 +02:00
Milos Kozak
4d30ba9cdb
treatments PumpHistory and NS mark
2017-06-07 19:43:19 +02:00
Johannes Mockenhaupt
d00e7f8b00
Clear notification when accepting temp basal.
...
This clears the notification about a new suggested basal when the
temp basal is accepted from within AndroidAPS.
2017-06-07 18:10:08 +02:00
Milos Kozak
e5a326c377
nsclient always use virtual pump, more sync fixes
2017-06-07 18:10:07 +02:00
Milos Kozak
fec56e7c23
fix bug in sync
2017-06-07 08:09:15 +02:00
Milos Kozak
8fab76ee9b
treatments synchronization improvement
2017-06-07 00:11:33 +02:00
Milos Kozak
5931abc860
BgReading optimization
2017-06-06 17:14:17 +02:00
Milos Kozak
a180e182eb
optimize rendering graph
2017-06-06 15:49:41 +02:00
Milos Kozak
8b8a8fcb45
remote time update extra task
2017-06-06 15:06:00 +02:00
Milos Kozak
b8b00dbc81
revert asynctask
2017-06-06 14:49:17 +02:00
Milos Kozak
f93090b012
allow only 1 updategui running
2017-06-06 10:56:26 +02:00
Milos Kozak
17f59df597
gui tweaking, pump battery event
2017-06-06 08:21:11 +02:00
Milos Kozak
7c7638a7a1
extract color resources
2017-06-05 15:34:22 +02:00
Milos Kozak
e0a6db22a2
run rendering calculations on background
2017-06-05 15:16:07 +02:00
Milos Kozak
88b9caa357
absolute basal line
2017-06-05 01:12:36 +02:00
Milos Kozak
dd7e777a24
simplify graph series
2017-06-05 00:50:31 +02:00
Milos Kozak
ac038a9252
bigger bg dots on tablet
2017-06-04 22:27:36 +02:00
Milos Kozak
013025b750
fix crashing at start
2017-06-04 01:15:11 +02:00
Milos Kozak
1702ce7702
adjusting nsclient mode
2017-06-04 00:46:44 +02:00
Milos Kozak
b40cf99201
gui tweaking
2017-06-03 22:43:35 +02:00
Milos Kozak
1a4e60d3a8
process duration correctly
2017-06-02 23:59:34 +02:00
Milos Kozak
d365fcd6a4
fix bugs & design tweaking
2017-06-02 23:25:11 +02:00
Milos Kozak
6ca4811e8e
profiles visualisation
2017-06-02 12:27:21 +02:00
Milos Kozak
f267c85377
it compiles now with profiles
2017-06-02 10:25:49 +02:00
Milos Kozak
a19a5a442b
some v2 driver tweaking
2017-06-01 20:52:38 +02:00
Milos Kozak
622097aabc
fix wrong merge
2017-06-01 19:33:56 +02:00
Milos Kozak
0a2cdff5e5
fix conflict
2017-05-31 09:29:39 +02:00
Milos Kozak
fb4ea156d6
disable loop as a fist action on superbolus
2017-05-31 09:26:08 +02:00
Milos Kozak
496872a58e
resend after 10sec allowed
2017-05-31 09:14:31 +02:00
Milos Kozak
15f44e6085
basic sync for v2
2017-05-30 22:44:26 +02:00
Milos Kozak
b3d18b2537
disable bolus when pump is suspended
2017-05-30 18:23:07 +02:00
Milos Kozak
f5f7d28cc1
temp basal dialog design
2017-05-30 18:10:05 +02:00
Milos Kozak
3861bece54
extended bolus dialog
2017-05-30 15:07:44 +02:00
Milos Kozak
5f6a77983b
Merge branch 'dev' into history
2017-05-29 22:42:17 +02:00
Milos Kozak
9e3edbb530
typo in checkbox handling
2017-05-29 22:36:04 +02:00
Milos Kozak
358de54322
redesign uploading treatments to NS
2017-05-29 21:45:59 +02:00
Milos Kozak
ec76908eca
redesign uploading tb&eb to NS
2017-05-29 19:43:19 +02:00
Milos Kozak
dec627946d
0xE004 DanaRv2 message
2017-05-29 16:45:09 +02:00
Milos Kozak
9032deaaf3
better cache invalidate handling
2017-05-29 15:26:25 +02:00
Milos Kozak
c90de88ec1
better logging & double treatment plugin fix
2017-05-29 13:07:58 +02:00
Milos Kozak
442ff12aa1
initialize treatment data first by another message
2017-05-29 11:39:12 +02:00
Milos Kozak
fa695b9399
Merge branch 'dev' into history
2017-05-29 10:04:09 +02:00
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
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
