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

7960 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Simon Pauwels 2df19b85a5
typo and added dutch translations 2018-01-09 21:16:37 +01:00
Johannes Mockenhaupt 9a74b0fb95
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  fix canceling temp in open loop mode. credits to @warstar2187
  prevent basal updated messages on virtual pump
  added BolusWizardTest
  prefill profile switch JSON from local store if not exists
  PARTIAL_WAKE_LOCK for NSClientService
 2018-01-09 20:59: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
Simon Pauwels ca100cd077
added translations 2018-01-09 20:23:03 +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
Johannes Mockenhaupt ad3ef00645
Merge pull request #41 from savek-cc/patch-1 
Update README-Combo.md
 2018-01-08 23:45:17 +01:00
Savek-CC ba8dd8c3c6
Update README-Combo.md 
Android 8.1 is also supported
 2018-01-08 21:20:04 +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
Johannes Mockenhaupt 22c774830c
README-Combo: add note on Quick info. 2018-01-07 21:26:40 +01:00
Simon Pauwels f0081bb77e
Merge pull request #15 from jotomo/combo-scripter-v2 
jan 7
 2018-01-07 17:36:12 +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
Johannes Mockenhaupt 968431d931
i18n reservoir unit. 2018-01-07 13:02:50 +01:00
Milos Kozak ab89e16acd PARTIAL_WAKE_LOCK for NSClientService 2018-01-07 12:09:23 +01:00
Johannes Mockenhaupt d72c243140
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  check 30min interval only for basal rates
 2018-01-07 11:38:51 +01:00
Johannes Mockenhaupt 117b79619b
Check reservoir level before bolus and abort if not enough left. 2018-01-07 11:27:28 +01:00
Johannes Mockenhaupt 836abd74ab
Read reservoir level. 2018-01-07 11:21:56 +01:00
Milos Kozak 8cf69006b2 check 30min interval only for basal rates 2018-01-07 11:13:02 +01:00
Johannes Mockenhaupt 3369d84de8
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  basal updated notification
  Dialogs usability tweaks
 2018-01-06 16:27:02 +01:00
Andrew Warrington 13ad74f77b Steampunk watch face: Chart readability improvement; point size increases when chert is highly zoomed in (less than 3 hours shown). 2018-01-06 14:21:31 +01:00
AdrianLxM 6c53fd11e9
Merge pull request #586 from MilosKozak/basalupdate-notif 
basal updated notification
 2018-01-06 09:10:00 +01:00
AdrianLxM 5089947bc1
Merge pull request #585 from MilosKozak/dialog-usability 
Dialog usability tweaks
 2018-01-06 09:09:29 +01:00
AdrianLxM 4dd238097f basal updated notification 2018-01-06 07:37:39 +01:00
AdrianLxM b9ad3a71fd Dialogs usability tweaks 2018-01-06 06:52:30 +01:00
Johannes Mockenhaupt 3aafcc9854
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  Cockpit watch face: Double-tap opens MainMenuActivity
  prevent processing incomplete profiles
  set defaults for display range
  actual bg in objective 1
  warn if wrong profile is detected
 2018-01-06 00:30:04 +01:00
AdrianLxM c939a35810
Merge pull request #582 from MilosKozak/watchfaces-steampunk 
actual bg in objective 1
 2018-01-06 00:15:55 +01:00
Simon Pauwels 7d1405c0eb
Merge pull request #14 from jotomo/combo-scripter-v2 
jan5
 2018-01-05 23:28:22 +01:00
AdrianLxM 2c7b34e434
Merge pull request #583 from andrew-warrington/watchfaces 
Cockpit watch face: Double-tap opens MainMenuActivity
 2018-01-05 12:24:47 +01:00
Andrew Warrington 02e7752c3e Cockpit watch face: Double-tap opens MainMenuActivity 2018-01-05 11:58:57 +01:00
Milos Kozak 144292576a
Merge branch 'dev' into watchfaces-steampunk 2018-01-05 11:36:48 +01:00
Milos Kozak aff0e6f5a8 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-01-04 23:12:40 +01:00
Milos Kozak b7df21c7d0 prevent processing incomplete profiles 2018-01-04 23:12:35 +01:00
Johannes Mockenhaupt ead299442a
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  allow old data on the wf
  request new data on preference change
  accept local NS data broadcast even when ns_upload_only is selected
  remove logging
 2018-01-04 21:38:19 +01:00