Johannes Mockenhaupt
db00404e43
Merge commit 'origin/dev^' into combo-dev-merge
...
* commit 'origin/dev^': (313 commits)
cleanup
draw profile in dana profile viewer
optimize imports
draw basal in profile viewer
BG autobackfill configurable
travis 2nd try
Save new profile when updating it
Add environment variable to handle testCoverage
do not pass DIA to SMB determine_basal
show Dana model properly after communication error
fix deviation slope calculations
Read maximum basal and bolus amount from pump
update maxIOB hard limits
Allow bolus record only in new treatment dialog
use safeGetString
JsonHelper test
food code cleanup
Show bolus progress
Missing import statement
Insight: add treatment to progress event
...
2018-03-16 15:44:54 +01:00
Milos Kozak
8a197f41dc
Merge branch 'dialogmmol' into dev
2018-03-10 19:25:41 +01:00
Milos Kozak
ec1c43b905
carbs dialog: defaults for mmol, i18n
2018-03-10 19:22:31 +01:00
Roumen Georgiev
9dd129bbe6
Revert "Update MainApp.java"
...
This reverts commit d3a7176209
2018-03-02 10:37:12 +02:00
Roumen Georgiev
d3a7176209
Update MainApp.java
2018-03-01 15:20:00 +02:00
AdrianLxM
e5e76113cc
Disable Insight by default
2018-03-01 11:09:57 +01:00
Jamorham
9d985ec3b7
Add FabricPrivacy
2018-02-22 12:30:36 +00:00
Markus M. May
b5969d4279
Minor cleanup based on feedback of jomoto
2018-02-15 20:33:03 +01:00
Milos Kozak
fa2e46fbe5
remove CPP profile
2018-02-11 23:02:21 +01:00
Markus M. May
a1bb67d425
Refactoring ConfigBuilder - cleanup fragment visibility
2018-02-08 22:23:48 +01:00
Milos Kozak
6312b81e10
Merge branch 'smb060' into dev
2018-02-02 10:51:13 +01:00
Milos Kozak
411add616b
Merge pull request #632 from jamorham/dev
...
Add Insight Pump Plugin
2018-02-02 09:21:57 +01:00
Jamorham
cdb3bc24c2
Use Config.DANAR to enable Insight
2018-02-01 21:37:21 +00:00
Johannes Mockenhaupt
372e435761
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
Fix format specifiers in Spanish translation, add MainApp.gs(id, args).
travis accept license manually
Push carbs only to pumps supporting storing carbs.
travis to 27.0.2
sdk27 & butterknife
2018-01-26 13:53:42 +01:00
Milos Kozak
98e850b1b3
Merge branch 'dev' into smb060
2018-01-26 11:54:09 +01:00
Johannes Mockenhaupt
0067eb75d5
Fix format specifiers in Spanish translation, add MainApp.gs(id, args).
2018-01-25 20:28:21 +01:00
Jamorham
7a4bc3b694
Initial bits for Insight Pump
2018-01-24 14:18:31 +00:00
Johannes Mockenhaupt
8fda1a678f
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
better handling of wrong profiles
2018-01-21 14:13:46 +01:00
Milos Kozak
e5ede788ba
Merge branch 'dev' into smb060
2018-01-21 13:38:21 +01:00
Milos Kozak
060895b33f
better handling of wrong profiles
2018-01-21 13:37:38 +01:00
Johannes Mockenhaupt
20c218ae9a
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
Overview: move checkboxes before label.
fix pump unreachable for virtual pump
getLastAutosensData improvement and logging
remove readstatus prior every command
bump 1.57-dev
better log build verison to Fabric
# Conflicts:
# app/build.gradle
2018-01-19 21:05:37 +01:00
Milos Kozak
91a6c7a96c
Merge branch 'dev' into smb060
2018-01-15 12:46:50 +01:00
Milos Kozak
5a00b68f68
remove readstatus prior every command
2018-01-14 21:42:36 +01:00
Milos Kozak
89b7b9c24a
better log build verison to Fabric
2018-01-14 17:11:39 +01:00
Johannes Mockenhaupt
ea5629fc86
Merge remote-tracking branch 'origin/dev' into csv2-staging
...
* origin/dev:
fix non smooth ratio graph
fix of fix
fix wrong button type
fix doubled percentage when comming from NS
proper select last used profile
when using profile percentage limit basal rate to minimal value supported by pump
SingleClickButton
RS fix crash when pairing is not confirmed on pump
Double -> double
use joda-time
Use autosensdata for wizard instead of APSResult
2017-12-25 20:29:32 +01:00
Milos Kozak
99e5a39b33
Merge branch 'dev' into smb060
2017-12-22 10:34:45 +01:00
Milos Kozak
31975396a2
use joda-time
2017-12-22 02:55:40 +01:00
Johannes Mockenhaupt
57944fb4b5
Merge remote-tracking branch 'origin/dev' into smb060
...
* origin/dev:
Actions tab: show profile switch button for single profile too.
Old NS-Version non-urgent
Add SP to imports
refactor cancelAlarm back to KeepAliveReceiver
push next alert on read status
G5 upload to xdrip
fake Esel new file
fake Esel
Apply bolus constraint before applying.
Rv2,RS: always load last 45 min
remove wear-overview notifications as replaced by system notifications
Remove missed reference to pref in NSProfilePlugin.
Remove 'sync to profile' pref.
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
2017-12-20 17:28:08 +01:00
Johannes Mockenhaupt
8e68a23225
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
G5 upload to xdrip
fake Esel new file
fake Esel
Rv2,RS: always load last 45 min
remove wear-overview notifications as replaced by system notifications
# Conflicts:
# app/src/main/res/values/strings.xml
2017-12-18 20:22:26 +01:00
AdrianLxM
00f13d0479
refactor cancelAlarm back to KeepAliveReceiver
2017-12-17 15:46:43 +01:00
AdrianLxM
9bd0a1f144
push next alert on read status
2017-12-17 15:46:33 +01:00
AdrianLxM
ca9b68da0d
refactor cancelAlarm back to KeepAliveReceiver
2017-12-17 01:40:27 +01:00
AdrianLxM
14810a142d
push next alert on read status
2017-12-17 01:37:27 +01:00
Milos Kozak
5f60e7cf2b
G5 upload to xdrip
2017-12-14 21:49:11 +01:00
AdrianLxM
0151dbd496
fake Esel
2017-12-13 22:14:47 +01:00
Johannes Mockenhaupt
87ab6432c6
Revert "Custom: Disable Crashlytics."
...
This reverts commit 015a852ab5
2017-12-07 18:19:27 +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
622ac15c50
Merge branch 'dev' into smb, fix compile, add queue features
2017-12-01 18:13:05 +01:00
Milos Kozak
7fc9efde40
G5 offline/uploader
2017-11-29 16:07:26 +01:00
Milos Kozak
d8d8b150b6
Merge branch 'dev2' into queue
2017-11-20 17:34:03 +01:00
Milos Kozak
86b11edd58
RS connection and status reading
2017-11-11 14:05:29 +01:00
Johannes Mockenhaupt
f569163d19
Merge remote-tracking branch 'origin/dev2' into combo-v2
...
* origin/dev2: (26 commits)
add getPreferenceId to food plugin
preferences update
use DateUtil#agoString
use DateUtil#untilString
timeframe strings
Show remaining time of TT
NSTreatments NPE fix
Cleanup.
Revert "Debug: wider thread column in log to improve readability."
Disable event logging by default.
Log summary after 10s, then every 60s.
Log receivers of event.
Log source of event.
Debug: wider thread column in log to improve readability.
Better log messages for events.
Group events in type hierarchy related to the LoopPlugin.
Remove dead NSPingAck class.
Let event classes extend Event(UpdageGui) classes.
Add base event class.
Log posted events.
...
2017-11-01 21:39:45 +01:00
Milos Kozak
a1c6704ae9
Merge branch 'dev2' into smb
2017-11-01 20:50:14 +01:00
Milos Kozak
f67bd291cd
Merge branch 'dev' into dev2
2017-11-01 20:44:24 +01:00
Milos Kozak
60699eddbb
preferences update
2017-11-01 20:43:59 +01:00
Milos Kozak
440be77de0
Merge pull request #488 from jotomo/events
...
Event logging
2017-11-01 18:29:14 +01:00
Milos Kozak
e71ce02131
fix merge conflict
2017-10-26 21:23:23 +02:00
Johannes Mockenhaupt
785a8f21de
Log receivers of event.
2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
5a446c9ab5
Log posted events.
2017-10-26 16:54:46 +02:00
AdrianLxM
707d2df345
No explicit service start
2017-10-25 20:10:59 +02:00
