Commit graph

12347 commits

Author SHA1 Message Date
fedor apanasenko ed8582b36a update russian 2017-09-01 10:37:59 +03:00
Milos Kozak 46f111076f Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-08-31 22:01:25 +02:00
Milos Kozak db952759e1 Insulin fragments consolidation 2017-08-31 22:00:45 +02:00
Milos Kozak c312b51fcf consolidate DanaR fragments 2017-08-31 19:32:28 +02:00
Milos Kozak 49b3a7cc1d Merge pull request #407 from RadoslavR/patch-44
Update strings.xml
2017-08-31 10:52:11 +02:00
Radoslav Radev e1c4074663 Update strings.xml 2017-08-31 09:09:26 +03:00
Milos Kozak 7da8b2de5c visibility icon 2017-08-29 21:40:06 +02:00
Milos Kozak 7dfe77dc9c single line in configbuilder 2017-08-29 19:47:32 +02:00
Milos Kozak 13b8a9ecf2 Merge pull request #404 from kakoni/master
Adding out_units support for determine-basal.js
2017-08-29 18:23:36 +02:00
Milos Kozak 981a96aa16 ConfigBuilder layout 2017-08-29 17:59:46 +02:00
Karri Niemelä 034faa4f6e Adding support out_units 2017-08-29 15:06:53 +03:00
AdrianLxM 36986a1b34 Update Combo-Setup.md - typo 2017-08-29 06:03:48 +00:00
AdrianLxM 788ba6649f Update Combo-Setup.md 2017-08-29 06:00:30 +00:00
Johannes Mockenhaupt da125308f4
Add location of logs in instructions. 2017-08-28 21:14:58 +02:00
Johannes Mockenhaupt 01d891efe3
Update instructions. 2017-08-28 21:09:15 +02:00
Johannes Mockenhaupt 448f527525
Splitted boluses: add a wait, so that boluses are delivered with 40s between them. 2017-08-28 21:02:37 +02:00
Johannes Mockenhaupt e4454be5c1
Update instructions. 2017-08-28 20:38:58 +02:00
Johannes Mockenhaupt f903b83315
Simplify. 2017-08-28 20:32:41 +02:00
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
Milos Kozak addd6c8232 fix conflict 2017-08-28 19:15:33 +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
boysim 0c4af846c5 Merge pull request #1 from MilosKozak/master
update
2017-08-27 19:32:12 +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