Johannes Mockenhaupt
8699d9a384
Add missing listener registration.
2017-12-09 19:46:28 +01:00
Johannes Mockenhaupt
27e9cfda6f
Overhaul Combo tab buttons and dialogs.
2017-12-09 19:46:28 +01:00
Johannes Mockenhaupt
063a5ba6b9
Only read Tdd and Alerts through buttons on Combo tab, not treatment history.
2017-12-09 19:45:58 +01:00
Johannes Mockenhaupt
b164793f42
Shorten/make clearer message on pump clock being off.
2017-12-09 19:44:28 +01:00
Johannes Mockenhaupt
a7f07b26f9
Pump time warning: urgency level based on how much the time is off.
2017-12-09 19:43:53 +01:00
AdrianLxM
4d356096cf
Check pump time not last connection time
2017-12-09 19:43:53 +01:00
Johannes Mockenhaupt
d2f2266a2b
Re-add warning if pump time is off (needed for basal rates).
2017-12-09 19:43:53 +01:00
Johannes Mockenhaupt
cf142a4538
Merge pull request #4 from jotomo/verify-record-date-after-bolus-cancel
...
Verify and return delivered bolus amount in BolusCommand
2017-12-09 19:41:16 +01:00
Johannes Mockenhaupt
b409b737e5
On connect, take over TBR CANCELLED warning and raise message. Fixes #9 .
2017-12-09 17:33:11 +01:00
Johannes Mockenhaupt
f09464e5d6
Move detection of partial bolus delivery to BolusCommand.
...
Have BolusCommand verify delivered bolus if needed and return the
actually delivered bolus amount. This makes more sense now,
given history is only read if unavoidable.
2017-12-08 12:56:15 +01:00
Johannes Mockenhaupt
a38afe7a2a
Merge pull request #2 from AdrianLxM/ghostbusters
...
bend translations
2017-12-07 22:04:15 +01:00
AdrianLxM
795292d891
bend translations
2017-12-07 20:51:17 +01:00
Johannes Mockenhaupt
81bde2cbde
Set version to 1.56-combo-csv2-test
2017-12-07 18:20:11 +01:00
Johannes Mockenhaupt
87ab6432c6
Revert "Custom: Disable Crashlytics."
...
This reverts commit 015a852ab5
2017-12-07 18:19:27 +01:00
Johannes Mockenhaupt
60d6f305b5
Debug code.
2017-12-06 19:31:51 +01:00
Johannes Mockenhaupt
de06c54f1d
Minor cleanups in ComboPlugin.
2017-12-06 17:14:30 +01:00
Johannes Mockenhaupt
b0d55b09d4
Minor cleanups around the Command queue.
2017-12-06 17:14:30 +01:00
Johannes Mockenhaupt
86b63cb27d
Combo tab: show command queue if non-empty.
2017-12-06 17:14:30 +01:00
Johannes Mockenhaupt
51b51c159c
Clean up earlier merge blunder.
2017-12-06 12:12:25 +01:00
Johannes Mockenhaupt
b548d092d1
Remove unneeded dependencies.
2017-12-06 11:50:44 +01:00
Johannes Mockenhaupt
32b7df39f9
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
Update strings.xml
Update strings.xml
2017-12-06 11:34:32 +01:00
AdrianLxM
525adddc5e
Merge pull request #527 from osodebailar/dev
...
Dev
2017-12-06 10:18:43 +01:00
Johannes Mockenhaupt
5caec45760
Fix add bolus record from pump history when bolus was cancelled.
2017-12-05 23:41:22 +01:00
Johannes Mockenhaupt
0f034dd662
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
check for duration in json
untranslatable strings
greek language
check for null
queue logging
2017-12-05 23:19:05 +01:00
Johannes Mockenhaupt
960cb92789
Remove idle-disconnect-monitor and let the command queue take care of that.
2017-12-05 23:17:05 +01:00
Milos Kozak
7be5c041cc
Merge pull request #526 from MilosKozak/untranslatable
...
untranslatable strings greek
2017-12-05 22:37:34 +01:00
Milos Kozak
455383cfd5
check for duration in json
2017-12-05 22:08:37 +01:00
AdrianLxM
50cbff6fa4
untranslatable strings
2017-12-05 22:08:14 +01:00
Johannes Mockenhaupt
21fc05a707
Remove ComboPlugin.checkHistory().
2017-12-05 21:48:13 +01:00
Johannes Mockenhaupt
f9867c69fb
Remove warning if pump time is off.
2017-12-05 21:46:12 +01:00
Johannes Mockenhaupt
7b88ec9e93
Device-Status: provide pseudo-levels or reservoir.
2017-12-05 21:07:49 +01:00
Milos Kozak
a47fe757b9
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-12-05 17:03:58 +01:00
Milos Kozak
188762519c
greek language
2017-12-05 17:03:40 +01:00
Milos Kozak
1adbee5c9e
check for null
2017-12-05 10:42:10 +01:00
Milos Kozak
6c714261d0
queue logging
2017-12-05 07:34:34 +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
