caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity
4228 commits 1 branch 20 tags 140 MiB
Commit graph

2923 commits

Author SHA1 Message Date
Johannes Mockenhaupt d0f876659e
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  Ensure basal rate shown as a percentage if required according to user preferences.
  Show watch basal rates, whether temporary or normal.
 2017-12-28 00:15:05 +01:00
AdrianLxM bd4e51e1f9
Merge pull request #546 from andrew-warrington/dev 
Always show basal rates on watch, whether temporary or normal.
 2017-12-27 23:17:52 +01:00
AdrianLxM 774203605f
Wear: No guard for RS 2017-12-27 21:19:57 +01:00
Johannes Mockenhaupt f970e5e20e
Minor cleanups. 2017-12-27 21:16:03 +01:00
Johannes Mockenhaupt 0e61032dec
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  wear update
  RS create bond
  add scrollview
  QuickWizard detailed settings

# Conflicts:
#	app/src/main/res/values/strings.xml
 2017-12-27 18:19:51 +01:00
Milos Kozak 3df0e8f9ce Merge branch 'dev' into smb060 2017-12-27 18:02:06 +01:00
Johannes Mockenhaupt ee1236c4e4
ComboPlugin: assume valid BR unless proven otherwise. 
(cherry picked from commit bc93a4b)
 2017-12-27 13:04:35 +01:00
Johannes Mockenhaupt 3333d7a6b7
Clean up all the basal rate sanity checks. 
* Disable loop entirely if no valid basal rate is set on the pump.
  Neither closed nor open loop mode makes sense without it.
* Check active BR before updating the pump profile
* Show 'loop disabled' state in Combo fragement.
* Cancel active TBR when basal profile switch to profile != 1
  is detected or when an unsupported bolus is active.
 2017-12-27 12:49:04 +01:00
Johannes Mockenhaupt 88b3857fb9
Clean up pump init. 2017-12-27 12:28:01 +01:00
Johannes Mockenhaupt 6af28479d6
Disable loop if unsupported basal rate profile is selected. Fixes #31. 2017-12-27 12:28:01 +01:00
AdrianLxM 79d05488c3
RS create bond 2017-12-27 02:24:26 +01:00
Johannes Mockenhaupt c84ba24c77
Provide message when setting basal profile fails. Fixes #29. 2017-12-27 01:33:54 +01:00
Johannes Mockenhaupt 715ffa28d2
Remove empty Combo prefs. 2017-12-27 01:33:42 +01:00
Johannes Mockenhaupt 3266cb4944
Don't show ComboPlugin as constraints plugin. 2017-12-27 01:33:38 +01:00
Milos Kozak 162e73e64d Merge branch 'dev' into smb060 2017-12-26 00:35:16 +01:00
Milos Kozak 8fdd16c305 QuickWizard detailed settings 2017-12-26 00:27:34 +01:00
Johannes Mockenhaupt a8e0a4dfe8
Merge remote-tracking branch 'origin/dev' into csv2-staging 
* origin/dev:
  don't show single connection timeouts on the watch
 2017-12-25 20:52:16 +01:00
Milos Kozak e2f6e6a450
Merge pull request #547 from MilosKozak/wear-noFakebolusProgressDismiss2 
don't show single connection timeouts on the watch
 2017-12-25 20:44:39 +01:00
AdrianLxM e50c6fc8ed RS BLE modifications 2017-12-25 20:39:14 +01:00
Johannes Mockenhaupt ea5629fc86
Merge remote-tracking branch 'origin/dev' into csv2-staging 
* origin/dev:
  fix non smooth ratio graph
  fix of fix
  fix wrong button type
  fix doubled percentage when comming from NS
  proper select last used profile
  when using profile percentage limit basal rate to minimal value supported by pump
  SingleClickButton
  RS fix crash when pairing is not confirmed on pump
  Double -> double
  use joda-time
  Use autosensdata for wizard instead of  APSResult
 2017-12-25 20:29:32 +01:00
Milos Kozak dd58952b42
Merge pull request #548 from MilosKozak/COB-Wizard-idea 
Use autosensdata for wizard instead of  APSResult
 2017-12-25 19:22:02 +01:00
Milos Kozak b0bf9b5c79 Merge branch 'dev' into smb060 2017-12-25 17:01:53 +01:00
Milos Kozak f968ec630c fix non smooth ratio graph 2017-12-25 17:01:31 +01:00
Johannes Mockenhaupt d081345da2
Define lowest non-zero basal rate as minimum basal rate for the Combo. 2017-12-25 11:05:51 +01:00
Milos Kozak 7380065bd9 Merge branch 'dev' into smb060 2017-12-22 21:11:38 +01:00
Milos Kozak 2bb37a4bfc fix doubled percentage when comming from NS 2017-12-22 21:03:36 +01:00
Milos Kozak 248d3d1697 proper select last used profile 2017-12-22 20:34:53 +01:00
Milos Kozak 93b954fffe when using profile percentage limit basal rate to minimal value supported by pump 2017-12-22 20:17:31 +01:00
Milos Kozak 600e2ade1c SingleClickButton 2017-12-22 19:50:16 +01:00
Milos Kozak 0851581f7f Merge branch 'dev' into smb060 2017-12-22 12:03:11 +01:00
Milos Kozak 25667bc79e RS fix crash when pairing is not confirmed on pump 2017-12-22 11:57:59 +01:00
Johannes Mockenhaupt 7073688920
Update ComboPlugin to match updated PumpInterface. 2017-12-22 10:46:54 +01:00
Johannes Mockenhaupt bd0ae23e30
Merge branch 'dev' into csv2-staging 
* dev:
  fix disconnecting pump
  format output date to be displayed on iDevices correctly
  BolusWizard use 0 for insulin correction if in range
  LocalProfile TimeListEdit min, max
  remove string with no default translation
  Rv2,RS fix loading events
  initialize lastCommandTime too after BT reset
  allow to read status after every command
 2017-12-22 10:39:30 +01:00
