Commit graph

2490 commits

Author SHA1 Message Date
Milos Kozak
31975396a2 use joda-time 2017-12-22 02:55:40 +01:00
Milos Kozak
74abdc0271 fix disconnecting pump 2017-12-22 01:35:52 +01:00
Milos Kozak
6b23ba10bd format output date to be displayed on iDevices correctly 2017-12-22 00:37:22 +01:00
Milos Kozak
a5c4495a5d BolusWizard use 0 for insulin correction if in range 2017-12-22 00:17:46 +01:00
Milos Kozak
771f9eac1a LocalProfile TimeListEdit min, max 2017-12-22 00:12:40 +01:00
Milos Kozak
5c7ad1e650
Merge pull request #553 from MilosKozak/AdrianLxM-patch-1
remove string with no default translation
2017-12-21 09:51:41 +01:00
Andrew Warrington
176c5f46ff Ensure basal rate shown as a percentage if required according to user preferences. 2017-12-21 09:50:16 +01:00
AdrianLxM
2d2bd6d77a
remove string with no default translation 2017-12-21 08:26:55 +01:00
Milos Kozak
2bdda9af43 Rv2,RS fix loading events 2017-12-21 07:45:56 +01:00
Milos Kozak
adff0329dd initialize lastCommandTime too after BT reset 2017-12-20 20:55:14 +01:00
Milos Kozak
0f43e95644 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-12-20 20:45:35 +01:00
Milos Kozak
63b0efede3 allow to read status after every command 2017-12-20 20:45:21 +01:00
Milos Kozak
beb87acc9f
Merge pull request #552 from MilosKozak/nsoffline
Nsoffline
2017-12-20 20:17:30 +01:00
Milos Kozak
c33dd1e7d7 RS enable BT before scanning 2017-12-20 19:50:44 +01:00
Milos Kozak
70f4b72ff9 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-12-20 18:26:52 +01:00
Milos Kozak
096b2e93a3 wait a few sec before disconnection for another command 2017-12-20 18:26:47 +01:00
Milos Kozak
3975ce4cbe
Merge pull request #551 from jotomo/profile-switch-on-actions-tab
Actions tab: show profile switch button for single profile too.
2017-12-20 16:45:10 +01:00
Johannes Mockenhaupt
d1085c876e
Actions tab: show profile switch button for single profile too. 2017-12-20 16:31:28 +01:00
Milos Kozak
fd91dfc8a6
Merge pull request #549 from MilosKozak/nonurgent-oldnsnotif
Old NS-Version non-urgent
2017-12-20 14:59:03 +01:00
AdrianLxM
81ca35515f
Old NS-Version non-urgent 2017-12-20 14:34:30 +01:00
Milos Kozak
eb34345ee2
Merge pull request #539 from jotomo/queue-bolus-constraints
Apply bolus constraint before issuing the bolus
2017-12-20 13:25:02 +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
AdrianLxM
e11a4f6d42
Use autosensdata for wizard instead of APSResult 2017-12-19 22:41:43 +01:00
AdrianLxM
3342d9daa3 don't show single connection timeouts on the watch 2017-12-19 14:47:55 +01:00
AdrianLxM
928635dbe9
Merge pull request #545 from MilosKozak/alarmfix-master3
Alarmfix
2017-12-19 08:02:52 +01:00
AdrianLxM
88adc31dbc
Add SP to imports 2017-12-19 07:16:41 +01:00
Andrew Warrington
b180569695 Show watch basal rates, whether temporary or normal. 2017-12-18 21:58:02 +01:00
Andrew Warrington
bc8b93045b Steampunk watchface (mmol support)
Includes delta granularity in the watch preferences.
2017-12-17 23:07:44 +01:00
AdrianLxM
00f13d0479 refactor cancelAlarm back to KeepAliveReceiver 2017-12-17 15:46:43 +01:00
AdrianLxM
9bd0a1f144 push next alert on read status 2017-12-17 15:46:33 +01:00
Andrew Warrington
a0983a99b9 Merge remote-tracking branch 'origin/dev' into watchfaces 2017-12-17 11:52:34 +01:00
Milos Kozak
8cb4921bab BG viewer 2017-12-15 01:03:31 +01:00
Milos Kozak
a05c1f947e Merge branch 'nsoffline' into bgsource 2017-12-14 23:35:01 +01:00
Milos Kozak
5f60e7cf2b G5 upload to xdrip 2017-12-14 21:49:11 +01:00
AdrianLxM
9602bde6a1 fake Esel new file 2017-12-13 22:39:44 +01:00
AdrianLxM
0151dbd496 fake Esel 2017-12-13 22:14:47 +01:00
Milos Kozak
fa4e80444d NSOffline remove from queue as well 2017-12-13 20:03:24 +01:00
Milos Kozak
2a284ce052
Merge pull request #532 from AdrianLxM/adrain156work01
remove wear-overview notifications as replaced by system notifications
2017-12-13 00:00:20 +01:00
Andrew Warrington
9e6f124097 Steampunk watchface (interim commit) 2017-12-12 23:17:25 +01:00
Johannes Mockenhaupt
f6721f628c
Apply bolus constraint before applying. 2017-12-12 22:30:42 +01:00
Milos Kozak
e14272c083 Rv2,RS: always load last 45 min 2017-12-12 18:18:41 +01:00
Andrew Warrington
ac37d691ee Steampunk watch face addition of mmol/L drawable 2017-12-12 06:15:47 +01:00
Milos Kozak
b98c321cbc NS offline 2017-12-12 00:12:35 +01:00
Andrew Warrington
c453eababb Steampunk watch face layout changes 2017-12-11 07:15:57 +01:00
Andrew Warrington
42aa552017 Merge remote-tracking branch 'origin/dev' into watchfaces 2017-12-10 21:40:46 +01:00
Andrew Warrington
74e833c873 Steampunk watch face (for testing) 2017-12-10 21:39:21 +01:00
Andrew Warrington
c3aef7b6f2 Steampunk watch face (not yet functional) 2017-12-10 03:29:14 +01:00
Milos Kozak
88defc9f7b
Merge pull request #533 from AdrianLxM/adrian156work01
adapt wear actions to command queue
2017-12-09 17:36:16 +01:00
Andrew Warrington
2d3333deda Steampunk watch face (not yet functional) 2017-12-09 14:23:43 +01:00
AdrianLxM
21f91b9b29 remove unused imports 2017-12-08 14:58:13 +01:00