Johannes Mockenhaupt
7b88ec9e93
Device-Status: provide pseudo-levels or reservoir.
2017-12-05 21:07:49 +01:00
Johannes Mockenhaupt
01c52e753c
Remove 'sync to profile' pref.
2017-12-05 01:24:43 +01:00
Johannes Mockenhaupt
ada5301361
Cleanups.
2017-12-05 01:08:36 +01:00
Johannes Mockenhaupt
68af342eeb
Update combo stuff to work with new queue.
2017-12-05 00:54:08 +01:00
Johannes Mockenhaupt
e7d49f2300
Merge branch 'no-history-for-you' into combo-scripter-v2
...
* no-history-for-you:
When bolusing, only read history in case of error or cancellation.
Cleanups.
Remove lastBolus, reservoirLevel.
Use timestamp for TBR, not pump minutes.
Rework checkAndResolveTbrMismatch to update from pump to AAPS only.
ComboFragment: move forced history read to long-pressing the TDD button.
More steps towards reducing comms amount.
Don't check pump history, clean up usage of pumpHistoryLastChecked, mark stuff to disable.
Remove last bolus, units display of reservoir level from Combo fragment.
# Conflicts:
# app/src/main/res/values/strings.xml
2017-12-05 00:34:22 +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
Johannes Mockenhaupt
98ba0fbf87
When bolusing, only read history in case of error or cancellation.
2017-12-05 00:21:58 +01:00
Johannes Mockenhaupt
8c04d12904
Cleanups.
2017-12-05 00:21:58 +01:00
Johannes Mockenhaupt
85e20a8977
Remove lastBolus, reservoirLevel.
2017-12-05 00:08:42 +01:00
Johannes Mockenhaupt
4c1c1c43a3
Use timestamp for TBR, not pump minutes.
2017-12-05 00:08:42 +01:00
Johannes Mockenhaupt
1735842e57
Rework checkAndResolveTbrMismatch to update from pump to AAPS only.
2017-12-05 00:08:42 +01:00
Johannes Mockenhaupt
141c116db6
ComboFragment: move forced history read to long-pressing the TDD button.
...
To avoid accidentally doing this when a short press on Refresh was
intended.
2017-12-05 00:08:42 +01:00
AdrianLxM
17867478fb
Merge pull request #524 from MilosKozak/watchfaces
...
Watchfaces Andrew
2017-12-04 23:19:52 +01:00
Milos Kozak
bce6d976b0
max connection time to 120 sec
2017-12-04 20:26:57 +01:00
AdrianLxM
2f235385e0
fix NPE
2017-12-04 20:04:58 +01:00
Milos Kozak
620c56e4cb
lowest priority for background calculations
2017-12-04 19:57:09 +01:00
AdrianLxM
c83f966d92
wear timestamps long
2017-12-04 18:40:13 +01:00
Milos Kozak
23e37a8be7
remove unneeded code
2017-12-04 18:13:20 +01:00
AdrianLxM
aefb0d62df
Merge pull request #522 from MilosKozak/dev
...
Dev
2017-12-04 17:53:36 +01:00
Milos Kozak
34fe8d8b60
Merge branch 'staledata' into dev
2017-12-04 13:02:23 +01:00
Milos Kozak
812583059a
Merge pull request #512 from PoweRGbg/patch-3
...
ProfileSwitch on graph depending on ScreenSize
2017-12-04 12:49:01 +01:00
AdrianLxM
53723411c4
fix landscape overview
2017-12-04 10:42:34 +01:00
Johannes Mockenhaupt
fe40ebd4a5
More steps towards reducing comms amount.
...
(cherry picked from commit 3ba6079)
2017-12-03 23:06:57 +01:00
Johannes Mockenhaupt
471c813bb4
Don't check pump history, clean up usage of pumpHistoryLastChecked, mark stuff to disable.
...
(cherry picked from commit bcd1ac3)
2017-12-03 22:48:06 +01:00
Johannes Mockenhaupt
0c7b2e1953
Remove last bolus, units display of reservoir level from Combo fragment.
...
(cherry picked from commit 42847cb)
2017-12-03 22:48:06 +01:00
Johannes Mockenhaupt
afdcf0b1c5
Remove combo pairing stubs.
2017-12-03 22:47:55 +01:00
Johannes Mockenhaupt
1b91684c65
Enforce low-suspend loop mode rather than disabling loop on usage violation. Because.
2017-12-03 22:26:02 +01:00
Johannes Mockenhaupt
1e19f19cd2
Hide buttons on Combo tab until plugin is initialized.
2017-12-03 22:25:43 +01:00
AdrianLxM
42c61f4e6f
synchronized wait
2017-12-03 21:58:35 +01:00
Milos Kozak
5a12d15c8c
upgrade build tools
2017-12-03 21:15:12 +01:00
Milos Kozak
4c3e26d19c
R: resolve thread deadlock during bolus stop
2017-12-03 20:10:54 +01:00
Milos Kozak
2b2d729f42
remove unsupported code from korean pump
2017-12-03 19:55:23 +01:00
Milos Kozak
4185bb347d
handle bolus stop prior to delivery correctly
2017-12-03 19:34:01 +01:00
Milos Kozak
9e0241aebc
fix translations
2017-12-03 19:12:07 +01:00
Milos Kozak
5d217cf1b3
better logging
2017-12-03 19:02:11 +01:00
Andrew Warrington
eea5082278
Revert unnecessary change.
2017-12-03 19:01:56 +01:00
Andrew Warrington
9dca53f968
Send OpenAPS timestamp to watch rather than minAgo, for more accurate updates on watch face.
2017-12-03 18:53:52 +01:00
Andrew Warrington
cefe93d0a0
Merge remote-tracking branch 'origin/dev' into watchfaces
2017-12-03 17:48:36 +01:00
Milos Kozak
f25334273a
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-12-03 17:34:58 +01:00
Milos Kozak
0101bc0a81
parse more iso formats
2017-12-03 17:34:29 +01:00
AdrianLxM
7777143b07
scrollable overview on Jelly
2017-12-03 17:30:20 +01:00
AdrianLxM
7958dc9dce
jelly overview
2017-12-03 13:55:54 +01:00
AdrianLxM
0a8d89db8a
Merge remote-tracking branch 'roumenremote/patch-3' into roumen-overview
2017-12-03 11:48:14 +01:00
AdrianLxM
07c1084287
Merge branch 'watchfaces' into dev
2017-12-02 21:45:39 +01:00
Milos Kozak
38ecd88f6c
Merge pull request #513 from AdrianLxM/btwatchdog-pr
2017-12-02 16:19:46 +01:00
AdrianLxM
14bb0e6ac4
Only do pump alarms in APS mode
2017-12-02 10:21:42 +01:00
Milos Kozak
8a7f0f22d9
min NS version 0.10.2
2017-12-01 22:51:25 +01:00
AdrianLxM
98777579c8
delta granularity and NPE fix
2017-12-01 20:32:26 +01:00
Milos Kozak
faea3a5147
RS proper evaluate extended bolus result
2017-12-01 17:37:49 +01:00
AdrianLxM
090127012c
Merge branch 'dev' into btwatchdog-pr
2017-12-01 14:03:44 +01:00