Milos Kozak e77e7ffbbd Merge branch 'smb060' of https://gitlab.com/MilosKozak/AndroidAPS into smb060 2017-12-22 10:35:33 +01:00
Milos Kozak 99e5a39b33 Merge branch 'dev' into smb060 2017-12-22 10:34:45 +01:00
Milos Kozak 5bc6ea04c2 Double -> double 2017-12-22 03:27:13 +01:00
Milos Kozak 31975396a2 use joda-time 2017-12-22 02:55:40 +01:00
Milos Kozak 74abdc0271 fix disconnecting pump 2017-12-22 01:35:52 +01:00
Milos Kozak 6b23ba10bd format output date to be displayed on iDevices correctly 2017-12-22 00:37:22 +01:00
Milos Kozak a5c4495a5d BolusWizard use 0 for insulin correction if in range 2017-12-22 00:17:46 +01:00
Milos Kozak 771f9eac1a LocalProfile TimeListEdit min, max 2017-12-22 00:12:40 +01:00
Johannes Mockenhaupt 42418d4146
ComboFragment: make warning/error bold for a better readability. 
On lower DPI devices they're already bold, but on higher DPI devices
the yellow "Low" is hardly discernible from white.

(cherry picked from commit 693ba73)
 2017-12-21 22:45:27 +01:00
Andrew Warrington 176c5f46ff Ensure basal rate shown as a percentage if required according to user preferences. 2017-12-21 09:50:16 +01:00
Milos Kozak fb12c0bc96 enable SMB for G5 2017-12-21 09:02:49 +01:00
Milos Kozak cb2368f535 Merge branch 'dev' into smb060 2017-12-21 08:58:33 +01:00
Milos Kozak 2bdda9af43 Rv2,RS fix loading events 2017-12-21 07:45:56 +01:00
Milos Kozak 5d3b307672 Merge branch 'dev' into smb060 2017-12-20 22:37:29 +01:00
Milos Kozak adff0329dd initialize lastCommandTime too after BT reset 2017-12-20 20:55:14 +01:00
Milos Kozak 0f43e95644 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-12-20 20:45:35 +01:00
Milos Kozak 63b0efede3 allow to read status after every command 2017-12-20 20:45:21 +01:00
Johannes Mockenhaupt 3b43e4d06a
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  RS enable BT before scanning
  BG viewer
  NSOffline remove from queue as well
  NS offline

# Conflicts:
#	app/src/main/res/values/strings.xml
 2017-12-20 20:21:12 +01:00
Milos Kozak beb87acc9f
Merge pull request #552 from MilosKozak/nsoffline 
Nsoffline
 2017-12-20 20:17:30 +01:00
Milos Kozak c33dd1e7d7 RS enable BT before scanning 2017-12-20 19:50:44 +01:00
Johannes Mockenhaupt 4094b0dd61
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  wait a few sec before disconnection for another command
 2017-12-20 19:42:13 +01:00
Milos Kozak 70f4b72ff9 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-12-20 18:26:52 +01:00
Milos Kozak 096b2e93a3 wait a few sec before disconnection for another command 2017-12-20 18:26:47 +01:00
Johannes Mockenhaupt 7c04f528cc
Revert "Handle edge case of setting basal rate in range 0.00 - 0.05." 
This reverts commit 2054e76cde.
 2017-12-20 18:06:50 +01:00
Johannes Mockenhaupt 7651107167 Merge branch 'bolus-progress-dialog' into 'smb060' 
Only show progress dialog for normal boluses, not SMBs.

See merge request MilosKozak/AndroidAPS!375
 2017-12-20 16:58:33 +00:00
Johannes Mockenhaupt c5089d821e Merge branch 'disappearing-predections-checkbox' into 'smb060' 
Overview: fix predictions checkbox disappearing after unchecking it.

See merge request MilosKozak/AndroidAPS!370
 2017-12-20 16:58:12 +00:00
Johannes Mockenhaupt 2955dd7ec6
Only show progress dialog for normal boluses, not SMBs. 
(cherry picked from commit b3d4607)
 2017-12-20 17:42:39 +01:00
Johannes Mockenhaupt 57944fb4b5
Merge remote-tracking branch 'origin/dev' into smb060 
* origin/dev:
  Actions tab: show profile switch button for single profile too.
  Old NS-Version non-urgent
  Add SP to imports
  refactor cancelAlarm back to KeepAliveReceiver
  push next alert on read status
  G5 upload to xdrip
  fake Esel new file
  fake Esel
  Apply bolus constraint before applying.
  Rv2,RS: always load last 45 min
  remove wear-overview notifications as replaced by system notifications
  Remove missed reference to pref in NSProfilePlugin.
  Remove 'sync to profile' pref.

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
 2017-12-20 17:28:08 +01:00
Johannes Mockenhaupt 3880c5ff61
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  Actions tab: show profile switch button for single profile too.
  Old NS-Version non-urgent
 2017-12-20 16:46:35 +01:00
Milos Kozak 3975ce4cbe
Merge pull request #551 from jotomo/profile-switch-on-actions-tab 
Actions tab: show profile switch button for single profile too.
 2017-12-20 16:45:10 +01:00
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
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
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
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
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 88adc31dbc
Add SP to imports 2017-12-19 07:16:41 +01:00
Johannes Mockenhaupt 28961da253
Declare profile switches being supported by the Combo. 2017-12-19 00:00:00 +01:00
Andrew Warrington b180569695 Show watch basal rates, whether temporary or normal. 2017-12-18 21:58:02 +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 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
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 34f3428d99
ComboPlugin.setTempBasal: clean up, fix potential bug. 
(cherry picked from commit 41c45a1)
 2017-12-17 15:39:38 +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 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 a6a87d0790
