Commit graph

134 commits

Author SHA1 Message Date
Johannes Mockenhaupt
7c9824e37d
Insulin button: allow negative presets, fix adding TT insulin. 2018-03-16 22:54:38 +01:00
Johannes Mockenhaupt
32108a7c2f
Carbs button: fix visibility pref, input type, allow negative increments. 2018-03-16 22:11:15 +01:00
Milos Kozak
e9313c5b28 BG autobackfill configurable 2018-03-14 20:21:48 +01:00
AdrianLxM
6904cb8807
Merge pull request #702 from McHoffi/McHoffi-SMBnotify_true
enable SMB notify by default
2018-03-08 15:17:28 +01:00
AdrianLxM
5a5e0ca8b6
Merge pull request #734 from MilosKozak/watchsmb2
Watchface overhaul
2018-03-08 15:10:53 +01:00
AdrianLxM
d2919f9577 Merge remote-tracking branch 'jotomoremote/watch-updater-service-worker-thread' into watchsmb2 2018-03-04 19:25:26 +01:00
AdrianLxM
7d8674aa61 fix 5m-impact parameter - always was 0 2018-03-02 21:09:09 +01:00
Milos Kozak
bd6fab3ca3
Merge pull request #721 from jamorham/floatmaxbasal
Make openapsama_current_basal_safety_multiplier Double instead of Int
2018-02-26 10:46:29 +01:00
Jamorham
805548dd1e
Make openapsama_current_basal_safety_multiplier Double instead of Integer 2018-02-25 21:30:11 +00:00
Milos Kozak
f62cac1b66 make new i & c buttons visible by default 2018-02-25 17:52:30 +01:00
Milos Kozak
a7da0bb67a
Merge pull request #719 from jotomo/buttons
Moar buttons.
2018-02-25 11:05:21 +01:00
Jamorham
9d985ec3b7
Add FabricPrivacy 2018-02-22 12:30:36 +00:00
AdrianLxM
c22c22f1d7 wear settings for predictions 2018-02-21 15:56:13 +01:00
JamOrHam
bc2f749ef3
Merge branch 'dev' into dev 2018-02-21 13:43:18 +00:00
Jamorham
67b397b417
Insight: preemptive connection preference option 2018-02-21 12:23:19 +00:00
McHoffi
21d6745d02
Update pref_wear.xml 2018-02-19 20:50:17 +01:00
McHoffi
293eff837b
Update pref_wear.xml 2018-02-19 20:49:53 +01:00
McHoffi
9dcd1c70d5
Update pref_wear.xml 2018-02-19 20:48:54 +01:00
Johannes Mockenhaupt
bf2e567f9c
Moar buttons. 2018-02-18 11:06:36 +01:00
AdrianLxM
a23c76f473
Merge branch 'dev' into smb-wear2 2018-02-14 15:03:45 +01:00
AdrianLxM
c821ef97d8 option to enable wear/SMB notifications 2018-02-14 15:02:04 +01:00
Johannes Mockenhaupt
f8075927f2
Make new behaviour configurable, default on. 2018-02-13 00:34:24 +01:00
Milos Kozak
6312b81e10 Merge branch 'smb060' into dev 2018-02-02 10:51:13 +01:00
Milos Kozak
411add616b
Merge pull request #632 from jamorham/dev
Add Insight Pump Plugin
2018-02-02 09:21:57 +01:00
Jamorham
73ea3628b2
Extracted insight strings 2018-02-01 10:33:54 +00:00
Jamorham
ef2189fec6
Insight faux cancel tbr option 2018-01-29 21:31:06 +00:00
Milos Kozak
296d5059d6 SMB options in preferences 2018-01-27 14:47:04 +01:00
Milos Kozak
98e850b1b3 Merge branch 'dev' into smb060 2018-01-26 11:54:09 +01:00
Jamorham
69da0cf57a
Always connected option 2018-01-25 23:21:42 +00:00
Jamorham
7a4bc3b694
Initial bits for Insight Pump 2018-01-24 14:18:31 +00:00
AdrianLxM
3962808626 minimum of 30 min for unreachable alert 2018-01-21 19:05:04 +01:00
Johannes Mockenhaupt
57944fb4b5
Merge remote-tracking branch 'origin/dev' into smb060
* origin/dev:
  Actions tab: show profile switch button for single profile too.
  Old NS-Version non-urgent
  Add SP to imports
  refactor cancelAlarm back to KeepAliveReceiver
  push next alert on read status
  G5 upload to xdrip
  fake Esel new file
  fake Esel
  Apply bolus constraint before applying.
  Rv2,RS: always load last 45 min
  remove wear-overview notifications as replaced by system notifications
  Remove missed reference to pref in NSProfilePlugin.
  Remove 'sync to profile' pref.

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
2017-12-20 17:28:08 +01:00
Milos Kozak
0d7e950b73
Merge pull request #505 from jotomo/sync-to-pump
Remove sync to pump pref, always sync
2017-12-20 10:49:47 +01:00
Milos Kozak
5f60e7cf2b G5 upload to xdrip 2017-12-14 21:49:11 +01:00
Milos Kozak
b1c4f28eb7 OpenAPS 0.6.0 1st part 2017-12-11 18:45:04 +01:00
Johannes Mockenhaupt
23874ebbd6
Remove 'sync to profile' pref.
(cherry picked from commit 01c52e7)
2017-12-05 10:00:31 +01:00
Milos Kozak
d4d194f7f0 Merge branch 'dev' into smb 2017-12-04 23:30:24 +01:00
AdrianLxM
07c1084287
Merge branch 'watchfaces' into dev 2017-12-02 21:45:39 +01:00
AdrianLxM
98777579c8 delta granularity and NPE fix 2017-12-01 20:32:26 +01:00
Milos Kozak
622ac15c50 Merge branch 'dev' into smb, fix compile, add queue features 2017-12-01 18:13:05 +01:00
AdrianLxM
090127012c
Merge branch 'dev' into btwatchdog-pr 2017-12-01 14:03:44 +01:00
AdrianLxM
09dac632f9 bluetooth watchdog 2017-12-01 13:57:53 +01:00
Milos Kozak
7fc9efde40 G5 offline/uploader 2017-11-29 16:07:26 +01:00
Milos Kozak
d1aec1ff18 Localalerts settings by adrian 2017-11-28 21:48:46 +01:00
Milos Kozak
a1c6704ae9 Merge branch 'dev2' into smb 2017-11-01 20:50:14 +01:00
Milos Kozak
60699eddbb preferences update 2017-11-01 20:43:59 +01:00
AdrianLxM
7ed7a2e8c4 Merge remote-tracking branch 'milosremote/dev' into smb-rhino 2017-10-21 17:06:57 +02:00
AdrianLxM
f751638a7f enabling wearcontrols from preferences 2017-10-12 18:01:10 +02:00
Milos Kozak
24099222f3 Dana R & v2 speed selection 2017-10-10 19:14:43 +02:00
Milos Kozak
d142d2e4f9 resolve RS merge conflict 2017-10-10 16:47:03 +02:00