Commit graph

2817 commits

Author SHA1 Message Date
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
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
AdrianLxM
c939a35810
Merge pull request #582 from MilosKozak/watchfaces-steampunk
actual bg in objective 1
2018-01-06 00:15:55 +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
Milos Kozak
955ecc6d64 set defaults for display range 2018-01-04 21:33:18 +01:00
AdrianLxM
95bca1a92d actual bg in objective 1 2018-01-04 18:53:38 +01:00
AdrianLxM
468426bd31
Merge pull request #581 from MilosKozak/watchfaces-steampunk
request new data on preference change
2018-01-04 17:41:30 +01:00
AdrianLxM
c3d14b506d allow old data on the wf 2018-01-04 16:20:49 +01:00
AdrianLxM
41fb92815b request new data on preference change 2018-01-04 12:22:08 +01:00
Milos Kozak
d7200d1e8e warn if wrong profile is detected 2018-01-04 11:06:57 +01:00
Milos Kozak
4643cdc3b9 accept local NS data broadcast even when ns_upload_only is selected 2018-01-04 09:45:17 +01:00
Milos Kozak
a08a6cbb70 patch SMB determine_basal to not produce error 2018-01-03 22:59:26 +01:00
Milos Kozak
ed3f076bd7 Merge branch 'dev' into smb060 2018-01-03 22:40:34 +01:00
Milos Kozak
de1475dbba remove logging 2018-01-03 22:28:48 +01:00
Milos Kozak
230ec7177b Merge branch 'dev' into smb060 2018-01-03 21:22:38 +01:00
Milos Kozak
cb1df61d88
Merge pull request #579 from jotomo/activity-npe-guard
Activity NPE guard
2018-01-03 21:17:01 +01:00
Johannes Mockenhaupt
f09d68ad59
Check activity != null before drawing graph. 2018-01-03 20:58:49 +01:00
Milos Kozak
ff5d42522c Merge branch 'dev' into smb060 2018-01-03 20:31:36 +01:00
Milos Kozak
094737adde improve GUI response 2018-01-03 19:59:18 +01:00
AdrianLxM
0b76290091
Merge pull request #578 from andrew-warrington/watchfaces
Steampunk watch face
2018-01-03 19:58:40 +01:00
Andrew Warrington
96c41881fd
Merge pull request #17 from AdrianLxM/watchfaces-steampunk
darker and gracile steampunk-chart
2018-01-03 19:50:13 +01:00
AdrianLxM
5270f2cc69 narrower temp basal line for steampunk watchface 2018-01-03 18:58:02 +01:00
AdrianLxM
a75ff0d1f6 darker and gracile steampunk-chart 2018-01-03 18:13:38 +01:00
Andrew Warrington
267bdd6a43 Steampunk: Enabled chart zoom with double-tap on bottom 1/3 of screen - xml files. 2018-01-03 16:33:39 +01:00
Andrew Warrington
512341e603 Steampunk: Enabled chart zoom with double-tap on bottom 1/3 of screen. 2018-01-03 15:24:06 +01:00
Andrew Warrington
7c73a72c66
Merge pull request #16 from AdrianLxM/watchfaces-steampunk
fix build issues and updates from upstream
2018-01-03 14:16:08 +01:00
AdrianLxM
99f0bbb478 move steampunk md to main dir 2018-01-03 14:00:57 +01:00
AdrianLxM
e0abd1b816 Merge remote-tracking branch 'andrewremote/watchfaces' into watchfaces-steampunk 2018-01-03 13:53:38 +01:00
AdrianLxM
28a52b3ab7
Merge pull request #574 from MilosKozak/illegalstate-fix
illegalState crash fix
2018-01-03 13:45:31 +01:00
Andrew Warrington
7ac413553b Addition of a file linking to the location of the Steampunk source photoshop file. File is not included in the repository as it exceeds Github's 25 mb limit. 2018-01-03 10:58:10 +01:00
Andrew Warrington
8b37826335 Steampunk watch face - improvement of the units switching functionality (less time spent on "?" on glucose dial). 2018-01-03 10:41:18 +01:00