Minor fixes and polish around bolus cancellation. 2017-12-15 10:41:07 +01:00
Milos Kozak 8cb4921bab BG viewer 2017-12-15 01:03:31 +01:00
Milos Kozak a05c1f947e Merge branch 'nsoffline' into bgsource 2017-12-14 23:35:01 +01:00
Milos Kozak 5f60e7cf2b G5 upload to xdrip 2017-12-14 21:49:11 +01:00
AdrianLxM 9602bde6a1 fake Esel new file 2017-12-13 22:39:44 +01:00
AdrianLxM 0151dbd496 fake Esel 2017-12-13 22:14:47 +01:00
Johannes Mockenhaupt b6bc957813
Minor tewaks and cleanups. 2017-12-13 21:37:44 +01:00
Johannes Mockenhaupt 618e00d71d
Update bolus progress dialog when recovery kicks in. 2017-12-13 21:22:13 +01:00
Johannes Mockenhaupt 67eb6b20ed
Handle errors when reading the history for verification fails. 2017-12-13 20:42:43 +01:00
Johannes Mockenhaupt 25f46fe601
Cleanup. 2017-12-13 20:42:43 +01:00
Johannes Mockenhaupt 7eb40653b2
The pump doesn't accept connections while a bolus delivery is in progress. 
Remove the code which checked for a bolus delivery in progress
and waited.
 2017-12-13 20:42:43 +01:00
Johannes Mockenhaupt a169245dc3
On bolusing failure, attempt verify by reading last bolus from history. 2017-12-13 20:39:08 +01:00
Milos Kozak fa4e80444d NSOffline remove from queue as well 2017-12-13 20:03:24 +01:00
Johannes Mockenhaupt 71355f0421
Typo that typo and other minor cleanups. 2017-12-13 16:29:53 +01:00
Milos Kozak 2a284ce052
Merge pull request #532 from AdrianLxM/adrain156work01 
remove wear-overview notifications as replaced by system notifications
 2017-12-13 00:00:20 +01:00
Andrew Warrington 9e6f124097 Steampunk watchface (interim commit) 2017-12-12 23:17:25 +01:00
Johannes Mockenhaupt f6721f628c
Apply bolus constraint before applying. 2017-12-12 22:30:42 +01:00
Milos Kozak e14272c083 Rv2,RS: always load last 45 min 2017-12-12 18:18:41 +01:00
Johannes Mockenhaupt f83dd1cb67
Unbreak RuffyCommandsV1Impl.readHistory, cleanups. 2017-12-12 00:57:04 +01:00
Milos Kozak b98c321cbc NS offline 2017-12-12 00:12:35 +01:00
Milos Kozak b1c4f28eb7 OpenAPS 0.6.0 1st part 2017-12-11 18:45:04 +01:00
Milos Kozak c714fead24 add deliverAt safety 2017-12-10 17:04:22 +01:00
Milos Kozak 890ef5978b safety check for multiple SMBs 2017-12-10 16:25:56 +01:00
Milos Kozak 20414c81c9 update minDeviationSlope default val 2017-12-10 16:14:10 +01:00
Milos Kozak 8822dcecd3 update smb execution in configbuilder 2017-12-10 15:48:28 +01:00
Johannes Mockenhaupt a5ea94de7d
Fix #12: properly update TBR from pump on mismatch. 2017-12-10 14:11:07 +01:00
Johannes Mockenhaupt ca9fe3e755
Fixes around bolus cancellation. 2017-12-10 01:39:58 +01:00
Milos Kozak cd1327fc9e Merge branch 'dev' into smb 2017-12-10 00:36:47 +01:00
Johannes Mockenhaupt fe281b9224
Minor cleanups. 2017-12-09 22:40:51 +01:00
Johannes Mockenhaupt 26fa63d571
ComboFragment: always show refresh button. 
To allow force starting a conecting attempt if the pump is still
in disconnected state.
 2017-12-09 22:08:38 +01:00
Johannes Mockenhaupt 471beae14c
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  remove unused imports
  adapt wear actions to command queue
  RS report unsupported firmware
  removing the whole if() statement
  fix NPE when profile not loaded
  fix of extended bolus size
  Added profile's target BG in NSClient mode
 2017-12-09 19:51:07 +01:00
Johannes Mockenhaupt 3316ab2081
ComboFragment: use queue to refresh state, explicit disconnects for tdd/alert.s 2017-12-09 19:46:28 +01:00
Johannes Mockenhaupt 8699d9a384
Add missing listener registration. 2017-12-09 19:46:28 +01:00
Johannes Mockenhaupt 27e9cfda6f
Overhaul Combo tab buttons and dialogs. 2017-12-09 19:46:28 +01:00
Johannes Mockenhaupt 063a5ba6b9
Only read Tdd and Alerts through buttons on Combo tab, not treatment history. 2017-12-09 19:45:58 +01:00
Johannes Mockenhaupt a7f07b26f9
Pump time warning: urgency level based on how much the time is off. 2017-12-09 19:43:53 +01:00
AdrianLxM 4d356096cf
Check pump time not last connection time 2017-12-09 19:43:53 +01:00
Johannes Mockenhaupt d2f2266a2b
Re-add warning if pump time is off (needed for basal rates). 2017-12-09 19:43:53 +01:00
Johannes Mockenhaupt cf142a4538
Merge pull request #4 from jotomo/verify-record-date-after-bolus-cancel 
Verify and return delivered bolus amount in BolusCommand
 2017-12-09 19:41:16 +01:00
Milos Kozak 88defc9f7b
Merge pull request #533 from AdrianLxM/adrian156work01 
adapt wear actions to command queue
 2017-12-09 17:36:16 +01:00
