Commit graph

2448 commits

Author SHA1 Message Date
Johannes Mockenhaupt
1b50b43fbb
Add headers to dialogs. 2017-11-21 00:22:16 +01:00
Johannes Mockenhaupt
75855f3f05
Implement reading basal profile. 2017-11-20 23:55:00 +01:00
Johannes Mockenhaupt
971a97a9e3
Some minor tweaks. 2017-11-20 23:53:39 +01:00
Johannes Mockenhaupt
3cccf287da
Only update pumpState cache if menu could be read. 2017-11-20 21:36:25 +01:00
Johannes Mockenhaupt
dbd442e8ea
ComboPlugin.checkTbrMismatch: allow for deviations
to compensenate inprecise times used by pump for tbr duration.
2017-11-20 18:59:59 +01:00
Johannes Mockenhaupt
aadb7c5728
Update TODO, javadoc. 2017-11-19 23:30:23 +01:00
Johannes Mockenhaupt
dafb6d225b
Display active alert in Combo tab. 2017-11-19 21:25:37 +01:00
Johannes Mockenhaupt
9d3625e78c
Show bolus/TBR percent and duration with activity. 2017-11-18 23:29:46 +01:00
Johannes Mockenhaupt
46fdd47ac0
Fixes and cleanups. 2017-11-18 21:32:01 +01:00
Johannes Mockenhaupt
2c0975994d
Fixes. 2017-11-18 18:33:46 +01:00
Johannes Mockenhaupt
9459dfe321
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev:
  Remove dead code.
  Ctors Android-style.
  Fix NPE initialising MyPreferencesFragment.
  RS fix last bolus time
  RS remove duplicated message
  RS fix extended bolus result
  show timeshift if not zero
  CS translation
  removed unneeded code
  long click on name to open settings
  add link to advanced settings

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
2017-11-18 17:46:20 +01:00
Johannes Mockenhaupt
99db38a8e0
Fix displaying connection problems in Combo tab. 2017-11-18 17:43:33 +01:00
Johannes Mockenhaupt
deb566c1bd
Align ComboPlugin with merged changes. 2017-11-18 16:42:56 +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
f03b9669d5
Minor improvements. 2017-11-18 16:41:25 +01:00
Johannes Mockenhaupt
b85b6f85f4
Major cleanup and some new features.
* PumpState.timestamp: round to second (format used in DB)
* Raise notification about wrong pump clock time since setting
  clock isn't possible with current ruffy
* Set TempBasal.pumpId when setting/cancelling TBR
* Checking state of pump on connect
* Better checks whether pump is ready to execute command
* Rework dynamic command timeout
* Confirm benign warnings on connect and turn into notifications
* Some groundwork for reading/setting basal profile
* Check pump history every 15m
2017-11-18 13:19:04 +01:00
Johannes Mockenhaupt
76cc08c1a9
BolusProgressDialog: hide stop button once pressed. 2017-11-16 00:23:37 +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
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
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
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
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
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
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
Johannes Mockenhaupt
cc6db3a059
Some ComboFragment cleanups. 2017-11-08 23:31:40 +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