Commit graph

2854 commits

Author SHA1 Message Date
Milos Kozak ed6cabe7fa initial RS work 2017-09-13 00:35:03 +02:00
boysim c2dbed5174 Merge pull request #3 from MilosKozak/dev
Dev
2017-09-12 21:26:02 +02:00
Johannes Mockenhaupt 07b04b8abf
Use correct units for low/high from TT. 2017-09-12 01:23:38 +02:00
Milos Kozak 69b04fdf26 Merge pull request #413 from samihusseingit/dev
Dev
2017-09-11 20:12:51 +02:00
Milos Kozak 1a986ce199 Merge pull request #414 from jotomo/logging-and-stuff
Logging and stuff
2017-09-11 10:14:15 +02:00
Johannes Mockenhaupt 936ce42cc0
Remove duplicate logging. 2017-09-10 14:24:00 +02:00
Johannes Mockenhaupt 612efa6a13
Revert "Make the BolusProgress dialog a bit more self-contained."
Breaks dismissal of dialog (only one invocation of
EventDismissBolusprogressIfRunning also sets bolusEnded=true).

This reverts commit c11455dff1.
2017-09-09 18:16:13 +02:00
Johannes Mockenhaupt c11455dff1
Make the BolusProgress dialog a bit more self-contained.
(cherry picked from commit 75db72a)
2017-09-09 16:41:21 +02:00
Johannes Mockenhaupt c227e0e5fa
Dead code be gone.
(cherry picked from commit bb626ce)
2017-09-09 16:41:16 +02:00
Johannes Mockenhaupt 5c3ec9a086
Use SystemClock.sleep instead of Thread.sleep.
Gets rid of all those pointless InterruptedException catching.

(cherry picked from commit 6acaa2b)
2017-09-09 16:41:11 +02:00
Johannes Mockenhaupt c50fad81bb
Log exceptions in catch blocks rather than printing to console.
The default code used by Android Studio when generating a
try/catch can be altered in Settings under
    Editor->File and Code Templates->Catch Statement body
to
    log.error("Unhandled exception", e);
to also do this for newly generated code.

(cherry picked from commit c2ae29f)

(cherry picked from commit 6031a25)
2017-09-09 16:41:06 +02:00
Johannes Mockenhaupt 627cb8e9b2
WizardDialog: don't persist state of tt checkbox, default to false.
This assumes that a default is not useful, as it needs to be decided
whether this is needed on each case (using tt when bolusing to
start eating soon, but not using it when bolusing for the meal
at the end of a tt).
2017-09-09 16:37:08 +02:00
Johannes Mockenhaupt b1e3b45ce9
Add temp target to Wizard dialog
Also, store checkboxes' state as prefereces.

(cherry picked from commit 6e1c66e)
2017-09-09 16:30:17 +02:00
Milos Kozak e3ae7bbeaf Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-09-05 22:47:37 +02:00
Milos Kozak 98848b61ec send max 30 at once to NS 2017-09-05 22:47:10 +02:00
SMUSTAF1 1fd99a9582 changing the color of the bolus value, for visual clarify and confirmation. Reducing errors. 2017-09-05 13:29:43 +02:00
samihusseingit d35729d874 Merge pull request #2 from MilosKozak/dev
Dev
2017-09-05 13:07:45 +02:00
boysim b8c4a34484 Merge pull request #2 from MilosKozak/dev
Dev
2017-09-04 22:13:54 +02:00
Milos Kozak 90496d0a02 Merge pull request #410 from jotomo/ok-cancel-profile-change-refresh
Use OK/Cancel buttons for 'profile changes refresh from NS' dialog in…
2017-09-03 17:13:43 +02:00
Johannes Mockenhaupt 3bebea37ae
Use OK/Cancel buttons for 'profile changes refresh from NS' dialog in Treatments tab. 2017-09-03 01:53:30 +02:00
Milos Kozak fa24368701 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-09-02 10:26:07 +02:00
Milos Kozak 7801db5a29 fix danar bolus step 2017-09-02 10:25:46 +02:00
Milos Kozak 737c1f4e0b Merge pull request #409 from MilosKozak/treatments-splotbroadcast
Split treatments into smaller packages before broadcasting
2017-09-01 16:30:54 +02:00
AdrianLxM 15a40cba80 Split treatments into smaller packages before broadcasting 2017-09-01 14:02:47 +02:00
Milos Kozak 3d956ed34a Merge pull request #408 from apanasef/patch-2
update russian
2017-09-01 10:41:46 +02:00
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
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