Johannes Mockenhaupt b409b737e5
On connect, take over TBR CANCELLED warning and raise message. Fixes #9. 2017-12-09 17:33:11 +01:00
AdrianLxM 21f91b9b29 remove unused imports 2017-12-08 14:58:13 +01:00
Johannes Mockenhaupt f09464e5d6
Move detection of partial bolus delivery to BolusCommand. 
Have BolusCommand verify delivered bolus if needed and return the
actually delivered bolus amount. This makes more sense now,
given history is only read if unavoidable.
 2017-12-08 12:56:15 +01:00
Milos Kozak e8c3a0cf91
Merge pull request #525 from PoweRGbg/patch-5 
Added profile's target BG in NSClient mode
 2017-12-08 08:20:37 +01:00
AdrianLxM 874915e7b4 adapt wear actions to command queue 2017-12-08 06:00:49 +01:00
Milos Kozak 696dd4c592 Merge branch 'dev' into smb 2017-12-07 23:54:37 +01:00
Milos Kozak dc3c853aca Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-12-07 18:48:18 +01:00
Milos Kozak 9d7e2f1bec RS report unsupported firmware 2017-12-07 18:48:05 +01:00
Johannes Mockenhaupt 87ab6432c6
Revert "Custom: Disable Crashlytics." 
This reverts commit 015a852ab5.
 2017-12-07 18:19:27 +01:00
AdrianLxM 0013050860 remove wear-overview notifications as replaced by system notifications 2017-12-07 17:07:32 +01:00
Roumen Georgiev 1d8dd5e35e
removing the whole if() statement 2017-12-07 17:11:54 +02:00
Milos Kozak d3e11d9331
Merge pull request #530 from PoweRGbg/patch-7 
fix of extended bolus size
 2017-12-07 15:24:55 +01:00
AdrianLxM aea47420e1 fix NPE when profile not loaded 2017-12-07 10:40:00 +01:00
Roumen Georgiev 242ed7217a
fix of extended bolus size 2017-12-07 10:08:26 +02:00
Johannes Mockenhaupt 60d6f305b5
Debug code. 2017-12-06 19:31:51 +01:00
Johannes Mockenhaupt de06c54f1d
Minor cleanups in ComboPlugin. 2017-12-06 17:14:30 +01:00
Johannes Mockenhaupt b0d55b09d4
Minor cleanups around the Command queue. 2017-12-06 17:14:30 +01:00
Johannes Mockenhaupt 86b63cb27d
Combo tab: show command queue if non-empty. 2017-12-06 17:14:30 +01:00
Johannes Mockenhaupt 51b51c159c
Clean up earlier merge blunder. 2017-12-06 12:12:25 +01:00
Johannes Mockenhaupt ab456d5966
Remove missed reference to pref in NSProfilePlugin. 2017-12-06 12:05:39 +01:00
Johannes Mockenhaupt d58bb75d01
Add missing synchronized so guard works properly. 2017-12-06 12:01:59 +01:00
Johannes Mockenhaupt d21a2bd691
Overview: fix predictions checkbox disappearing after unchecking it. 2017-12-06 11:35:58 +01:00
Johannes Mockenhaupt 5caec45760
Fix add bolus record from pump history when bolus was cancelled. 2017-12-05 23:41:22 +01:00
Johannes Mockenhaupt 0f034dd662
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  check for duration in json
  untranslatable strings
  greek language
  check for null
  queue logging
 2017-12-05 23:19:05 +01:00
Johannes Mockenhaupt 960cb92789
Remove idle-disconnect-monitor and let the command queue take care of that. 2017-12-05 23:17:05 +01:00
Milos Kozak 455383cfd5 check for duration in json 2017-12-05 22:08:37 +01:00
Johannes Mockenhaupt 21fc05a707
Remove ComboPlugin.checkHistory(). 2017-12-05 21:48:13 +01:00
Johannes Mockenhaupt f9867c69fb
Remove warning if pump time is off. 2017-12-05 21:46:12 +01:00
Johannes Mockenhaupt 7b88ec9e93
Device-Status: provide pseudo-levels or reservoir. 2017-12-05 21:07:49 +01:00
Milos Kozak a293f86978 Merge branch 'dev' into smb 2017-12-05 17:36:44 +01:00
Milos Kozak 1adbee5c9e check for null 2017-12-05 10:42:10 +01:00
Johannes Mockenhaupt 23874ebbd6
Remove 'sync to profile' pref. 
(cherry picked from commit 01c52e7)
 2017-12-05 10:00:31 +01:00
Roumen Georgiev 5e597f03d0
Added profile's target BG in NSClient mode 2017-12-05 09:23:57 +02:00
Milos Kozak 202d260ad2 Merge branch 'dev' into smb 2017-12-05 07:34:48 +01:00
Milos Kozak 6c714261d0 queue logging 2017-12-05 07:34:34 +01:00
Johannes Mockenhaupt 01c52e753c
Remove 'sync to profile' pref. 2017-12-05 01:24:43 +01:00
Johannes Mockenhaupt ada5301361
Cleanups. 2017-12-05 01:08:36 +01:00
Johannes Mockenhaupt 68af342eeb
Update combo stuff to work with new queue. 2017-12-05 00:54:08 +01:00
Johannes Mockenhaupt e7d49f2300
Merge branch 'no-history-for-you' into combo-scripter-v2 
* no-history-for-you:
  When bolusing, only read history in case of error or cancellation.
  Cleanups.
  Remove lastBolus, reservoirLevel.
  Use timestamp for TBR, not pump minutes.
  Rework checkAndResolveTbrMismatch to update from pump to AAPS only.
  ComboFragment: move forced history read to long-pressing the TDD button.
  More steps towards reducing comms amount.
  Don't check pump history, clean up usage of pumpHistoryLastChecked, mark stuff to disable.
  Remove last bolus, units display of reservoir level from Combo fragment.

# Conflicts:
#	app/src/main/res/values/strings.xml
 2017-12-05 00:34:22 +01:00
