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

2241 commits

This branch
This branch
All branches
Author SHA1 Message Date
Johannes Mockenhaupt 7d5571ffd2
SetTbrCommand: rewrite inputing duration. 
Inputs all steps at once, including 'alignment' step, thereby removing a wait
between the initial step and subsequent step where a bad timing could
break the command.
 2017-08-28 20:13:20 +02:00
Johannes Mockenhaupt b1bd891a93
Update instructions. 2017-08-28 19:48:11 +02:00
Johannes Mockenhaupt 4c313a6a14
Small cleanup. 
(cherry picked from commit b0b533e)
 2017-08-28 12:43:12 +02:00
Johannes Mockenhaupt 6f8e0fc257
Remove hack to cancel a request for a TBR that is already running (localized issue). 
(cherry picked from commit a671536)
 2017-08-28 12:43:11 +02:00
Johannes Mockenhaupt cff4bc1abe
Add temporary fix for edge case resulting in SetTbrCommand failing to set TBR_DURATION, where duration is not correctly pumped up to a multiple of 15. 
(cherry picked from commit df9952f)
 2017-08-28 12:43:09 +02:00
Johannes Mockenhaupt a53564fcae
Add wait in loop to check for update from pump. 
(cherry picked from commit fe8d09e)
 2017-08-28 12:43:08 +02:00
Johannes Mockenhaupt 11332391b8
Clean up (Cancellable)BolusCommands, to use dynamic scroll wait as well. 
(cherry picked from commit 711cc58)
 2017-08-28 12:43:06 +02:00
Johannes Mockenhaupt 03ff15d533
Remove unused test class. 2017-08-28 00:57:47 +02:00
Johannes Mockenhaupt 381a26119b
Crap, don't enable experimental bolus by default. 2017-08-28 00:33:33 +02:00
Johannes Mockenhaupt a42b671965
Update version. 2017-08-27 20:40:29 +02:00
Johannes Mockenhaupt f15373420c
Merge branch 'just-a-flesh-wound' into develop 
* just-a-flesh-wound: (50 commits)
  Small  refactoring.
  Restore bolus splitting hack.
  Make new BolusCommand configurable.
  Report bolus delivered if the pump raised a warning/error during delivery.
  Cleanup merge.
  Restore bolus comands alongside.
  Merge fixes without changes to behaviour.
  Try to be clever about slow screen updates when scrolling.
  Revert "Try building against ruffy stable, 8dae0c0fedd5e371e85da3433a07aaab27b05db0"
  Try building against ruffy stable, 8dae0c0fedd5e371e85da3433a07aaab27b05db0
  Workaound for #27 (TBR issued twice).
  Revert "Retry with current ruffy."
  Retry with current ruffy.
  Remove code to determine pump capabilities for the time being.
  Don't provide status JSON until we can provide it properly.
  ComboPlugin: don't implement ConstraintsInterface, ProfileInterface.
  Use string resource.
  Cleanup.
  Only display Extended Bolus tab in Treatments if pump supports them.
  Build against ruffy b916a900c0899ef58ad58c7427d1c30d3c8731f4.
  ...
 2017-08-27 20:35:29 +02:00
Johannes Mockenhaupt c774af9f01
Update instructions. 2017-08-27 20:35:18 +02:00
Johannes Mockenhaupt e3a732d53d
Small refactoring. 2017-08-27 20:30:58 +02:00
Johannes Mockenhaupt 9b30d35ca7
Add setup instructions as Combo-Setup.md. 2017-08-27 19:43:26 +02:00
Johannes Mockenhaupt b85f5324de
Restore bolus splitting hack. 2017-08-27 19:37:43 +02:00
Johannes Mockenhaupt ecd05bef2d
Make new BolusCommand configurable. 2017-08-27 19:11:17 +02:00
Johannes Mockenhaupt b53db22ae1
Report bolus delivered if the pump raised a warning/error during delivery. 
Most likely this is due to a low cartridge warning, but might also be an occlusion alert.
This lets the alarm ring and asks the user to check it. The treatment is also recorded in
the db as enacted.

(cherry picked from commit 6cc017a)
 2017-08-27 19:08:27 +02:00
