Commit graph

4602 commits

Author SHA1 Message Date
Johannes Mockenhaupt
d40a4bf57e
Merge pull request #55 from AdrianLxM/comborc01
links unten in über
2018-02-10 15:19:17 +01:00
Milos Kozak
359b8401b2
Merge pull request #678 from jamorham/dev
Updates to Insight plugin
2018-02-10 15:13:35 +01:00
AdrianLxM
c5057f3d5a remove unused import 2018-02-10 14:55:29 +01:00
AdrianLxM
4587a47840 add links to about 2018-02-10 14:53:43 +01:00
Johannes Mockenhaupt
573c818eb7
Combo: Answer detected TBR mismatches. 2018-02-10 14:33:44 +01:00
Jamorham
046de51496
Insight few small changes 2018-02-10 09:29:23 +00:00
Simon Pauwels
9e956cdf5e
Merge pull request #29 from jotomo/combo-scripter-v2
Feb 9
2018-02-09 06:43:23 +01:00
Johannes Mockenhaupt
5b63008774
Set version 1.58-combo. 2018-02-08 22:47:41 +01:00
Johannes Mockenhaupt
811b07449e
Moved docs to wiki. 2018-02-08 22:47:32 +01:00
Markus M. May
a1bb67d425 Refactoring ConfigBuilder - cleanup fragment visibility 2018-02-08 22:23:48 +01:00
Johannes Mockenhaupt
0cbf65d2d4
Set version. 2018-02-08 22:19:26 +01:00
Johannes Mockenhaupt
89c832b5aa
Use pager sound instead of smoke detector alarm for bolus error.
(cherry picked from commit 6767d8b)
2018-02-08 22:18:41 +01:00
Johannes Mockenhaupt
1985ed379d
Add mute button to error dialog.
So that users needn't hastily close the dialog to stop the sound
and then not being able to read the actual message.

