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
Milos Kozak
e8c3a0cf91
Merge pull request #525 from PoweRGbg/patch-5
...
Added profile's target BG in NSClient mode
2017-12-08 08:20:37 +01:00
AdrianLxM
874915e7b4
adapt wear actions to command queue
2017-12-08 06:00:49 +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
Milos Kozak
dc3c853aca
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-12-07 18:48:18 +01:00
Milos Kozak
9d7e2f1bec
RS report unsupported firmware
2017-12-07 18:48:05 +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
AdrianLxM
0013050860
remove wear-overview notifications as replaced by system notifications
2017-12-07 17:07:32 +01:00
Roumen Georgiev
1d8dd5e35e
removing the whole if() statement
2017-12-07 17:11:54 +02:00
Milos Kozak
d3e11d9331
Merge pull request #530 from PoweRGbg/patch-7
...
fix of extended bolus size
2017-12-07 15:24:55 +01:00
AdrianLxM
aea47420e1
fix NPE when profile not loaded
2017-12-07 10:40:00 +01:00
Roumen Georgiev
242ed7217a
fix of extended bolus size
2017-12-07 10:08:26 +02: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
Milos Kozak
648b918e3a
Merge pull request #528 from jotomo/log-packages
...
Log full class name (not just filename), so logs can be filtered by p…
2017-12-06 14:16:20 +01:00
Johannes Mockenhaupt
51b51c159c
Clean up earlier merge blunder.
2017-12-06 12:12:25 +01:00
Johannes Mockenhaupt
ab456d5966
Remove missed reference to pref in NSProfilePlugin.
2017-12-06 12:05:39 +01:00
Johannes Mockenhaupt
d58bb75d01
Add missing synchronized so guard works properly.
2017-12-06 12:01:59 +01:00
Johannes Mockenhaupt
7d07982181
Log full class name (not just filename), so logs can be filtered by package name.
2017-12-06 11:53:51 +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
Johannes Mockenhaupt
23874ebbd6
Remove 'sync to profile' pref.
...
(cherry picked from commit 01c52e7
2017-12-05 10:00:31 +01:00
Roumen Georgiev
5e597f03d0
Added profile's target BG in NSClient mode
2017-12-05 09:23:57 +02: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
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
AdrianLxM
09dac632f9
bluetooth watchdog
2017-12-01 13:57:53 +01:00
AdrianLxM
4b063a7766
fix SP for long with string-ressource-id
2017-12-01 13:49:50 +01:00
Milos Kozak
aa210970ec
Merge branch 'g5' into dev
2017-12-01 10:18:53 +01:00
Milos Kozak
77e855ec61
fix NPE
2017-12-01 10:18:27 +01:00
Roumen Georgiev
ecbac7ea96
Make ProfileSwitch text 20% larger
2017-12-01 10:30:18 +02:00
Andreas
29d9d20605
Update strings.xml
...
Add german text for local alerts
2017-12-01 08:03:33 +01:00
Andreas
e07c5fb50d
Update strings.xml
...
Change "Temp basal" to "Temp Basal"
2017-11-30 15:04:40 +01:00
Roumen Georgiev
d683ea2f0c
All labes scaled
...
COB is not here
2017-11-30 11:28:26 +02:00
Roumen Georgiev
24b9326602
Update PointsWithLabelGraphSeries.java
2017-11-30 09:57:16 +02:00
Roumen Georgiev
418a7f7094
ProfileSwitch depending on ScreenSize
...
Text size in ProfileSwitch events depends on screen resolution
2017-11-30 09:45:18 +02:00
Milos Kozak
04742c60cd
G5 fix time value
2017-11-29 23:00:41 +01:00
Milos Kozak
b73e12b731
G5: accept arrays
2017-11-29 17:22:45 +01:00
Milos Kozak
7fc9efde40
G5 offline/uploader
2017-11-29 16:07:26 +01:00
Roumen Georgiev
c56330cae7
Less than, not moreThan15
2017-11-29 09:21:55 +02:00
Milos Kozak
b1a214b9e7
Merge branch 'dev' into dev
2017-11-28 21:50:32 +01:00
Milos Kozak
d1aec1ff18
Localalerts settings by adrian
2017-11-28 21:48:46 +01:00
Milos Kozak
7d5d327c5d
fix compile
2017-11-28 21:06:50 +01:00
Milos Kozak
9b135cc4e4
Merge branch 'queue' into dev
2017-11-28 20:52:49 +01:00
Milos Kozak
694e90960e
reenable RS driver
2017-11-28 20:52:24 +01:00
Milos Kozak
b4187c84ed
bump 1.56-dev
2017-11-28 20:51:54 +01:00
Milos Kozak
bf4ffaed8f
bump 1.55
2017-11-28 20:31:31 +01:00
Milos Kozak
70621837d9
disable RS driver
2017-11-28 20:29:30 +01:00
Milos Kozak
b8df1fcec4
Merge branch 'dev' into queue
2017-11-28 20:27:58 +01:00
Roumen Georgiev
542cedff9d
check for sgv older than 15 mins
2017-11-28 16:29:18 +02:00
Roumen Georgiev
723cb33497
Disabling staledata alarm on new sgv values fromNSClient
2017-11-28 16:15:25 +02:00
Roumen Georgiev
eb593a4557
Update Notification.java
2017-11-28 16:09:23 +02:00
Andrew Warrington
dcf79c710c
Update following testing! Bug fixes:
...
- Detailed IOB always shown in older watch faces (fixed)
- Cockpit: Loop graphic stays red once set (fixed)
Design changes:
- AAPSv2: Changed spacing of status and cob/time/iob lines to use layout_weight instead of padding (more dynamic)
- Removed decimal point in delta strings when BG is in mg/dL to gain space so everything fits with all options switched on. This will affect older watch faces.
- Changed to 1 decimal point in BGI to gain space. This will affect older watches as well.
- Changed order of preferences to match screen layout more closely
New features:
- Exposed BGI as an individual item in dataMap & added to BaseWatchFace + AAPSv2
2017-11-28 09:24:52 +01:00
Johannes Mockenhaupt
b03202f3d3
Bug notes.
...
(cherry picked from commit c553626)
2017-11-27 11:46:17 +01:00
Johannes Mockenhaupt
dc6c91fd87
Set Source.PUMP when setting/cancelling TBR.
...
While technically, the history isn't read, we can be reasonably
sure a TBR was set/cancelled by reading the main menu (and for
TBR starts that's the only way to do so). Reading the history
might cause (more) problems with the pump's minute-precision
and not yield much safety. Besides, command mode is expected
to take over yesterday.
(cherry picked from commit 04fb1c8)
2017-11-26 21:51:34 +01:00
Johannes Mockenhaupt
383750d5e8
Set Source.PUMP when bolusing (already reading from history).
...
(cherry picked from commit d747415)
2017-11-26 21:51:33 +01:00
Johannes Mockenhaupt
720e64e541
Fix checkTbrMismatch tolerance for TBRs up to 2m off.
...
(cherry picked from commit 46c1e00)
2017-11-26 16:47:19 +01:00
Johannes Mockenhaupt
ffb5ee3b22
Show min/avg/max in Combo TDD dialog.
...
(cherry picked from commit 348b53a)
2017-11-26 12:52:23 +01:00
Johannes Mockenhaupt
b46165e52a
Abort reading all pump data if history read fails.
...
(cherry picked from commit 9f679bc)
2017-11-26 12:52:22 +01:00
Johannes Mockenhaupt
9ce57e7076
Fix bolus verification.
2017-11-26 03:04:13 +01:00
Johannes Mockenhaupt
a0ba857279
Move WarningOrErrorCode class to parent package.
...
(cherry picked from commit 38922ba)
2017-11-25 21:19:21 +01:00
Johannes Mockenhaupt
c36eac1ff3
More logging around bolusing.
...
(cherry picked from commit df89b7f)
2017-11-25 21:19:20 +01:00
Johannes Mockenhaupt
0f8442d65c
Issue a history read when bolusing fails.
...
(cherry picked from commit cafed14)
2017-11-25 21:19:19 +01:00
Johannes Mockenhaupt
1d83abc0d2
Fix rejecting multiple TBRs.
...
(cherry picked from commit c1e9800)
2017-11-25 19:36:15 +01:00
Johannes Mockenhaupt
1e9d0d08c3
Reject requents to enact TBRs if one was already started within this minute.
...
(cherry picked from commit 3805413)
2017-11-25 13:20:08 +01:00
Johannes Mockenhaupt
e13f29e615
Use correct key in prefs.
2017-11-25 02:25:02 +01:00
Johannes Mockenhaupt
b148b334b2
Adhere to 'Sync to profile' setting in ConfigBuilder.
2017-11-25 02:11:01 +01:00
Johannes Mockenhaupt
ac935b19de
SetTempBasal: if requested percentage is rounded to 100%, do a soft cancel instead.
2017-11-25 00:52:33 +01:00
Johannes Mockenhaupt
5e79900411
Small robustness improvements.
2017-11-24 23:03:34 +01:00
Johannes Mockenhaupt
1a00f8c661
Treatments tab: display extended bolus tab if active pump supports it or if there are any extended bolus records.
2017-11-24 21:28:34 +01:00
Johannes Mockenhaupt
44ccbc06a0
Retry reading/writing basal profile, cleanups, notes.
2017-11-24 21:11:55 +01:00
Johannes Mockenhaupt
28f31414ba
Update pump profile during Combo init.
2017-11-23 20:54:28 +01:00
AdrianLxM
5b9fd6fd78
set basal rate overview notifications
2017-11-23 03:06:10 +01:00
AdrianLxM
b3f0951d1f
isThisProfileSet - same behaviour on uninitialized pump as DanaR
2017-11-23 02:19:29 +01:00
AdrianLxM
3f10c316a4
combo set basal: account for different granularity > 1 U/h
2017-11-23 01:47:14 +01:00
Johannes Mockenhaupt
61d1028011
Update local basal profile after setting it on pump.
2017-11-22 22:42:47 +01:00
Johannes Mockenhaupt
1a8c0fcf52
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
Cancel ongoing notification when plugin is disabled.
Fix typo in fragment name.
Nitpicky symmetry.
PersistentNotification unregister workaround.
Make PumpEnactResult fluent.
Minor code cleanup.
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java
# app/src/main/java/info/nightscout/androidaps/plugins/Persistentnotification/PersistentNotificationPlugin.java
2017-11-22 22:17:57 +01:00
Johannes Mockenhaupt
83be0a8315
Setting basal rate on pump (combo side).
2017-11-22 22:16:28 +01:00
Milos Kozak
a13661400f
DanaRv2 queue & pump autodection
2017-11-22 22:09:58 +01:00
AdrianLxM
681add11a9
remove translations without english default
2017-11-22 21:06:31 +01:00
Milos Kozak
8818afe033
KoreanDanaR queue
2017-11-22 20:11:25 +01:00
Milos Kozak
dfd0218a6a
Merge branch 'dev' into queue
2017-11-22 19:44:16 +01:00
Milos Kozak
a9f1acf7a7
Merge pull request #502 from jotomo/combo-extractions
...
Combo extractions
2017-11-22 19:36:59 +01:00
Johannes Mockenhaupt
e28e5685f6
Cancel ongoing notification when plugin is disabled.
2017-11-22 19:13:56 +01:00
Johannes Mockenhaupt
9f946229bc
Slightly improve the dialogs.
2017-11-22 14:48:05 +01:00
Johannes Mockenhaupt
cf430b84cf
Extract some string resources.
2017-11-22 14:27:29 +01:00
Johannes Mockenhaupt
1e4070e862
Fix typo in fragment name.
2017-11-22 11:34:23 +01:00
Johannes Mockenhaupt
5690772946
Nitpicky symmetry.
2017-11-22 11:33:26 +01:00
Johannes Mockenhaupt
d202976251
PersistentNotification unregister workaround.
2017-11-22 11:32:41 +01:00
Johannes Mockenhaupt
9442c56eb8
Make PumpEnactResult fluent.
2017-11-22 11:30:48 +01:00
Johannes Mockenhaupt
60324ac6c6
Minor code cleanup.
2017-11-22 11:30:38 +01:00
Johannes Mockenhaupt
c6ad1b59f3
Clean up string resources.
2017-11-22 11:27:49 +01:00
Johannes Mockenhaupt
813f857306
Rename fragment 'error history' -> 'alert history'.
2017-11-22 11:17:18 +01:00
Johannes Mockenhaupt
2861509d07
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires before next loop iteration.
BolusProgressDialog: hide stop button once pressed.
fix RU translation
use MIN_DIA instead of DEFAULT_DIA
2017-11-22 10:56:57 +01:00
Milos Kozak
62527ab33b
Merge pull request #500 from jotomo/prevent-gaps-in-tbr
...
ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires bef…
2017-11-22 10:52:15 +01:00
Milos Kozak
63dbe2bd52
Merge pull request #501 from jotomo/hide-stop-button-once-pressed
...
BolusProgressDialog: hide stop button once pressed.
2017-11-22 10:51:39 +01:00
Johannes Mockenhaupt
4c66199142
Cleanups based on Android Studio analysis.
2017-11-22 00:53:37 +01:00
Johannes Mockenhaupt
8b81925ccb
Only raise notification to check pump time when the latter could be read.
2017-11-22 00:44:56 +01:00
Johannes Mockenhaupt
b4d2d9f71d
Rename 'error' to 'alert' when referring to Combo pump alerts.
2017-11-22 00:41:56 +01:00
Johannes Mockenhaupt
a8a7d47da2
ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires before next loop iteration.
2017-11-22 00:22:02 +01:00
Johannes Mockenhaupt
b49a4c57ba
BolusProgressDialog: hide stop button once pressed.
2017-11-22 00:20:50 +01:00
Johannes Mockenhaupt
b27ee06ebe
Fix issues during history read.
2017-11-22 00:05:59 +01:00
Milos Kozak
252c0b3db9
DanaR queue driver
2017-11-21 23:00:53 +01:00
Milos Kozak
f134163a76
Merge branch 'dev' into queue
2017-11-21 22:31:56 +01:00
Johannes Mockenhaupt
066d138e59
Double comparisons.
2017-11-21 22:31:28 +01:00
Milos Kozak
a6bf18244a
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-11-21 22:31:22 +01:00
Milos Kozak
ca44ae9a0b
fix RU translation
2017-11-21 22:31:02 +01:00
Milos Kozak
4007049118
use MIN_DIA instead of DEFAULT_DIA
2017-11-21 22:29:50 +01:00
Milos Kozak
d2cba61354
allign dana plugin code
2017-11-21 19:27:43 +01:00
Johannes Mockenhaupt
bf52352224
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
missing return
log profiles if different
fix setting of TRB when low basal rate is running
fix format and add test for fromISODateString
use mills from status if available
2017-11-21 10:57:11 +01:00
Johannes Mockenhaupt
d6938c20e6
Updating README.
2017-11-21 10:53:47 +01:00
Johannes Mockenhaupt
426379c6d3
Remoe SetBasalProfileCommand.
...
Too slow, unclear usage (ProfileInterface), likely superseeded soon.
2017-11-21 09:45:34 +01:00
Johannes Mockenhaupt
4b1a774544
Optimize fetching full history.
2017-11-21 00:43:17 +01:00
Johannes Mockenhaupt
63607d169d
Polish dialogs.
2017-11-21 00:36:01 +01:00
Johannes Mockenhaupt
1b50b43fbb
Add headers to dialogs.
2017-11-21 00:22:16 +01:00
Johannes Mockenhaupt
75855f3f05
Implement reading basal profile.
2017-11-20 23:55:00 +01:00
Johannes Mockenhaupt
971a97a9e3
Some minor tweaks.
2017-11-20 23:53:39 +01:00
Milos Kozak
3ab235f829
refactor pump interface out of ConfigBuilder, remove handlers
2017-11-20 23:39:12 +01:00
Johannes Mockenhaupt
3cccf287da
Only update pumpState cache if menu could be read.
2017-11-20 21:36:25 +01:00
Johannes Mockenhaupt
dbd442e8ea
ComboPlugin.checkTbrMismatch: allow for deviations
...
to compensenate inprecise times used by pump for tbr duration.
2017-11-20 18:59:59 +01:00
Milos Kozak
21ae42d37b
Merge branch 'dev' into queue
2017-11-20 17:50:49 +01:00
Milos Kozak
1335887957
Merge branch 'dev' into dev2
2017-11-20 17:40:45 +01:00
Milos Kozak
2f0599fbc7
missing return
2017-11-20 17:38:06 +01:00
Milos Kozak
d8d8b150b6
Merge branch 'dev2' into queue
2017-11-20 17:34:03 +01:00
Milos Kozak
973b9d50c1
Merge branch 'dev' into dev2
2017-11-20 17:28:15 +01:00
Milos Kozak
0f0f39dfb4
log profiles if different
2017-11-20 17:26:03 +01:00
Milos Kozak
777aedd5db
fix setting of TRB when low basal rate is running
2017-11-20 15:25:44 +01:00
Milos Kozak
297617467e
fix format and add test for fromISODateString
2017-11-20 13:34:13 +01:00
Milos Kozak
d8798e0bcf
use mills from status if available
2017-11-20 13:23:25 +01:00
Johannes Mockenhaupt
aadb7c5728
Update TODO, javadoc.
2017-11-19 23:30:23 +01:00
Johannes Mockenhaupt
dafb6d225b
Display active alert in Combo tab.
2017-11-19 21:25:37 +01:00
Johannes Mockenhaupt
9d3625e78c
Show bolus/TBR percent and duration with activity.
2017-11-18 23:29:46 +01:00
Johannes Mockenhaupt
46fdd47ac0
Fixes and cleanups.
2017-11-18 21:32:01 +01:00
Johannes Mockenhaupt
2c0975994d
Fixes.
2017-11-18 18:33:46 +01:00
Johannes Mockenhaupt
9459dfe321
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
Remove dead code.
Ctors Android-style.
Fix NPE initialising MyPreferencesFragment.
RS fix last bolus time
RS remove duplicated message
RS fix extended bolus result
show timeshift if not zero
CS translation
removed unneeded code
long click on name to open settings
add link to advanced settings
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
2017-11-18 17:46:20 +01:00
Johannes Mockenhaupt
99db38a8e0
Fix displaying connection problems in Combo tab.
2017-11-18 17:43:33 +01:00
