Commit graph

4440 commits

Author SHA1 Message Date
Johannes Mockenhaupt 2054e76cde
Handle edge case of setting basal rate in range 0.00 - 0.05. 2017-12-20 16:40:45 +01:00
Johannes Mockenhaupt d1085c876e
Actions tab: show profile switch button for single profile too. 2017-12-20 16:31:28 +01:00
Milos Kozak fd91dfc8a6
Merge pull request #549 from MilosKozak/nonurgent-oldnsnotif
Old NS-Version non-urgent
2017-12-20 14:59:03 +01:00
AdrianLxM 81ca35515f
Old NS-Version non-urgent 2017-12-20 14:34:30 +01:00
Johannes Mockenhaupt a3db2136e1
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev:
  Remove missed reference to pref in NSProfilePlugin.
  Remove 'sync to profile' pref.

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfilePlugin.java
2017-12-20 13:28:41 +01:00
Milos Kozak eb34345ee2
Merge pull request #539 from jotomo/queue-bolus-constraints
Apply bolus constraint before issuing the bolus
2017-12-20 13:25:02 +01:00
Johannes Mockenhaupt 40edb9ff5c
Don't update pump basal profile during startup.
* Avoids issues of no profile being set yet
* Making startup take minutes
* KeepAlive will update profile as needed every 5m.
2017-12-20 13:01:24 +01:00
Johannes Mockenhaupt ea1fd8fee8
Don't declare connection unusable too quickly. 2017-12-20 12:52:54 +01:00
Milos Kozak 0d7e950b73
Merge pull request #505 from jotomo/sync-to-pump
Remove sync to pump pref, always sync
2017-12-20 10:49:47 +01:00
Johannes Mockenhaupt 181338e9e2
Another NPE check for failure scenarios. 2017-12-20 00:04:14 +01:00
Johannes Mockenhaupt f4c1f4a3a1
Make recovering from command failure more robust. 2017-12-19 23:43:08 +01:00
AdrianLxM e11a4f6d42
Use autosensdata for wizard instead of APSResult 2017-12-19 22:41:43 +01:00
Johannes Mockenhaupt 715366b2b4
Don't consider pump initialized if updating basal profile on start failed. 2017-12-19 22:24:46 +01:00
Simon Pauwels f4b36ae095
Merge pull request #10 from jotomo/combo-scripter-v2
dev
2017-12-19 22:16:56 +01:00
Johannes Mockenhaupt 0e20a148e2
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev:
  Add SP to imports
  refactor cancelAlarm back to KeepAliveReceiver
  push next alert on read status

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java
2017-12-19 21:18:18 +01:00
AdrianLxM 3342d9daa3 don't show single connection timeouts on the watch 2017-12-19 14:47:55 +01:00
AdrianLxM 928635dbe9
Merge pull request #545 from MilosKozak/alarmfix-master3
Alarmfix
2017-12-19 08:02:52 +01:00
AdrianLxM 88adc31dbc
Add SP to imports 2017-12-19 07:16:41 +01:00
Johannes Mockenhaupt 28ce67ae42
Typo fixes. 2017-12-19 00:07:15 +01:00
Johannes Mockenhaupt 28961da253
Declare profile switches being supported by the Combo. 2017-12-19 00:00:00 +01:00
Simon Pauwels f113eabf6b
Typo fix 2017-12-18 22:11:59 +01:00
Simon Pauwels 2e69d9fe56
double string removal 2017-12-18 22:06:10 +01:00
Simon Pauwels c6b303f3f1
typo fix 2017-12-18 22:02:11 +01:00
Andrew Warrington b180569695 Show watch basal rates, whether temporary or normal. 2017-12-18 21:58:02 +01:00
Simon Pauwels e1af74ff00
Added and improved Dutch translations 2017-12-18 21:52:11 +01:00
Johannes Mockenhaupt 9eefae4f67
Merge branch 'queue-bolus-constraints' into combo-scripter-v2
* queue-bolus-constraints:
  Apply bolus constraint before applying.

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
2017-12-18 21:06:31 +01:00
Johannes Mockenhaupt 559dbdf0b1
Undo over-eager optimization.
Makes setting actual 90/110% TBRs impossiblee and will result in
ComboPlugin starting TBRs with 100% (and failing because duration
is not readable or 0).