(cherry picked from commit 43755f0)
2018-02-08 22:18:38 +01:00
Johannes Mockenhaupt
7fa51a9248
Revert: Combo: retry twice to establish connection before giving up.
Only increases number of failed connection attempts.
2018-02-08 22:15:36 +01:00
Milos Kozak
538f70a725
Merge pull request #669 from MilosKozak/AdrianLxM-bolusDelivered
Don't treat an extended bolus as bolus if it emulates basal
2018-02-08 21:08:10 +01:00
Milos Kozak
5c7c430ee4
Merge pull request #673 from jotomo/bolus-error-dialog-sound
Bolus error dialog / sound
2018-02-08 21:07:21 +01:00
Milos Kozak
6f487aded5
Merge pull request #674 from jotomo/ext-bolus-query-race-condition
Avoid race condition using active extended bolus.
2018-02-08 21:06:26 +01:00
Johannes Mockenhaupt
f888e0d7ab
Avoid race condition using active extended bolus.
(cherry picked from commit 5b7c0cc)
2018-02-08 20:44:42 +01:00
Simon Pauwels
c57bb61d20
Merge pull request #28 from jotomo/combo-scripter-v2
feb 7 V2
2018-02-07 23:17:58 +01:00
Simon Pauwels
9c95a75ede Added dutch translations (#52) 2018-02-07 23:17:50 +01:00
boysim
a95cd95cb0 Added Dutch combo translations 2018-02-07 23:11:40 +01:00
Johannes Mockenhaupt
483ecadede
Fix dutch translation for Combo's last bolus, minor cleanup.
(cherry picked from commit c0cf06a)
2018-02-07 22:53:59 +01:00
Johannes Mockenhaupt
46ea4be4eb
ComboFragment: display last bolus regardless of age.
(cherry picked from commit 197874e)
2018-02-07 22:51:15 +01:00
Johannes Mockenhaupt
6b36dd27d8
Don't create a cancel record for requests to cancel a TBR when none is running.
(cherry picked from commit a46b475)
2018-02-07 22:08:16 +01:00
Simon Pauwels
7c27146237
Merge pull request #27 from jotomo/combo-scripter-v2
feb 7
2018-02-07 20:50:17 +01:00
Johannes Mockenhaupt
6767d8b767
Use pager sound instead of smoke detector alarm for bolus error. 2018-02-07 20:32:09 +01:00
Johannes Mockenhaupt
43755f071d
Add mute button to error dialog.
So that users needn't hastily close the dialog to stop the sound
and then not being able to read the actual message.
2018-02-07 20:32:09 +01:00
Tebbe Ubben
1d8ffeb36d Merge remote-tracking branch 'remotes/origin/dev' into dev 2018-02-07 19:28:33 +01:00
Johannes Mockenhaupt
6fb5f5bad4
Check result.success when hard cancelling TBR.
(cherry picked from commit 654f984)
2018-02-07 15:30:02 +01:00
Jamorham
bda1866c6d
Do our own history merging for TBRs 2018-02-07 13:36:06 +00:00
AdrianLxM
599b04c4ff
Don't treat an extended bolus as bolus if it emulates basal 2018-02-06 19:31:04 +01:00
Johannes Mockenhaupt
b435bb3cd5
Update version. 2018-02-06 00:51:40 +01:00
Tebbe Ubben
515b0d251a Merge remote-tracking branch 'remotes/origin/dev' into dev 2018-02-06 00:13:28 +01:00
Simon Pauwels
5093b7b815
Merge pull request #26 from jotomo/combo-scripter-v2
feb 6
2018-02-06 00:06:51 +01:00
Johannes Mockenhaupt
c781601cbb
Commit missing string. 2018-02-06 00:04:24 +01:00
Johannes Mockenhaupt
743685f8e5
Merge pull request #51 from jotomo/history-timestamps
History timestamps
2018-02-06 00:01:03 +01:00
Johannes Mockenhaupt
e9f0fa3c04
Warn when finding multiple boluses in the same minute with same amount.
Not much can be done if the user manages to bolus multiple boluses
within the same minute, with the same amount. This should almost
never happen, but if it does, at least warn the user one of those
boluses isn't accounted for wrt to IOB.
2018-02-05 23:58:19 +01:00
Johannes Mockenhaupt
a861afa208
Log bolus amount when saving to DB failed. 2018-02-05 23:19:43 +01:00
AdrianLxM
0c0f68d510
Merge pull request #666 from MilosKozak/AdrianLxM-VPdefault
Don't enable Insight by default
2018-02-05 23:16:48 +01:00
Johannes Mockenhaupt
5b21844423
Did it again. 2018-02-05 23:14:25 +01:00
Johannes Mockenhaupt
e812c7119f
Fix setting 'pumpHistoryChanged'. 2018-02-05 23:14:25 +01:00
Johannes Mockenhaupt
f07017a4f6
Document global state variables. 2018-02-05 23:14:25 +01:00
Jamorham
693c3ef8ad
Store in history exactly what we enact 2018-02-05 22:11:26 +00:00
AdrianLxM
8e69573710
Merge pull request #668 from savek-cc/careportal-bg-update
fix display unit when updating careportal entry for historic bg value
2018-02-05 22:47:46 +01:00
Timm Korte
9713836e69 fix display unit when updating careportal entry for historic bg value 2018-02-05 22:35:08 +01:00
Tebbe Ubben
ac3b15135e Merge remote-tracking branch 'remotes/origin/dev' into dev 2018-02-05 18:58:17 +01:00
Jamorham
6a9b293e49
Improved TBR cancelling 2018-02-05 14:39:55 +00:00
AdrianLxM
36608559af
Don't enable Insight by default 2018-02-05 14:11:54 +01:00
Jamorham
44ba10e00c
Insight treat 100% TBR from absolute as cancel 2018-02-05 11:33:00 +00:00
Milos Kozak
9fd8ad8705
Merge pull request #665 from jotomo/graph-target-line-fix
Graph: fix rendering target line for ranges from profiles.
2018-02-04 22:32:33 +01:00