Commit graph

13366 commits

Author SHA1 Message Date
Johannes Mockenhaupt 4b1a774544
Optimize fetching full history. 2017-11-21 00:43:17 +01:00
Johannes Mockenhaupt 63607d169d
Polish dialogs. 2017-11-21 00:36:01 +01:00
Johannes Mockenhaupt a5bee4aac3
Incomplete SetBasalProfileCommand. 2017-11-21 00:23:08 +01:00
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
Milos Kozak 3ab235f829 refactor pump interface out of ConfigBuilder, remove handlers 2017-11-20 23:39:12 +01:00
Johannes Mockenhaupt 3cccf287da
Only update pumpState cache if menu could be read. 2017-11-20 21:36:25 +01:00
Johannes Mockenhaupt 86eb33403d
Fix overshoots navigating to a menu. 2017-11-20 19:14:43 +01:00
Johannes Mockenhaupt 1375ee053c
Call rtDisconnect after connect timeout. 2017-11-20 19:14:21 +01:00
Johannes Mockenhaupt 16c97acf4e
Clean up ReadHistoryCommand. 2017-11-20 19:13:39 +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
Milos Kozak 21ae42d37b Merge branch 'dev' into queue 2017-11-20 17:50:49 +01:00
Milos Kozak d37acdaba0
Merge pull request #498 from MilosKozak/dev2
Dev2
2017-11-20 17:46:50 +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
Johannes Mockenhaupt aadb7c5728
Update TODO, javadoc. 2017-11-19 23:30:23 +01:00
Johannes Mockenhaupt a5ce3f85f6
RuffyCommandsV1Impl: Return error for unsupported commands 2017-11-19 23:13:20 +01:00
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