(cherry picked from commit 5a4e7d4)
2017-12-18 20:43:00 +01:00
Simon Pauwels 8c4ccf8b49
Merge pull request #9 from MilosKozak/dev
Dev
2017-12-18 20:25:04 +01:00
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
Simon Pauwels a076eda49d
Merge pull request #8 from jotomo/combo-scripter-v2
combo
2017-12-18 19:29:35 +01:00
Andrew Warrington bc8b93045b Steampunk watchface (mmol support)
Includes delta granularity in the watch preferences.
2017-12-17 23:07:44 +01:00
Johannes Mockenhaupt d2339f0a5b
Merge pull request #24 from jotomo/cleanups
Cleanups
2017-12-17 21:23:02 +01:00
Johannes Mockenhaupt 7996acceb7
RuffyScripter.isConnected: one millisecond is a long time.
(cherry picked from commit 796b9a0)
2017-12-17 18:50:56 +01:00
Johannes Mockenhaupt 3ac63a980c
Clean up Testing-Combo.md a bit. 2017-12-17 16:56:52 +01:00
AdrianLxM 00f13d0479 refactor cancelAlarm back to KeepAliveReceiver 2017-12-17 15:46:43 +01:00
AdrianLxM 9bd0a1f144 push next alert on read status 2017-12-17 15:46:33 +01:00
Johannes Mockenhaupt e0d77b9b0c
Don't bother setting a fake TBR if we waited for a TBR to run out.
(cherry picked from commit 3a5ecea)
2017-12-17 15:39:38 +01:00
Johannes Mockenhaupt 34f3428d99
ComboPlugin.setTempBasal: clean up, fix potential bug.
(cherry picked from commit 41c45a1)
2017-12-17 15:39:38 +01:00
Johannes Mockenhaupt 5f4a90d068
Explicit disconnect during recovery.
BT connection might still be there, but no menu updates coming in.
Thus, explicitely close the connection before attempting to
reconnect.
2017-12-17 15:39:38 +01:00
Johannes Mockenhaupt a85da1d9ec
README updates. 2017-12-17 15:38:33 +01:00
Johannes Mockenhaupt 4e526bba96
Merge pull request #23 from jotomo/alarmfix
Alarmfix
2017-12-17 15:34:59 +01:00
Andrew Warrington a0983a99b9 Merge remote-tracking branch 'origin/dev' into watchfaces 2017-12-17 11:52:34 +01:00
AdrianLxM ca9b68da0d refactor cancelAlarm back to KeepAliveReceiver 2017-12-17 01:40:27 +01:00
AdrianLxM 14810a142d push next alert on read status 2017-12-17 01:37:27 +01:00
Johannes Mockenhaupt da652c2e99
README-Combo.med: Add 'known issues' section. 2017-12-16 14:05:01 +01:00
Johannes Mockenhaupt fd71ab6b68
Update fake reservoir numbers to trigger default NS warnings.
(cherry picked from commit 6e5f9fc)
2017-12-16 12:09:44 +01:00
Johannes Mockenhaupt 92d0630c55
Fix partial bolus displayed in error popup. 2017-12-15 23:05:09 +01:00
Johannes Mockenhaupt 7e7b11ba14
Bolusing: make cancellation during 'confirmation wait window' robust. 2017-12-15 22:38:28 +01:00
Johannes Mockenhaupt b9f12aeddb
Fix formatting. 2017-12-15 21:53:33 +01:00
Johannes Mockenhaupt 1b5b06d349
BolusCommand: log steps. 2017-12-15 21:52:51 +01:00