Commit graph

3143 commits

Author SHA1 Message Date
Andrew Warrington
78dd6d165b Addition of the "airplane cockpit" watch face -- unfinished. This commit is not yet ready to be merged into dev as more work is required for compatibility with multiple watches. 2017-11-19 22:14:28 +01:00
Johannes Mockenhaupt
dafb6d225b
Display active alert in Combo tab. 2017-11-19 21:25:37 +01:00
Johannes Mockenhaupt
3070cba612
Increase connection timeout to 90s. 2017-11-19 21:25:36 +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
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
51d242a3fb
Add method RuffyCommands.isConnected(). 2017-11-14 22:57:23 +01:00
Johannes Mockenhaupt
7c662345ae
Recover after command failure by returning to pump main menu, so
subsequent commands won't fail.
2017-11-14 19:00:23 +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
b99513aafb
Round timestamps from pump history to full second to align with DB. 2017-11-13 23:05:49 +01:00
Johannes Mockenhaupt
d76740dda7
Clean up access to RuffyScripter.currentMenu. 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
f2569b587a
Fix ReadHistoryCommand to read the 30th record as well. 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
Milos Kozak
c5cd0e38ab
Merge pull request #496 from jotomo/fix-prefs-npe
Fix prefs NPE
2017-11-13 07:32:23 +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
f2bfc73b88
toString, equals. 2017-11-12 17:08:18 +01:00
Johannes Mockenhaupt
7b7bc6efb6
RuffyScripter: increase overall command timeout to 4m. 2017-11-12 17:07:59 +01:00
Johannes Mockenhaupt
1da8f2080f
Add document describes tests to perform. 2017-11-12 15:59:22 +01:00
Johannes Mockenhaupt
ab8d3051b3
Untested: don't false trigger dynamic timeout in RS.runCommand. 2017-11-12 12:37:16 +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
a1b0240088
Finish ReadHistoryCommand for TBR, TDD. 2017-11-11 21:40:50 +01:00
Johannes Mockenhaupt
89d5593a52
Notes 2017-11-11 17:29:44 +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