Commit graph

2816 commits

Author SHA1 Message Date
Tebbe Ubben
33ea34243a Merge remote-tracking branch 'remotes/milos/dev' into dev 2018-02-03 20:37:47 +01:00
AdrianLxM
b21fac92e9
revert min_5m_carbimpact to int 2018-02-02 22:46:52 +01:00
AdrianLxM
4f05917467
autosens deactivated -> 1 2018-02-02 22:45:18 +01:00
Milos Kozak
0832ae9491
Merge pull request #648 from jotomo/do-not-loop-for-smb-treatment-change
Do not loop for SMB treatment change
2018-02-02 22:26:49 +01:00
Johannes Mockenhaupt
5adaff6bc6
Don't run loop on treatment change if it's an SMB. 2018-02-02 21:27:05 +01:00
Johannes Mockenhaupt
eedd2ee28b
Add bg/treatment to EventNewBG/EventTreatmentChange. 2018-02-02 19:04:28 +01:00
Jamorham
8e2fe7eaec
Insight ConstraintsInterface and Mstatus response type 2018-02-02 15:09:20 +00:00
Milos Kozak
9797f6e5f4 fix NPE 2018-02-02 15:33:19 +01:00
Milos Kozak
bb21f2ae7b fix NPE 2018-02-02 15:31:25 +01:00
Milos Kozak
d9cfe15b87 fix rendering absolute basal line 2018-02-02 14:44:56 +01:00
Milos Kozak
6312b81e10 Merge branch 'smb060' into dev 2018-02-02 10:51:13 +01:00
Milos Kozak
6d968b099a
Merge pull request #642 from Cukrovka/patch-1
Update strings.xml
2018-02-02 09:47:38 +01:00
Cukrovka
af5dc7cc7b
Update strings.xml
Oprava diakritiky.
2018-02-02 09:36:03 +01:00
Milos Kozak
411add616b
Merge pull request #632 from jamorham/dev
Add Insight Pump Plugin
2018-02-02 09:21:57 +01:00
Milos Kozak
87722abb64
Merge pull request #640 from MilosKozak/spanishmerge
Spanishmerge
2018-02-02 09:18:07 +01:00
Milos Kozak
72eed13932 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-02-02 09:17:51 +01:00
Milos Kozak
727ace4cc1 check for NPE 2018-02-02 09:17:26 +01:00
AdrianLxM
aca422dfb6
remove duplicates 2018-02-01 23:55:08 +01:00
Milos Kozak
c953086e3d Merge branch 'smb-events' into 'smb060'
Let IobCob handle EventNewBg and loop act on IobCob result.

See merge request MilosKozak/AndroidAPS!379
2018-02-01 22:13:59 +00:00
Milos Kozak
90b0e6d84a Merge branch 'dev' into smb060 2018-02-01 23:02:00 +01:00
Milos Kozak
36cb4fc474 recover deviation slope calculation 2018-02-01 22:57:58 +01:00
Jamorham
cdb3bc24c2
Use Config.DANAR to enable Insight 2018-02-01 21:37:21 +00:00
AdrianLxM
cea99a968f
small fixes 2018-02-01 22:09:57 +01:00
AdrianLxM
2e44734b61
Merge branch 'dev' into spanishmerge 2018-02-01 22:07:06 +01:00
AdrianLxM
276784c799 Merge branch 'patch-1' of https://github.com/CaroGo/AndroidAPS into dev180127 2018-02-01 22:02:27 +01:00
Milos Kozak
65ad55ef98
Merge pull request #638 from MilosKozak/AdrianLxM-wearnullprofile
check for null profile
2018-02-01 20:23:42 +01:00
Milos Kozak
463031bd31 FR language 2018-02-01 20:17:42 +01:00
AdrianLxM
96668cbf9b
check for null profile 2018-02-01 18:45:48 +01:00
Jamorham
b3c0daaeae
Enable isRefillingCapable 2018-02-01 17:39:28 +00:00
Milos Kozak
416c9f817b fix smb iob calculation 2018-02-01 17:12:19 +01:00
Milos Kozak
d088bfccc8 remove unused microBolusInsulin 2018-02-01 16:35:04 +01:00
Jamorham
6a12b0a931
Use bolus id for history entry 2018-02-01 14:37:16 +00:00
Jamorham
73ea3628b2
Extracted insight strings 2018-02-01 10:33:54 +00:00
Milos Kozak
fa46798fdf remove unused microBolusIOB 2018-02-01 10:57:05 +01:00
Milos Kozak
e779dbf221 fix merge conflict 2018-02-01 10:29:00 +01:00
Milos Kozak
f3769521a5 bump 1.59-dev 2018-02-01 10:25:28 +01:00
Milos Kozak
2157022735 bump 1.58 2018-01-31 23:21:02 +01:00
AdrianLxM
588cae4282
Merge pull request #627 from andrew-warrington/watchfaces
Watchfaces
2018-01-31 23:05:41 +01:00
Milos Kozak
035770f6d3
Merge pull request #631 from jotomo/issue-template
Add issue template.
2018-01-31 20:26:19 +01:00
CaroGo
815247dabb
Update strings.xml
I did a few changes...
2018-01-31 16:51:00 +01:00
Jamorham
7f73c59530
Nightscout + UI performance improvements 2018-01-31 14:23:22 +00:00
Johannes Mockenhaupt
1ea324d871
Add issue template. 2018-01-31 14:45:57 +01:00
Jamorham
d07d9d309e
Implement additional methods 2018-01-31 09:53:31 +00:00
Jamorham
ce0650a495
Check remote protocol version 2018-01-31 00:33:10 +00:00
Jamorham
c3b07d2a0f
Match library refactoring 2018-01-31 00:31:55 +00:00
Milos Kozak
fada51c380
Merge pull request #597 from triplem/test
Add a unit test for Insulin Plugin
2018-01-30 22:47:33 +01:00
Markus M. May
a6f65f5d33 Enhance insulin plugin test 2018-01-30 19:52:57 +01:00
Milos Kozak
56451a67bf
Merge pull request #628 from MilosKozak/AdrianLxM-filter-null-btdevices
filter null BT devices
2018-01-30 09:24:03 +01:00
Milos Kozak
df2a8ec835 Merge branch 'patch-5' into 'smb060'
show output in mmol like in AMA

See merge request MilosKozak/AndroidAPS!385
2018-01-30 07:57:56 +00:00
AdrianLxM
3a0d5d73f8
filter null BT devices 2018-01-30 01:02:21 +01:00