Johannes Mockenhaupt bf9f877b3d
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev: (68 commits)
  max connection time to 120 sec
  make chart zoomable again
  fix NPE
  lowest priority for background calculations
  wear timestamps long
  remove unneeded code
  fix landscape overview
  synchronized wait
  fix build tools for travis
  try to fix travis
  upgrade build tools
  R: resolve thread deadlock during bolus stop
  remove unsupported code from korean pump
  handle bolus stop prior to delivery correctly
  fix translations
  better logging
  Revert unnecessary change.
  Send OpenAPS timestamp to watch rather than minAgo, for more accurate updates on watch face.
  gradle update
  parse more iso formats
  ...

# Conflicts:
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/info/nightscout/androidaps/Config.java
#	app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsFragment.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewExtendedBolusDialog.java
#	app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/DismissNotificationService.java
#	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/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfilePlugin.java
#	app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfilePlugin.java
#	app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/DanaRSService.java
#	app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java
#	app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java
#	app/src/main/res/values/strings.xml
#	app/src/main/res/xml/pref_others.xml
#	app/src/main/res/xml/pref_wear.xml
#	gradle/wrapper/gradle-wrapper.properties
#	wear/build.gradle
 2017-12-05 00:32:47 +01:00
Johannes Mockenhaupt 98ba0fbf87
When bolusing, only read history in case of error or cancellation. 2017-12-05 00:21:58 +01:00
Johannes Mockenhaupt 8c04d12904
Cleanups. 2017-12-05 00:21:58 +01:00
Johannes Mockenhaupt 85e20a8977
Remove lastBolus, reservoirLevel. 2017-12-05 00:08:42 +01:00
Johannes Mockenhaupt 4c1c1c43a3
Use timestamp for TBR, not pump minutes. 2017-12-05 00:08:42 +01:00
Johannes Mockenhaupt 1735842e57
Rework checkAndResolveTbrMismatch to update from pump to AAPS only. 2017-12-05 00:08:42 +01:00
Johannes Mockenhaupt 141c116db6
ComboFragment: move forced history read to long-pressing the TDD button. 
To avoid accidentally doing this when a short press on Refresh was
intended.
 2017-12-05 00:08:42 +01:00
Milos Kozak 1986594877 hide deviation slope graph 2017-12-04 23:34:55 +01:00
Milos Kozak ef16174e5b fix NPE 2017-12-04 23:31:35 +01:00
Milos Kozak d4d194f7f0 Merge branch 'dev' into smb 2017-12-04 23:30:24 +01:00
AdrianLxM 17867478fb
Merge pull request #524 from MilosKozak/watchfaces 
Watchfaces Andrew
 2017-12-04 23:19:52 +01:00
Milos Kozak bce6d976b0 max connection time to 120 sec 2017-12-04 20:26:57 +01:00
AdrianLxM 2f235385e0 fix NPE 2017-12-04 20:04:58 +01:00
Milos Kozak 620c56e4cb lowest priority for background calculations 2017-12-04 19:57:09 +01:00
AdrianLxM c83f966d92 wear timestamps long 2017-12-04 18:40:13 +01:00
Milos Kozak 23e37a8be7 remove unneeded code 2017-12-04 18:13:20 +01:00
AdrianLxM aefb0d62df
Merge pull request #522 from MilosKozak/dev 
Dev
 2017-12-04 17:53:36 +01:00
Milos Kozak 34fe8d8b60 Merge branch 'staledata' into dev 2017-12-04 13:02:23 +01:00
Milos Kozak 812583059a
Merge pull request #512 from PoweRGbg/patch-3 
ProfileSwitch on graph depending on ScreenSize
 2017-12-04 12:49:01 +01:00
AdrianLxM 53723411c4
fix landscape overview 2017-12-04 10:42:34 +01:00
Johannes Mockenhaupt fe40ebd4a5
More steps towards reducing comms amount. 
(cherry picked from commit 3ba6079)
 2017-12-03 23:06:57 +01:00
Johannes Mockenhaupt 471c813bb4
Don't check pump history, clean up usage of pumpHistoryLastChecked, mark stuff to disable. 
(cherry picked from commit bcd1ac3)
 2017-12-03 22:48:06 +01:00
Johannes Mockenhaupt 0c7b2e1953
Remove last bolus, units display of reservoir level from Combo fragment. 
(cherry picked from commit 42847cb)
 2017-12-03 22:48:06 +01:00
