Jamorham
501ca5c597
Fix for some TBR cancels getting through
2018-02-04 12:57:10 +00:00
AdrianLxM
316c3da46c
use default repo for rhino
2018-02-04 08:24:12 +01:00
AdrianLxM
1bac0e573d
move rhino to external lib
2018-02-04 07:27:02 +01:00
Johannes Mockenhaupt
8c25bc4002
Answers cleanup.
2018-02-04 01:29:27 +01:00
Johannes Mockenhaupt
6b4b044cd6
Remove nested layout for better performance.
2018-02-04 00:36:08 +01:00
Johannes Mockenhaupt
f573265bc2
Add target line to graph.
...
Uses the middle if a range is specified to show what the loop
aims for.
2018-02-04 00:34:14 +01:00
Bog Dan
27bf66b501
RO translation
...
Added RO translation
2018-02-04 01:24:18 +02:00
Johannes Mockenhaupt
87771e8753
A few fixes.
2018-02-03 23:44:17 +01:00
Johannes Mockenhaupt
956a611af4
Fix checking/updating history.
...
(cherry picked from commit 5413a0f)
2018-02-03 22:07:42 +01:00
Johannes Mockenhaupt
2a5c28cf6b
ReadQuickInfoCommand: only read as many boluses as are available.
...
(cherry picked from commit 7857abb)
2018-02-03 22:07:41 +01:00
Tebbe Ubben
33ea34243a
Merge remote-tracking branch 'remotes/milos/dev' into dev
2018-02-03 20:37:47 +01:00
Johannes Mockenhaupt
183edfcc09
When checking for changed pump history, compare the last two records.
...
This ensures changes are also detected if a bolus was added on the
pump within the same minute of the previous record.
2018-02-03 20:03:30 +01:00
Johannes Mockenhaupt
1e8e2a59fd
ReadHistoryCommand: fetch records including the requested timestamp.
...
To ensure we retrieve records with the same timestamp.
2018-02-03 19:56:27 +01:00
Johannes Mockenhaupt
6fded4c1bd
ComboPlugin.deliverBolus: avoid creating boluses within the same minute.
2018-02-03 19:32:00 +01:00
Johannes Mockenhaupt
72e4cd29c4
Extend ReadQuickInfoCommand to read more history records.
...
Also remove switch to forego quick info, which really isn't the cause
of the infamous bug, but is now required with the updated history
check logic against timestamp dups.
(cherry picked from commit 18aa827)
2018-02-03 19:31:01 +01:00
Johannes Mockenhaupt
ec4280bc2e
Fix creating a seconds-based bolus record based on minute and bolus.
...
(cherry picked from commit f8848be)
2018-02-03 19:26:35 +01:00
Johannes Mockenhaupt
f6c5b95904
Merge remote-tracking branch 'origin/master' into combo-scripter-v2
...
* origin/master:
Revert "Update strings.xml"
bump 1.58
Update strings.xml
Add issue template.
Enhance insulin plugin test
filter null BT devices
BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete.
BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete.
ES translations
Dana plugin refactoring
KO language cleanup
Update strings.xml
Update strings.xml
Bg translation
add RO language
CS translations
ButterKnife to Dana fragment
bump 1.57a-dev
Add a unit test for Insulin Plugin
# Conflicts:
# app/build.gradle
# app/src/main/res/values-de/strings.xml
# app/src/main/res/values-nl/strings.xml
# app/src/main/res/values/strings.xml
2018-02-03 16:45:29 +01:00
Johannes Mockenhaupt
435c4dee85
Create Answer events when adding bolus to DB fails.
...
(cherry picked from commit 947ea4f)
2018-02-03 16:33:52 +01:00
Johannes Mockenhaupt
6c9effd027
Minor cleanup to reduce merge noise.
...
(cherry picked from commit 4015f73)
2018-02-03 16:33:50 +01:00
Johannes Mockenhaupt
f49f3c7e4b
Clean up string resources.
...
(cherry picked from commit 4adcffc)
2018-02-03 16:33:40 +01:00
Timm Korte
c33232108d
remote unused import
2018-02-03 14:57:36 +01:00
Timm Korte
c4a5285c24
update bg for treatment in the past via careportal
2018-02-03 12:00:59 +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
Markus M. May
41ae8e45db
Revert recent changes
2018-02-02 20:00:31 +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
Simon Pauwels
e3f9954e62
Merge pull request #24 from jotomo/combo-scripter-v2
...
feb 2
2018-02-02 15:13:57 +01:00
Milos Kozak
d9cfe15b87
fix rendering absolute basal line
2018-02-02 14:44:56 +01:00
Johannes Mockenhaupt
a07a4beaf8
Combo: update timestampOfLastKnownPumpBolusRecord after bolusing.
2018-02-02 11:59:11 +01:00
Milos Kozak
6312b81e10
Merge branch 'smb060' into dev
2018-02-02 10:51:13 +01:00
Johannes Mockenhaupt
1f06d801a2
Combo: retry twice to establish connection before giving up.
...
(cherry picked from commit a16560a)
2018-02-02 10:06:04 +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
Johannes Mockenhaupt
26e7834093
Clean up, no behavioral changes and a bigger bed.
2018-02-02 00:40:24 +01:00
AdrianLxM
aca422dfb6
remove duplicates
2018-02-01 23:55:08 +01:00
Markus M. May
8b6bac6144
Rework ivy repo, use a homegrown mvn repo
2018-02-01 23:28:54 +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
