caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity
3126 commits 1 branch 20 tags 140 MiB
Commit graph

3126 commits

This branch
This branch
All branches
Author SHA1 Message Date
Johannes Mockenhaupt fe281b9224
Minor cleanups. 2017-12-09 22:40:51 +01:00
Johannes Mockenhaupt 6527b13934
Ignore disconnect failures. 2017-12-09 22:21:24 +01:00
Johannes Mockenhaupt bb1c1f79f1
RuffyScripter: fix on-connect checks to detect running bolus properly. 2017-12-09 22:11:41 +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 4a7b2b3da2
Add note on ruffy pairing to Readme. 2017-12-09 21:39:53 +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 97d13fd14a
Merge branch 'buttons-business' into combo-scripter-v2 
* buttons-business:
  Fix TDDS dialog title.
  ComboFragment: use queue to refresh state, explicit disconnects for tdd/alert.s
  Fix ReadHistoryCommand to not ignore TDD requests.
  Add missing listener registration.
  Overhaul Combo tab buttons and dialogs.
  Only read Tdd and Alerts through buttons on Combo tab, not treatment history.
 2017-12-09 19:46:37 +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 b8ad44ba43
Fix ReadHistoryCommand to not ignore TDD requests. 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 279d322c53
Merge branch 're-add-pump-time-check' into combo-scripter-v2 
* re-add-pump-time-check:
  Shorten/make clearer message on pump clock being off.
  Pump time warning: urgency level based on how much the time is off.
  Check pump time not last connection time
  Re-add warning if pump time is off (needed for basal rates).
  RuffyScripter: read/infer pump time from menu.
 2017-12-09 19:45:30 +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 e286b9e3c2
RuffyScripter: read/infer pump time from menu. 2017-12-09 19:43:24 +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
Johannes Mockenhaupt d3926f64c8
Make CommandResult.delivered the primitive it always should've been. 2017-12-09 16:33:43 +01:00
Johannes Mockenhaupt 8bba8c4d5a
SetTbrCommand: handle edge case where TBR expires while a new one is being programmed. 2017-12-09 16:21:40 +01:00
Johannes Mockenhaupt d18fdc4974
Bolus used to determine last bolus must be within last/next 10min. 2017-12-09 00:37:38 +01:00
Johannes Mockenhaupt 197c116c0b
Document corner-cases when bolusing fails. 2017-12-09 00:34:08 +01:00
Johannes Mockenhaupt 6db58a4e93
Testing-Combo: add entry on experimenting with menu timeouts. 2017-12-08 23:49:33 +01:00
AdrianLxM 21f91b9b29 remove unused imports 2017-12-08 14:58:13 +01:00
Johannes Mockenhaupt 2c8c25c082
Another NPE fix when ruffy isn't available. 2017-12-08 13:10:54 +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 e5a68608a0
Fix NPE when there's no pump. 2017-12-08 12:55:05 +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 6e5f848c6b
Updating Testing-Combo.md to reflect removed history functionality. 2017-12-07 23:23:37 +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
Milos Kozak 89cf340d6d
Merge pull request #531 from AdrianLxM/adrian156work 
fix NPE when profile not loaded
 2017-12-07 15:23:32 +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 9e03e078b6
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  Add missing synchronized so guard works properly.
  Log full class name (not just filename), so logs can be filtered by package name.
 2017-12-06 20:32:50 +01:00
Johannes Mockenhaupt dc3aa000f4
Update docs. 2017-12-06 20:27:36 +01:00
Johannes Mockenhaupt 8009b32b16
Fix reading history when bolus was attempted to cancel but bolus finished before pump accepted request. 2017-12-06 20:06:56 +01:00
Johannes Mockenhaupt 60d6f305b5
Debug code. 2017-12-06 19:31:51 +01:00
Johannes Mockenhaupt 865fc63bd4
RuffyScripter: consider pump connected when BT connection is there AND menu updates are being received. 2017-12-06 17:14:30 +01:00