Milos Kozak
|
f14ba554f0
|
RS ble cleanup
|
2018-06-16 13:18:00 +02:00 |
|
Tebbe Ubben
|
1e4c7178f4
|
Merge branch 'dev' into dev
|
2018-06-15 21:10:33 +02:00 |
|
Milos Kozak
|
21b598edfa
|
Merge pull request #1100 from MilosKozak/rsoption
Rsoption
|
2018-06-15 00:19:08 +02:00 |
|
Nico Schmitz
|
43d787ff88
|
Simplify isOlderThan()
|
2018-06-14 12:38:15 +02:00 |
|
Nico Schmitz
|
f82240a724
|
Fix bug in getHoursFromStart()
|
2018-06-14 12:34:42 +02:00 |
|
Roumen Georgiev
|
904957d0d2
|
removing unneeded methods
|
2018-06-13 18:24:50 +03:00 |
|
PoweRGbg
|
a64364de4e
|
removed excessive debugging and unneeded source
|
2018-06-13 16:17:10 +03:00 |
|
PoweRGbg
|
5a197676fb
|
IT WORKS!!!
|
2018-06-13 15:57:42 +03:00 |
|
PoweRGbg
|
faab8fbc67
|
setting full userOptions
|
2018-06-13 11:43:44 +03:00 |
|
Milos Kozak
|
4d2e166620
|
try to fix crash
|
2018-06-13 10:41:15 +02:00 |
|
PoweRGbg
|
56651691a5
|
more more
|
2018-06-13 11:08:47 +03:00 |
|
PoweRGbg
|
64b5783e4a
|
more
|
2018-06-13 11:07:03 +03:00 |
|
PoweRGbg
|
71c474ef5f
|
danaR changes
|
2018-06-13 11:04:32 +03:00 |
|
PoweRGbg
|
5634aabd9f
|
more
|
2018-06-13 11:02:52 +03:00 |
|
PoweRGbg
|
2cb3c15d61
|
more update
|
2018-06-13 11:01:43 +03:00 |
|
PoweRGbg
|
cd337ecdc8
|
update to latest changes from Milos
|
2018-06-13 10:51:06 +03:00 |
|
PoweRGbg
|
434db333b1
|
reverting changes
|
2018-06-13 09:56:30 +03:00 |
|
PoweRGbg
|
87bc6ed798
|
Revert "more debugging output"
This reverts commit 1adf8718ae.
|
2018-06-13 09:49:58 +03:00 |
|
PoweRGbg
|
0f067ef3a7
|
Revert "more debugging output"
This reverts commit f1f8bae2d1.
|
2018-06-13 09:49:45 +03:00 |
|
PoweRGbg
|
90a3a66c30
|
Revert "Merge remote-tracking branch 'upstream/rsoption' into dev"
This reverts commit 233fb33659, reversing
changes made to f1f8bae2d1.
|
2018-06-13 09:49:37 +03:00 |
|
PoweRGbg
|
0e40d1e7ef
|
Revert "Revert "more debugging output""
This reverts commit 209fb79396.
|
2018-06-13 09:49:35 +03:00 |
|
PoweRGbg
|
209fb79396
|
Revert "more debugging output"
This reverts commit f1f8bae2d1.
|
2018-06-13 09:34:57 +03:00 |
|
PoweRGbg
|
233fb33659
|
Merge remote-tracking branch 'upstream/rsoption' into dev
|
2018-06-13 09:14:46 +03:00 |
|
Roumen Georgiev
|
f1f8bae2d1
|
more debugging output
|
2018-06-13 09:00:04 +03:00 |
|
Milos Kozak
|
082918c776
|
remove unneded code
|
2018-06-13 07:44:26 +02:00 |
|
Milos Kozak
|
6fa759a395
|
remove unneded code
|
2018-06-13 07:42:57 +02:00 |
|
Milos Kozak
|
ecdbe2ac37
|
setUserOptions cleanup
|
2018-06-12 23:43:04 +02:00 |
|
Milos Kozak
|
d051e081e2
|
Merge branch 'dev' into rsoption
|
2018-06-12 21:59:20 +02:00 |
|
Milos Kozak
|
d4ed6539d8
|
poctech units mmol/L
|
2018-06-12 21:57:33 +02:00 |
|
Roumen Georgiev
|
1adf8718ae
|
more debugging output
|
2018-06-12 13:30:07 +03:00 |
|
Roumen Georgiev
|
06507bab2c
|
update method names
|
2018-06-12 12:41:40 +03:00 |
|
Roumen Georgiev
|
978d94499f
|
update method names
|
2018-06-12 11:03:23 +03:00 |
|
Roumen Georgiev
|
f044ab15c0
|
setting swithces in activity
|
2018-06-12 10:39:47 +03:00 |
|
Roumen Georgiev
|
01012d817c
|
getting userOptions from v2
|
2018-06-12 10:29:47 +03:00 |
|
Milos Kozak
|
e7eec8fe69
|
Poctech BG source
|
2018-06-11 17:26:31 +02:00 |
|
TebbeUbben
|
41a7f57b75
|
Update Objective views every minute
|
2018-06-11 16:35:47 +02:00 |
|
TebbeUbben
|
3ac10f4f7a
|
Improved MinimumDurationTask visualization
|
2018-06-11 16:24:46 +02:00 |
|
TebbeUbben
|
31cb68240b
|
Automatically scroll to currently active objective
|
2018-06-11 15:45:28 +02:00 |
|
Roumen Georgiev
|
2441214bb8
|
added SetUserOptions for DanaR
|
2018-06-11 11:36:32 +03:00 |
|
TebbeUbben
|
97984f8ef3
|
Improved leftover time display
|
2018-06-09 23:15:46 +02:00 |
|
TebbeUbben
|
6bc13d9cc0
|
Don't return false in isStarted if objective has been accomplished
|
2018-06-09 23:10:54 +02:00 |
|
TebbeUbben
|
0d21a0ab62
|
Fixed tests
|
2018-06-09 23:03:31 +02:00 |
|
TebbeUbben
|
005039effc
|
Objectives styling
|
2018-06-09 22:07:41 +02:00 |
|
TebbeUbben
|
531a926d00
|
Close navigation drawer on click
|
2018-06-09 13:17:26 +02:00 |
|
Milos Kozak
|
30dbbb12a8
|
Merge pull request #1081 from MilosKozak/AdrianLxM-patch-3
Wizard: fully undo "ok" on constraints violation
|
2018-06-09 11:46:41 +02:00 |
|
TebbeUbben
|
f7597c93d7
|
Merge remote-tracking branch 'milos/AdrianLxM-patch-4' into dev
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalPlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java
|
2018-06-08 23:30:39 +02:00 |
|
TebbeUbben
|
2d94133175
|
Plugin descriptions
|
2018-06-08 21:19:46 +02:00 |
|
AdrianLxM
|
bbf09a62f1
|
synchronize onDestroyView
|
2018-06-08 06:20:35 +02:00 |
|
AdrianLxM
|
97bbc00dcf
|
Don't set text onunbound gui elements
|
2018-06-08 06:19:02 +02:00 |
|
TebbeUbben
|
38526d64c6
|
These should not be changed
|
2018-06-07 23:24:10 +02:00 |
|
TebbeUbben
|
e25ebbdafa
|
Protection against callback looping
|
2018-06-07 23:23:10 +02:00 |
|
TebbeUbben
|
aa86a49339
|
Use real plugin descriptions
|
2018-06-07 22:55:13 +02:00 |
|
TebbeUbben
|
13cb4c28ed
|
ConfigBuilder styling
|
2018-06-07 22:54:27 +02:00 |
|
AdrianLxM
|
d6184cc151
|
Wizard: fully undo "ok" on constraints violation
Fixes https://github.com/MilosKozak/AndroidAPS/issues/1056
|
2018-06-07 22:44:09 +02:00 |
|
Roumen Georgiev
|
4b7f8615bf
|
Merge pull request #26 from MilosKozak/rsoption
update
|
2018-06-07 09:30:22 +03:00 |
|
Roumen Georgiev
|
9e2074433e
|
remove button if pump is DanaR Korean
|
2018-06-07 09:26:33 +03:00 |
|
Milos Kozak
|
1d13712aec
|
nsclient setup wizard tweaking
|
2018-06-06 22:58:50 +02:00 |
|
Milos Kozak
|
f94d1e85e1
|
cleanup
|
2018-06-06 18:32:19 +02:00 |
|
Milos Kozak
|
04fffae811
|
addd setUserOption to Queue (Dana pumps)
|
2018-06-06 18:29:40 +02:00 |
|
Milos Kozak
|
d2830d1938
|
DanaRUserOptionActivity update on pump load
|
2018-06-06 17:13:58 +02:00 |
|
Milos Kozak
|
bbeca6b83e
|
cleanup
|
2018-06-06 16:57:00 +02:00 |
|
AdrianLxM
|
5ec828e16f
|
restrict local profile DIA to min of 5 on the GUI
|
2018-06-06 15:18:03 +02:00 |
|
Milos Kozak
|
4adcb88d12
|
Merge pull request #1067 from jotomo/fill-one-shot-guard
One-short guards for Fill/Prime dialog.
|
2018-06-06 08:47:08 +02:00 |
|
Milos Kozak
|
65c8cb22ef
|
check for null context
|
2018-06-05 14:38:00 +02:00 |
|
Milos Kozak
|
7e7e921853
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2018-06-05 14:37:47 +02:00 |
|
Milos Kozak
|
5df51e8a6e
|
check for NPE
|
2018-06-05 14:35:18 +02:00 |
|
Roumen Georgiev
|
4a481bf294
|
Merge branch 'dev' into dev
|
2018-06-05 12:45:00 +03:00 |
|
Roumen Georgiev
|
c1b69404d0
|
files renamed and added icon
|
2018-06-05 12:19:47 +03:00 |
|
AdrianLxM
|
171209503e
|
remove unneeded log statement
|
2018-06-05 00:04:03 +02:00 |
|
AdrianLxM
|
4998ebae89
|
Merge pull request #1071 from TebbeUbben/new-design
TabLayout + NavigationDrawer
|
2018-06-04 23:53:42 +02:00 |
|
TebbeUbben
|
f7b19e37a1
|
Button for plugin preferences
|
2018-06-04 21:56:31 +02:00 |
|
TebbeUbben
|
80e9d769e4
|
Compact version of toolbar
|
2018-06-04 21:34:21 +02:00 |
|
Roumen Georgiev
|
19e7d507b2
|
shutdown value can be 0
|
2018-06-04 10:24:20 +03:00 |
|
Roumen Georgiev
|
1147c28f04
|
use numberPicker instead of editText
|
2018-06-04 10:23:01 +03:00 |
|
TebbeUbben
|
9cf9da0d22
|
MINIMUM_BASAL_VALUE_REPLACED -> MAXIMUM_BASAL_VALUE_REPLACED
|
2018-06-03 23:33:49 +02:00 |
|
TebbeUbben
|
263275659a
|
TabLayout + NavigationDrawer
|
2018-06-03 23:28:04 +02:00 |
|
TebbeUbben
|
a86c654f8d
|
Use real TBR cancels and dismiss their alerts
|
2018-06-03 10:56:29 +02:00 |
|
Johannes Mockenhaupt
|
ef6ee43c32
|
One-short guards for Fill/Prime dialog.
|
2018-06-02 18:06:04 +02:00 |
|
TebbeUbben
|
f151cbb0bf
|
TBR emulation
|
2018-06-02 16:37:53 +02:00 |
|
Roumen Georgiev
|
054003460c
|
push new settings to pump
|
2018-06-01 16:42:56 +03:00 |
|
Roumen Georgiev
|
75dbf71a70
|
Merge remote-tracking branch 'origin/dev' into dev
|
2018-06-01 12:11:29 +03:00 |
|
Roumen Georgiev
|
861f9bdd8d
|
Timeformat reverse
|
2018-06-01 12:10:08 +03:00 |
|
Roumen Georgiev
|
9569fbf183
|
Merge branch 'dev' into dev
|
2018-06-01 12:02:41 +03:00 |
|
Roumen Georgiev
|
85bef0036b
|
back to original
|
2018-06-01 11:45:31 +03:00 |
|
Roumen Georgiev
|
4581733cd7
|
some debugging output and forced getting user options
|
2018-06-01 11:41:37 +03:00 |
|
Roumen Georgiev
|
319e786988
|
display 666 in backlightontime if no settings read
|
2018-06-01 10:08:13 +03:00 |
|
Roumen Georgiev
|
f3d19aa6f4
|
convert int values to strings
|
2018-06-01 09:38:18 +03:00 |
|
swissalpine
|
dd60cadd5a
|
Fix broken cage age
|
2018-05-31 22:22:22 +02:00 |
|
Roumen Georgiev
|
bbb9c681e6
|
filling in some data
|
2018-05-31 17:16:30 +03:00 |
|
Roumen Georgiev
|
41af503104
|
filling in some data
|
2018-05-31 17:10:09 +03:00 |
|
Roumen Georgiev
|
da89ea1643
|
some formatting
|
2018-05-31 16:47:58 +03:00 |
|
Roumen Georgiev
|
39e704645b
|
create userOptionsActivity class
|
2018-05-31 14:45:26 +03:00 |
|
Markus M. May
|
a587f72de2
|
Fix wrong usage of event in refactored source
|
2018-05-30 18:09:41 +02:00 |
|
Milos Kozak
|
418f68153e
|
Merge pull request #1058 from MilosKozak/NSC-no-advancedfiltering
NSClient as source without advanced filtering
|
2018-05-30 08:08:04 +02:00 |
|
Markus M. May
|
0fe744c3e6
|
Remove unnecessary assignment
|
2018-05-29 21:44:33 +02:00 |
|
Markus M. May
|
41503800e8
|
Remove some duplicate code lines
|
2018-05-29 20:57:55 +02:00 |
|
AdrianLxM
|
de1196f34b
|
NSClient as source without advanced filtering
|
2018-05-29 12:57:07 +02:00 |
|
Milos Kozak
|
35c07d1e60
|
SW scroll to the top on activity create
|
2018-05-24 00:13:59 +02:00 |
|
Milos Kozak
|
d642418e02
|
resolve NPE
|
2018-05-23 23:43:41 +02:00 |
|
Milos Kozak
|
683caf78f8
|
SW configure insulin button
|
2018-05-23 13:47:16 +02:00 |
|