Commit graph

2680 commits

Author SHA1 Message Date
Simon Pauwels
2e69d9fe56
double string removal 2017-12-18 22:06:10 +01:00
Simon Pauwels
c6b303f3f1
typo fix 2017-12-18 22:02:11 +01:00
Simon Pauwels
e1af74ff00
Added and improved Dutch translations 2017-12-18 21:52:11 +01:00
Johannes Mockenhaupt
34f3428d99
ComboPlugin.setTempBasal: clean up, fix potential bug.
(cherry picked from commit 41c45a1)
2017-12-17 15:39:38 +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
Johannes Mockenhaupt
fd71ab6b68
Update fake reservoir numbers to trigger default NS warnings.
(cherry picked from commit 6e5f9fc)
2017-12-16 12:09:44 +01:00
Johannes Mockenhaupt
92d0630c55
Fix partial bolus displayed in error popup. 2017-12-15 23:05:09 +01:00
Johannes Mockenhaupt
a6a87d0790
Minor fixes and polish around bolus cancellation. 2017-12-15 10:41:07 +01:00
Johannes Mockenhaupt
b6bc957813
Minor tewaks and cleanups. 2017-12-13 21:37:44 +01:00
Johannes Mockenhaupt
618e00d71d
Update bolus progress dialog when recovery kicks in. 2017-12-13 21:22:13 +01:00
Johannes Mockenhaupt
67eb6b20ed
Handle errors when reading the history for verification fails. 2017-12-13 20:42:43 +01:00
Johannes Mockenhaupt
25f46fe601
Cleanup. 2017-12-13 20:42:43 +01:00
Johannes Mockenhaupt
7eb40653b2
The pump doesn't accept connections while a bolus delivery is in progress.
Remove the code which checked for a bolus delivery in progress
and waited.
2017-12-13 20:42:43 +01:00
Johannes Mockenhaupt
a169245dc3
On bolusing failure, attempt verify by reading last bolus from history. 2017-12-13 20:39:08 +01:00
Johannes Mockenhaupt
71355f0421
Typo that typo and other minor cleanups. 2017-12-13 16:29:53 +01:00
Johannes Mockenhaupt
f83dd1cb67
Unbreak RuffyCommandsV1Impl.readHistory, cleanups. 2017-12-12 00:57:04 +01:00
Johannes Mockenhaupt
a5ea94de7d
Fix #12: properly update TBR from pump on mismatch. 2017-12-10 14:11:07 +01:00
Johannes Mockenhaupt
ca9fe3e755
Fixes around bolus cancellation. 2017-12-10 01:39:58 +01:00
Johannes Mockenhaupt
fe281b9224
Minor cleanups. 2017-12-09 22:40:51 +01:00
Johannes Mockenhaupt
26fa63d571
ComboFragment: always show refresh button.
To allow force starting a conecting attempt if the pump is still
in disconnected state.
2017-12-09 22:08:38 +01:00
Johannes Mockenhaupt
471beae14c
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev:
  remove unused imports
  adapt wear actions to command queue
  RS report unsupported firmware
  removing the whole if() statement
  fix NPE when profile not loaded
  fix of extended bolus size
  Added profile's target BG in NSClient mode
2017-12-09 19:51:07 +01:00
Johannes Mockenhaupt
c386d0ba03
Fix TDDS dialog title. 2017-12-09 19:46:28 +01:00
Johannes Mockenhaupt
3316ab2081
ComboFragment: use queue to refresh state, explicit disconnects for tdd/alert.s 2017-12-09 19:46:28 +01:00
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
Milos Kozak
88defc9f7b
Merge pull request #533 from AdrianLxM/adrian156work01
adapt wear actions to command queue
2017-12-09 17:36: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
AdrianLxM
21f91b9b29 remove unused imports 2017-12-08 14:58:13 +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
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
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