Johannes Mockenhaupt afdcf0b1c5
Remove combo pairing stubs. 2017-12-03 22:47:55 +01:00
Johannes Mockenhaupt 1b91684c65
Enforce low-suspend loop mode rather than disabling loop on usage violation. Because. 2017-12-03 22:26:02 +01:00
Johannes Mockenhaupt 1e19f19cd2
Hide buttons on Combo tab until plugin is initialized. 2017-12-03 22:25:43 +01:00
AdrianLxM 42c61f4e6f synchronized wait 2017-12-03 21:58:35 +01:00
Milos Kozak 4c3e26d19c R: resolve thread deadlock during bolus stop 2017-12-03 20:10:54 +01:00
Milos Kozak 2b2d729f42 remove unsupported code from korean pump 2017-12-03 19:55:23 +01:00
Milos Kozak 4185bb347d handle bolus stop prior to delivery correctly 2017-12-03 19:34:01 +01:00
Milos Kozak 5d217cf1b3 better logging 2017-12-03 19:02:11 +01:00
Andrew Warrington eea5082278 Revert unnecessary change. 2017-12-03 19:01:56 +01:00
Andrew Warrington 9dca53f968 Send OpenAPS timestamp to watch rather than minAgo, for more accurate updates on watch face. 2017-12-03 18:53:52 +01:00
Andrew Warrington cefe93d0a0 Merge remote-tracking branch 'origin/dev' into watchfaces 2017-12-03 17:48:36 +01:00
Milos Kozak f25334273a Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-12-03 17:34:58 +01:00
Milos Kozak 0101bc0a81 parse more iso formats 2017-12-03 17:34:29 +01:00
AdrianLxM 7777143b07 scrollable overview on Jelly 2017-12-03 17:30:20 +01:00
AdrianLxM 7958dc9dce jelly overview 2017-12-03 13:55:54 +01:00
AdrianLxM 0a8d89db8a Merge remote-tracking branch 'roumenremote/patch-3' into roumen-overview 2017-12-03 11:48:14 +01:00
AdrianLxM 07c1084287
Merge branch 'watchfaces' into dev 2017-12-02 21:45:39 +01:00
Milos Kozak 38ecd88f6c
Merge pull request #513 from AdrianLxM/btwatchdog-pr 2017-12-02 16:19:46 +01:00
AdrianLxM 14bb0e6ac4
Only do pump alarms in APS mode 2017-12-02 10:21:42 +01:00
Milos Kozak 8a7f0f22d9 min NS version 0.10.2 2017-12-01 22:51:25 +01:00
AdrianLxM 98777579c8 delta granularity and NPE fix 2017-12-01 20:32:26 +01:00
Milos Kozak 67c89f5d98 distinguish between common and SMB bolus in queue 2017-12-01 18:41:24 +01:00
Milos Kozak 622ac15c50 Merge branch 'dev' into smb, fix compile, add queue features 2017-12-01 18:13:05 +01:00
Milos Kozak faea3a5147 RS proper evaluate extended bolus result 2017-12-01 17:37:49 +01:00
Milos Kozak 2a04505862 fix compile 2017-12-01 16:18:46 +01:00
AdrianLxM 090127012c
Merge branch 'dev' into btwatchdog-pr 2017-12-01 14:03:44 +01:00
AdrianLxM 09dac632f9 bluetooth watchdog 2017-12-01 13:57:53 +01:00
AdrianLxM 4b063a7766 fix SP for long with string-ressource-id 2017-12-01 13:49:50 +01:00
Milos Kozak aa210970ec Merge branch 'g5' into dev 2017-12-01 10:18:53 +01:00
Milos Kozak 77e855ec61 fix NPE 2017-12-01 10:18:27 +01:00
Roumen Georgiev ecbac7ea96
Make ProfileSwitch text 20% larger 2017-12-01 10:30:18 +02:00
Roumen Georgiev d683ea2f0c
All labes scaled 
COB is not here
 2017-11-30 11:28:26 +02:00
Roumen Georgiev 24b9326602
Update PointsWithLabelGraphSeries.java 2017-11-30 09:57:16 +02:00
Roumen Georgiev 418a7f7094
ProfileSwitch depending on ScreenSize 
Text size in ProfileSwitch events depends on screen resolution
 2017-11-30 09:45:18 +02:00
Milos Kozak 04742c60cd G5 fix time value 2017-11-29 23:00:41 +01:00
Milos Kozak b73e12b731 G5: accept arrays 2017-11-29 17:22:45 +01:00
Milos Kozak 7fc9efde40 G5 offline/uploader 2017-11-29 16:07:26 +01:00
Roumen Georgiev c56330cae7
Less than, not moreThan15 2017-11-29 09:21:55 +02:00
Milos Kozak b1a214b9e7
Merge branch 'dev' into dev 2017-11-28 21:50:32 +01:00
Milos Kozak d1aec1ff18 Localalerts settings by adrian 2017-11-28 21:48:46 +01:00
Milos Kozak 7d5d327c5d fix compile 2017-11-28 21:06:50 +01:00
Milos Kozak b8df1fcec4 Merge branch 'dev' into queue 2017-11-28 20:27:58 +01:00
Roumen Georgiev 542cedff9d
check for sgv older than 15 mins 2017-11-28 16:29:18 +02:00
Roumen Georgiev 723cb33497
Disabling staledata alarm on new sgv values fromNSClient 2017-11-28 16:15:25 +02:00
Roumen Georgiev eb593a4557
Update Notification.java 2017-11-28 16:09:23 +02:00
Andrew Warrington dcf79c710c Update following testing! Bug fixes: 
- Detailed IOB always shown in older watch faces (fixed)
- Cockpit: Loop graphic stays red once set (fixed)

Design changes:
- AAPSv2: Changed spacing of status and cob/time/iob lines to use layout_weight instead of padding (more dynamic)
- Removed decimal point in delta strings when BG is in mg/dL to gain space so everything fits with all options switched on. This will affect older watch faces.
- Changed to 1 decimal point in BGI to gain space. This will affect older watches as well.
- Changed order of preferences to match screen layout more closely

New features:
- Exposed BGI as an individual item in dataMap & added to BaseWatchFace + AAPSv2
 2017-11-28 09:24:52 +01:00
Johannes Mockenhaupt b03202f3d3
Bug notes. 
(cherry picked from commit c553626)
 2017-11-27 11:46:17 +01:00