Johannes Mockenhaupt fea1309fa3
Cleanup merge. 2017-08-27 19:05:33 +02:00
Johannes Mockenhaupt 3d2732a68e
Restore bolus comands alongside. 2017-08-27 19:05:08 +02:00
Johannes Mockenhaupt 95fda165a3
Merge fixes without changes to behaviour. 2017-08-27 18:49:24 +02:00
Johannes Mockenhaupt e399fac8dc
Try to be clever about slow screen updates when scrolling. 2017-08-27 18:45:25 +02:00
Johannes Mockenhaupt ad44b356c4
Revert "Try building against ruffy stable, 8dae0c0fedd5e371e85da3433a07aaab27b05db0" 
This reverts commit 8720c08cdd4a7f89b77816d849da9c585fb8f1ef.
 2017-08-27 18:45:24 +02:00
Johannes Mockenhaupt f70cbbc6c0
Try building against ruffy stable, 8dae0c0fedd5e371e85da3433a07aaab27b05db0 2017-08-27 18:45:24 +02:00
Johannes Mockenhaupt 7bd7c7d035
Workaound for #27 (TBR issued twice). 2017-08-27 18:45:24 +02:00
Johannes Mockenhaupt 0705755368
Revert "Retry with current ruffy." 
This reverts commit f9281c1f996679a2c8065aa52cbb8cb4698353bc.
 2017-08-27 18:45:24 +02:00
Johannes Mockenhaupt 2a80111034
Retry with current ruffy. 2017-08-27 18:45:24 +02:00
Johannes Mockenhaupt c8f7b535c2
Remove code to determine pump capabilities for the time being. 2017-08-27 18:45:22 +02:00
Johannes Mockenhaupt 40941996c2
Don't provide status JSON until we can provide it properly. 2017-08-27 18:44:55 +02:00
Johannes Mockenhaupt ff088ddd3f
ComboPlugin: don't implement ConstraintsInterface, ProfileInterface. 2017-08-27 18:44:55 +02:00
Johannes Mockenhaupt 1d53305ff9
Use string resource. 2017-08-27 18:44:55 +02:00
Johannes Mockenhaupt c2ae0b7289
Cleanup. 2017-08-27 18:44:55 +02:00
Johannes Mockenhaupt fdab7daf2c
Only display Extended Bolus tab in Treatments if pump supports them. 
(cherry picked from commit e862c35)
 2017-08-27 18:44:30 +02:00
Johannes Mockenhaupt 4046305380
Build against ruffy b916a900c0899ef58ad58c7427d1c30d3c8731f4. 2017-08-27 18:44:30 +02:00
Johannes Mockenhaupt bc68f2cc1b
Better log output. 2017-08-27 18:44:30 +02:00
Johannes Mockenhaupt 99b98f1dec
Set custom version 2017-08-27 18:44:30 +02:00
Johannes Mockenhaupt fce696b51d
Cleanup, fix merge issues. 2017-08-27 18:44:28 +02:00
Johannes Mockenhaupt 4d2fa19ad4
Merge branch 'bolus-progress' into rework 
* bolus-progress:
  wip
  wip
  wip
  more
  more
  Remove TODOs for extended bolus.
  wip cancelling
  Initial take on bolus cancellation.
  Initial take on bolus progress reporting.
  Add alternative SetTbrCommand for pumps with different behaviour.
  Formatting.
 2017-08-27 18:43:19 +02:00
Johannes Mockenhaupt e6ba99b02f
Fix reading blinking values, use alternate SetTbrCommand by default, 
cleanups
 2017-08-27 18:05:05 +02:00
Johannes Mockenhaupt 37523fbdd1
ComboPlugin: Extract fields into ComboPump. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt 3fdac4b23e
Small refactoring. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt 9f57f82b6a
Remove wait for carb-only treatment. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt c301d6585c
ComboPlugin: implement Constraint, ProfileInterface. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt eb74a24e54
Misc cleanups. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt 5eea6d7b8d
Fix waiting between reconnects. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt 7a41117a64
Experiments. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt 6b19759a9f
Command stubs. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt 9349662f8e
Rename ReadPumpStateCommand -> GetPumpStateCommand. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt de693c0f76
Add reservoirLevel to PumpState. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt 785a01a056
Extract methods to read blinking values. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt 7537048a96
Finish injecting scripter. 2017-08-27 18:05:03 +02:00