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
Milos Kozak
d1aec1ff18
Localalerts settings by adrian
2017-11-28 21:48:46 +01:00
Milos Kozak
7d5d327c5d
fix compile
2017-11-28 21:06:50 +01:00
Milos Kozak
9b135cc4e4
Merge branch 'queue' into dev
2017-11-28 20:52:49 +01:00
Milos Kozak
694e90960e
reenable RS driver
2017-11-28 20:52:24 +01:00
Milos Kozak
b4187c84ed
bump 1.56-dev
2017-11-28 20:51:54 +01:00
Milos Kozak
bf4ffaed8f
bump 1.55
2017-11-28 20:31:31 +01:00
Milos Kozak
70621837d9
disable RS driver
2017-11-28 20:29:30 +01:00
Milos Kozak
b8df1fcec4
Merge branch 'dev' into queue
2017-11-28 20:27:58 +01:00
Roumen Georgiev
542cedff9d
check for sgv older than 15 mins
2017-11-28 16:29:18 +02:00
Roumen Georgiev
723cb33497
Disabling staledata alarm on new sgv values fromNSClient
2017-11-28 16:15:25 +02:00
Roumen Georgiev
eb593a4557
Update Notification.java
2017-11-28 16:09:23 +02:00
Andrew Warrington
dcf79c710c
Update following testing! Bug fixes:
...
- Detailed IOB always shown in older watch faces (fixed)
- Cockpit: Loop graphic stays red once set (fixed)
Design changes:
- AAPSv2: Changed spacing of status and cob/time/iob lines to use layout_weight instead of padding (more dynamic)
- Removed decimal point in delta strings when BG is in mg/dL to gain space so everything fits with all options switched on. This will affect older watch faces.
- Changed to 1 decimal point in BGI to gain space. This will affect older watches as well.
- Changed order of preferences to match screen layout more closely
New features:
- Exposed BGI as an individual item in dataMap & added to BaseWatchFace + AAPSv2
2017-11-28 09:24:52 +01:00
Johannes Mockenhaupt
1a00f8c661
Treatments tab: display extended bolus tab if active pump supports it or if there are any extended bolus records.
2017-11-24 21:28:34 +01:00
Milos Kozak
a13661400f
DanaRv2 queue & pump autodection
2017-11-22 22:09:58 +01:00
Milos Kozak
8818afe033
KoreanDanaR queue
2017-11-22 20:11:25 +01:00
Milos Kozak
dfd0218a6a
Merge branch 'dev' into queue
2017-11-22 19:44:16 +01:00
Milos Kozak
a9f1acf7a7
Merge pull request #502 from jotomo/combo-extractions
...
Combo extractions
2017-11-22 19:36:59 +01:00
Johannes Mockenhaupt
e28e5685f6
Cancel ongoing notification when plugin is disabled.
2017-11-22 19:13:56 +01:00
Johannes Mockenhaupt
1e4070e862
Fix typo in fragment name.
2017-11-22 11:34:23 +01:00
Johannes Mockenhaupt
5690772946
Nitpicky symmetry.
2017-11-22 11:33:26 +01:00
Johannes Mockenhaupt
d202976251
PersistentNotification unregister workaround.
2017-11-22 11:32:41 +01:00
Johannes Mockenhaupt
9442c56eb8
Make PumpEnactResult fluent.
2017-11-22 11:30:48 +01:00
Johannes Mockenhaupt
60324ac6c6
Minor code cleanup.
2017-11-22 11:30:38 +01:00
Milos Kozak
62527ab33b
Merge pull request #500 from jotomo/prevent-gaps-in-tbr
...
ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires bef…
2017-11-22 10:52:15 +01:00
Milos Kozak
63dbe2bd52
Merge pull request #501 from jotomo/hide-stop-button-once-pressed
...
BolusProgressDialog: hide stop button once pressed.
2017-11-22 10:51:39 +01:00
Johannes Mockenhaupt
a8a7d47da2
ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires before next loop iteration.
2017-11-22 00:22:02 +01:00
Johannes Mockenhaupt
b49a4c57ba
BolusProgressDialog: hide stop button once pressed.
2017-11-22 00:20:50 +01:00
Milos Kozak
252c0b3db9
DanaR queue driver
2017-11-21 23:00:53 +01:00
Milos Kozak
f134163a76
Merge branch 'dev' into queue
2017-11-21 22:31:56 +01:00
Milos Kozak
a6bf18244a
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-11-21 22:31:22 +01:00
Milos Kozak
ca44ae9a0b
fix RU translation
2017-11-21 22:31:02 +01:00
Milos Kozak
4007049118
use MIN_DIA instead of DEFAULT_DIA
2017-11-21 22:29:50 +01:00
Milos Kozak
d2cba61354
allign dana plugin code
2017-11-21 19:27:43 +01:00
Milos Kozak
3ab235f829
refactor pump interface out of ConfigBuilder, remove handlers
2017-11-20 23:39:12 +01:00
Milos Kozak
21ae42d37b
Merge branch 'dev' into queue
2017-11-20 17:50:49 +01:00
Milos Kozak
1335887957
Merge branch 'dev' into dev2
2017-11-20 17:40:45 +01:00
Milos Kozak
2f0599fbc7
missing return
2017-11-20 17:38:06 +01:00
Milos Kozak
d8d8b150b6
Merge branch 'dev2' into queue
2017-11-20 17:34:03 +01:00
Milos Kozak
973b9d50c1
Merge branch 'dev' into dev2
2017-11-20 17:28:15 +01:00
Milos Kozak
0f0f39dfb4
log profiles if different
2017-11-20 17:26:03 +01:00
Milos Kozak
777aedd5db
fix setting of TRB when low basal rate is running
2017-11-20 15:25:44 +01:00
Milos Kozak
297617467e
fix format and add test for fromISODateString
2017-11-20 13:34:13 +01:00
Milos Kozak
d8798e0bcf
use mills from status if available
2017-11-20 13:23:25 +01:00
Andrew Warrington
bc485a4783
Refactor of BaseWatchFace.java in order to allow greater flexibility in presenting or removing data from various watch faces.
...
Inclusion of Home2 ("AAPSv2") watch face for round.
2017-11-15 23:07:44 +01:00
Johannes Mockenhaupt
e0df4646f9
Remove dead code.
2017-11-13 01:12:23 +01:00
Johannes Mockenhaupt
5839ad6a93
Ctors Android-style.
2017-11-13 01:12:15 +01:00
Johannes Mockenhaupt
9a4acbe052
Fix NPE initialising MyPreferencesFragment.
2017-11-13 01:12:05 +01:00
Andrew Warrington
45a26da8b3
Inclusion of the new watch face "AAPSv2" which: 1) has larger text, 2) shows COB, 3) allows to choose between showing phone battery level (AAPS) or rig battery level (OpenAPS) via watch Settings menu.
...
Most changes are either minor or are completely new files. The largest changes were to the WatchUpdaterService.java, which required several new blocks of code in order to expose COB, IOB, and current temp basal independently of the main status string.
2017-11-12 21:46:32 +01:00
Milos Kozak
7374545046
refactor all deliverTreatment
2017-11-12 00:08:25 +01:00
Milos Kozak
620a54a31b
bolus from wizard to queue
2017-11-11 23:44:30 +01:00
Milos Kozak
c7faf2a5e7
bolus progress dialog during connection
2017-11-11 23:03:31 +01:00
Milos Kozak
25aa5094a4
alarm for failed bolus
2017-11-11 22:32:00 +01:00
Milos Kozak
a5227fc773
add bolus sound
2017-11-11 16:20:34 +01:00
Milos Kozak
86b11edd58
RS connection and status reading
2017-11-11 14:05:29 +01:00
Milos Kozak
a186ce6468
more command queue code
2017-11-10 00:27:18 +01:00
Milos Kozak
d40e0c97c4
simplify active pump access where possible
2017-11-08 23:40:54 +01:00
Milos Kozak
8bae1a18e4
CommandQueue
2017-11-08 22:22:51 +01:00
Milos Kozak
3a773feeeb
RS fix last bolus time
2017-11-08 19:23:48 +01:00
Milos Kozak
676dfcc5d1
RS remove duplicated message
2017-11-08 19:18:17 +01:00
Milos Kozak
30f16c7d3e
RS fix extended bolus result
2017-11-08 19:13:44 +01:00
Milos Kozak
0af51bb6ea
show timeshift if not zero
2017-11-07 13:24:08 +01:00
Andrew Warrington
d70860bd97
Inclusion of the new watch face "AAPSv2" which: 1) has larger text, 2) shows COB, 3) allows to choose between showing phone battery level (AAPS) or rig battery level (OpenAPS) via watch Settings menu.
...
Most changes are either minor or are completely new files. The largest changes were to the WatchUpdaterService.java, which required several new blocks of code in order to expose COB, IOB, and current temp basal independently of the main status string.
2017-11-05 21:41:50 +01:00
Milos Kozak
5ad564e0e3
CS translation
2017-11-03 10:13:23 +01:00
Milos Kozak
e063f3a2cb
removed unneeded code
2017-11-02 18:03:40 +01:00
Milos Kozak
a7077a8a6a
long click on name to open settings
2017-11-02 17:47:41 +01:00
Milos Kozak
20c66e3b6f
add link to advanced settings
2017-11-02 17:39:25 +01:00
Milos Kozak
a1c6704ae9
Merge branch 'dev2' into smb
2017-11-01 20:50:14 +01:00
Milos Kozak
a162343cd4
add getPreferenceId to food plugin
2017-11-01 20:47:16 +01:00
Milos Kozak
f67bd291cd
Merge branch 'dev' into dev2
2017-11-01 20:44:24 +01:00
Milos Kozak
60699eddbb
preferences update
2017-11-01 20:43:59 +01:00
Milos Kozak
00152eaffa
Merge pull request #490 from MilosKozak/tt-remaining
...
Show remaining time of TT
2017-11-01 18:29:54 +01:00
Milos Kozak
f7871e64e0
Merge pull request #489 from MilosKozak/NPE-fix
...
NSTreatments NPE fix
2017-11-01 18:29:34 +01:00
Milos Kozak
440be77de0
Merge pull request #488 from jotomo/events
...
Event logging
2017-11-01 18:29:14 +01:00
AdrianLxM
f9ed104fe3
use DateUtil#agoString
2017-10-29 02:08:43 +02:00
AdrianLxM
3121fa3e84
use DateUtil#untilString
2017-10-29 02:07:17 +02:00
AdrianLxM
9e8752b096
timeframe strings
2017-10-29 02:06:06 +02:00
AdrianLxM
7d82870203
Show remaining time of TT
2017-10-28 02:16:30 +02:00
AdrianLxM
88e22c5f17
NSTreatments NPE fix
...
When the dialog was open and the phone goes to sleep/lock screen, Android may garbage collect and options is no longer available. -> NPE
I think as quick fix it is ok to not show a dialog at all. If the user stopped using the dialog and lets the phone sleep for a longer while with the phone going to sleep... he can open it again, if he wants it.
2017-10-27 16:56:17 +02:00
Milos Kozak
b5f843d901
getLastSBMTime -> getLastBolusTime
2017-10-26 22:12:15 +02:00
Milos Kozak
dfd657ce2d
remove wrong imports
2017-10-26 21:29:38 +02:00
Milos Kozak
e71ce02131
fix merge conflict
2017-10-26 21:23:23 +02:00
Milos Kozak
8a6e811c95
Merge branch 'dev' into dev2
2017-10-26 21:13:10 +02:00
Milos Kozak
ae47183459
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-10-26 21:12:37 +02:00
Milos Kozak
26b216a8ee
fix RS response code
2017-10-26 20:40:24 +02:00
Johannes Mockenhaupt
91df07ca8f
Cleanup.
2017-10-26 17:35:46 +02:00
Johannes Mockenhaupt
79316bf948
Revert "Debug: wider thread column in log to improve readability."
...
This reverts commit 5fe2d19e6363c4efcaad90fe5aa627b58d230cd1.
2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
e5cb5386e3
Disable event logging by default.
2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
82dd8c2c5e
Log summary after 10s, then every 60s.
2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
785a8f21de
Log receivers of event.
2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
9a1d7fd512
Log source of event.
2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
a6ae3ddd2d
Debug: wider thread column in log to improve readability.
2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
d830096482
Better log messages for events.
2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
9d10563bd9
Group events in type hierarchy related to the LoopPlugin.
2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
3e24a6069d
Remove dead NSPingAck class.
2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
302ed69564
Let event classes extend Event(UpdageGui) classes.
2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
8ad223e5e1
Add base event class.
2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
5a446c9ab5
Log posted events.
2017-10-26 16:54:46 +02:00
AdrianLxM
707d2df345
No explicit service start
2017-10-25 20:10:59 +02:00
Johannes Mockenhaupt
4767809931
Start KeepAliveService after pump init.
2017-10-25 20:10:24 +02:00
AdrianLxM
41dcf8d6f4
Merge remote-tracking branch 'milosremote/dev' into servicestart
2017-10-25 19:57:00 +02:00
AdrianLxM
f3872cd934
Merge pull request #465 from jotomo/j2v8-removal
...
J2v8 removal
2017-10-25 19:56:29 +02:00
Milos Kozak
3e6fcabfab
Merge branch 'dev2' into smb
2017-10-25 11:38:45 +02:00
Milos Kozak
4f0bbda847
Merge branch 'dev' into dev2
2017-10-25 11:38:12 +02:00
Milos Kozak
7c99157d89
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-10-25 11:37:19 +02:00
Milos Kozak
606973d4ad
use max absorption time for AAPS and weighted average sensitivity detection
2017-10-25 11:37:05 +02:00
Johannes Mockenhaupt
551ca92201
Remove cast to DetermineBasalResultAMA for predictions.
2017-10-24 23:14:45 +02:00
Milos Kozak
9de332e997
Merge branch 'dev2' into smb
2017-10-24 21:09:17 +02:00
Milos Kozak
f673d3a721
Merge branch 'dev' into dev2
2017-10-24 21:08:54 +02:00
Milos Kozak
8b020d72cd
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-10-24 21:08:13 +02:00
Milos Kozak
2fb707b9ed
log.debug -> log.error on RS comm
2017-10-24 21:08:03 +02:00
Milos Kozak
2925c16fb9
comment minDeviationSlope
2017-10-24 17:50:44 +02:00
Milos Kozak
29b075e700
display minDeviationSlope
2017-10-24 17:15:49 +02:00
Milos Kozak
fe0376206e
fix merge conflict
2017-10-24 11:46:27 +02:00
Milos Kozak
441c2beffc
read status after bolus
2017-10-24 09:19:03 +02:00
Milos Kozak
1ad409754f
move preparing graph series to extra class #2
2017-10-23 22:41:12 +02:00
Milos Kozak
d180d088f0
fix merge conflict
2017-10-22 21:11:31 +02:00
AdrianLxM
4e5a374b9c
include smb into basal iob
2017-10-22 02:20:11 +02:00
AdrianLxM
755c82898c
SMB Rhino
2017-10-21 22:38:07 +02:00
Milos Kozak
3cdca93b30
RS connectivity & bolus improvement
2017-10-21 20:09:21 +02:00
Milos Kozak
7dd678c917
Better bolusing with different speeds (R & Rv2)
2017-10-21 18:55:56 +02:00
Milos Kozak
8e82e341fd
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-10-21 18:07:30 +02:00
Milos Kozak
39af399ea4
Merge pull request #478 from RadoslavR/patch-48
...
Update strings.xml
2017-10-21 18:06:44 +02:00
Milos Kozak
a8751bf35a
Detailed onscreen history logging
2017-10-21 18:05:19 +02:00
McHoffi
986eab041d
Merge pull request #1 from MilosKozak/dev
...
Dev
2017-10-21 17:43:33 +02:00
McHoffi
9c7c583aed
Split to smaller pieces
2017-10-21 17:41:01 +02:00
AdrianLxM
7ed7a2e8c4
Merge remote-tracking branch 'milosremote/dev' into smb-rhino
2017-10-21 17:06:57 +02:00
Radoslav Radev
075b74ec84
Update strings.xml
2017-10-21 17:11:25 +03:00
Milos Kozak
dbf5a5e577
Sensitivity logging optional
2017-10-21 13:14:06 +02:00
Milos Kozak
881a745e32
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-10-20 21:36:56 +02:00
Milos Kozak
01d6f1594a
RS synchronized change
2017-10-20 17:37:06 +02:00
Milos Kozak
e545f75d69
fix displaying XX:30 time intervals
2017-10-20 11:34:33 +02:00
Milos Kozak
b76cb755e0
CS translations
2017-10-19 20:37:37 +02:00
Milos Kozak
c258b41f11
allow to use actual profile in wizard
2017-10-19 19:35:35 +02:00
Milos Kozak
65cb095dfd
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-10-19 19:23:52 +02:00
Milos Kozak
0b7832ec60
getUnits from active profile not interface
2017-10-19 19:23:19 +02:00
Milos Kozak
2e32fe51e2
Merge pull request #475 from diabetesdt1/patch-3
...
Update strings.xml
2017-10-19 18:11:52 +02:00
diabetesdt1
51caffa591
Update strings.xml
2017-10-19 16:40:36 +02:00
Milos Kozak
e7fb045f04
Merge pull request #474 from boysim/dev
...
dutch translation update
2017-10-19 16:16:27 +02:00
diabetesdt1
17eec803f4
Update strings.xml
2017-10-19 16:03:31 +02:00
Milos Kozak
19f107fe53
move preparing graph series to extra class #2
2017-10-18 23:56:13 +02:00
Simon Pauwels
28430d117d
Update dutch
2017-10-18 21:19:12 +02:00
Milos Kozak
55b1dcb992
Merge branch 'dev' into dev2
2017-10-18 20:14:14 +02:00
Milos Kozak
fe9fefa601
Update strings.xml
2017-10-18 20:06:35 +02:00
Milos Kozak
d65a2d8f8c
move preparing graph series to extra class
2017-10-18 19:01:39 +02:00
Radoslav Radev
f0ee2b8bed
Update strings.xml
2017-10-18 14:25:34 +03:00
McHoffi
434f4474b5
DE_translations
2017-10-18 11:11:41 +02:00
warstar2187
e3d3664ac2
Update strings.xml
2017-10-18 16:39:55 +09:00
warstar2187
a35262840f
Update strings.xml
2017-10-18 13:49:17 +09:00
Milos Kozak
6ff3d00f3c
Merge remote-tracking branch 'origin/dev' into food
2017-10-17 20:55:55 +02:00
Milos Kozak
13184dcb51
food plugin
2017-10-17 20:55:23 +02:00
Johannes Mockenhaupt
fee19db501
ConfigBuilder: hide disabled plugins by default.
2017-10-16 22:14:49 +02:00
Johannes Mockenhaupt
f7a46d386e
Remove j2v8.
2017-10-16 21:52:06 +02:00
Johannes Mockenhaupt
d77fa9b0cf
Revert "NDK filters to work around j2v8 vs. libBleCommandUtil issue."
...
This reverts commit 7c04787004
2017-10-16 21:48:08 +02:00
Milos Kozak
d1a9398451
Merge pull request #463 from AdrianLxM/mr-profileRhino
...
sum on name for LP
2017-10-16 14:58:41 +02:00
AdrianLxM
414cb5fd8d
sum on name for LP
2017-10-16 12:54:17 +02:00
Milos Kozak
5172a91ca1
Merge pull request #458 from jotomo/gh-417-new-treatment-validation
...
NewTreatmentDialog: sanitize inputs, fixes #417 .
2017-10-16 08:38:30 +02:00
AdrianLxM
dbc5657003
log to debug not error
2017-10-15 23:21:55 +02:00
AdrianLxM
2a8ab96fe3
Merge pull request #461 from AdrianLxM/rhinoAMA
...
Rhino ama
2017-10-15 22:39:54 +02:00
AdrianLxM
3e7b7ced06
logger reformat
2017-10-15 22:34:03 +02:00
AdrianLxM
c499e5977c
logging
2017-10-15 22:27:08 +02:00
AdrianLxM
1c49362415
rhinoAMA first full run
2017-10-15 20:42:36 +02:00
AdrianLxM
1494b7f5b3
rhinoAMA first crashfree call
2017-10-15 19:36:31 +02:00
AdrianLxM
564c882754
rhino some more cleanups
2017-10-15 16:19:29 +02:00
AdrianLxM
d32a874baa
rhino logging and cleanups
2017-10-15 16:10:58 +02:00
AdrianLxM
e65b4bf858
rhino MA looping
2017-10-15 14:06:13 +02:00
AdrianLxM
190305c6df
rhino first real detemine-basal call
2017-10-15 13:00:10 +02:00
AdrianLxM
124ec6e992
rhino small refactor
2017-10-15 11:51:12 +02:00
Johannes Mockenhaupt
7c04787004
NDK filters to work around j2v8 vs. libBleCommandUtil issue.
...
j2v8 only provides files for x86 and arm-v7a while libBleCommandUtil
provides x64 libs as well. This fails to load since x86 & x64 can't be mixed
and Android ends up loading libBleCommandUtil's x64 variant (on a x64
device) and then failing since there's no x64 version of j2v8.
This excludes all libBleCommandUtil ibs except those that match j2v8.
Revert this when we switch away from j2v8.
(cherry picked from commit 09036dc)
2017-10-15 11:19:34 +02:00
Johannes Mockenhaupt
a9adcee974
NewTreatmentDialog: sanitize inputs, fixes #417 .
...
Inputs are now check as they're being made and cleared if they
exceed constraints. This is the same behaviour the Calculator
dialog shows.
2017-10-15 10:45:12 +02:00
AdrianLxM
9008ef6f6f
rhino complex parameter passing
2017-10-15 03:55:03 +02:00
AdrianLxM
303d35118e
rhino first parameter passing
2017-10-15 03:50:18 +02:00
AdrianLxM
81b611ad92
rhino function passing
2017-10-15 03:21:32 +02:00
AdrianLxM
7f2451934c
first rhino
2017-10-15 02:52:57 +02:00
Milos Kozak
1db158670a
location permission for BLE scanning
2017-10-14 13:36:38 +02:00
Milos Kozak
1994cd707c
use customized name only for LocalProfile
2017-10-14 10:39:32 +02:00
Milos Kozak
3b90d02e05
show status on Dana fragment too
2017-10-13 13:31:32 +02:00
Milos Kozak
02c57fb9a3
RS connection improvement
2017-10-13 13:17:17 +02:00
Milos Kozak
c99830968a
adjust enforcing new temp basal on user request
2017-10-13 12:39:34 +02:00
Milos Kozak
f235b5fb02
use basalStep instead of fixed value
2017-10-13 12:07:33 +02:00
Milos Kozak
9a4e457d2b
fix RS events parsing
2017-10-13 11:54:50 +02:00
Milos Kozak
e40033dcb8
formated=false
2017-10-13 09:24:02 +02:00
Milos Kozak
bee60eb0e3
CS translations
2017-10-13 09:16:15 +02:00
Milos Kozak
1f3c54eb73
split sgvs before broadcast
2017-10-13 08:35:29 +02:00
Milos Kozak
6124ef25a4
report wrong alarm data #2
2017-10-13 08:21:37 +02:00
Milos Kozak
91e286b2ae
report wrong alarm data
2017-10-13 08:11:30 +02:00
Milos Kozak
45a2eba0c2
fix NPE
2017-10-13 08:06:27 +02:00
AdrianLxM
71d95bea92
fix ic isf
2017-10-13 02:56:49 +02:00
AdrianLxM
869b3eff5f
Spinner set selection delayed
2017-10-12 23:56:58 +02:00
AdrianLxM
746d71bcff
remove wear flavours
2017-10-12 18:24:48 +02:00
AdrianLxM
f751638a7f
enabling wearcontrols from preferences
2017-10-12 18:01:10 +02:00
AdrianLxM
944e334231
migrate CPP->LP working
2017-10-12 12:44:17 +02:00
AdrianLxM
6f97e52a07
migrate CPP->LP partial
2017-10-12 12:36:06 +02:00
AdrianLxM
45c07d4106
U/h -> U
2017-10-11 23:38:08 +02:00
AdrianLxM
4667a047ea
add sum to basal in lp
2017-10-11 20:57:43 +02:00
AdrianLxM
39b18915d0
Align LP GUI
2017-10-11 20:19:42 +02:00
AdrianLxM
339c33bd75
Spinner - selection events only after first touch
2017-10-11 19:25:09 +02:00
AdrianLxM
374983e1ae
only inflate elements when needed
2017-10-11 07:59:41 +02:00
AdrianLxM
c181aaaf34
Basal sum in label
2017-10-11 02:32:17 +02:00
AdrianLxM
e6565c1911
reuse button on profile switch
2017-10-11 00:25:44 +02:00
AdrianLxM
02369b952b
a little safer<
2017-10-10 22:54:24 +02:00
AdrianLxM
398e950f8e
fix percentage concatenation on profile names
2017-10-10 22:11:06 +02:00
AdrianLxM
549b72b032
fix percentage/shift from watch
2017-10-10 21:51:58 +02:00
AdrianLxM
b60ff8ceef
max timeshift to 23
2017-10-10 20:47:38 +02:00
AdrianLxM
36784b983e
remove cpp import
2017-10-10 20:42:29 +02:00
AdrianLxM
1410b2e706
wear cpp -> general profile
2017-10-10 20:32:43 +02:00
Milos Kozak
982e46d958
prepare profileswitch function for watch
2017-10-10 19:25:21 +02:00
Milos Kozak
77ec52ff23
fix sending profile switch to pump
2017-10-10 19:19:39 +02:00
Milos Kozak
da71cdfca0
Merge branch 'profile' of https://github.com/MilosKozak/AndroidAPS into profile
2017-10-10 19:15:07 +02:00
Milos Kozak
24099222f3
Dana R & v2 speed selection
2017-10-10 19:14:43 +02:00
Milos Kozak
50de4a5979
Merge branch 'profile' of https://github.com/MilosKozak/AndroidAPS into profile
2017-10-10 18:03:50 +02:00
Milos Kozak
d142d2e4f9
resolve RS merge conflict
2017-10-10 16:47:03 +02:00
Milos Kozak
c6392ec625
Merge remote-tracking branch 'origin/dev' into profile
2017-10-09 23:15:02 +02:00
Milos Kozak
9ec3efbaab
fix conflict
2017-10-09 23:14:46 +02:00
Milos Kozak
230dd5f0a8
Merge pull request #451 from jotomo/checkboxes-and-labels-aligned
...
Overview: align checkboxes and labels vertically.
2017-10-09 23:13:16 +02:00
Johannes Mockenhaupt
e586e1389e
Overview: align checkboxes and labels vertically.
2017-10-09 22:37:50 +02:00
Johannes Mockenhaupt
62803f2a4d
Use existing string resource.
2017-10-09 21:18:55 +02:00
Johannes Mockenhaupt
70fefa9b70
NSTreatmentDialog: use same format for ES reason field as for profile.
2017-10-09 21:03:25 +02:00
Milos Kozak
4687b001e0
more cpp functionality to Profile
2017-10-08 14:41:51 +02:00
Johannes Mockenhaupt
c6c5624b85
Singleton OpenAPSSMBPlugin.
2017-10-07 23:05:37 +02:00
Milos Kozak
a617d591b0
fix NPE
2017-10-07 22:29:55 +02:00
Milos Kozak
8f259042d6
fix NPE
2017-10-07 22:24:42 +02:00
Johannes Mockenhaupt
fa1c282699
Merge remote-tracking branch 'origin/dev' into smb
...
* origin/dev: (28 commits)
Singleton & Crashlytics logging part 2
treatments in config builder
Singleton & Crashlytics logging part 1
checkboxes for NS-Client layouts
overview checkboxes cutoff fix
update NP value after manual entry
restore preferences
temp target presets
Rv2 percent fix
korean percent fix
serialize reload of treatments
getTempBasalFromHistory -> getRealTempBasalFromHistory
Do not misinterpret a fake-extended as 0% temp.
In one line
Update danar_fragment.xml
text identation
Add files via upload
Add files via upload
Add files via upload
Add files via upload
...
# Conflicts:
# app/build.gradle
# app/src/main/java/info/nightscout/androidaps/MainApp.java
2017-10-07 21:33:22 +02:00
Milos Kozak
6618d2fef2
fix negative timeshift
2017-10-07 20:42:56 +02:00
Milos Kozak
60086dac8d
Merge remote-tracking branch 'origin/dev' into profile
2017-10-07 18:30:55 +02:00
Milos Kozak
a54b9e52d8
Merge pull request #446 from AdrianLxM/numberpicker-update
...
overview checkboxes cutoff fix
2017-10-07 18:29:56 +02:00
Milos Kozak
c56ecfced6
Merge pull request #447 from AdrianLxM/treatments-configbuilder2
...
treatments in config builder
2017-10-07 18:29:44 +02:00
Milos Kozak
9e7c81613c
Merge branch 'profile' of https://github.com/MilosKozak/AndroidAPS into profile
2017-10-07 18:28:59 +02:00
Milos Kozak
ef645ca600
fix merge conflict
2017-10-07 18:27:20 +02:00
Milos Kozak
d6fb912ff9
Singleton & Crashlytics logging part 2
2017-10-07 17:48:03 +02:00
Johannes Mockenhaupt
da3f02648c
Use SpinnerHelper in TimeListEdit.
...
Resolves the spinner's onItemSelected handler to back invoked
repeatedly on faster devices.
2017-10-07 16:37:24 +02:00
AdrianLxM
046c28856c
treatments in config builder
2017-10-07 01:18:28 +02:00
Milos Kozak
0e763724f6
Singleton & Crashlytics logging part 1
2017-10-06 16:39:59 +02:00
Milos Kozak
a1ca4677c0
log exception
2017-10-06 16:07:41 +02:00
AdrianLxM
10d273dac8
checkboxes for NS-Client layouts
2017-10-06 15:48:32 +02:00
AdrianLxM
333b131c1e
overview checkboxes cutoff fix
2017-10-06 13:53:55 +02:00
Milos Kozak
4db82fd275
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-10-06 13:15:57 +02:00
Milos Kozak
32d6e06b07
Merge pull request #444 from AdrianLxM/temptarget-presets
...
Temptarget presets
2017-10-06 13:15:06 +02:00
Milos Kozak
a670a43346
Merge pull request #445 from AdrianLxM/numberpicker-update
...
update NP value after manual entry
2017-10-06 12:41:34 +02:00
AdrianLxM
1b5ef50eb2
update NP value after manual entry
2017-10-06 03:24:35 +02:00
AdrianLxM
7f403166c7
restore preferences
2017-10-06 03:05:36 +02:00
AdrianLxM
bd93fc1adb
temp target presets
2017-10-06 02:53:23 +02:00
Milos Kozak
e0794a6e7f
fix time shifting
2017-10-05 00:54:35 +02:00
Milos Kozak
f08809ff9e
rename button to activate profile
2017-10-04 23:33:02 +02:00
Milos Kozak
3d58fe6bb5
cleanup
2017-10-04 23:24:56 +02:00
Milos Kozak
96edac5ddf
LocalProfile fix
2017-10-04 23:17:19 +02:00
AdrianLxM
d6089bef73
Rv2 percent fix
2017-10-04 19:39:41 +02:00
AdrianLxM
7ce282dc4e
korean percent fix
2017-10-04 19:38:42 +02:00
Milos Kozak
9f6962cee5
serialize reload of treatments
2017-10-04 18:04:34 +02:00
AdrianLxM
3d2647321b
getTempBasalFromHistory -> getRealTempBasalFromHistory
2017-10-04 16:51:54 +02:00
AdrianLxM
9e2968f21a
Do not misinterpret a fake-extended as 0% temp.
2017-10-04 16:00:48 +02:00
Milos Kozak
8bf5933c88
refactor TimeListEdit
2017-10-04 15:46:23 +02:00
Milos Kozak
6d08a608a2
dana layout
2017-10-03 22:37:53 +02:00
Milos Kozak
58ed0416d1
fix conflict
2017-10-03 22:33:35 +02:00
Milos Kozak
067494fae1
RS hightempbasal
2017-10-03 22:27:06 +02:00
Milos Kozak
2a98a7e9ba
RS bolus code
2017-10-03 21:47:36 +02:00
Milos Kozak
f5dfff7491
RS APS messages
2017-10-03 20:58:09 +02:00
Milos Kozak
3a014949e9
remove firmware check
2017-10-03 18:45:54 +02:00
Milos Kozak
a5730cb982
initialize only with proper protocol
2017-10-02 22:44:10 +02:00
Milos Kozak
97f69c50fd
store pairing key per pump
2017-10-02 22:21:11 +02:00
Milos Kozak
8cecac0a7f
more LocalProfile work
2017-10-02 19:57:41 +02:00
Milos Kozak
1a5b72f745
Fix time parsing
2017-10-02 17:38:45 +02:00
Roumen Georgiev
ef803d6a41
In one line
2017-09-29 15:06:23 +03:00
Roumen Georgiev
e004b95a60
Update danar_fragment.xml
2017-09-29 09:50:07 +03:00
Roumen Georgiev
7444bc11fa
text identation
2017-09-29 09:47:29 +03:00
Roumen Georgiev
2e61bc136f
Add files via upload
2017-09-29 09:44:25 +03:00
Roumen Georgiev
3c0a509541
Add files via upload
2017-09-29 09:43:42 +03:00
Roumen Georgiev
a152f94f53
Add files via upload
2017-09-29 09:42:42 +03:00
Roumen Georgiev
cb982477cd
Add files via upload
2017-09-29 09:41:32 +03:00
Roumen Georgiev
271534a64b
Add files via upload
2017-09-29 09:40:58 +03:00
Roumen Georgiev
92e2008692
Adding button Icons
2017-09-29 09:40:11 +03:00
Milos Kozak
ba54dacffb
1.54-dev
2017-09-25 19:51:05 +02:00
Milos Kozak
8bbee37b70
fix TB & EB is not set
2017-09-25 19:38:27 +02:00
Milos Kozak
73687442c8
Merge branch 'dev' into rs
2017-09-25 19:36:01 +02:00
Milos Kozak
dc6cbadbdf
fix TB & EB is not set
2017-09-25 19:34:49 +02:00
Milos Kozak
d9f59840b6
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into food
2017-09-24 22:47:50 +02:00
Milos Kozak
4fbe7d1000
food database support
2017-09-24 22:47:18 +02:00
Milos Kozak
91b02d4d39
fill dialog refactor & code clean
2017-09-24 14:51:16 +02:00
Milos Kozak
3c7abff88d
remove unused imports
2017-09-24 14:28:26 +02:00
Milos Kozak
1823cd3f24
extended bolus dialog refactor
2017-09-24 13:00:59 +02:00
Milos Kozak
547f09ffbd
allow to view profile from overview
2017-09-24 11:45:32 +02:00
Milos Kozak
c79b750a9c
reactor OptionsToShow
2017-09-24 11:08:04 +02:00
Milos Kozak
082414f0d3
CPP support to profile switch
2017-09-24 10:39:54 +02:00
Milos Kozak
349b27e31a
NS profile fragment shows all profiles
2017-09-23 23:54:43 +02:00
Milos Kozak
6393ee5e10
CPP functionality to Profile.class
2017-09-23 23:12:08 +02:00
Milos Kozak
b3bcb778e0
check for NPE in posted dialogs
2017-09-23 20:12:53 +02:00
Milos Kozak
c3a0f5ddad
split BLE to separate class
2017-09-23 15:03:07 +02:00
Milos Kozak
144a227d14
more progress logging on R
2017-09-23 12:53:41 +02:00
Milos Kozak
8cd8c6b5d9
more progress logging on RS
2017-09-23 12:28:11 +02:00
Milos Kozak
4ed2896f76
remove duplicated code
2017-09-23 10:56:00 +02:00
Johannes Mockenhaupt
7e8e7f0dae
Fix APSResult.toString as well.
...
(cherry picked from commit d485e5b)
2017-09-22 16:00:19 +02:00
Milos Kozak
1eeb1c6f7a
RS history OK
2017-09-22 14:57:23 +02:00
Johannes Mockenhaupt
2750ccbf26
Fix APSResult.toSpanned for SMBs.
...
Adds a missing newline after "SMB: xxx"
(cherry picked from commit d4de9ce)
2017-09-22 09:54:51 +02:00
SMUSTAF1
81fe9ebdcc
Clear the SMS text field if the user removes the old number.
2017-09-20 13:54:05 +02:00
Johannes Mockenhaupt
ce2b1e4d10
Merge remote-tracking branch 'origin/dev' into smb
...
* origin/dev: (40 commits)
bump 1.53
BG & IOB contribution on by default in wizard
check for NaN
Revert "Rounding issues visible in nightscout insulin field"
Clarified boolean logic with parentheses :)
loadEvents after bolus in separate thread
use notification for bolus delivery failed message when window has been destroyed
fix null pointer exception
Added cases to accept both a.m./p.m. and AM/PM
split JSON arrays to 50 elements
Update strings.xml
Changed rounding to use BigDecimals to avoid noisy long doubles in output
Revert "Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts."
Changed how time strings are parsed to fix a problem where PM times were being saved as the AM version any time toSeconds was called
Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts.
Removed unused imports
Rounding fix
VirtualPump: set PumpEnactResult.enacted.
Use correct units for low/high from TT.
Remove duplicate logging.
...
# Conflicts:
# app/build.gradle
# app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
# app/src/main/java/info/nightscout/androidaps/plugins/Loop/APSResult.java
# app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java
2017-09-20 13:02:31 +02:00
Milos Kozak
e1903840dd
handle received foods in nsclient
2017-09-20 10:20:50 +02:00
Milos Kozak
60990e500e
Revert "Only do SMB if invoke is from EventNewBG"
...
This reverts commit 6ef4b0c2a9
2017-09-18 21:28:43 +00:00
Milos Kozak
fdc3c49a2a
fix merge conflits
2017-09-18 22:03:26 +02:00
Milos Kozak
cd7c7733ea
bump 1.53
2017-09-18 21:59:01 +02:00
Milos Kozak
b797530c9d
BG & IOB contribution on by default in wizard
2017-09-18 21:57:35 +02:00
Milos Kozak
d2815e4045
check for NaN
2017-09-18 21:52:06 +02:00
Milos Kozak
d7f8d75d06
Revert "Rounding issues visible in nightscout insulin field"
2017-09-18 21:24:22 +02:00
Milos Kozak
a98d2e846f
Merge pull request #419 from dylanleonard/feature_time_spinner_fix
...
Time Spinner Local Profile Fix
2017-09-18 21:06:34 +02:00
Dylan Leonard
d8590fe8f1
Clarified boolean logic with parentheses :)
2017-09-18 15:04:46 -04:00
Milos Kozak
bf748f3d4b
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-09-18 20:56:42 +02:00
Milos Kozak
8785bc63d5
loadEvents after bolus in separate thread
2017-09-18 20:54:53 +02:00
Milos Kozak
c2afa328e3
Merge branch 'dev' into tt-in-wizard
2017-09-18 20:44:54 +02:00
Milos Kozak
42ee7c668e
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-09-18 20:43:24 +02:00
Milos Kozak
8daf9e5c2c
use notification for bolus delivery failed message when window has been destroyed
2017-09-18 20:40:03 +02:00
Milos Kozak
17fa2617f7
fix null pointer exception
2017-09-18 20:23:05 +02:00
Dylan Leonard
4f5987b72a
Added cases to accept both a.m./p.m. and AM/PM
2017-09-18 14:20:28 -04:00
Milos Kozak
3f7819937b
split JSON arrays to 50 elements
2017-09-18 20:10:53 +02:00
Milos Kozak
aa89e8f886
Merge pull request #421 from wouterla/dev
...
Rounding issues visible in nightscout insulin field
2017-09-18 19:46:40 +02:00
Milos Kozak
04994924c5
GUI tweaking, small fixes
2017-09-18 18:41:45 +02:00
Milos Kozak
7f4888978e
warn if basal step is not 0.01
2017-09-18 13:28:00 +02:00
Milos Kozak
6cee6c0f51
RS extended disabled warning
2017-09-18 12:59:56 +02:00
Milos Kozak
e3ad396f65
more work on service
2017-09-18 12:57:07 +02:00
Milos Kozak
ee4d8b7748
some work on history
2017-09-18 09:10:27 +02:00
boysim
81aadcc1be
Update strings.xml
2017-09-17 17:02:27 +02:00
Wouter Lagerweij
02c2213545
Changed rounding to use BigDecimals to avoid noisy long doubles in output
2017-09-17 14:27:49 +02:00
Dylan Leonard
91f0c21306
Changed how time strings are parsed to fix a problem where PM times were being saved as the AM version any time toSeconds was called
2017-09-16 19:30:07 -04:00
Wouter Lagerweij
aaa3f648d0
Removed unused imports
2017-09-17 00:56:00 +02:00
Wouter Lagerweij
e350c8c3c3
Rounding fix
2017-09-17 00:53:16 +02:00
Milos Kozak
6662c9dd6c
bolus ok
2017-09-15 13:52:28 +02:00
Roumen Georgiev
6ef4b0c2a9
Only do SMB if invoke is from EventNewBG
2017-09-15 09:33:07 +00:00
Milos Kozak
08fca41b5f
partial bolus code, messages blocked by sleep :(
2017-09-14 22:53:11 +02:00
Milos Kozak
01002f11e7
Merge pull request #416 from jotomo/vpump-enact
...
VirtualPump: set PumpEnactResult.enacted.
2017-09-14 10:06:01 +02:00
Milos Kozak
13fd6136c3
refactor connectivity notifications
2017-09-14 00:29:34 +02:00
Milos Kozak
1bd938c8d5
Merge branch 'smb-source' into 'smb'
...
Set Source.USER for SMB to deliver.
See merge request !363
2017-09-13 11:21:27 +00:00
Johannes Mockenhaupt
a4ebd15dbf
Set Source.USER for SMB to deliver.
2017-09-13 13:19:20 +02:00
Johannes Mockenhaupt
cb3b472488
VirtualPump: set PumpEnactResult.enacted.
...
(cherry picked from commit ec49bc3)
2017-09-13 13:16:48 +02:00
Milos Kozak
e795a8cd99
Revert "Temp fix for not adding SMB boluses to treatments and IOB calculations"
...
This reverts commit 87c993cde1
2017-09-13 07:05:47 +00:00
Roumen Georgiev
87c993cde1
Temp fix for not adding SMB boluses to treatments and IOB calculations
2017-09-13 06:49:48 +00:00
Milos Kozak
ed6cabe7fa
initial RS work
2017-09-13 00:35:03 +02:00
Paul Andrel
88c1248c41
Update determine-basal.js and basal-set-temp.js from Current oref0 dev.
2017-09-12 15:04:04 -04:00
Paul Andrel
936184be60
Update determine-basal.js and basal-set-temp.js from Current oref0 dev.
2017-09-12 15:03:48 -04:00
Johannes Mockenhaupt
07b04b8abf
Use correct units for low/high from TT.
2017-09-12 01:23:38 +02:00
Milos Kozak
69b04fdf26
Merge pull request #413 from samihusseingit/dev
...
Dev
2017-09-11 20:12:51 +02:00
Roumen Georgiev
1a8edc8372
Update ConfigBuilderPlugin.java - Typo fix on line 598
2017-09-11 13:09:57 +00:00
Johannes Mockenhaupt
936ce42cc0
Remove duplicate logging.
2017-09-10 14:24:00 +02:00
Johannes Mockenhaupt
612efa6a13
Revert "Make the BolusProgress dialog a bit more self-contained."
...
Breaks dismissal of dialog (only one invocation of
EventDismissBolusprogressIfRunning also sets bolusEnded=true).
This reverts commit c11455dff1
2017-09-09 18:16:13 +02:00
Johannes Mockenhaupt
c11455dff1
Make the BolusProgress dialog a bit more self-contained.
...
(cherry picked from commit 75db72a)
2017-09-09 16:41:21 +02:00
Johannes Mockenhaupt
c227e0e5fa
Dead code be gone.
...
(cherry picked from commit bb626ce)
2017-09-09 16:41:16 +02:00
Johannes Mockenhaupt
5c3ec9a086
Use SystemClock.sleep instead of Thread.sleep.
...
Gets rid of all those pointless InterruptedException catching.
(cherry picked from commit 6acaa2b)
2017-09-09 16:41:11 +02:00
Johannes Mockenhaupt
c50fad81bb
Log exceptions in catch blocks rather than printing to console.
...
The default code used by Android Studio when generating a
try/catch can be altered in Settings under
Editor->File and Code Templates->Catch Statement body
to
log.error("Unhandled exception", e);
to also do this for newly generated code.
(cherry picked from commit c2ae29f)
(cherry picked from commit 6031a25)
2017-09-09 16:41:06 +02:00
Johannes Mockenhaupt
627cb8e9b2
WizardDialog: don't persist state of tt checkbox, default to false.
...
This assumes that a default is not useful, as it needs to be decided
whether this is needed on each case (using tt when bolusing to
start eating soon, but not using it when bolusing for the meal
at the end of a tt).
2017-09-09 16:37:08 +02:00
Johannes Mockenhaupt
b1e3b45ce9
Add temp target to Wizard dialog
...
Also, store checkboxes' state as prefereces.
(cherry picked from commit 6e1c66e)
2017-09-09 16:30:17 +02:00
Milos Kozak
e3ae7bbeaf
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-09-05 22:47:37 +02:00
Milos Kozak
98848b61ec
send max 30 at once to NS
2017-09-05 22:47:10 +02:00
SMUSTAF1
1fd99a9582
changing the color of the bolus value, for visual clarify and confirmation. Reducing errors.
2017-09-05 13:29:43 +02:00
Milos Kozak
90496d0a02
Merge pull request #410 from jotomo/ok-cancel-profile-change-refresh
...
Use OK/Cancel buttons for 'profile changes refresh from NS' dialog in…
2017-09-03 17:13:43 +02:00
Johannes Mockenhaupt
3bebea37ae
Use OK/Cancel buttons for 'profile changes refresh from NS' dialog in Treatments tab.
2017-09-03 01:53:30 +02:00
Milos Kozak
fa24368701
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-09-02 10:26:07 +02:00
Milos Kozak
7801db5a29
fix danar bolus step
2017-09-02 10:25:46 +02:00
AdrianLxM
15a40cba80
Split treatments into smaller packages before broadcasting
2017-09-01 14:02:47 +02:00
fedor apanasenko
ed8582b36a
update russian
2017-09-01 10:37:59 +03:00
Milos Kozak
46f111076f
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-08-31 22:01:25 +02:00
Milos Kozak
db952759e1
Insulin fragments consolidation
2017-08-31 22:00:45 +02:00
Milos Kozak
c312b51fcf
consolidate DanaR fragments
2017-08-31 19:32:28 +02:00
Radoslav Radev
e1c4074663
Update strings.xml
2017-08-31 09:09:26 +03:00
Milos Kozak
7da8b2de5c
visibility icon
2017-08-29 21:40:06 +02:00
Milos Kozak
7dfe77dc9c
single line in configbuilder
2017-08-29 19:47:32 +02:00
Milos Kozak
13b8a9ecf2
Merge pull request #404 from kakoni/master
...
Adding out_units support for determine-basal.js
2017-08-29 18:23:36 +02:00
Milos Kozak
981a96aa16
ConfigBuilder layout
2017-08-29 17:59:46 +02:00
Karri Niemelä
034faa4f6e
Adding support out_units
2017-08-29 15:06:53 +03:00
Milos Kozak
addd6c8232
fix conflict
2017-08-28 19:15:33 +02:00
Milos Kozak
03bf1abdd4
add WakeLock#isHeld()
2017-08-27 11:57:06 +02:00
Milos Kozak
1417410dbb
add WakeLock#isHeld()
2017-08-27 11:53:36 +02:00
Milos Kozak
162389a7e0
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-08-27 11:46:25 +02:00
Milos Kozak
ba967df2e3
disable careportal buttons until profile is set
2017-08-27 11:44:39 +02:00
Milos Kozak
c9bfd27d93
Merge pull request #396 from warstar2187/dev
...
KR translation update
2017-08-27 00:38:44 +02:00
warstar2187
761f9f5075
Update strings.xml
2017-08-27 06:09:17 +09:00
Radoslav Radev
6bf120e9da
Update strings.xml
2017-08-26 22:59:14 +03:00
Milos Kozak
e4c98e6cd1
make dev 1.52
2017-08-26 21:28:08 +02:00
Milos Kozak
b02b1829ad
put back sensitivity plugins
2017-08-26 21:26:40 +02:00
Milos Kozak
491378caf5
1.51 bump
2017-08-26 20:42:53 +02:00
Milos Kozak
3369ce1759
temporary remove untested plugin for release
2017-08-26 20:42:25 +02:00
Milos Kozak
40d86eb87a
fix strings
2017-08-26 14:37:38 +02:00
Milos Kozak
6ea7549e4f
update languages
2017-08-26 12:07:37 +02:00
boysim
196e0bb309
Update strings.xml
2017-08-24 23:18:21 +02:00
Milos Kozak
adceef3641
fix merge conflict
2017-08-23 23:42:51 +02:00
Milos Kozak
4e8d92a74b
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-08-23 23:04:10 +02:00
Milos Kozak
ad3d175b02
better handling DetailedBolusInfo in v2 driver
2017-08-23 23:03:28 +02:00
Milos Kozak
d6a27c1af0
1.5h
2017-08-23 13:28:07 +02:00
Milos Kozak
01a93a35b9
Merge branch 'dev' into smb
2017-08-22 20:34:38 +02:00
Milos Kozak
c98cd3c834
Merge pull request #375 from samihusseingit/delay_in_bg_update_onResume
...
Delay in bg update on resume
2017-08-22 20:33:56 +02:00
Milos Kozak
e74c2b564a
fix conflicts
2017-08-22 20:25:10 +02:00
Milos Kozak
0551f7f16d
Merge pull request #387 from MilosKozak/invalid-overview
...
Fill treatments in Overview
2017-08-22 20:20:28 +02:00
Milos Kozak
5b17eee586
Merge pull request #389 from jotomo/cleanups
...
Cleanups
2017-08-22 20:20:10 +02:00
Johannes Mockenhaupt
bde57fde5f
Don't change schema.
2017-08-22 18:28:36 +02:00
Johannes Mockenhaupt
56423028f6
Fix comparing non-primitives.
2017-08-22 13:47:02 +02:00
Johannes Mockenhaupt
30372897c0
Generify MainApp.getSpecificPlugin.
2017-08-22 13:47:02 +02:00
Johannes Mockenhaupt
59c7dbef27
Fix some warnings / simplify a bit.
2017-08-22 13:47:02 +02:00
Johannes Mockenhaupt
97d0140614
Remove now unused dia, insulinInterfaceId from Treatment.
2017-08-22 13:47:02 +02:00
AdrianLxM
d5ea2a2f08
correct supercall
2017-08-22 13:26:48 +02:00
AdrianLxM
4d33e1df97
Use bolusstep granularity in fill dialog
2017-08-22 13:02:56 +02:00
AdrianLxM
7ea33c7de4
bugfix: fill as invalid treatments if triggered from phone
2017-08-22 12:57:03 +02:00
AdrianLxM
3f8dea1197
add invalid treatments to charts in "invalid" colour
2017-08-22 12:56:17 +02:00
AdrianLxM
6b0bf5860c
Use bolusstep as step for insulin correction in wizard
2017-08-22 00:41:23 +02:00
Milos Kozak
aad168c50f
visualize SMB
2017-08-21 17:42:26 +02:00
Milos Kozak
204c39880f
mark SMB boluses in treatments tab
2017-08-21 17:22:25 +02:00
Milos Kozak
4f16700dc0
provide lastBolusTime
2017-08-21 15:47:37 +02:00
Milos Kozak
ebfc4e3075
colored predictions
2017-08-21 15:36:52 +02:00
Milos Kozak
f5143b2ec4
display UAM prediction
2017-08-21 09:24:17 +02:00
Milos Kozak
ec114c3b38
execute SMB
2017-08-21 08:41:34 +02:00
Patrik Nilsson
c91988081f
Update strings.xml
...
Updated some changes. Milos, I jjust copied the hole SV xml-file. :-)
2017-08-21 00:01:12 +02:00
Milos Kozak
466ba2907b
Merge branch 'dev' into smb
2017-08-20 21:53:19 +02:00
Milos Kozak
33cf707d45
Merge pull request #380 from MilosKozak/dia-divisor-fix
...
Dia divisor / bolussnooze fix
2017-08-20 21:52:42 +02:00
Milos Kozak
ab035e3949
Merge pull request #371 from diabetesdt1/patch-2
...
Update strings.xml
2017-08-20 21:44:21 +02:00
Milos Kozak
a18e2b4641
fix of fix :(
2017-08-20 19:42:41 +02:00
Milos Kozak
86d791d93f
Merge pull request #378 from jotomo/profile-default-values
...
Fix initalizing profile with default values.
2017-08-20 19:08:55 +02:00
AdrianLxM
9c2808bf6f
small refactoring
2017-08-19 20:37:25 +02:00
AdrianLxM
d49eea854c
Multiply time passed instead of divide dia.
2017-08-19 20:12:37 +02:00
warstar2187
36c25cbd45
Update strings.xml
2017-08-19 21:35:03 +09:00
Johannes Mockenhaupt
ce4aee67d0
Fix initalizing profile with default values.
2017-08-19 12:28:10 +02:00
Susan
4f3b5f551a
moved the code of the bg update to the top before all the loop logic happens, so there would be no delay
2017-08-18 20:58:54 +02:00
Milos Kozak
838deed1e8
Merge branch 'dev' into smb
2017-08-18 12:30:09 +02:00
Milos Kozak
6b8dd5868d
fix displaying target in mmol
2017-08-18 11:46:04 +02:00
Milos Kozak
a097bf51aa
minDeviationSlope 1st try
2017-08-17 23:37:59 +02:00
diabetesdt1
efb9bed3fa
Update strings.xml
2017-08-17 22:21:09 +02:00
diabetesdt1
ef42193d95
Update strings.xml
...
Contraints translated with "Beschränkungen" (but not in the Config-Builder -> the Option to activate/show the Contraints-Tab)
objectives_*_ updated
dia_too_short updated
2017-08-17 22:06:10 +02:00
Johannes Mockenhaupt
5991f307af
Profile.getValuesList: don't add trailing newline.
2017-08-17 22:01:59 +02:00
Johannes Mockenhaupt
a6351f4455
Fix some warnings.
2017-08-17 22:01:59 +02:00
Johannes Mockenhaupt
4f2357e9fb
Use OK/Cancel buttons for profile removal dialog.
2017-08-17 22:01:59 +02:00
AdrianLxM
5d6327bfaa
static variables -> object variables
2017-08-17 21:34:30 +02:00
AdrianLxM
5769915f8c
Merge remote-tracking branch 'milosremote/profile-switch-viewer' into profile-switch-viewer
2017-08-17 21:29:15 +02:00
Milos Kozak
c36587430c
fix merge conflict
2017-08-17 21:24:50 +02:00
AdrianLxM
0cc9ee4193
Avoid npe if no string is assigned to the profile switch
2017-08-17 21:24:31 +02:00
Milos Kozak
ca3d94a8ca
fix merge conflict
2017-08-17 21:21:38 +02:00
Milos Kozak
73c2be5248
isValid implementation
2017-08-17 20:51:24 +02:00
AdrianLxM
92077dcb6a
Show profile on tap in Treatments->ProfileSwitch
2017-08-17 17:03:08 +02:00
diabetesdt1
64446f07c5
Update strings.xml
...
added more translations, but please review the Objectiv-Strings, it was not so easy, so i hope i have translated it right.
Then, the most german varibles are translated.
2017-08-17 12:40:14 +02:00
AdrianLxM
47e295b3c1
Check for tempbasal not RealTempbasla
2017-08-17 00:42:26 +02:00
AdrianLxM
776ae3f424
Overlapping interval - regard first element on cut
2017-08-16 23:56:14 +02:00
AdrianLxM
8287fe22cf
AcceptTempButton visible
2017-08-16 23:22:14 +02:00
Milos Kozak
6ca44fce84
Merge pull request #367 from MilosKozak/profile-switch-buttons
...
show notification on toast alarm
2017-08-16 22:58:34 +02:00
AdrianLxM
e61d7a4442
show notification on toast alarm
2017-08-16 21:37:33 +02:00
Milos Kozak
b93a153b23
parse 12h format properly
2017-08-16 19:33:41 +02:00
Milos Kozak
e5cc34b975
fix merge conflict
2017-08-16 18:38:14 +02:00
Milos Kozak
7884c98f2f
fix index
2017-08-16 18:26:47 +02:00
Milos Kozak
35db28f013
Merge pull request #365 from MilosKozak/dia-expecteddelta-fix
...
Restrict DIA for expectedDelta
2017-08-16 18:11:37 +02:00
Milos Kozak
69a378bb75
Merge pull request #366 from MilosKozak/profile-switch-buttons
...
Show profile switch button in profiles
2017-08-16 18:11:26 +02:00
AdrianLxM
63793ed358
Show profile switch button in profiles
...
Shows the button to trigger a profile switch button in the profile fragments even when the pump basal cannot be written.
Instead of "SEND TO PUMP" it will then show "ACTIVATE PROFILE".
This has become necessary with the interval logic that needs profile switch events to happen in order to accept a new profile.
2017-08-16 17:56:57 +02:00
Milos Kozak
e005a6172b
set pump time only if needed
2017-08-16 17:26:58 +02:00
AdrianLxM
5fc63d8f16
restrict DIA for expectedDelta
2017-08-16 14:23:22 +02:00
Milos Kozak
e1d2c557af
Merge pull request #364 from MilosKozak/overlappin-intervals-fix
...
Overlappinginterfals - find first element
2017-08-16 08:11:04 +02:00
Milos Kozak
898e162300
initial work on SMB
2017-08-15 23:13:37 +02:00
AdrianLxM
2e382267d4
Overlappinginterfals - find first element
2017-08-15 22:38:48 +02:00
Johannes Mockenhaupt
759afcec7a
Extract method Profile.toTargetRangeString.
2017-08-15 16:12:42 +02:00
Johannes Mockenhaupt
754a0097b9
Simplify.
2017-08-15 15:50:24 +02:00
Johannes Mockenhaupt
6dcdeb2bbc
Overview: format target using unit specific format.
2017-08-15 14:51:09 +02:00
Milos Kozak
4c490c32f7
Merge pull request #361 from MilosKozak/oref-insulincurves
...
Oref Insulincurves
2017-08-15 10:13:50 +02:00
Milos Kozak
151165809e
Dutch language
2017-08-14 21:57:49 +02:00
AdrianLxM
ee7b3cca22
insulincurves - notification on short DIA
2017-08-14 20:41:24 +02:00
AdrianLxM
f23c3e7ae1
insulincurves - forgotten string updated
2017-08-14 16:44:39 +02:00
AdrianLxM
707d5a480c
insulincurves - rename peak to peak time
2017-08-14 16:02:07 +02:00
AdrianLxM
94fbd620f4
insulincurves - remove unused base fragment
2017-08-14 15:53:47 +02:00
AdrianLxM
ced1da09cf
insulincurves - i18n
2017-08-14 15:25:37 +02:00
AdrianLxM
13cd7dbda1
insulincurves - ActivityGraph fix double plotting
2017-08-14 15:25:21 +02:00
AdrianLxM
085caddeee
insulincurves - freepeak
2017-08-14 15:24:55 +02:00
AdrianLxM
63d46aed56
insulincurves - minimum 5
2017-08-14 15:24:41 +02:00
AdrianLxM
a538160e76
insulincurves - rapid and ultra both with adjustable dia
2017-08-14 15:24:30 +02:00
AdrianLxM
b8496e3208
insulincurves - working with default params
2017-08-14 15:22:27 +02:00
Milos Kozak
82d3289602
add oref1 asssets
2017-08-14 12:20:12 +02:00
Milos Kozak
2d2ccde6e4
log Bundle
2017-08-14 12:11:53 +02:00
Johannes Mockenhaupt
d49356a922
Logging: Print filename and line instead of logger name.
2017-08-13 21:31:21 +02:00
Milos Kozak
377b711896
Merge pull request #352 from diabetesdt1/patch-1
...
Update strings.xml
2017-08-13 20:31:54 +02:00
Milos Kozak
a49a496651
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into force
2017-08-13 20:31:45 +02:00
Milos Kozak
d4642b3958
do not enforce stop for v2 driver
2017-08-13 20:31:15 +02:00
Milos Kozak
2a2b5dbb31
Merge pull request #357 from savek-cc/logfile-name
...
change logfile name pattern
2017-08-13 15:55:53 +02:00
Timm Korte
8caaeeff2a
change logfile name pattern to still be rotated once a day but include the hour-minute-seconds as timestamp in the filename
2017-08-13 14:32:37 +02:00
Timm Korte
6bbb785574
rename 'userRequested' to 'force' as parameter to cancelTempBasal in order to have the same naming as with setTempBasalAbsolute
2017-08-12 13:36:35 +02:00
AdrianLxM
f861546e12
Quickfix to avoid crashes after staleData merge
2017-08-12 11:20:56 +02:00
Timm Korte
8db9cb8887
add cancelTempBasal to setTempBasal if forced
2017-08-11 23:06:35 +02:00
Milos Kozak
73b6235188
APSRequest Answers event
2017-08-11 22:46:08 +02:00
Timm Korte
7839299530
add force parameter to setTempBasalAbsolute in order to force setting of a 0 temp for disconnecting the pump - instead of calling cancel as introduced in a24cbfda50
2017-08-11 22:08:33 +02:00
Milos Kozak
2770e93ed4
Merge pull request #337 from RoumenGeorgiev/dev
...
Alarm for StaleData
2017-08-11 18:45:52 +02:00
diabetesdt1
8cd24fd919
Update strings.xml
...
Replaced "Empfindlichkeit" with "Sensitivität"
2017-08-11 13:28:39 +02:00
diabetesdt1
a69a94a384
Update strings.xml
2017-08-11 12:48:15 +02:00
diabetesdt1
15fc53530d
Update strings.xml
...
Changed Nightscout to NS back (but not on the short Text).
Add more Translations.
Overview-Notification used and not "Popup-Notification".
Removed on short Names the ".
I think "treatment" = "Behandlung" sounds wrong :-|
2017-08-11 12:43:46 +02:00
diabetesdt1
0b62669079
Update strings.xml
...
typo fixed
2017-08-11 07:30:53 +02:00
Milos Kozak
26fbd450b0
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into sv
2017-08-10 22:39:25 +02:00
Milos Kozak
3ca058ce60
SV language cleanup
2017-08-10 22:33:38 +02:00
diabetesdt1
d78928a264
Update strings.xml
...
typo fixed and empty strings removed
2017-08-10 21:40:03 +02:00
diabetesdt1
c5b5d65efc
Update strings.xml
2017-08-10 21:29:41 +02:00
diabetesdt1
8df0ccdbb1
Update strings.xml
...
rollback language-names
2017-08-10 21:28:09 +02:00
diabetesdt1
33f5e97ac6
Update strings.xml
...
add more german translation and typos fixed
2017-08-10 21:12:56 +02:00
Milos Kozak
3a574c3803
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-08-10 17:28:57 +02:00
Milos Kozak
f703c82ca7
microbolus calculation
2017-08-10 17:28:41 +02:00
Milos Kozak
dae82d49fb
Merge remote-tracking branch 'patrik/dev' into sv
2017-08-10 16:29:42 +02:00
ellabellakaramella
0766ac812c
SV translation
2017-08-10 15:15:40 +02:00
Winfried Kuiper
5b43f11a3f
Update strings.xml
...
Confirmation=Bestätigung statt Konfiguration (configuration)
2017-08-09 22:12:09 +02:00
Winfried Kuiper
99a0edfa06
Update strings.xml
...
Missing units in german translation
2017-08-09 22:03:59 +02:00
Milos Kozak
57f5e5a92d
add bolus metadata when reading pump history
2017-08-08 23:14:56 +02:00
Milos Kozak
bbc68b2266
synchronized getAutosensData
2017-08-08 15:55:31 +02:00
Milos Kozak
2f8ca8bb04
fix setting zero temp
2017-08-08 15:06:31 +02:00
RoumenGeorgiev
122efb1b8e
Fix for getting double of alarmTimeagoWarnMins
2017-08-07 20:06:15 +03:00
RoumenGeorgiev
1dd9086924
added snoozing if bgReadingAgo is smaller than threshold
2017-08-07 18:53:56 +03:00
Milos Kozak
3bfecd6da8
check for existing
2017-08-07 16:13:09 +02:00
Milos Kozak
2ae0028495
Swedish
2017-08-07 14:06:11 +02:00
RoumenGeorgiev
4f054907cb
Merge pull request #1 from MilosKozak/dev
...
Dev
2017-08-07 09:17:07 +03:00
Milos Kozak
a40afd0948
1.5g
2017-08-06 14:28:01 +02:00
Milos Kozak
848863aca5
calculateFromTreatmentsAndTempsSynchronized
2017-08-06 14:25:25 +02:00
Milos Kozak
f1f7a6ca6c
check for null
2017-08-06 14:14:03 +02:00
Milos Kozak
066283a4b0
add SMB flag to treatments
2017-08-06 12:19:25 +02:00
Milos Kozak
6ab6f82b10
more debug on setting temp basal
2017-08-06 11:42:20 +02:00
Milos Kozak
4e4088f164
remove unneeded strings
2017-08-05 18:47:01 +02:00
Milos Kozak
4fda4fd547
convert target values to mdgl before passing to openaps
2017-08-05 18:14:10 +02:00
Milos Kozak
e295c8a2dc
target range change confirm dialog
2017-08-05 18:09:19 +02:00
Milos Kozak
f834b3b7e0
remove unneeded texts
2017-08-05 17:43:31 +02:00
Milos Kozak
1604b85d34
Merge branch 'dev' into move-to-range-in-profile
2017-08-05 14:48:41 +02:00
RoumenGeorgiev
222c357456
Added check for enabled openAPS stale data alarm in NS
2017-08-05 11:58:49 +03:00
RoumenGeorgiev
ad122153a9
added openAPSEnabledAlerts()
...
check for OpenAPS alerts enabled
2017-08-05 11:26:12 +03:00
RoumenGeorgiev
3d9df4e18e
Using equals() instead of == on line 1811
2017-08-05 11:20:09 +03:00
RoumenGeorgiev
cdee9bf703
Get staleData setting from NS first
2017-08-04 17:04:57 +03:00
RoumenGeorgiev
aff62d86b1
Changed name of button to snooze if it's staleDataAlarm
2017-08-04 16:43:46 +03:00
RoumenGeorgiev
714a292d78
fixed wrong pasting
2017-08-04 15:05:09 +03:00
RoumenGeorgiev
837dcdb23b
If alarm is staledata dismis snoozes it
2017-08-04 14:51:25 +03:00
RoumenGeorgiev
82541a50e4
Added functions for snoozing and unsnoozing
2017-08-04 14:49:46 +03:00
RoumenGeorgiev
a8b17a1f22
adding staleDataThreshold as snooze time
2017-08-04 14:48:44 +03:00
RoumenGeorgiev
529d267b9d
Added check for staleData and notification
...
with every loop
2017-08-04 12:29:48 +03:00
RoumenGeorgiev
232590e707
Added staleData
2017-08-03 18:48:45 +03:00
RoumenGeorgiev
74bb05a654
added staledataalarm
2017-08-03 17:14:14 +03:00
AdrianLxM
36e6cb8497
remove canceltemp button from all layouts and click handling from overview fragment
2017-08-03 08:22:59 +02:00
AdrianLxM
053004bbbd
correct logging
2017-08-03 08:20:11 +02:00
AdrianLxM
7a7f75db01
fix cancel real temp basals from actions
2017-08-03 03:22:30 +02:00
AdrianLxM
0ac7357ee9
color for active temp
2017-08-03 03:12:47 +02:00
AdrianLxM
1ac1b77fd4
remove translated string not in default strings and add flag to cancel method
2017-08-03 02:01:52 +02:00
AdrianLxM
23abc0e4e5
Some more German
2017-08-02 00:08:56 +02:00
AdrianLxM
5d51b8f0f9
Some more German
2017-08-01 23:56:16 +02:00
AdrianLxM
e30e62e9ab
Some German translations, remove unused strings, App name for all
2017-08-01 23:46:58 +02:00
Radoslav Radev
39891bbad9
Update strings.xml
2017-08-01 23:29:23 +03:00
Milos Kozak
e933650330
CS translations
2017-08-01 22:17:39 +02:00
Milos Kozak
9cf5c6b6c3
hide all overview buttons by default
2017-08-01 20:52:23 +02:00
Milos Kozak
34d4bec556
move cancel temp to actions
2017-08-01 20:45:57 +02:00
Milos Kozak
9596987b35
new temp basal dialog refactor
2017-08-01 20:02:17 +02:00
Milos Kozak
d2a5939ce3
fix virtual pump crash
2017-08-01 17:53:28 +02:00
Milos Kozak
a24cbfda50
Disconnect pump: cancel temp before setting new to make sure it will last as expected
2017-08-01 17:37:32 +02:00
Milos Kozak
6828e11dd9
remove notes strings as well
2017-08-01 17:25:43 +02:00
Milos Kozak
6f9f72d849
remove notes from temp basal upload
2017-08-01 17:21:32 +02:00
Milos Kozak
668008e1c1
cancel current temp before activating superbolus
2017-07-31 19:53:09 +02:00
AdrianLxM
5569b42ac3
wear wizard percentage
2017-07-26 09:58:51 +02:00
Milos Kozak
7a572d2341
1.5f
2017-07-25 22:53:55 +02:00
Milos Kozak
4bb3b7c11d
Merge pull request #323 from MilosKozak/nsclient-local-second
...
Nsclient local broadcasts
2017-07-25 19:51:57 +02:00
Milos Kozak
0914e67c11
typo
2017-07-25 19:25:58 +02:00
Milos Kozak
f1e21053b5
use key instead of string
2017-07-25 19:24:51 +02:00
