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 |
|
AdrianLxM
|
79d05488c3
|
RS create bond
|
2017-12-27 02:24:26 +01:00 |
|
Milos Kozak
|
72d6c4494b
|
add scrollview
|
2017-12-26 01:22:35 +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
|
f968ec630c
|
fix non smooth ratio graph
|
2017-12-25 17:01:31 +01:00 |
|
Milos Kozak
|
3ce260dfe9
|
fix of fix
|
2017-12-23 11:18:17 +01:00 |
|
Milos Kozak
|
6e09bfbbe4
|
fix wrong button type
|
2017-12-23 11:07:29 +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
|
25667bc79e
|
RS fix crash when pairing is not confirmed on pump
|
2017-12-22 11:57:59 +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 |
|
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 |
|
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
|
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 |
|
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 |
|
Milos Kozak
|
b98c321cbc
|
NS offline
|
2017-12-12 00:12:35 +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 |
|
AdrianLxM
|
21f91b9b29
|
remove unused imports
|
2017-12-08 14:58:13 +01:00 |
|
Milos Kozak
|
e8c3a0cf91
|
Merge pull request #525 from PoweRGbg/patch-5
Added profile's target BG in NSClient mode
|
2017-12-08 08:20:37 +01:00 |
|
AdrianLxM
|
874915e7b4
|
adapt wear actions to command queue
|
2017-12-08 06:00:49 +01:00 |
|
Milos Kozak
|
dc3c853aca
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2017-12-07 18:48:18 +01:00 |
|
Milos Kozak
|
9d7e2f1bec
|
RS report unsupported firmware
|
2017-12-07 18:48:05 +01:00 |
|
AdrianLxM
|
0013050860
|
remove wear-overview notifications as replaced by system notifications
|
2017-12-07 17:07:32 +01:00 |
|
Roumen Georgiev
|
1d8dd5e35e
|
removing the whole if() statement
|
2017-12-07 17:11:54 +02:00 |
|
Milos Kozak
|
d3e11d9331
|
Merge pull request #530 from PoweRGbg/patch-7
fix of extended bolus size
|
2017-12-07 15:24:55 +01:00 |
|
AdrianLxM
|
aea47420e1
|
fix NPE when profile not loaded
|
2017-12-07 10:40:00 +01:00 |
|
Roumen Georgiev
|
242ed7217a
|
fix of extended bolus size
|
2017-12-07 10:08:26 +02:00 |
|
Milos Kozak
|
648b918e3a
|
Merge pull request #528 from jotomo/log-packages
Log full class name (not just filename), so logs can be filtered by p…
|
2017-12-06 14:16:20 +01:00 |
|
Johannes Mockenhaupt
|
ab456d5966
|
Remove missed reference to pref in NSProfilePlugin.
|
2017-12-06 12:05:39 +01:00 |
|
Johannes Mockenhaupt
|
d58bb75d01
|
Add missing synchronized so guard works properly.
|
2017-12-06 12:01:59 +01:00 |
|
Johannes Mockenhaupt
|
7d07982181
|
Log full class name (not just filename), so logs can be filtered by package name.
|
2017-12-06 11:53:51 +01:00 |
|
AdrianLxM
|
525adddc5e
|
Merge pull request #527 from osodebailar/dev
Dev
|
2017-12-06 10:18:43 +01:00 |
|
Milos Kozak
|
7be5c041cc
|
Merge pull request #526 from MilosKozak/untranslatable
untranslatable strings greek
|
2017-12-05 22:37:34 +01:00 |
|
Milos Kozak
|
455383cfd5
|
check for duration in json
|
2017-12-05 22:08:37 +01:00 |
|
AdrianLxM
|
50cbff6fa4
|
untranslatable strings
|
2017-12-05 22:08:14 +01:00 |
|
Milos Kozak
|
a47fe757b9
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2017-12-05 17:03:58 +01:00 |
|
Milos Kozak
|
188762519c
|
greek language
|
2017-12-05 17:03:40 +01:00 |
|
Milos Kozak
|
1adbee5c9e
|
check for null
|
2017-12-05 10:42:10 +01:00 |
|
Johannes Mockenhaupt
|
23874ebbd6
|
Remove 'sync to profile' pref.
(cherry picked from commit 01c52e7)
|
2017-12-05 10:00:31 +01:00 |
|
Roumen Georgiev
|
5e597f03d0
|
Added profile's target BG in NSClient mode
|
2017-12-05 09:23:57 +02:00 |
|
Milos Kozak
|
6c714261d0
|
queue logging
|
2017-12-05 07:34:34 +01:00 |
|
AdrianLxM
|
17867478fb
|
Merge pull request #524 from MilosKozak/watchfaces
Watchfaces Andrew
|
2017-12-04 23:19:52 +01:00 |
|
Milos Kozak
|
bce6d976b0
|
max connection time to 120 sec
|
2017-12-04 20:26:57 +01:00 |
|
AdrianLxM
|
2f235385e0
|
fix NPE
|
2017-12-04 20:04:58 +01:00 |
|
Milos Kozak
|
620c56e4cb
|
lowest priority for background calculations
|
2017-12-04 19:57:09 +01:00 |
|
AdrianLxM
|
c83f966d92
|
wear timestamps long
|
2017-12-04 18:40:13 +01:00 |
|
Milos Kozak
|
23e37a8be7
|
remove unneeded code
|
2017-12-04 18:13:20 +01:00 |
|
AdrianLxM
|
aefb0d62df
|
Merge pull request #522 from MilosKozak/dev
Dev
|
2017-12-04 17:53:36 +01:00 |
|
Milos Kozak
|
34fe8d8b60
|
Merge branch 'staledata' into dev
|
2017-12-04 13:02:23 +01:00 |
|
Milos Kozak
|
812583059a
|
Merge pull request #512 from PoweRGbg/patch-3
ProfileSwitch on graph depending on ScreenSize
|
2017-12-04 12:49:01 +01:00 |
|
AdrianLxM
|
53723411c4
|
fix landscape overview
|
2017-12-04 10:42:34 +01:00 |
|
AdrianLxM
|
42c61f4e6f
|
synchronized wait
|
2017-12-03 21:58:35 +01:00 |
|
Milos Kozak
|
5a12d15c8c
|
upgrade build tools
|
2017-12-03 21:15:12 +01:00 |
|
Milos Kozak
|
4c3e26d19c
|
R: resolve thread deadlock during bolus stop
|
2017-12-03 20:10:54 +01:00 |
|
Milos Kozak
|
2b2d729f42
|
remove unsupported code from korean pump
|
2017-12-03 19:55:23 +01:00 |
|
Milos Kozak
|
4185bb347d
|
handle bolus stop prior to delivery correctly
|
2017-12-03 19:34:01 +01:00 |
|
Milos Kozak
|
9e0241aebc
|
fix translations
|
2017-12-03 19:12:07 +01:00 |
|
Milos Kozak
|
5d217cf1b3
|
better logging
|
2017-12-03 19:02:11 +01:00 |
|
Andrew Warrington
|
eea5082278
|
Revert unnecessary change.
|
2017-12-03 19:01:56 +01:00 |
|
Andrew Warrington
|
9dca53f968
|
Send OpenAPS timestamp to watch rather than minAgo, for more accurate updates on watch face.
|
2017-12-03 18:53:52 +01:00 |
|
Andrew Warrington
|
cefe93d0a0
|
Merge remote-tracking branch 'origin/dev' into watchfaces
|
2017-12-03 17:48:36 +01:00 |
|
Milos Kozak
|
f25334273a
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2017-12-03 17:34:58 +01:00 |
|
Milos Kozak
|
0101bc0a81
|
parse more iso formats
|
2017-12-03 17:34:29 +01:00 |
|
AdrianLxM
|
7777143b07
|
scrollable overview on Jelly
|
2017-12-03 17:30:20 +01:00 |
|
AdrianLxM
|
7958dc9dce
|
jelly overview
|
2017-12-03 13:55:54 +01:00 |
|
AdrianLxM
|
0a8d89db8a
|
Merge remote-tracking branch 'roumenremote/patch-3' into roumen-overview
|
2017-12-03 11:48:14 +01:00 |
|
AdrianLxM
|
07c1084287
|
Merge branch 'watchfaces' into dev
|
2017-12-02 21:45:39 +01:00 |
|
Milos Kozak
|
38ecd88f6c
|
Merge pull request #513 from AdrianLxM/btwatchdog-pr
|
2017-12-02 16:19:46 +01:00 |
|
AdrianLxM
|
14bb0e6ac4
|
Only do pump alarms in APS mode
|
2017-12-02 10:21:42 +01:00 |
|
Milos Kozak
|
8a7f0f22d9
|
min NS version 0.10.2
|
2017-12-01 22:51:25 +01:00 |
|
AdrianLxM
|
98777579c8
|
delta granularity and NPE fix
|
2017-12-01 20:32:26 +01:00 |
|
Milos Kozak
|
faea3a5147
|
RS proper evaluate extended bolus result
|
2017-12-01 17:37:49 +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 |
|
AdrianLxM
|
4b063a7766
|
fix SP for long with string-ressource-id
|
2017-12-01 13:49:50 +01:00 |
|
Milos Kozak
|
aa210970ec
|
Merge branch 'g5' into dev
|
2017-12-01 10:18:53 +01:00 |
|
Milos Kozak
|
77e855ec61
|
fix NPE
|
2017-12-01 10:18:27 +01:00 |
|
Roumen Georgiev
|
ecbac7ea96
|
Make ProfileSwitch text 20% larger
|
2017-12-01 10:30:18 +02:00 |
|
Andreas
|
29d9d20605
|
Update strings.xml
Add german text for local alerts
|
2017-12-01 08:03:33 +01:00 |
|
Andreas
|
e07c5fb50d
|
Update strings.xml
Change "Temp basal" to "Temp Basal"
|
2017-11-30 15:04:40 +01:00 |
|
Roumen Georgiev
|
d683ea2f0c
|
All labes scaled
COB is not here
|
2017-11-30 11:28:26 +02:00 |
|
Roumen Georgiev
|
24b9326602
|
Update PointsWithLabelGraphSeries.java
|
2017-11-30 09:57:16 +02:00 |
|
Roumen Georgiev
|
418a7f7094
|
ProfileSwitch depending on ScreenSize
Text size in ProfileSwitch events depends on screen resolution
|
2017-11-30 09:45:18 +02:00 |
|
Milos Kozak
|
04742c60cd
|
G5 fix time value
|
2017-11-29 23:00:41 +01:00 |
|
Milos Kozak
|
b73e12b731
|
G5: accept arrays
|
2017-11-29 17:22:45 +01:00 |
|
Milos Kozak
|
7fc9efde40
|
G5 offline/uploader
|
2017-11-29 16:07:26 +01:00 |
|
Roumen Georgiev
|
c56330cae7
|
Less than, not moreThan15
|
2017-11-29 09:21:55 +02:00 |
|
Milos Kozak
|
b1a214b9e7
|
Merge branch 'dev' into dev
|
2017-11-28 21:50:32 +01:00 |
|