Johannes Mockenhaupt
8e68a23225
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
G5 upload to xdrip
fake Esel new file
fake Esel
Rv2,RS: always load last 45 min
remove wear-overview notifications as replaced by system notifications
# Conflicts:
# app/src/main/res/values/strings.xml
2017-12-18 20:22:26 +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
Johannes Mockenhaupt
471beae14c
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
remove unused imports
adapt wear actions to command queue
RS report unsupported firmware
removing the whole if() statement
fix NPE when profile not loaded
fix of extended bolus size
Added profile's target BG in NSClient mode
2017-12-09 19:51:07 +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
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
Roumen Georgiev
242ed7217a
fix of extended bolus size
2017-12-07 10:08:26 +02:00
Johannes Mockenhaupt
51b51c159c
Clean up earlier merge blunder.
2017-12-06 12:12:25 +01:00
Johannes Mockenhaupt
d58bb75d01
Add missing synchronized so guard works properly.
2017-12-06 12:01:59 +01:00
Roumen Georgiev
5e597f03d0
Added profile's target BG in NSClient mode
2017-12-05 09:23:57 +02:00
Johannes Mockenhaupt
bf9f877b3d
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev: (68 commits)
max connection time to 120 sec
make chart zoomable again
fix NPE
lowest priority for background calculations
wear timestamps long
remove unneeded code
fix landscape overview
synchronized wait
fix build tools for travis
try to fix travis
upgrade build tools
R: resolve thread deadlock during bolus stop
remove unsupported code from korean pump
handle bolus stop prior to delivery correctly
fix translations
better logging
Revert unnecessary change.
Send OpenAPS timestamp to watch rather than minAgo, for more accurate updates on watch face.
gradle update
parse more iso formats
...
# Conflicts:
# app/build.gradle
# app/src/main/AndroidManifest.xml
# app/src/main/java/info/nightscout/androidaps/Config.java
# app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
# app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsFragment.java
# app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java
# app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewExtendedBolusDialog.java
# app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/DismissNotificationService.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/NotificationStore.java
# app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfilePlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfilePlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/DanaRSService.java
# app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java
# app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java
# app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java
# app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java
# app/src/main/res/values/strings.xml
# app/src/main/res/xml/pref_others.xml
# app/src/main/res/xml/pref_wear.xml
# gradle/wrapper/gradle-wrapper.properties
# wear/build.gradle
2017-12-05 00:32:47 +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
Milos Kozak
4185bb347d
handle bolus stop prior to delivery correctly
2017-12-03 19:34:01 +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
Roumen Georgiev
ecbac7ea96
Make ProfileSwitch text 20% larger
2017-12-01 10:30:18 +02: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
7fc9efde40
G5 offline/uploader
2017-11-29 16:07:26 +01:00
Milos Kozak
d1aec1ff18
Localalerts settings by adrian
2017-11-28 21:48:46 +01:00
Roumen Georgiev
eb593a4557
Update Notification.java
2017-11-28 16:09:23 +02:00
Milos Kozak
a13661400f
DanaRv2 queue & pump autodection
2017-11-22 22:09:58 +01:00
Milos Kozak
dfd0218a6a
Merge branch 'dev' into queue
2017-11-22 19:44:16 +01:00
Johannes Mockenhaupt
b49a4c57ba
BolusProgressDialog: hide stop button once pressed.
2017-11-22 00:20:50 +01:00
Milos Kozak
3ab235f829
refactor pump interface out of ConfigBuilder, remove handlers
2017-11-20 23:39:12 +01:00
Milos Kozak
d8d8b150b6
Merge branch 'dev2' into queue
2017-11-20 17:34:03 +01:00
Johannes Mockenhaupt
d92540a17c
Merge remote-tracking branch 'adrian/localalerts-settings' into combo-scripter-v2
...
* adrian/localalerts-settings:
remove already commented out code
upper case literals
use correct setting
Don't alarm while disconnected
disconnect state
remove deprecated wear notification settings
no-urgent notification title
presnooze missed readings/pump on startup
system notifications for non-urgent
Notification bugfixes
use ID as request code
guard double clicks
refactor notifications: subpackage
initialized only when maxBasal >0
Dismiss notification service
local alert thresholds as settings
Extract local alerts for unreachable pump, missed BG readings.
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/NotificationStore.java
# app/src/main/res/values/strings.xml
2017-11-18 16:42:20 +01:00
Johannes Mockenhaupt
76cc08c1a9
BolusProgressDialog: hide stop button once pressed.
2017-11-16 00:23:37 +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
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
AdrianLxM
ec81f124e9
remove already commented out code
2017-11-08 18:53:33 +01:00
AdrianLxM
b9ad90a51b
disconnect state
2017-11-06 22:04:48 +01:00
AdrianLxM
f2e44e8ab9
no-urgent notification title
2017-11-06 21:38:42 +01:00
AdrianLxM
2f56687e82
system notifications for non-urgent
2017-11-06 20:16:17 +01:00
AdrianLxM
2b06e9e63e
Notification bugfixes
2017-11-06 17:12:33 +01:00
AdrianLxM
ef425563bf
use ID as request code
2017-11-06 15:24:52 +01:00
AdrianLxM
e4f15c0e0d
guard double clicks
2017-11-06 15:07:39 +01:00
AdrianLxM
8c8674ed63
refactor notifications: subpackage
2017-11-06 14:26:06 +01:00
AdrianLxM
d990d59ddf
Dismiss notification service
2017-11-06 14:09:03 +01:00
AdrianLxM
ffd912e32b
Merge remote-tracking branch 'jotomoremote/local-alerts' into localalerts-settings
2017-11-06 11:56:41 +01:00
Johannes Mockenhaupt
f569163d19
Merge remote-tracking branch 'origin/dev2' into combo-v2
...
* origin/dev2: (26 commits)
add getPreferenceId to food plugin
preferences update
use DateUtil#agoString
use DateUtil#untilString
timeframe strings
Show remaining time of TT
NSTreatments NPE fix
Cleanup.
Revert "Debug: wider thread column in log to improve readability."
Disable event logging by default.
Log summary after 10s, then every 60s.
Log receivers of event.
Log source of event.
Debug: wider thread column in log to improve readability.
Better log messages for events.
Group events in type hierarchy related to the LoopPlugin.
Remove dead NSPingAck class.
Let event classes extend Event(UpdageGui) classes.
Add base event class.
Log posted events.
...
2017-11-01 21:39:45 +01:00
