Milos Kozak
|
e71ce02131
|
fix merge conflict
|
2017-10-26 21:23:23 +02:00 |
|
Milos Kozak
|
8a6e811c95
|
Merge branch 'dev' into dev2
|
2017-10-26 21:13:10 +02:00 |
|
Milos Kozak
|
ae47183459
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2017-10-26 21:12:37 +02:00 |
|
Milos Kozak
|
26b216a8ee
|
fix RS response code
|
2017-10-26 20:40:24 +02:00 |
|
Milos Kozak
|
3389a5da97
|
Merge pull request #486 from MilosKozak/servicestart
Servicestart
|
2017-10-26 18:35:25 +02:00 |
|
AdrianLxM
|
707d2df345
|
No explicit service start
|
2017-10-25 20:10:59 +02:00 |
|
Johannes Mockenhaupt
|
4767809931
|
Start KeepAliveService after pump init.
|
2017-10-25 20:10:24 +02:00 |
|
AdrianLxM
|
41dcf8d6f4
|
Merge remote-tracking branch 'milosremote/dev' into servicestart
|
2017-10-25 19:57:00 +02:00 |
|
AdrianLxM
|
f3872cd934
|
Merge pull request #465 from jotomo/j2v8-removal
J2v8 removal
|
2017-10-25 19:56:29 +02:00 |
|
Milos Kozak
|
3e6fcabfab
|
Merge branch 'dev2' into smb
|
2017-10-25 11:38:45 +02:00 |
|
Milos Kozak
|
4f0bbda847
|
Merge branch 'dev' into dev2
|
2017-10-25 11:38:12 +02:00 |
|
Milos Kozak
|
7c99157d89
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2017-10-25 11:37:19 +02:00 |
|
Milos Kozak
|
606973d4ad
|
use max absorption time for AAPS and weighted average sensitivity detection
|
2017-10-25 11:37:05 +02:00 |
|
Johannes Mockenhaupt
|
9d4bba4190
|
Merge branch 'fix-predictions-cast' into 'smb'
Remove cast to DetermineBasalResultAMA for predictions.
See merge request MilosKozak/AndroidAPS!367
|
2017-10-24 21:59:37 +00:00 |
|
Johannes Mockenhaupt
|
551ca92201
|
Remove cast to DetermineBasalResultAMA for predictions.
|
2017-10-24 23:14:45 +02:00 |
|
Milos Kozak
|
9de332e997
|
Merge branch 'dev2' into smb
|
2017-10-24 21:09:17 +02:00 |
|
Milos Kozak
|
f673d3a721
|
Merge branch 'dev' into dev2
|
2017-10-24 21:08:54 +02:00 |
|
Milos Kozak
|
8b020d72cd
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2017-10-24 21:08:13 +02:00 |
|
Milos Kozak
|
2fb707b9ed
|
log.debug -> log.error on RS comm
|
2017-10-24 21:08:03 +02:00 |
|
Milos Kozak
|
2925c16fb9
|
comment minDeviationSlope
|
2017-10-24 17:50:44 +02:00 |
|
Milos Kozak
|
29b075e700
|
display minDeviationSlope
|
2017-10-24 17:15:49 +02:00 |
|
Milos Kozak
|
fe0376206e
|
fix merge conflict
|
2017-10-24 11:46:27 +02:00 |
|
Milos Kozak
|
441c2beffc
|
read status after bolus
|
2017-10-24 09:19:03 +02:00 |
|
AdrianLxM
|
afd5b521ee
|
Merge branch 'smb-iobfix' into 'smb'
Smb iobfix
See merge request MilosKozak/AndroidAPS!366
|
2017-10-24 06:17:52 +00:00 |
|
AdrianLxM
|
337f31382f
|
Merge branch 'smb-rhino' into 'smb'
SMB Rhino
See merge request MilosKozak/AndroidAPS!365
|
2017-10-23 22:34:30 +00:00 |
|
Milos Kozak
|
1ad409754f
|
move preparing graph series to extra class #2
|
2017-10-23 22:41:12 +02:00 |
|
Milos Kozak
|
d180d088f0
|
fix merge conflict
|
2017-10-22 21:11:31 +02:00 |
|
AdrianLxM
|
4e5a374b9c
|
include smb into basal iob
|
2017-10-22 02:20:11 +02:00 |
|
AdrianLxM
|
755c82898c
|
SMB Rhino
|
2017-10-21 22:38:07 +02:00 |
|
Milos Kozak
|
3cdca93b30
|
RS connectivity & bolus improvement
|
2017-10-21 20:09:21 +02:00 |
|
Milos Kozak
|
7dd678c917
|
Better bolusing with different speeds (R & Rv2)
|
2017-10-21 18:55:56 +02:00 |
|
Milos Kozak
|
8e82e341fd
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2017-10-21 18:07:30 +02:00 |
|
Milos Kozak
|
39af399ea4
|
Merge pull request #478 from RadoslavR/patch-48
Update strings.xml
|
2017-10-21 18:06:44 +02:00 |
|
Milos Kozak
|
06da0471d2
|
Merge pull request #479 from McHoffi/dev
Split to smaller pieces
|
2017-10-21 18:06:29 +02:00 |
|
Milos Kozak
|
a8751bf35a
|
Detailed onscreen history logging
|
2017-10-21 18:05:19 +02:00 |
|
McHoffi
|
986eab041d
|
Merge pull request #1 from MilosKozak/dev
Dev
|
2017-10-21 17:43:33 +02:00 |
|
McHoffi
|
9c7c583aed
|
Split to smaller pieces
|
2017-10-21 17:41:01 +02:00 |
|
AdrianLxM
|
7ed7a2e8c4
|
Merge remote-tracking branch 'milosremote/dev' into smb-rhino
|
2017-10-21 17:06:57 +02:00 |
|
Radoslav Radev
|
075b74ec84
|
Update strings.xml
|
2017-10-21 17:11:25 +03:00 |
|
Milos Kozak
|
dbf5a5e577
|
Sensitivity logging optional
|
2017-10-21 13:14:06 +02:00 |
|
Milos Kozak
|
881a745e32
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2017-10-20 21:36:56 +02:00 |
|
Milos Kozak
|
01d6f1594a
|
RS synchronized change
|
2017-10-20 17:37:06 +02:00 |
|
Milos Kozak
|
e545f75d69
|
fix displaying XX:30 time intervals
|
2017-10-20 11:34:33 +02:00 |
|
Milos Kozak
|
b76cb755e0
|
CS translations
|
2017-10-19 20:37:37 +02:00 |
|
Milos Kozak
|
c258b41f11
|
allow to use actual profile in wizard
|
2017-10-19 19:35:35 +02:00 |
|
Milos Kozak
|
65cb095dfd
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2017-10-19 19:23:52 +02:00 |
|
Milos Kozak
|
0b7832ec60
|
getUnits from active profile not interface
|
2017-10-19 19:23:19 +02:00 |
|
Milos Kozak
|
2e32fe51e2
|
Merge pull request #475 from diabetesdt1/patch-3
Update strings.xml
|
2017-10-19 18:11:52 +02:00 |
|
diabetesdt1
|
51caffa591
|
Update strings.xml
|
2017-10-19 16:40:36 +02:00 |
|
Milos Kozak
|
e7fb045f04
|
Merge pull request #474 from boysim/dev
dutch translation update
|
2017-10-19 16:16:27 +02:00 |
|