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 |
|
|
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 |
|
|
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
|
27dcb40f48
|
Add null check in ConfigBuildPlugin.getTempBasalFromHistory.
|
2018-01-10 22:44:18 +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 |
|
|
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 |
|
|
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 |
|
|
AdrianLxM
|
6c53fd11e9
|
Merge pull request #586 from MilosKozak/basalupdate-notif
basal updated notification
|
2018-01-06 09:10:00 +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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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
|
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 |
|
|
Milos Kozak
|
cc1cd675c7
|
Merge pull request #573 from MilosKozak/combo-bolus-fix
combo-bolus-fix
|
2018-01-02 10:05:20 +01:00 |
|
|
Andrew Warrington
|
7475b1ba3a
|
Merge remote-tracking branch 'origin/dev' into watchfaces
|
2018-01-01 22:36:07 +01:00 |
|
|
AdrianLxM
|
c8fa729d8d
|
update German
|
2018-01-01 15:45:01 +01:00 |
|
|
swissalpine
|
62da90011a
|
Revised German Translation
|
2018-01-01 15:10:38 +01:00 |
|
|
Milos Kozak
|
d2753e0dad
|
another cob fix
|
2018-01-01 14:38:37 +01:00 |
|
|
AdrianLxM
|
4a01b14b35
|
missing file
|
2017-12-31 16:51:44 +01:00 |
|
|
AdrianLxM
|
e190f1b9ef
|
illegalState crash fix
|
2017-12-31 16:44:13 +01:00 |
|
|
Milos Kozak
|
d27d1b1821
|
Objectives update
|
2017-12-31 12:24:51 +01:00 |
|
|
Milos Kozak
|
458d812e2e
|
fix objective 1
|
2017-12-31 11:07:21 +01:00 |
|
|
Milos Kozak
|
fcbe8555a6
|
upload aps status and iob when loop is suspended
|
2017-12-31 10:22:18 +01:00 |
|
|
AdrianLxM
|
d3127bc97b
|
Merge pull request #571 from MilosKozak/offline-treatments
fully offline CP
|
2017-12-31 09:52:29 +01:00 |
|
|
AdrianLxM
|
3a7fe56f64
|
combo-bolus-fix
|
2017-12-31 09:50:51 +01:00 |
|
|
Milos Kozak
|
7b0a4d2ce7
|
Merge pull request #570 from jotomo/queue-starts
Queue: synchronize creating queue thread to avoid multiple threads.
|
2017-12-31 09:27:27 +01:00 |
|
|
AdrianLxM
|
937872e80c
|
fully offline CP
|
2017-12-30 23:01:25 +01:00 |
|
|
AdrianLxM
|
fb2271e758
|
Merge pull request #568 from MilosKozak/AdrianLxM-patch-3
Wear: No guard for RS
|
2017-12-30 22:20:37 +01:00 |
|
|
Milos Kozak
|
f3db104979
|
autofix error in profile
|
2017-12-30 19:56:37 +01:00 |
|
|
Milos Kozak
|
8c213cbc11
|
missing cob fix
|
2017-12-30 19:42:07 +01:00 |
|
|
Milos Kozak
|
b39fe2ee5e
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2017-12-30 16:25:18 +01:00 |
|
|
Milos Kozak
|
cc50a6fb99
|
missing inheritance
|
2017-12-30 16:25:08 +01:00 |
|
|
Johannes Mockenhaupt
|
facdc51f6f
|
Queue: synchronize creating queue thread to avoid multiple threads.
|
2017-12-29 16:36:19 +01:00 |
|
|
Andrew Warrington
|
c43afd9d28
|
Merge remote-tracking branch 'origin/dev' into watchfaces
|
2017-12-28 01:03:02 +01:00 |
|
|
AdrianLxM
|
bd4e51e1f9
|
Merge pull request #546 from andrew-warrington/dev
Always show basal rates on watch, whether temporary or normal.
|
2017-12-27 23:17:52 +01:00 |
|
|
AdrianLxM
|
774203605f
|
Wear: No guard for RS
|
2017-12-27 21:19:57 +01:00 |
|
|
Milos Kozak
|
3df0e8f9ce
|
Merge branch 'dev' into smb060
|
2017-12-27 18:02:06 +01:00 |
|
|
AdrianLxM
|
79d05488c3
|
RS create bond
|
2017-12-27 02:24:26 +01:00 |
|
|
Milos Kozak
|
0ab259f61f
|
Merge branch 'dev' into smb060
|
2017-12-26 01:22:49 +01:00 |
|
|
Milos Kozak
|
72d6c4494b
|
add scrollview
|
2017-12-26 01:22:35 +01:00 |
|
|
Milos Kozak
|
162e73e64d
|
Merge branch 'dev' into smb060
|
2017-12-26 00:35:16 +01:00 |
|
|
Milos Kozak
|
8fdd16c305
|
QuickWizard detailed settings
|
2017-12-26 00:27:34 +01:00 |
|
|
Milos Kozak
|
e2f6e6a450
|
Merge pull request #547 from MilosKozak/wear-noFakebolusProgressDismiss2
don't show single connection timeouts on the watch
|
2017-12-25 20:44:39 +01:00 |
|
|
AdrianLxM
|
e50c6fc8ed
|
RS BLE modifications
|
2017-12-25 20:39:14 +01:00 |
|
|
Milos Kozak
|
dd58952b42
|
Merge pull request #548 from MilosKozak/COB-Wizard-idea
Use autosensdata for wizard instead of APSResult
|
2017-12-25 19:22:02 +01:00 |
|
|
Milos Kozak
|
b0bf9b5c79
|
Merge branch 'dev' into smb060
|
2017-12-25 17:01:53 +01:00 |
|
|
Milos Kozak
|
f968ec630c
|
fix non smooth ratio graph
|
2017-12-25 17:01:31 +01:00 |
|
|
Milos Kozak
|
ae30046c95
|
Merge branch 'dev' into smb060
|
2017-12-23 11:18:37 +01:00 |
|
|
Milos Kozak
|
3ce260dfe9
|
fix of fix
|
2017-12-23 11:18:17 +01:00 |
|
|
Milos Kozak
|
51de0f16c1
|
Merge branch 'dev' into smb060
|
2017-12-23 11:07:48 +01:00 |
|
|
Milos Kozak
|
6e09bfbbe4
|
fix wrong button type
|
2017-12-23 11:07:29 +01:00 |
|
|
Milos Kozak
|
7380065bd9
|
Merge branch 'dev' into smb060
|
2017-12-22 21:11:38 +01:00 |
|
|
Milos Kozak
|
2bb37a4bfc
|
fix doubled percentage when comming from NS
|
2017-12-22 21:03:36 +01:00 |
|
|
Milos Kozak
|
248d3d1697
|
proper select last used profile
|
2017-12-22 20:34:53 +01:00 |
|
|
Milos Kozak
|
93b954fffe
|
when using profile percentage limit basal rate to minimal value supported by pump
|
2017-12-22 20:17:31 +01:00 |
|
|
Milos Kozak
|
600e2ade1c
|
SingleClickButton
|
2017-12-22 19:50:16 +01:00 |
|
|
Milos Kozak
|
0851581f7f
|
Merge branch 'dev' into smb060
|
2017-12-22 12:03:11 +01:00 |
|
|
Milos Kozak
|
25667bc79e
|
RS fix crash when pairing is not confirmed on pump
|
2017-12-22 11:57:59 +01:00 |
|
|
Milos Kozak
|
e77e7ffbbd
|
Merge branch 'smb060' of https://gitlab.com/MilosKozak/AndroidAPS into smb060
|
2017-12-22 10:35:33 +01:00 |
|
|
Milos Kozak
|
99e5a39b33
|
Merge branch 'dev' into smb060
|
2017-12-22 10:34:45 +01:00 |
|
|
Milos Kozak
|
5bc6ea04c2
|
Double -> double
|
2017-12-22 03:27:13 +01:00 |
|
|
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 |
|
|
Andrew Warrington
|
176c5f46ff
|
Ensure basal rate shown as a percentage if required according to user preferences.
|
2017-12-21 09:50:16 +01:00 |
|
|
Milos Kozak
|
fb12c0bc96
|
enable SMB for G5
|
2017-12-21 09:02:49 +01:00 |
|
|
Milos Kozak
|
cb2368f535
|
Merge branch 'dev' into smb060
|
2017-12-21 08:58:33 +01:00 |
|