Commit graph

2705 commits

Author SHA1 Message Date
Milos Kozak 060895b33f better handling of wrong profiles 2018-01-21 13:37:38 +01:00
Milos Kozak c070d47736
Merge pull request #610 from jotomo/overview-checkboxes
Overview: move checkboxes before label.
2018-01-19 21:00:39 +01:00
Johannes Mockenhaupt 8109900e9b
Overview: move checkboxes before label.
(cherry picked from commit 4825e16)
2018-01-19 20:13:53 +01:00
Milos Kozak 97e0aaa380 fix pump unreachable for virtual pump 2018-01-16 23:28:09 +01:00
Milos Kozak 7fdc146b91 getLastAutosensData improvement and logging 2018-01-16 19:28:25 +01:00
Milos Kozak 54ac28bdf9 typo fix 2018-01-15 16:56:30 +01:00
Milos Kozak 98e28654eb Merge branch 'smb-defaults' into 'smb060'
Smb defaults

See merge request MilosKozak/AndroidAPS!378
2018-01-15 13:36:15 +00:00
Johannes Mockenhaupt 0569addc55
Set enableSMB_always if using a non-noisy BG source. 2018-01-15 14:03:37 +01:00
Johannes Mockenhaupt 0e4c72e790
Fix check for DexcomG5 Bg source. 2018-01-15 13:58:25 +01:00
Milos Kozak c501d8e3c5 Merge branch 'smb060' of https://gitlab.com/MilosKozak/AndroidAPS into smb060 2018-01-15 12:47:28 +01:00
Milos Kozak 91a6c7a96c Merge branch 'dev' into smb060 2018-01-15 12:46:50 +01:00
Milos Kozak 5a00b68f68 remove readstatus prior every command 2018-01-14 21:42:36 +01:00
Milos Kozak 99d83a60f4 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-01-14 17:12:35 +01:00
Milos Kozak 44381288f4 bump 1.57-dev 2018-01-14 17:12:18 +01:00
Milos Kozak 89b7b9c24a better log build verison to Fabric 2018-01-14 17:11:39 +01:00
Milos Kozak 12fe8bcfdd Merge branch 'dev' into smb060 2018-01-13 22:50:41 +01:00
Milos Kozak 24909bf59c Merge branch 'smb060' of https://gitlab.com/MilosKozak/AndroidAPS into smb060 2018-01-13 22:50:10 +01:00
Milos Kozak 390cef5174 remainingCATime fix 2018-01-13 22:49:58 +01:00
Milos Kozak fdbd2a2cb1
Merge pull request #596 from jotomo/tbr-active-check-race-condition
Avoid race condition checking for an active TBR.
2018-01-13 22:43:41 +01:00
Milos Kozak 4f9df99ffb
Merge pull request #601 from jotomo/combo-strings
Add strings for the Combo pump, including some renames.
2018-01-13 22:29:46 +01:00
Milos Kozak f8ff076c59
Merge pull request #602 from triplem/pr_gradle
Cleanup gradle build files
2018-01-13 22:29:08 +01:00
Markus M. May f5cc2debd7 Cleanup gradle build files 2018-01-13 21:34:38 +01:00
Johannes Mockenhaupt be8534db51
Add strings for the Combo pump, including some renames.
Some virtualpump_* strings have been renamed to pump_* since they're
now used for multiple pumps.
2018-01-11 21:47:30 +01:00
AdrianLxM 3fc3a61c37
Merge pull request #587 from andrew-warrington/watchfaces
Steampunk watch face: Chart readability improvement
2018-01-11 20:19:37 +01:00
Andrew Warrington 3495ef129a Merge remote-tracking branch 'origin/dev' into watchfaces 2018-01-11 19:42:50 +01:00
AdrianLxM 6d60a5e195
Merge pull request #600 from MilosKozak/AdrianLxM-patch-1
Ignore Extra translations (on dev branch)
2018-01-11 14:57:56 +01:00
AdrianLxM 51ca0e0d12
Update build.gradle 2018-01-11 14:14:53 +01:00
Milos Kozak 92642c5d0c update badge 2018-01-11 10:01:33 +01:00
Milos Kozak 1d5d44e008
Merge pull request #598 from MilosKozak/coverage
Coverage
2018-01-11 00:09:07 +01:00
Milos Kozak 99eef3b19a more round tests 2018-01-10 23:57:02 +01:00
Milos Kozak a430a7d70d coverage 2018-01-10 23:31:31 +01:00
Johannes Mockenhaupt 27dcb40f48
Add null check in ConfigBuildPlugin.getTempBasalFromHistory. 2018-01-10 22:44:18 +01:00
Milos Kozak bae9eefc4c
Merge pull request #593 from boysim/dev
typo fixes and added dutch translations
2018-01-10 11:18:55 +01:00
Johannes Mockenhaupt 06d949cd82
Avoid race condition checking for an active TBR. 2018-01-10 10:48:44 +01:00
Simon Pauwels 2df19b85a5
typo and added dutch translations 2018-01-09 21:16:37 +01:00
Simon Pauwels 0cc97388f5
Merge pull request #16 from MilosKozak/dev
Dev 9/01/18
2018-01-09 20:34:05 +01:00
Milos Kozak 70e22487b2 fix canceling temp in open loop mode. credits to @warstar2187 2018-01-09 19:47:32 +01:00
Milos Kozak 1ce6f32c39 Merge branch 'dev' into smb060 2018-01-09 19:45:45 +01:00
Milos Kozak bdd1a85d26 fix canceling temp in open loop mode. credits to @warstar2187 2018-01-09 19:44:42 +01:00
Milos Kozak 7e625918ac Merge branch 'dev' into smb060 2018-01-08 14:27:39 +01:00
Milos Kozak d7dfe8942e prevent basal updated messages on virtual pump 2018-01-08 14:27:27 +01:00
Milos Kozak 144315ba61 pass enableSMB_always to determinebasal 2018-01-08 14:19:21 +01:00
Milos Kozak db3369865a Merge branch 'dev' into smb060 2018-01-08 14:09:23 +01:00
Milos Kozak 6ebd6bcdc0 Merge branch 'nsc' into dev 2018-01-08 14:09:02 +01:00
Milos Kozak b31504ac83
Merge pull request #590 from kuchjir/BolusWizard_fix_for_bg_bellow_targetBGLow
added BolusWizardTest
2018-01-07 22:58:22 +01:00
kuchjir e5b21ccc3e added BolusWizardTest 2018-01-07 22:16:08 +01:00
Milos Kozak fbb120673f Merge branch 'dev' into smb060 2018-01-07 15:32:14 +01:00
Milos Kozak 1ff99c4814 prefill profile switch JSON from local store if not exists 2018-01-07 15:29:50 +01:00
Milos Kozak ab89e16acd PARTIAL_WAKE_LOCK for NSClientService 2018-01-07 12:09:23 +01:00
Milos Kozak 8cf69006b2 check 30min interval only for basal rates 2018-01-07 11:13:02 +01:00