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

3445 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Warrington ac37d691ee Steampunk watch face addition of mmol/L drawable 2017-12-12 06:15:47 +01:00
Johannes Mockenhaupt f83dd1cb67
Unbreak RuffyCommandsV1Impl.readHistory, cleanups. 2017-12-12 00:57:04 +01:00
Milos Kozak b98c321cbc NS offline 2017-12-12 00:12:35 +01:00
Johannes Mockenhaupt be446145c0
Update Testing-Combo.md to be in line with code. 2017-12-11 20:44:29 +01:00
Andrew Warrington c453eababb Steampunk watch face layout changes 2017-12-11 07:15:57 +01:00
Johannes Mockenhaupt a6cba8b2d1
RuffyCommandsV1Impl: actually do delegation. 
(cherry picked from commit 5e447ad)
 2017-12-10 22:24:07 +01:00
Andrew Warrington 42aa552017 Merge remote-tracking branch 'origin/dev' into watchfaces 2017-12-10 21:40:46 +01:00
Andrew Warrington 74e833c873 Steampunk watch face (for testing) 2017-12-10 21:39:21 +01:00
Johannes Mockenhaupt dfcf0a7e2a
Update README-Combo. 
* Add bits on taking over TBR CANCELLED via refresh
* Note on bolus not being recorded in a small number of error situations.
 2017-12-10 14:21:39 +01:00
Johannes Mockenhaupt a5ea94de7d
Fix #12: properly update TBR from pump on mismatch. 2017-12-10 14:11:07 +01:00
Johannes Mockenhaupt 6c5d5fa71e
README-Combo: add Combo config step to set 15m TBR step size. 2017-12-10 13:54:23 +01:00
Johannes Mockenhaupt 7e4164e16f
Testing-Combo: clarify late bolus cancel 2017-12-10 12:17:46 +01:00
Andrew Warrington c3aef7b6f2 Steampunk watch face (not yet functional) 2017-12-10 03:29:14 +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 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
Andrew Warrington 2d3333deda Steampunk watch face (not yet functional) 2017-12-09 14:23:43 +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