Johannes Mockenhaupt dc6c91fd87
Set Source.PUMP when setting/cancelling TBR. 
While technically, the history isn't read, we can be reasonably
sure a TBR was set/cancelled by reading the main menu (and for
TBR starts that's the only way to do so). Reading the history
might cause (more) problems with the pump's minute-precision
and not yield much safety. Besides, command mode is expected
to take over yesterday.

(cherry picked from commit 04fb1c8)
 2017-11-26 21:51:34 +01:00
Johannes Mockenhaupt 383750d5e8
Set Source.PUMP when bolusing (already reading from history). 
(cherry picked from commit d747415)
 2017-11-26 21:51:33 +01:00
Johannes Mockenhaupt 720e64e541
Fix checkTbrMismatch tolerance for TBRs up to 2m off. 
(cherry picked from commit 46c1e00)
 2017-11-26 16:47:19 +01:00
Johannes Mockenhaupt ffb5ee3b22
Show min/avg/max in Combo TDD dialog. 
(cherry picked from commit 348b53a)
 2017-11-26 12:52:23 +01:00
Johannes Mockenhaupt b46165e52a
Abort reading all pump data if history read fails. 
(cherry picked from commit 9f679bc)
 2017-11-26 12:52:22 +01:00
Johannes Mockenhaupt 9ce57e7076
Fix bolus verification. 2017-11-26 03:04:13 +01:00
Johannes Mockenhaupt a0ba857279
Move WarningOrErrorCode class to parent package. 
(cherry picked from commit 38922ba)
 2017-11-25 21:19:21 +01:00
Johannes Mockenhaupt c36eac1ff3
More logging around bolusing. 
(cherry picked from commit df89b7f)
 2017-11-25 21:19:20 +01:00
Johannes Mockenhaupt 0f8442d65c
Issue a history read when bolusing fails. 
(cherry picked from commit cafed14)
 2017-11-25 21:19:19 +01:00
Johannes Mockenhaupt 1d83abc0d2
Fix rejecting multiple TBRs. 
(cherry picked from commit c1e9800)
 2017-11-25 19:36:15 +01:00
Johannes Mockenhaupt 1e9d0d08c3
Reject requents to enact TBRs if one was already started within this minute. 
(cherry picked from commit 3805413)
 2017-11-25 13:20:08 +01:00
Johannes Mockenhaupt b148b334b2
Adhere to 'Sync to profile' setting in ConfigBuilder. 2017-11-25 02:11:01 +01:00
Johannes Mockenhaupt ac935b19de
SetTempBasal: if requested percentage is rounded to 100%, do a soft cancel instead. 2017-11-25 00:52:33 +01:00
Johannes Mockenhaupt 5e79900411
Small robustness improvements. 2017-11-24 23:03:34 +01:00
Johannes Mockenhaupt 1a00f8c661
Treatments tab: display extended bolus tab if active pump supports it or if there are any extended bolus records. 2017-11-24 21:28:34 +01:00
Johannes Mockenhaupt 44ccbc06a0
Retry reading/writing basal profile, cleanups, notes. 2017-11-24 21:11:55 +01:00
Johannes Mockenhaupt 28f31414ba
Update pump profile during Combo init. 2017-11-23 20:54:28 +01:00
AdrianLxM 5b9fd6fd78 set basal rate overview notifications 2017-11-23 03:06:10 +01:00
AdrianLxM b3f0951d1f isThisProfileSet - same behaviour on uninitialized pump as DanaR 2017-11-23 02:19:29 +01:00
AdrianLxM 3f10c316a4 combo set basal: account for different granularity > 1 U/h 2017-11-23 01:47:14 +01:00
Johannes Mockenhaupt 61d1028011
Update local basal profile after setting it on pump. 2017-11-22 22:42:47 +01:00
Johannes Mockenhaupt 1a8c0fcf52
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  Cancel ongoing notification when plugin is disabled.
  Fix typo in fragment name.
  Nitpicky symmetry.
  PersistentNotification unregister workaround.
  Make PumpEnactResult fluent.
  Minor code cleanup.

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Persistentnotification/PersistentNotificationPlugin.java
 2017-11-22 22:17:57 +01:00
Johannes Mockenhaupt 83be0a8315
Setting basal rate on pump (combo side). 2017-11-22 22:16:28 +01:00
Milos Kozak a13661400f DanaRv2 queue & pump autodection 2017-11-22 22:09:58 +01:00
Milos Kozak 8818afe033 KoreanDanaR queue 2017-11-22 20:11:25 +01:00
Milos Kozak dfd0218a6a Merge branch 'dev' into queue 2017-11-22 19:44:16 +01:00
Milos Kozak a9f1acf7a7
Merge pull request #502 from jotomo/combo-extractions 
Combo extractions
 2017-11-22 19:36:59 +01:00
Johannes Mockenhaupt e28e5685f6
Cancel ongoing notification when plugin is disabled. 2017-11-22 19:13:56 +01:00
Johannes Mockenhaupt 9f946229bc
Slightly improve the dialogs. 2017-11-22 14:48:05 +01:00
Johannes Mockenhaupt cf430b84cf
Extract some string resources. 2017-11-22 14:27:29 +01:00
Johannes Mockenhaupt 1e4070e862
Fix typo in fragment name. 2017-11-22 11:34:23 +01:00
Johannes Mockenhaupt 5690772946
Nitpicky symmetry. 2017-11-22 11:33:26 +01:00
Johannes Mockenhaupt d202976251
PersistentNotification unregister workaround. 2017-11-22 11:32:41 +01:00
Johannes Mockenhaupt 9442c56eb8
Make PumpEnactResult fluent. 2017-11-22 11:30:48 +01:00
Johannes Mockenhaupt 60324ac6c6
Minor code cleanup. 2017-11-22 11:30:38 +01:00
Johannes Mockenhaupt c6ad1b59f3
Clean up string resources. 2017-11-22 11:27:49 +01:00
Johannes Mockenhaupt 813f857306
Rename fragment 'error history' -> 'alert history'. 2017-11-22 11:17:18 +01:00
Johannes Mockenhaupt 2861509d07
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires before next loop iteration.
  BolusProgressDialog: hide stop button once pressed.
  fix RU translation
  use MIN_DIA instead of DEFAULT_DIA
 2017-11-22 10:56:57 +01:00
Milos Kozak 62527ab33b
Merge pull request #500 from jotomo/prevent-gaps-in-tbr 
ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires bef…
 2017-11-22 10:52:15 +01:00
Milos Kozak 63dbe2bd52
Merge pull request #501 from jotomo/hide-stop-button-once-pressed 
BolusProgressDialog: hide stop button once pressed.
 2017-11-22 10:51:39 +01:00
Johannes Mockenhaupt 4c66199142
Cleanups based on Android Studio analysis. 2017-11-22 00:53:37 +01:00
Johannes Mockenhaupt 8b81925ccb
Only raise notification to check pump time when the latter could be read. 2017-11-22 00:44:56 +01:00
Johannes Mockenhaupt b4d2d9f71d
Rename 'error' to 'alert' when referring to Combo pump alerts. 2017-11-22 00:41:56 +01:00
Johannes Mockenhaupt a8a7d47da2
ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires before next loop iteration. 2017-11-22 00:22:02 +01:00
Johannes Mockenhaupt b49a4c57ba
BolusProgressDialog: hide stop button once pressed. 2017-11-22 00:20:50 +01:00
Johannes Mockenhaupt b27ee06ebe
Fix issues during history read. 2017-11-22 00:05:59 +01:00
Milos Kozak 252c0b3db9 DanaR queue driver 2017-11-21 23:00:53 +01:00
Milos Kozak f134163a76 Merge branch 'dev' into queue 2017-11-21 22:31:56 +01:00
Johannes Mockenhaupt 066d138e59
Double comparisons. 2017-11-21 22:31:28 +01:00
Milos Kozak a6bf18244a Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-11-21 22:31:22 +01:00
Milos Kozak 4007049118 use MIN_DIA instead of DEFAULT_DIA 2017-11-21 22:29:50 +01:00
Milos Kozak d2cba61354 allign dana plugin code 2017-11-21 19:27:43 +01:00
Johannes Mockenhaupt bf52352224
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 
* origin/dev:
  missing return
  log profiles if different
  fix setting of TRB when low basal rate is running
  fix format and add test for fromISODateString
  use mills from status if available
 2017-11-21 10:57:11 +01:00
Johannes Mockenhaupt d6938c20e6
Updating README. 2017-11-21 10:53:47 +01:00
Johannes Mockenhaupt 426379c6d3
Remoe SetBasalProfileCommand. 
Too slow, unclear usage (ProfileInterface), likely superseeded soon.
 2017-11-21 09:45:34 +01:00
Johannes Mockenhaupt 4b1a774544
Optimize fetching full history. 2017-11-21 00:43:17 +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 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 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 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
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 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 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 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 7163fbae54
ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires before next loop iteration. 2017-11-10 01:26:17 +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 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
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 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
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 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 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 a1c6704ae9 Merge branch 'dev2' into smb 2017-11-01 20:50:14 +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 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 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 b5f843d901 getLastSBMTime -> getLastBolusTime 2017-10-26 22:12:15 +02:00
Milos Kozak dfd657ce2d remove wrong imports 2017-10-26 21:29:38 +02:00
Milos Kozak e71ce02131 fix merge conflict 2017-10-26 21:23:23 +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 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 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
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 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 3e6fcabfab Merge branch 'dev2' into smb 2017-10-25 11:38:45 +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
Johannes Mockenhaupt 551ca92201
Remove cast to DetermineBasalResultAMA for predictions. 2017-10-24 23:14:45 +02:00
Milos Kozak 9de332e997 Merge branch 'dev2' into smb 2017-10-24 21:09:17 +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 2925c16fb9 comment minDeviationSlope 2017-10-24 17:50:44 +02:00
Milos Kozak 29b075e700 display minDeviationSlope 2017-10-24 17:15:49 +02:00
Milos Kozak fe0376206e fix merge conflict 2017-10-24 11:46:27 +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
AdrianLxM 4e5a374b9c include smb into basal iob 2017-10-22 02:20:11 +02:00
AdrianLxM 755c82898c SMB Rhino 2017-10-21 22:38:07 +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 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
AdrianLxM 7ed7a2e8c4 Merge remote-tracking branch 'milosremote/dev' into smb-rhino 2017-10-21 17:06:57 +02: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
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 c29b4d13a3
Support pump suspend status (and misc other ...). 2017-10-19 21:31:10 +02:00
Milos Kozak c258b41f11 allow to use actual profile in wizard 2017-10-19 19:35:35 +02:00
Milos Kozak 0b7832ec60 getUnits from active profile not interface 2017-10-19 19:23:19 +02:00
Johannes Mockenhaupt 4de010b1a2
Strings reuse for pumps. 2017-10-19 16:11:36 +02:00
Johannes Mockenhaupt 8fe72e1474
WIP notes, combo fragement expansion 2017-10-19 13:24:18 +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 dca219d900
Fix initializing ruffy service, read reservoir level on init. 2017-10-18 20:53:44 +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
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 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 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 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
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 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 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
Milos Kozak 1994cd707c use customized name only for LocalProfile 2017-10-14 10:39:32 +02:00
Milos Kozak 3b90d02e05 show status on Dana fragment too 2017-10-13 13:31:32 +02:00
Milos Kozak 02c57fb9a3 RS connection improvement 2017-10-13 13:17:17 +02:00
Milos Kozak c99830968a adjust enforcing new temp basal on user request 2017-10-13 12:39:34 +02:00
Milos Kozak f235b5fb02 use basalStep instead of fixed value 2017-10-13 12:07:33 +02:00
Milos Kozak 9a4e457d2b fix RS events parsing 2017-10-13 11:54:50 +02:00
Milos Kozak 1f3c54eb73 split sgvs before broadcast 2017-10-13 08:35:29 +02:00
Milos Kozak 6124ef25a4 report wrong alarm data #2 2017-10-13 08:21:37 +02:00
Milos Kozak 91e286b2ae report wrong alarm data 2017-10-13 08:11:30 +02:00
Milos Kozak 45a2eba0c2 fix NPE 2017-10-13 08:06:27 +02:00
AdrianLxM 71d95bea92 fix ic isf 2017-10-13 02:56:49 +02:00
AdrianLxM 869b3eff5f Spinner set selection delayed 2017-10-12 23:56:58 +02:00
AdrianLxM 746d71bcff remove wear flavours 2017-10-12 18:24:48 +02:00