Milos Kozak
32d9a8b4d6
Fix connection handshake for DanaR pumps
2018-08-21 17:25:20 +02:00
Milos Kozak
1d67f124fc
get rid of Date.class
2018-08-17 15:11:43 +02:00
AdrianLxM
a5d0ec45cc
Merge remote-tracking branch 'milosremote/dev' into tdds-again-merged
2018-03-26 08:39:24 +02:00
Milos Kozak
e2ea44a8a8
applyBasalPercentConstraints reactor & tests part1
2018-03-21 20:24:02 +01:00
Milos Kozak
15ebfc1193
applyBasalConstraints reactor & tests
2018-03-20 22:09:22 +01:00
AdrianLxM
1e1a58468f
TDD 01
2018-03-19 19:08:51 +01:00
Johannes Mockenhaupt
8457cd3843
Merge remote-tracking branch 'origin/dev' into combo-dev-merge
...
* origin/dev:
check for null profile
remove profile dependency from pump drivers, TRB optimalization
split enacting TRB and SMB
2018-03-17 13:51:40 +01:00
Milos Kozak
b6ce7c03c6
remove profile dependency from pump drivers, TRB optimalization
2018-03-16 16:53:38 +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
bd0ae23e30
Merge branch 'dev' into csv2-staging
...
* dev:
fix disconnecting pump
format output date to be displayed on iDevices correctly
BolusWizard use 0 for insulin correction if in range
LocalProfile TimeListEdit min, max
remove string with no default translation
Rv2,RS fix loading events
initialize lastCommandTime too after BT reset
allow to read status after every command
2017-12-22 10:39:30 +01:00
Milos Kozak
74abdc0271
fix disconnecting pump
2017-12-22 01:35:52 +01:00
Johannes Mockenhaupt
bf9f877b3d
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev: (68 commits)
max connection time to 120 sec
make chart zoomable again
fix NPE
lowest priority for background calculations
wear timestamps long
remove unneeded code
fix landscape overview
synchronized wait
fix build tools for travis
try to fix travis
upgrade build tools
R: resolve thread deadlock during bolus stop
remove unsupported code from korean pump
handle bolus stop prior to delivery correctly
fix translations
better logging
Revert unnecessary change.
Send OpenAPS timestamp to watch rather than minAgo, for more accurate updates on watch face.
gradle update
parse more iso formats
...
# Conflicts:
# app/build.gradle
# app/src/main/AndroidManifest.xml
# app/src/main/java/info/nightscout/androidaps/Config.java
# app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
# app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsFragment.java
# app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java
# app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewExtendedBolusDialog.java
# app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/DismissNotificationService.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/NotificationStore.java
# app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfilePlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfilePlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/DanaRSService.java
# app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java
# app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java
# app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java
# app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java
# app/src/main/res/values/strings.xml
# app/src/main/res/xml/pref_others.xml
# app/src/main/res/xml/pref_wear.xml
# gradle/wrapper/gradle-wrapper.properties
# wear/build.gradle
2017-12-05 00:32:47 +01:00
Milos Kozak
86b11edd58
RS connection and status reading
2017-11-11 14:05:29 +01:00
Milos Kozak
a186ce6468
more command queue code
2017-11-10 00:27:18 +01:00
Milos Kozak
8bae1a18e4
CommandQueue
2017-11-08 22:22:51 +01:00
Johannes Mockenhaupt
dd98d9f7ae
wip
2017-11-08 10:43:11 +01:00
Johannes Mockenhaupt
950d1b62db
Undo "explicit pump initalization."
2017-10-20 20:09:58 +02:00
Johannes Mockenhaupt
57be9bb9b1
Explicit pump initialization.
...
(cherry picked from commit d8b244a)
2017-10-20 15:10:24 +02:00
Johannes Mockenhaupt
c29b4d13a3
Support pump suspend status (and misc other ...).
2017-10-19 21:31:10 +02:00
Milos Kozak
c99830968a
adjust enforcing new temp basal on user request
2017-10-13 12:39:34 +02:00
Timm Korte
6bbb785574
rename 'userRequested' to 'force' as parameter to cancelTempBasal in order to have the same naming as with setTempBasalAbsolute
2017-08-12 13:36:35 +02:00
Timm Korte
7839299530
add force parameter to setTempBasalAbsolute in order to force setting of a 0 temp for disconnecting the pump - instead of calling cancel as introduced in a24cbfda50
2017-08-11 22:08:33 +02:00
AdrianLxM
1ac1b77fd4
remove translated string not in default strings and add flag to cancel method
2017-08-03 02:01:52 +02:00
Milos Kozak
f267c85377
it compiles now with profiles
2017-06-02 10:25:49 +02:00
Milos Kozak
358de54322
redesign uploading treatments to NS
2017-05-29 21:45:59 +02:00
Milos Kozak
559e07904c
remove unneeded call
2017-05-26 10:31:05 +02:00
Milos Kozak
87993c6163
return functionality of faking by extended boluses
2017-05-25 17:26:05 +02:00
Milos Kozak
6004a17594
change database structures
2017-05-21 22:05:03 +02:00
Milos Kozak
d641b0edd9
move rest of PumpInterface to TreatmentInterface
2017-05-12 21:21:31 +02:00
Milos Kozak
52177cead1
move part of PumpInterface to TreatmentInterface
2017-05-12 21:07:29 +02:00
Milos Kozak
9fc1d59bd0
allow to enforce Treatment plugin
2017-05-12 17:30:52 +02:00
Milos Kozak
25491fbac6
Insulin interface
2017-04-21 11:45:25 +02:00
Milos Kozak
5f4eb1e4c4
pump status tweaking
2017-02-19 19:15:14 +01:00
Milos Kozak
71112a90e2
internal nsclient
2017-02-17 13:18:36 +01:00
AdrianLxM
665f662f3a
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into pumpstatus2
2017-02-13 02:18:32 +01:00
AdrianLxM
5ce9d257e8
pump shortStatus String in interface
2017-02-13 02:18:25 +01:00
Milos Kozak
4e3cc65d5d
handling pump suspend, show pump actions on overview
2017-02-12 19:51:13 +01:00
Milos Kozak
55f99ee28e
connect when outdated basal
2017-01-29 11:11:07 +01:00
Milos Kozak
46be73d187
send sms notification when profile received from NS
2016-12-25 14:26:41 +01:00
Milos Kozak
052ac47595
Better profile handling
2016-12-24 23:53:17 +01:00
Milos Kozak
073cc84368
added PumpDescription
2016-12-08 15:21:16 +01:00
Milos Kozak
e8d169f078
allow automated actions only whem pump is initialized
2016-11-10 23:33:12 +01:00
Milos Kozak
a7d3dca752
Bolusing dialog
2016-08-04 09:17:26 +02:00
Milos Kozak
76d42ef3fb
displaying basal fix
2016-07-12 17:56:01 +02:00
Milos Kozak
143d347841
most danar code there
2016-07-10 15:05:13 +02:00
Milos Kozak
c16ad7e37d
move applyAPSResult out of pump interface
2016-07-06 11:25:27 +02:00
Milos Kozak
a9748cc721
move some support classes
2016-06-28 11:30:42 +02:00
Milos Kozak
120341b706
devicestatus, lot of gui and internal improvements, temp&extended in db only
2016-06-24 17:16:17 +02:00
Milos Kozak
4645c2bc4d
apply constraints on new treatment dialog
2016-06-20 21:43:29 +02:00
Milos Kozak
5ac31bd0ca
menu, preferences, treatment&wizard buttons, ns upload
2016-06-19 20:06:00 +02:00
