Johannes Mockenhaupt
76cc08c1a9
BolusProgressDialog: hide stop button once pressed.
2017-11-16 00:23:37 +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
5ed97d297f
Minor code cleanup.
2017-11-15 11:23:20 +01:00
Johannes Mockenhaupt
e27730229e
Update TODO-Combo, nicer icon in fragment.
2017-11-14 10:43:36 +01:00
Johannes Mockenhaupt
21a2c688c6
Cleanups.
2017-11-13 23:05:49 +01:00
Johannes Mockenhaupt
104cead555
Lots of work around properly reading pump history.
2017-11-13 23:05:49 +01:00
Johannes Mockenhaupt
a52e159bf6
Fire EventInitializationChanged after pump init.
2017-11-13 23:05:49 +01:00
Johannes Mockenhaupt
c22d18eabc
ComboFragment: alert button for pump alerts (instead of alarms).
2017-11-13 23:05:49 +01:00
Johannes Mockenhaupt
ef0c5b9138
Dialog cleanups.
2017-11-13 23:05:49 +01:00
Johannes Mockenhaupt
c21799fe0f
Treatments tab: display extended bolus tab if active pump supports it or there are any ext bolus records.
2017-11-13 23:05:49 +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
Johannes Mockenhaupt
9606df13b7
Fix false error popup when cancelling bolus after confirmation on the pump, during the wait before delivery starts.
2017-11-12 02:06:32 +01:00
Johannes Mockenhaupt
11777f8b7f
Cleanups.
2017-11-12 00:58:16 +01:00
Johannes Mockenhaupt
02af439dd7
Minor tweaks.
2017-11-12 00:37:03 +01:00
Milos Kozak
7374545046
refactor all deliverTreatment
2017-11-12 00:08:25 +01:00
Johannes Mockenhaupt
c11086d9ea
Stuff:
...
* Read all history
* Simple viewer for TDDs, errors
* Clean up cancelling TBR (incomplete)
* Initializing pump robustness
2017-11-12 00:01:01 +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
Johannes Mockenhaupt
3072a42cd7
Initial dialog to display pump alerts.
2017-11-11 21:44:00 +01:00
Johannes Mockenhaupt
9804f004f5
Remove unreachable code.
2017-11-11 17:29:39 +01:00
Johannes Mockenhaupt
a9970a9efe
Cleanups
2017-11-11 16:52:07 +01:00
Johannes Mockenhaupt
ee6f29dd75
Revert more local alerts
2017-11-11 16:29:46 +01:00
Milos Kozak
a5227fc773
add bolus sound
2017-11-11 16:20:34 +01:00
Johannes Mockenhaupt
2f8febabb8
Remove debris of localalerts to make upstream re-integration only a minor PITA, maybe.
2017-11-11 16:15:03 +01:00
Johannes Mockenhaupt
fb65aca081
ComboFragment: hack to make battery display look pretty before init.
2017-11-11 16:13:06 +01:00
Johannes Mockenhaupt
355a973727
Empty activity instead of 'Idle' in combo tab.
2017-11-11 16:12:19 +01:00
Milos Kozak
86b11edd58
RS connection and status reading
2017-11-11 14:05:29 +01:00
Johannes Mockenhaupt
e6a29e5214
Reorder items in fragments.
2017-11-10 02:23:21 +01:00
Johannes Mockenhaupt
7163fbae54
ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires before next loop iteration.
2017-11-10 01:26:17 +01:00
Johannes Mockenhaupt
5d077c329a
fix the fix with the fix from the fix that fixes the fix.
2017-11-10 01:16:01 +01:00
Johannes Mockenhaupt
bfc6f0b618
another fi
2017-11-10 00:59:40 +01:00
Johannes Mockenhaupt
5ce956b5fc
quick fix for cancelling tbr to fake neutral temp.
2017-11-10 00:57:40 +01:00
Johannes Mockenhaupt
8983143bff
Cleanup.
2017-11-10 00:57:40 +01:00
Milos Kozak
a186ce6468
more command queue code
2017-11-10 00:27:18 +01:00
AdrianLxM
d0806802eb
compile fixes
2017-11-10 00:19:13 +01:00
Johannes Mockenhaupt
a17cff7adf
Some work around refreshing pump data.
2017-11-08 23:41:53 +01:00
Milos Kozak
d40e0c97c4
simplify active pump access where possible
2017-11-08 23:40:54 +01:00
Johannes Mockenhaupt
cc6db3a059
Some ComboFragment cleanups.
2017-11-08 23:31:40 +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
AdrianLxM
ec81f124e9
remove already commented out code
2017-11-08 18:53:33 +01:00
Johannes Mockenhaupt
ff3707d201
Fix NPE initialising MyPreferencesFragment, part 2
2017-11-08 15:07:10 +01:00
Johannes Mockenhaupt
cda621f32b
Disable loop when selected basal rate is not 1.
2017-11-08 14:28:02 +01:00
Johannes Mockenhaupt
dd98d9f7ae
wip
2017-11-08 10:43:11 +01:00
Johannes Mockenhaupt
324b68717f
Fix NPE initialising MyPreferencesFragment.
2017-11-08 10:20:49 +01:00
Milos Kozak
0af51bb6ea
show timeshift if not zero
2017-11-07 13:24:08 +01:00
Johannes Mockenhaupt
5bd2911754
wip ..
2017-11-07 09:36:21 +01:00
Johannes Mockenhaupt
445392ee69
add pretty time dep.
2017-11-07 09:22:29 +01:00
AdrianLxM
4e53b4b1a4
upper case literals
2017-11-07 00:00:38 +01:00
AdrianLxM
d6b534b3b6
use correct setting
2017-11-06 23:47:39 +01:00
Johannes Mockenhaupt
be5f7e68a7
unsafe usage checks update.
2017-11-06 23:15:16 +01:00
AdrianLxM
a864703c76
Don't alarm while disconnected
2017-11-06 22:24:25 +01:00
AdrianLxM
b9ad90a51b
disconnect state
2017-11-06 22:04:48 +01:00
AdrianLxM
ccad0c18b1
remove deprecated wear notification settings
2017-11-06 21:44:01 +01:00
AdrianLxM
f2e44e8ab9
no-urgent notification title
2017-11-06 21:38:42 +01:00
AdrianLxM
2e6a136de6
presnooze missed readings/pump on startup
2017-11-06 20:32:33 +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
3ea4bfaf37
initialized only when maxBasal >0
2017-11-06 14:16:50 +01:00
AdrianLxM
d990d59ddf
Dismiss notification service
2017-11-06 14:09:03 +01:00
AdrianLxM
87ea412516
local alert thresholds as settings
2017-11-06 12:58:44 +01:00
AdrianLxM
ffd912e32b
Merge remote-tracking branch 'jotomoremote/local-alerts' into localalerts-settings
2017-11-06 11:56:41 +01:00
Johannes Mockenhaupt
8b7725c076
add pretty time dep
...
(cherry picked from commit 8ac2aba)
2017-11-05 21:52:45 +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
Johannes Mockenhaupt
7c44761f25
WIP
2017-11-04 17:42:47 +01:00
Johannes Mockenhaupt
011409a6e5
Minor cleanups.
2017-11-03 23:40:57 +01:00
Johannes Mockenhaupt
6ba57ff1f7
WIP Cleaning up ComboPlugin/Ruffyscripter.cancelTbr
2017-11-03 22:04:48 +01:00
Johannes Mockenhaupt
598fbe40cc
Unsource ruffy.
2017-11-03 22:04:48 +01:00
Johannes Mockenhaupt
142878a22b
Fix getting resources string in fragment.
2017-11-03 21:41:20 +01:00
Johannes Mockenhaupt
f9a7d6fe20
Use PumpEnactResult's fluent interface in Combo plugin.
2017-11-03 14:40:01 +01:00
Johannes Mockenhaupt
49885afb39
Refresh entire pump state when long-pressing Combo tab's refresh button.
2017-11-03 14:23:47 +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
Johannes Mockenhaupt
604a9e664a
Reject requests to bolus the same amount within 60s.
2017-11-02 15:37:19 +01:00
Johannes Mockenhaupt
fe45b917be
Align Combo with recent preferences updates.
2017-11-01 23:25:37 +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
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
Johannes Mockenhaupt
4da160a951
Disable closed loop under unsafe conditions.
2017-11-01 10:55:09 +01:00
Johannes Mockenhaupt
8d3947dc7f
Initial bolus syncing.
2017-10-31 19:30:25 +01:00
Johannes Mockenhaupt
744d24cbcf
DatabaseHelper: add getTreatmentByDate.
2017-10-31 19:28:32 +01:00
Johannes Mockenhaupt
74bbab9cf1
More bolus work.
2017-10-31 14:46:46 +01:00
Johannes Mockenhaupt
ab900fda6c
Refresh tab after pump init.
2017-10-31 14:46:06 +01:00
Johannes Mockenhaupt
69648ecf30
Make bolusing safe.
2017-10-31 12:47:53 +01:00
Johannes Mockenhaupt
efc298bf90
Make PumpEnactResult fluent.
2017-10-31 12:47:41 +01:00
Johannes Mockenhaupt
f64e00fc79
Auto-retrying repeatable commands when there's a connection loss.
2017-10-31 11:05:07 +01:00
Johannes Mockenhaupt
88f500417d
Cleanup: ComboFragement.
2017-10-31 11:02:14 +01:00
Johannes Mockenhaupt
9121aa5217
Bolus cancellation for all stages.
2017-10-31 11:01:58 +01:00
Johannes Mockenhaupt
522b5e9e1b
Clean up string resource names.
2017-10-30 21:42:14 +01:00
Johannes Mockenhaupt
2198747feb
NPE fix.
2017-10-30 19:52:26 +01:00
Johannes Mockenhaupt
75bc2cd940
NotificationStore: extract key string.
2017-10-30 19:49:16 +01:00
Johannes Mockenhaupt
9bae22f551
Tweaking ComboFragment's Last Connection.
2017-10-30 19:49:16 +01:00
Johannes Mockenhaupt
a920946cd1
Extract local alerts for unreachable pump, missed BG readings.
2017-10-30 17:48:22 +01:00
Johannes Mockenhaupt
79d7ec5467
Add prefs for local alerts.
2017-10-30 16:49:21 +01:00
Johannes Mockenhaupt
bffd1239c0
Disable reading history while incomplete.
2017-10-30 16:20:43 +01:00
Johannes Mockenhaupt
550ed57ca5
KeepAliveReceiver: clean up, categorize Android notification as alarm so it plays sound even in silent mode.
2017-10-30 16:20:08 +01:00
Johannes Mockenhaupt
d423c8ae2a
Add pref to raise urgent alarms as system notifications.
2017-10-30 03:04:41 +01:00
Johannes Mockenhaupt
bdc61765ce
KeepAliveReceiver: sanitize pump disconnected/missed readings alarms.
...
* Don't raise alarm on application start
* Re-raise alert only every ~30 min, not every 5 min.
2017-10-30 02:02:01 +01:00
Johannes Mockenhaupt
a2460180f9
Remove unclear error message field from CommandResult, use codes from pump warnings/errors.
2017-10-29 21:19:03 +01:00
Johannes Mockenhaupt
6b6d252173
Day 1
...
* Some UI rework
* Start removing (retry) logic from ruffyscripter to ComboPlugin
* Cleanups all over
* Remove TDD stuff, this can be done independently of a pump
* New SPI/API methods confirmAlert, readReservoirLevelAndLastBolus
* Add warning and error codes from Combo manual
* Rework commands to just execute an action (verification will be in
ComboPlugin eventually, together with retry logic)
* Rework commands to update state in field as command progresses
rather than returnin/throwing.
* Initial version reading bolus and error history (no DB sync yet).
2017-10-29 11:36:35 +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
Johannes Mockenhaupt
394a42837a
Set source/target version to 1.8 for Java 8 features with Studio 3.0.
...
See https://developer.android.com/studio/write/java8-support.html
for what is supported with our currently used SDK 23 target.
2017-10-28 13:43:25 +02:00
Johannes Mockenhaupt
255e9d0dff
Move initialized flag to ComoPump class.
2017-10-28 13:12:55 +02:00
Johannes Mockenhaupt
4befa38d46
Close bolus progress dialog better in case of error.
2017-10-28 11:46:54 +02:00
AdrianLxM
7d82870203
Show remaining time of TT
2017-10-28 02:16:30 +02:00
Johannes Mockenhaupt
36d5c4d806
Clean up ComboFragment, related string resources.
2017-10-28 00:47:45 +02:00
Johannes Mockenhaupt
c53936a7ac
Revert inadvertent change to keepAlive interval.
2017-10-28 00:19:18 +02:00
Johannes Mockenhaupt
b6a62dedae
Fix merge conflict.
2017-10-27 22:26:47 +02:00
Johannes Mockenhaupt
d237c46ca8
Merge remote-tracking branch 'origin/dev' into combo-v2
...
* origin/dev: (26 commits)
fix RS response code
use max absorption time for AAPS and weighted average sensitivity detection
log.debug -> log.error on RS comm
read status after bolus
RS connectivity & bolus improvement
Better bolusing with different speeds (R & Rv2)
Detailed onscreen history logging
Split to smaller pieces
Update strings.xml
Sensitivity logging optional
RS synchronized change
fix displaying XX:30 time intervals
CS translations
allow to use actual profile in wizard
getUnits from active profile not interface
Update strings.xml
Update strings.xml
Update dutch
Update strings.xml
Update strings.xml
...
2017-10-27 22:24:38 +02:00
Johannes Mockenhaupt
4bc970091e
More i18n.
2017-10-27 21:51:15 +02:00
Johannes Mockenhaupt
a8061b410c
Clean up pump init.
2017-10-27 19:40:44 +02:00
Johannes Mockenhaupt
a1d6834bce
KeepAliveReceiver: check pump only if initialized already.
2017-10-27 19:39:51 +02:00
Johannes Mockenhaupt
eed3773b49
Combo i18n.
2017-10-27 17:19:10 +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
Johannes Mockenhaupt
b47559647f
wip
2017-10-27 00:03:01 +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
Johannes Mockenhaupt
e895ba65eb
KeepAliveReceiver: proper Notification ids.
2017-10-26 01:09:46 +02:00
Johannes Mockenhaupt
4539b5a9e5
KeepAliveReceiver: add alarm for missed readings.
2017-10-26 01:09:37 +02:00
Johannes Mockenhaupt
001a56728d
KeepAliveReceiver: add alarm sound to 'pump unreachable' notification.
2017-10-26 01:09:31 +02:00
Johannes Mockenhaupt
7b3f474b58
Upgrade to Android Studio 3.0.
2017-10-25 22:49:50 +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
Johannes Mockenhaupt
e620878d17
KeepAliveReceiver: raise notification when pump couldn't be reached for 25m.
2017-10-25 18:30:06 +02:00
Johannes Mockenhaupt
d907a1b6b3
Force refresh every 15 min (previously 30).
2017-10-25 18:20:38 +02:00
Johannes Mockenhaupt
22bac709fb
Cleanups around ComboPlugin.refreshDataFromPump.
2017-10-25 18:17:19 +02:00
Johannes Mockenhaupt
5ba68a86f0
Log full class name (not just filename), so logs can be filtered by package name.
2017-10-25 18:17:18 +02:00
Johannes Mockenhaupt
68a3dbbf33
Start KeepAliveService after pump init.
2017-10-25 18:16:38 +02:00
Johannes Mockenhaupt
ec383bb082
Remove the alerter and related prefs.
2017-10-25 16:27:55 +02:00
Johannes Mockenhaupt
e09d337c02
ComboFragment: colours and text for last connection.
2017-10-25 15:42:38 +02:00
Johannes Mockenhaupt
fa81f57d9f
ComboPlugin.deliverTreatment: don't update progress dialog for non-interactive SMBs.
2017-10-25 15:11:27 +02:00
Johannes Mockenhaupt
34861960ea
Bolus command: ensure the progress dialog is always closed.
2017-10-25 15:11:27 +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
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
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
Johannes Mockenhaupt
2d8b3a7cb8
wip
2017-10-22 10:40:24 +02:00
Johannes Mockenhaupt
300a4609f8
Clean up prefs.
2017-10-21 20:24:17 +02:00
Milos Kozak
3cdca93b30
RS connectivity & bolus improvement
2017-10-21 20:09:21 +02:00
Johannes Mockenhaupt
73d5db43ed
Nitpicky symmetry.
2017-10-21 19:17:04 +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
Johannes Mockenhaupt
fc60edc15a
wip
2017-10-21 17:44:16 +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
Radoslav Radev
075b74ec84
Update strings.xml
2017-10-21 17:11:25 +03:00
Johannes Mockenhaupt
cb438934b6
WIP: Pairing
2017-10-21 13:50:19 +02:00
Johannes Mockenhaupt
015a852ab5
Custom: Disable Crashlytics.
...
(cherry picked from commit 7890f6b)
(cherry picked from commit 1374739)
2017-10-21 13:37:42 +02:00
Milos Kozak
dbf5a5e577
Sensitivity logging optional
2017-10-21 13:14:06 +02:00
Johannes Mockenhaupt
6cb1d5c0bd
ComboFragment, set "Initializing" as initial status.
2017-10-21 11:22:40 +02:00
Milos Kozak
881a745e32
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-10-20 21:36:56 +02:00
Johannes Mockenhaupt
e2d684ac33
PersistentNotification unregister workaround.
2017-10-20 20:15:37 +02:00
Johannes Mockenhaupt
950d1b62db
Undo "explicit pump initalization."
2017-10-20 20:09:58 +02:00
Johannes Mockenhaupt
87c1c4b112
More sync prototyping.
2017-10-20 18:51:15 +02:00
Milos Kozak
01d6f1594a
RS synchronized change
2017-10-20 17:37:06 +02:00
Johannes Mockenhaupt
1aa2ce48a1
First steps to syncing full pump state with AAPS.
2017-10-20 15:24:11 +02:00
Johannes Mockenhaupt
491caadd71
Check for active alerts on the pump, confirm and re-raise in AAPS.
2017-10-20 15:23:16 +02:00
Johannes Mockenhaupt
57be9bb9b1
Explicit pump initialization.
...
(cherry picked from commit d8b244a)
2017-10-20 15:10:24 +02:00
Milos Kozak
e545f75d69
fix displaying XX:30 time intervals
2017-10-20 11:34:33 +02:00
Johannes Mockenhaupt
8b8a135804
Add (back) last bolus to ComboFragment.
2017-10-20 01:12:47 +02:00
Johannes Mockenhaupt
4517736122
Add back TBR to ComboFragment.
2017-10-20 00:28:49 +02:00
Johannes Mockenhaupt
c04d746cfc
Remove duplicated code.
2017-10-19 23:30:44 +02:00
Johannes Mockenhaupt
4e978656f5
Trim down ComboFragment.
...
Base basal rate, TBR, last bolus are redundant, they're already displayed on the overview
and the treatment tab. When they're not in sync, that's an error of the ComboPlugin.
2017-10-19 23:11:32 +02:00
Johannes Mockenhaupt
3d6c8ee2a5
Combo Fragment misc.
2017-10-19 23:01:27 +02:00
Johannes Mockenhaupt
71eff7ec79
Add space between number and minute for 'x min ago' template.
2017-10-19 22:59:03 +02:00
Johannes Mockenhaupt
c29b4d13a3
Support pump suspend status (and misc other ...).
2017-10-19 21:31:10 +02:00
Johannes Mockenhaupt
e1c1f4b996
Revert string danar_stats.
2017-10-19 21:31:10 +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
Johannes Mockenhaupt
4de010b1a2
Strings reuse for pumps.
2017-10-19 16:11:36 +02:00
diabetesdt1
17eec803f4
Update strings.xml
2017-10-19 16:03:31 +02:00
Johannes Mockenhaupt
8fe72e1474
WIP notes, combo fragement expansion
2017-10-19 13:24:18 +02:00
Johannes Mockenhaupt
5fc9da885a
Pairing stub.
2017-10-19 12:16:07 +02:00
Johannes Mockenhaupt
07253b59a0
Refactoring.
2017-10-19 02:56:29 +02:00
Johannes Mockenhaupt
413464f1f1
Overview: add space between insulin and unit letter.
2017-10-19 02:46:06 +02:00
Johannes Mockenhaupt
7797cbd69e
Remove accidential debug wait.
2017-10-19 02:45:39 +02:00
Johannes Mockenhaupt
64c3d452a8
Some ui polish.
2017-10-19 02:45:29 +02:00
Johannes Mockenhaupt
0a67bb73a4
Fix displaying reservoir level on startup.
2017-10-19 00:04:01 +02:00
Milos Kozak
19f107fe53
move preparing graph series to extra class #2
2017-10-18 23:56:13 +02:00
Johannes Mockenhaupt
52d3803275
Source ruffy@eb659b3aa47a1ed699789df7e50e0d80c4640cc3, with pumpdata hackery.
2017-10-18 21:37:11 +02:00
Simon Pauwels
28430d117d
Update dutch
2017-10-18 21:19:12 +02:00
Johannes Mockenhaupt
dca219d900
Fix initializing ruffy service, read reservoir level on init.
2017-10-18 20:53:44 +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
Johannes Mockenhaupt
ab4f46471b
Add RuffyCommands.readPumpState, cleanup, fix.
2017-10-18 18:29:29 +02:00
Johannes Mockenhaupt
e4901f292f
Extract modules ruffy-spi, ruffyscripter.
2017-10-18 14:00:47 +02:00
Johannes Mockenhaupt
e5eba342ba
SPI first draft.
2017-10-18 14:00:47 +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
4a91b68ed7
Package refactoring.
2017-10-17 19:45:37 +02:00
Johannes Mockenhaupt
f33d55b092
Trim combo prefs.
2017-10-17 19:37:32 +02:00
Johannes Mockenhaupt
64ecf84174
Cleaning up.
2017-10-17 19:08:56 +02:00
Johannes Mockenhaupt
5ab7e4dbd6
Connect to IRuffyService in RuffyScripter, rather than ComboPlugin.
2017-10-17 19:05:55 +02:00
Johannes Mockenhaupt
142f9cf6a3
Extract SPI.
2017-10-17 18:59:41 +02:00
Johannes Mockenhaupt
5131b8b62f
Remove combo hacks outside of combo plugin.
2017-10-17 12:20:48 +02:00
Johannes Mockenhaupt
357c84e2e2
ComboPlugin singletion.
2017-10-17 12:20:12 +02:00
Johannes Mockenhaupt
41ebabe5e7
Merge remote-tracking branch 'origin/dev' into combo-v2
...
* origin/dev: (126 commits)
ConfigBuilder: hide disabled plugins by default.
sum on name for LP
log to debug not error
logger reformat
logging
rhinoAMA first full run
rhinoAMA first crashfree call
rhino some more cleanups
rhino logging and cleanups
rhino MA looping
rhino first real detemine-basal call
rhino small refactor
NDK filters to work around j2v8 vs. libBleCommandUtil issue.
NewTreatmentDialog: sanitize inputs, fixes #417 .
rhino complex parameter passing
rhino first parameter passing
rhino function passing
first rhino
location permission for BLE scanning
use customized name only for LocalProfile
...
2017-10-17 12:16:43 +02:00
Johannes Mockenhaupt
d123e7b7c0
Remove duplicate values in strings.xml.
2017-10-17 11:40:24 +02:00
Johannes Mockenhaupt
60c9a984b5
Refactor, clean out stuff, add RuffyCommands interface.
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
960586b79d
ExperimentalBolusCommand: update progress when starting to programm the pump.
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
cb24d13cae
Remove GetReservoirLevelCommand, will be a method in the future.
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
f4f91c0b85
Add TODO.
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
09f834d990
Make access to RuffyScripter.currentMenu safer.
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
dc7dd15571
Update pref descriptions.
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
882f400d1e
Disable incomplete parts in ExperimentalBolusCommand.
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
5d10956900
Declare RuffyScripter.currentMenu nullable.
...
(cherry picked from commit fb0c829)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
15bac4d386
Wait for currentMenu to be != null
...
(cherry picked from commit 13b96ec)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
fd7f4ae145
Option to ignore TBR failures: also ignore errors when reading pump state.
...
(cherry picked from commit 82052e8)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
a33d7db471
Refactorings and notes.
...
(cherry picked from commit 8c77f0e)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
0fda86dffa
A little less broken CancellableBolusCommand.
...
(cherry picked from commit 9d56f23)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
add3011e4b
Update pref descriptions
...
(cherry picked from commit 13e358a)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
a76fbefee8
Add pref to disable all pump comm alerts.
...
(cherry picked from commit f074a5b)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
516a8c044b
Move RuffyScripter to PumpCombo package.
...
(cherry picked from commit 7875ac0)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
c8c445c608
Add option to skip small TBR changes, add summaries to prefs.
...
(cherry picked from commit a76b03a)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
58757735f8
Refactor.
...
(cherry picked from commit 06a454d)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
c96122cbed
Move confirmAlert method to scripter.
...
(cherry picked from commit f018d42)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
b1d000eae3
SetTbrCommand: extract confirrmAlert method.
...
(cherry picked from commit 329ff14)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
9b6cd23cdd
Experimental options: for specifc prefs, always check experimental options are turned on.
...
While the specific prefs are disabled when disabling experimental options, they can still be turned on.
(cherry picked from commit 6270239)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
81b97b5278
Add option to ignore setting a TBR as long as it does't occur twice in a row.
...
(cherry picked from commit 238e85c)
2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt
6019323740
Work around curentMenu being null, maybe.
...
(cherry picked from commit da49be0)
2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt
4aac46f2bc
Cleanup.
...
(cherry picked from commit e7fe202)
2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt
17dd6df527
Move config options to preferences.
...
(cherry picked from commit 24657ed)
2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt
21a37c9247
Add experimental option to avoid one vibration after bolusing.
...
(cherry picked from commit 104777c)
2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt
9649682ae3
Don't raise alerts if loop is disabled.
...
(cherry picked from commit dc7fd2b)
2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt
9d6ff73b34
SetTbrCommand: extract method refactoring and minor cleanup.
2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt
bf9369babc
Move readDuration method to SetTbrCommand.
2017-10-17 11:27:20 +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
