Commit graph

1323 commits

Author SHA1 Message Date
Roumen Georgiev
6ef4b0c2a9 Only do SMB if invoke is from EventNewBG 2017-09-15 09:33:07 +00:00
Milos Kozak
1bd938c8d5 Merge branch 'smb-source' into 'smb'
Set Source.USER for SMB to deliver.

See merge request !363
2017-09-13 11:21:27 +00:00
Johannes Mockenhaupt
a4ebd15dbf
Set Source.USER for SMB to deliver. 2017-09-13 13:19:20 +02:00
Milos Kozak
e795a8cd99 Revert "Temp fix for not adding SMB boluses to treatments and IOB calculations"
This reverts commit 87c993cde1
2017-09-13 07:05:47 +00:00
Roumen Georgiev
87c993cde1 Temp fix for not adding SMB boluses to treatments and IOB calculations 2017-09-13 06:49:48 +00:00
Roumen Georgiev
1a8edc8372 Update ConfigBuilderPlugin.java - Typo fix on line 598 2017-09-11 13:09:57 +00:00
Milos Kozak
addd6c8232 fix conflict 2017-08-28 19:15:33 +02:00
Milos Kozak
03bf1abdd4 add WakeLock#isHeld() 2017-08-27 11:57:06 +02:00
Milos Kozak
1417410dbb add WakeLock#isHeld() 2017-08-27 11:53:36 +02:00
Milos Kozak
ba967df2e3 disable careportal buttons until profile is set 2017-08-27 11:44:39 +02:00
Milos Kozak
b02b1829ad put back sensitivity plugins 2017-08-26 21:26:40 +02:00
Milos Kozak
3369ce1759 temporary remove untested plugin for release 2017-08-26 20:42:25 +02:00
Milos Kozak
adceef3641 fix merge conflict 2017-08-23 23:42:51 +02:00
Milos Kozak
4e8d92a74b Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-08-23 23:04:10 +02:00
Milos Kozak
ad3d175b02 better handling DetailedBolusInfo in v2 driver 2017-08-23 23:03:28 +02:00
Milos Kozak
d6a27c1af0 1.5h 2017-08-23 13:28:07 +02:00
Milos Kozak
01a93a35b9 Merge branch 'dev' into smb 2017-08-22 20:34:38 +02:00
Milos Kozak
c98cd3c834 Merge pull request #375 from samihusseingit/delay_in_bg_update_onResume
Delay in bg update on resume
2017-08-22 20:33:56 +02:00
Milos Kozak
e74c2b564a fix conflicts 2017-08-22 20:25:10 +02:00
Milos Kozak
0551f7f16d Merge pull request #387 from MilosKozak/invalid-overview
Fill treatments in Overview
2017-08-22 20:20:28 +02:00
Milos Kozak
5b17eee586 Merge pull request #389 from jotomo/cleanups
Cleanups
2017-08-22 20:20:10 +02:00
Johannes Mockenhaupt
bde57fde5f
Don't change schema. 2017-08-22 18:28:36 +02:00
Johannes Mockenhaupt
56423028f6
Fix comparing non-primitives. 2017-08-22 13:47:02 +02:00
Johannes Mockenhaupt
30372897c0
Generify MainApp.getSpecificPlugin. 2017-08-22 13:47:02 +02:00
Johannes Mockenhaupt
59c7dbef27
Fix some warnings / simplify a bit. 2017-08-22 13:47:02 +02:00
Johannes Mockenhaupt
97d0140614
Remove now unused dia, insulinInterfaceId from Treatment. 2017-08-22 13:47:02 +02:00
AdrianLxM
d5ea2a2f08 correct supercall 2017-08-22 13:26:48 +02:00
AdrianLxM
4d33e1df97 Use bolusstep granularity in fill dialog 2017-08-22 13:02:56 +02:00
AdrianLxM
7ea33c7de4 bugfix: fill as invalid treatments if triggered from phone 2017-08-22 12:57:03 +02:00
AdrianLxM
3f8dea1197 add invalid treatments to charts in "invalid" colour 2017-08-22 12:56:17 +02:00
AdrianLxM
6b0bf5860c Use bolusstep as step for insulin correction in wizard 2017-08-22 00:41:23 +02:00
Milos Kozak
aad168c50f visualize SMB 2017-08-21 17:42:26 +02:00
Milos Kozak
204c39880f mark SMB boluses in treatments tab 2017-08-21 17:22:25 +02:00
Milos Kozak
4f16700dc0 provide lastBolusTime 2017-08-21 15:47:37 +02:00
Milos Kozak
ebfc4e3075 colored predictions 2017-08-21 15:36:52 +02:00
Milos Kozak
f5143b2ec4 display UAM prediction 2017-08-21 09:24:17 +02:00
Milos Kozak
ec114c3b38 execute SMB 2017-08-21 08:41:34 +02:00
Milos Kozak
466ba2907b Merge branch 'dev' into smb 2017-08-20 21:53:19 +02:00
Milos Kozak
33cf707d45 Merge pull request #380 from MilosKozak/dia-divisor-fix
Dia divisor / bolussnooze fix
2017-08-20 21:52:42 +02:00
Milos Kozak
a18e2b4641 fix of fix :( 2017-08-20 19:42:41 +02:00
AdrianLxM
9c2808bf6f small refactoring 2017-08-19 20:37:25 +02:00
AdrianLxM
d49eea854c Multiply time passed instead of divide dia. 2017-08-19 20:12:37 +02:00
Johannes Mockenhaupt
ce4aee67d0
Fix initalizing profile with default values. 2017-08-19 12:28:10 +02:00
Susan
4f3b5f551a moved the code of the bg update to the top before all the loop logic happens, so there would be no delay 2017-08-18 20:58:54 +02:00
Milos Kozak
838deed1e8 Merge branch 'dev' into smb 2017-08-18 12:30:09 +02:00
Milos Kozak
6b8dd5868d fix displaying target in mmol 2017-08-18 11:46:04 +02:00
Milos Kozak
a097bf51aa minDeviationSlope 1st try 2017-08-17 23:37:59 +02:00
Johannes Mockenhaupt
5991f307af
Profile.getValuesList: don't add trailing newline. 2017-08-17 22:01:59 +02:00
Johannes Mockenhaupt
a6351f4455
Fix some warnings. 2017-08-17 22:01:59 +02:00
Johannes Mockenhaupt
4f2357e9fb
Use OK/Cancel buttons for profile removal dialog. 2017-08-17 22:01:59 +02:00