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
Johannes Mockenhaupt
1cf6448b0e
Add CommandResult.completionTime field and set it in RuffyScripter when the command has finished executing.
2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt
97733848e7
SetTbrCommand: replace static wait with dynamic wait to have completionDate more accurate.
2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt
467cf1e6ed
Pass pre-cmd pump state to command, log it.
2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt
a7c77bc177
Add "pump error (message)" as a field in Combo fragement.
2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt
8cdd604b84
Merge remote-tracking branch 'origin/dev' into combo
...
* origin/dev:
bulgarian removed non-translatable
synchronize interval access
nsclient remove debug data that puts stress on the broadcast system 3
nsclient remove debug data that puts stress on the broadcast system 2
nsclient remove debug data that puts stress on the broadcast system
Align OpenAS(A)MA fragments with layout of other fragments.
local broadcasts better setting title
setting to disable local broadcasts in NSClient
removed some "unneeded" translations
wear tdd weighted
wear TDD status
wear menu simplification
Translated latest additions strings.xml
ns client quickfix now catch all
NS client quickfix - catch even more
catch TransactionTooLargeException
TT new "old" logic for temp targets
TT refactor OverlappingIntervals to two classes with an abstract superclass Intervals
# Conflicts:
# app/src/main/res/values/strings.xml
2017-07-19 19:54:50 +02:00
AdrianLxM
123b171f58
Merge pull request #300 from AdrianLxM/language-fix
...
bulgarian removed non-translatable
2017-07-19 19:52:16 +02:00
AdrianLxM
732e225c7d
bulgarian removed non-translatable
2017-07-19 19:50:40 +02:00
AdrianLxM
f220bb034e
Merge pull request #286 from AdrianLxM/temp-target-logic
...
Temp target logic
2017-07-19 19:33:17 +02:00
AdrianLxM
e51954cec3
Merge pull request #292 from AdrianLxM/wear-tdd
...
Wear tdd
2017-07-19 19:05:41 +02:00
Milos Kozak
3475b64e1b
Merge pull request #299 from MilosKozak/dev-nsclient-quickfix
...
NSClient quickfix
2017-07-19 18:53:38 +02:00
AdrianLxM
76990b7983
synchronize interval access
2017-07-19 17:39:55 +02:00
Milos Kozak
62ff62a31f
Merge pull request #290 from PoweRGbg/patch-1
2017-07-19 17:21:15 +02:00
Milos Kozak
ecd018d8d1
Merge pull request #296 from jotomo/fragmented-aesthetics
2017-07-19 17:19:42 +02:00
AdrianLxM
e6ce35485a
nsclient remove debug data that puts stress on the broadcast system 3
2017-07-19 16:09:34 +02:00
AdrianLxM
621c32d832
nsclient remove debug data that puts stress on the broadcast system 2
2017-07-19 16:06:36 +02:00
AdrianLxM
c1e030d789
nsclient remove debug data that puts stress on the broadcast system
2017-07-19 16:05:13 +02:00
Johannes Mockenhaupt
c95879e6ad
Align OpenAS(A)MA fragments with layout of other fragments.
...
Removes a margin that makes the top elements jump up and
down when flipping through tabs.
2017-07-19 12:32:18 +02:00
Johannes Mockenhaupt
7b16716b65
Clean up statusSumary, command result and pump status.
2017-07-19 01:53:37 +02:00
Johannes Mockenhaupt
485b99e260
Show last command and pump state better in the Combo tab.
...
Gets rid of unhelpful "Unknown error" messaegs.
2017-07-19 01:33:19 +02:00
Johannes Mockenhaupt
5aacf8410d
Fix CancelTbrCommand to return command resutlt not in PumpState but as part of the CommandResult object.
2017-07-19 01:30:26 +02:00
Johannes Mockenhaupt
825a87f474
Use OpenAPS-requested duration for TBRs.
2017-07-18 23:57:48 +02:00
AdrianLxM
cfe8e0a23a
local broadcasts better setting title
2017-07-18 22:18:10 +02:00
AdrianLxM
c753873769
setting to disable local broadcasts in NSClient
2017-07-18 22:15:17 +02:00
Johannes Mockenhaupt
9927ab4989
Raise an error upon attempting to cancel a TBR when none is active.
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
14d7043600
Skip fetching initial pump state if ruffy service isn't ready yet.
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
f3b508ba2d
Combo tab: refresh on resume
...
Since we're not getting events when the fragement is not displayed,
since we're unregistering from event in onPause.
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
3b287df77d
Check active menu again when retrying inputs.
2017-07-18 21:20:40 +02:00
