Commit graph

2650 commits

Author SHA1 Message Date
Johannes Mockenhaupt
b3a7585a52
Note an pump sluggishness. 2017-07-22 11:07:35 +02:00
AdrianLxM
baaa83a850 removed empty ghost files 2017-07-22 03:40:35 +02:00
AdrianLxM
3d4fa0cebf remove duplicate IDs and indentation fix 2017-07-22 02:15:55 +02:00
Johannes Mockenhaupt
e45acab420
Return original exception in case retry fails as well. 2017-07-22 02:13:34 +02:00
AdrianLxM
0b6c9845fa synchronize NSClient log 2017-07-22 01:43:33 +02:00
Johannes Mockenhaupt
d0d3e46e03
Log exception when automatically retrying command. 2017-07-22 00:44:53 +02:00
Johannes Mockenhaupt
7f185557f4
DEBUG: log temp basals that are active when pump receives command to issue a tbr when non is active on the pump. 2017-07-21 22:46:00 +02:00
Johannes Mockenhaupt
0029fdad01
Combo-specifici hack: Consider a TBR with less than 60 seconds left as completed
when determining whether to set a new TBR.

Setting a new TBR overrides an running TBR if any, so this won't fail on
the Combo. Without this, a TBR mostly runs out 20 seconds after a loop
iteration (when receiving a SGV), so for that almost 5 minutes to TBR
is set.

Note that this is Combo-specific and needs to be revised when
integrating this with mainline.
2017-07-21 22:45:47 +02:00
AdrianLxM
10d27f0b6a Picture renaming (#311)
* adding icons
2017-07-21 22:24:06 +02:00
Johannes Mockenhaupt
3bd865a870
Merge remote-tracking branch 'origin/dev' into combo
* origin/dev:
  1.5e
  Let CircadianPercentageProfileFragment inherit from SubscriberFragment.
  Fix after merge-conflict cleanup
  Files renamed
  Added icons for home, actions and care portal screens
  update bg translation
  synchronize interval access from other classes
  remove unnecessary semicolons
  spanish emptiy string
  remove extra strings
  self asignment -> comment
  string comparison
  Add color of chart to corresponding lables/scale
  Update InsulinFastactingProlongedFragment.java
  Update InsulinFastactingFragment.java
  Extract SubscriberFragment base class.
  Have most fragments update their content in onResume.
2017-07-21 17:42:27 +02:00
Johannes Mockenhaupt
9af2e0af01
Add v2 TODO 2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt
893a604ef9
Fix combo_fragment blunder. 2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt
d7eee17112
Fix creating treatment record when bolusing (carb only treatment). 2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt
46b1dff334
Make accessing pump/cmd state in Fragment safer. 2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt
cb8a22582a
Wait up to 90s before timing out on connection attempt.
Might take longer if we need to wait for the pump display to time
out due to recent user activity.
2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt
a28efb4be0
Add "pump error (message)" as a field in Combo fragement. 2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt
63131f73d0
Cleanups. 2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt
29cb1def50
Fix up "Rebind ruffy if there is an exception.".
Some removals, but more importantly to note that
the commit set pump/command state variables
volatile again.
2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt
5c36094b8b
Remove some debug code. 2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt
821e31c1c3
Add debug logging. 2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt
a2fad3293d
Fix adding pump state to CommandResult when there are violations. 2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt
d85425e68b
NPE guard. 2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt
d5bf5812b7
Rebind ruffy if there is an exception. 2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt
e526de68ea
Some improvements around connection state. 2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt
bf179cd751
Fail on attempts to cancel non-running TBR.
Until we know this would be benign.
We still return 'enacted=true', so AAPS can mark the TBR as finished
to recover from this error state.
2017-07-21 17:28:30 +02:00
AdrianLxM
e381d197cb 1.5e 2017-07-21 16:49:43 +02:00
AdrianLxM
3d82bdb347 Merge pull request #295 from jotomo/on-resume-update-gui
On resume update gui
2017-07-21 16:47:28 +02:00
AdrianLxM
06497a862d Merge pull request #303 from AdrianLxM/synchronize-intervals
synchronize interval access from other classes
2017-07-21 16:47:00 +02:00
AdrianLxM
6d1c0feeab Merge pull request #302 from AdrianLxM/cleanups
Cleanups
2017-07-21 16:46:48 +02:00
AdrianLxM
0297f2b75d Merge pull request #301 from MilosKozak/insulin-colourlables
Add color of chart to corresponding lables/scale
2017-07-21 16:46:39 +02:00
Johannes Mockenhaupt
fdc0aea24b
Let CircadianPercentageProfileFragment inherit from SubscriberFragment. 2017-07-21 14:56:14 +02:00
AdrianLxM
4d5bf928bb Merge pull request #309 from AdrianLxM/picture-rename
Picture rename
2017-07-21 12:02:55 +02:00
AdrianLxM
31fcf34a2d Fix after merge-conflict cleanup 2017-07-21 11:59:36 +02:00
PoweRGbg
059e58c640 Files renamed 2017-07-21 11:55:12 +02:00
Milos Kozak
c68eccc328 Merge pull request #306 from boikonur/dev 2017-07-20 20:49:35 +02:00
Boyko Kazakov
3b1407b8dd Added icons for home, actions and care portal screens 2017-07-20 20:57:45 +03:00
Milos Kozak
2db5d366c7 Merge pull request #304 from slavidex/patch-38 2017-07-20 08:48:37 +02:00
Radoslav Radev
3098f0bdfa update bg translation 2017-07-20 09:24:35 +03:00
AdrianLxM
42263e979e synchronize interval access from other classes 2017-07-20 02:43:01 +02:00
AdrianLxM
b72482601e remove unnecessary semicolons 2017-07-20 01:06:41 +02:00
AdrianLxM
1ba11ed006 spanish emptiy string 2017-07-20 01:06:21 +02:00
AdrianLxM
b5cb68be73 remove extra strings 2017-07-20 01:06:00 +02:00
AdrianLxM
6daff6fae9 self asignment -> comment 2017-07-20 01:05:25 +02:00
AdrianLxM
c35b7bb9d6 string comparison 2017-07-20 01:05:05 +02:00
AdrianLxM
03ad898562 Merge branch 'dev' into on-resume-update-gui 2017-07-20 00:17:32 +02:00
AdrianLxM
98bb792264 Add color of chart to corresponding lables/scale 2017-07-19 23:46:32 +02:00
Johannes Mockenhaupt
a1564d5bb7
RuffyScripter: only set connected variable in rtConnected, rtDisconnected.
Hopefully fixes intermittent failures to close the connection, as
idleDisconnectMonitorThread sometimes fails to disconnect
because connected == false.
2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt
e322b15e1c
debug: setTbrPercent: 5 minute head start 2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt
a55756367f
ComboPlugin: use CommandResult.completionTime for treatment entries. 2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt
a8ecc85429
ConfigBuilderPlugin.applyApsResult: more verbose logging
Log whether the pump was asked to set a TBR if if that is skipped
since the pump still runs the requested TBR and for how long.
2017-07-19 21:45:28 +02:00