Commit graph

7071 commits

Author SHA1 Message Date
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
Johannes Mockenhaupt 454cb49ec5
Cleanup. 2017-10-24 09:23:45 +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
Johannes Mockenhaupt 01def4c9b3
Optimize programming TBR and bolus. 2017-10-23 02:21:35 +02:00
Simon Pauwels ac66e37bec Merge pull request #7 from MilosKozak/dev
Dev
2017-10-22 22:13:16 +02:00
Milos Kozak d180d088f0 fix merge conflict 2017-10-22 21:11:31 +02:00
Johannes Mockenhaupt 2d8b3a7cb8
wip 2017-10-22 10:40:24 +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
Johannes Mockenhaupt 300a4609f8
Clean up prefs. 2017-10-21 20:24:17 +02:00
Milos Kozak 3cdca93b30 RS connectivity & bolus improvement 2017-10-21 20:09:21 +02:00
Johannes Mockenhaupt 73d5db43ed
Nitpicky symmetry. 2017-10-21 19:17:04 +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
Johannes Mockenhaupt fc60edc15a
wip 2017-10-21 17:44:16 +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
Johannes Mockenhaupt cb438934b6
WIP: Pairing 2017-10-21 13:50:19 +02:00
Johannes Mockenhaupt 015a852ab5
Custom: Disable Crashlytics.
(cherry picked from commit 7890f6b)

(cherry picked from commit 1374739)
2017-10-21 13:37:42 +02:00
Johannes Mockenhaupt dddcfb02f0
ruffy: unbound existing pump on pairing reset. 2017-10-21 13:14:41 +02:00
Milos Kozak dbf5a5e577 Sensitivity logging optional 2017-10-21 13:14:06 +02:00
Johannes Mockenhaupt 6cb1d5c0bd
ComboFragment, set "Initializing" as initial status. 2017-10-21 11:22:40 +02:00
Johannes Mockenhaupt 6ec1011bd7
ruffy: add empty battery symbol and parsing. 2017-10-21 11:22:40 +02:00
Milos Kozak 881a745e32 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-10-20 21:36:56 +02:00
Johannes Mockenhaupt e2d684ac33
PersistentNotification unregister workaround. 2017-10-20 20:15:37 +02:00
Johannes Mockenhaupt 950d1b62db
Undo "explicit pump initalization." 2017-10-20 20:09:58 +02:00
Johannes Mockenhaupt 87c1c4b112
More sync prototyping. 2017-10-20 18:51:15 +02:00
Milos Kozak 01d6f1594a RS synchronized change 2017-10-20 17:37:06 +02:00
Johannes Mockenhaupt 1aa2ce48a1
First steps to syncing full pump state with AAPS. 2017-10-20 15:24:11 +02:00
Johannes Mockenhaupt 491caadd71
Check for active alerts on the pump, confirm and re-raise in AAPS. 2017-10-20 15:23:16 +02:00
Johannes Mockenhaupt 57be9bb9b1
Explicit pump initialization.
(cherry picked from commit d8b244a)
2017-10-20 15:10:24 +02:00
Milos Kozak e545f75d69 fix displaying XX:30 time intervals 2017-10-20 11:34:33 +02:00
Johannes Mockenhaupt 8b8a135804
Add (back) last bolus to ComboFragment. 2017-10-20 01:12:47 +02:00
Johannes Mockenhaupt 4517736122
Add back TBR to ComboFragment. 2017-10-20 00:28:49 +02:00
Johannes Mockenhaupt c04d746cfc
Remove duplicated code. 2017-10-19 23:30:44 +02:00