Commit graph

12701 commits

Author SHA1 Message Date
Milos Kozak 7fdc146b91 getLastAutosensData improvement and logging 2018-01-16 19:28:25 +01:00
Simon Pauwels 3c6a456ed4
Merge pull request #18 from jotomo/combo-scripter-v2
jan 16
2018-01-16 15:02:43 +01:00
Johannes Mockenhaupt fcd7c91b82
Typo. 2018-01-15 21:57:08 +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
Johannes Mockenhaupt 723bcc4ee3
Remove 'queued activities' from ComboFragment.
(cherry picked from commit 57a4449)
2018-01-15 11:11:58 +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
Johannes Mockenhaupt ad54c67c23
README-Combo: ruffy tips & tricks. 2018-01-13 23:36:01 +01:00
Johannes Mockenhaupt 2e0d052209
Merge remote-tracking branch 'MasterPlexus/combo-scripter-v2' into combo-scripter-v2
* MasterPlexus/combo-scripter-v2:
  Update Readme-Combo.md
2018-01-13 23:23:08 +01:00
Johannes Mockenhaupt d54b99c559
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev:
  Cleanup gradle build files
  Add null check in ConfigBuildPlugin.getTempBasalFromHistory.
  Avoid race condition checking for an active TBR.
  Steampunk watch face: Chart readability improvement; point size increases when chert is highly zoomed in (less than 3 hours shown).

# Conflicts:
#	app/build.gradle
2018-01-13 23:18:44 +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
MasterPlexus 8cd3e3ec9f
Update Readme-Combo.md
Add recommendation for ruffy to put screen rotation off,and an additional way for possible pairing.
2018-01-12 21:36:14 +01:00
Johannes Mockenhaupt 7d4d6374be
Merge branch 'combo-strings' into combo-scripter-v2
* combo-strings:
  Add strings for the Combo pump, including some renames.

# Conflicts:
#	app/src/main/res/values/strings.xml
2018-01-11 21:48:01 +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
Johannes Mockenhaupt 61174d1b0a
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev:
  Update build.gradle
  update badge
  more round tests
  coverage
2018-01-11 17:50:07 +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
Johannes Mockenhaupt 864a5e6d81
Missing string resources (en/de). 2018-01-10 23:41:56 +01:00
Simon Pauwels 0ffc61a1ba Added dutch combo translations (#42)
* Added and improved Dutch translations

* typo fix

* double string removal

* Typo fix

* added translations

* Update strings.xml

* Added Dutch combo translations
2018-01-10 23:36:20 +01:00
Johannes Mockenhaupt cc86330f1b
Merge pull request #43 from swissalpine/patch-4
Übersetzungen RUN und STOP MODE
2018-01-10 23:35:15 +01:00
Milos Kozak a430a7d70d coverage 2018-01-10 23:31:31 +01:00
swissalpine 8f91f37f73
Übersetzungen RUN und STOP MODE 2018-01-10 23:24:49 +01:00
Johannes Mockenhaupt 27dcb40f48
Add null check in ConfigBuildPlugin.getTempBasalFromHistory. 2018-01-10 22:44:18 +01:00
boysim c72f339498 Added Dutch combo translations 2018-01-10 22:26:09 +01:00
Markus M. May d4365a2352 Add a unit test for Insulin Plugin 2018-01-10 22:11:20 +01:00
Simon Pauwels 0c2ef80854
Merge pull request #17 from jotomo/combo-scripter-v2
10.01
2018-01-10 22:09:19 +01:00
Simon Pauwels 090d655f7d
Update strings.xml 2018-01-10 22:08:22 +01:00
Johannes Mockenhaupt b4998feee1
Disable reading reservoir level units. 2018-01-10 15:05:17 +01:00
Johannes Mockenhaupt 9ece407f32
Integrate dutch translation with Combo changes.
The lesson to learn here: don't rename string resources in a long-
running branch, but do it after the merge.

Note that Multiwave is a Combo-specific term, the more general
term to describe the combination of a bolus and an extended
bolus is combo bolus, ironically and confusingly ;-)
2018-01-10 11:37:42 +01:00
Johannes Mockenhaupt 0c0a58f16b
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev:
  typo and added dutch translations
2018-01-10 11:20:15 +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