Johannes Mockenhaupt
a5692d1076
Don't attempt to start idleDisconnectMonitor again if RS is restarted.
2017-08-05 11:28:53 +02:00
Johannes Mockenhaupt
4a1684eb92
Merge remote-tracking branch 'origin/dev' into stable
...
* origin/dev:
remove canceltemp button from all layouts and click handling from overview fragment
correct logging
fix cancel real temp basals from actions
color for active temp
remove translated string not in default strings and add flag to cancel method
Some more German
Some more German
Some German translations, remove unused strings, App name for all
Update strings.xml
CS translations
hide all overview buttons by default
move cancel temp to actions
new temp basal dialog refactor
fix virtual pump crash
Disconnect pump: cancel temp before setting new to make sure it will last as expected
remove notes strings as well
remove notes from temp basal upload
cancel current temp before activating superbolus
2017-08-05 11:02:13 +02:00
Timm Korte
f22f96c138
change ComboPlugin to change basal to 90 or 110 percent instead of cancel - depending on previous tbr
2017-08-04 22:39:15 +02:00
Sandra Keßler
37a3270a16
missing stuf :/
2017-08-04 17:58:28 +02:00
Sandra Keßler
f790ce6f20
add unused (but tested) command to get basal rate from Profile 1
2017-08-04 17:57:34 +02:00
Sandra Keßler
ac3859dcae
update setTBRCommand to way faster methods in scripter
2017-08-04 16:39:03 +02:00
Sandra Keßler
d35283ad74
add waitScreen (wait for refresh with timeout), gotToMainMenuScreen (with the help of back and menu navigate to a given main menu), enterMenu (to navigate withhin submenus), and step (send a key repeated)
2017-08-04 16:38:25 +02:00
Sandra Keßler
d8ca2771fb
add back key
2017-08-04 16:36:25 +02:00
Sandra Keßler
efb73ba4f2
make keypress wait up to 2000ms for key response
2017-08-04 16:36:12 +02:00
Sandra Keßler
763cc23939
add type of menu to MenuType (main or sub menu)
2017-08-04 16:34:25 +02:00
Sandra Keßler
6981276cab
- fix Multi connect
...
- add key sent with 2500ms wait on keypress
- fix Timing and npes in setTBR
- make ruffyScripter not reinit every time
- fix menu npe
2017-08-04 11:53:51 +02:00
AdrianLxM
36e6cb8497
remove canceltemp button from all layouts and click handling from overview fragment
2017-08-03 08:22:59 +02:00
AdrianLxM
053004bbbd
correct logging
2017-08-03 08:20:11 +02:00
AdrianLxM
7a7f75db01
fix cancel real temp basals from actions
2017-08-03 03:22:30 +02:00
AdrianLxM
0ac7357ee9
color for active temp
2017-08-03 03:12:47 +02:00
AdrianLxM
1ac1b77fd4
remove translated string not in default strings and add flag to cancel method
2017-08-03 02:01:52 +02:00
Milos Kozak
34d4bec556
move cancel temp to actions
2017-08-01 20:45:57 +02:00
Milos Kozak
9596987b35
new temp basal dialog refactor
2017-08-01 20:02:17 +02:00
Milos Kozak
d2a5939ce3
fix virtual pump crash
2017-08-01 17:53:28 +02:00
Milos Kozak
a24cbfda50
Disconnect pump: cancel temp before setting new to make sure it will last as expected
2017-08-01 17:37:32 +02:00
Milos Kozak
6828e11dd9
remove notes strings as well
2017-08-01 17:25:43 +02:00
Milos Kozak
6f9f72d849
remove notes from temp basal upload
2017-08-01 17:21:32 +02:00
Milos Kozak
668008e1c1
cancel current temp before activating superbolus
2017-07-31 19:53:09 +02:00
Sandra Keßler
791d905b14
exceptions
2017-07-31 13:08:10 +02:00
Sandra Keßler
14fdc14807
maybe better error recovery?
2017-07-31 12:59:03 +02:00
Sandra Keßler
58e6791441
alternate setTBR based on StateMachine
2017-07-31 11:52:31 +02:00
Sandra Keßler
3497296b6c
more time
2017-07-31 09:08:12 +02:00
Sandra Keßler
a7165497ea
increase Button Timing to 200ms
2017-07-30 22:49:52 +02:00
Sandra Keßler
7c001e97bf
wait till we get something currentDuration % 15 == 0
2017-07-30 22:25:49 +02:00
Sandra Keßler
bfb6039c16
slow pump fix
2017-07-30 22:25:49 +02:00
Sandra Keßler
1d3fee54e9
if umbind fails while service is dead, bind would never be called
2017-07-30 22:23:01 +02:00
Sandra Keßler
afda4f9254
Merge remote-tracking branch 'refs/remotes/origin/trim-to-max-tbr' into HEAD
2017-07-30 16:21:10 +02:00
Johannes Mockenhaupt
16dc21c7f1
Merge branch 'changeRuffyService' into 'stable'
...
change to support changed IRuffyService
See merge request !7
2017-07-30 11:27:27 +00:00
Johannes Mockenhaupt
27f788424a
Trim requested TBR rate to maximum the pump supports, properly round.
2017-07-30 13:06:52 +02:00
Johannes Mockenhaupt
d672f3c653
Remove hander on ruffy unbind.
2017-07-30 13:03:43 +02:00
AdrianLxM
bfd96b0635
Merge branch 'stable' into '1_5f'
...
# Conflicts:
# app/src/main/res/values/strings.xml
2017-07-29 16:55:55 +00:00
Sandra Keßler
5e845e37f7
change to support changed IRuffyService
2017-07-28 13:41:10 +02:00
AdrianLxM
785e1b323c
refresh-data - make guard condition better readable
2017-07-28 05:48:34 +02:00
AdrianLxM
f680d70548
refresh data greater smaller fix
2017-07-27 23:35:44 +02:00
AdrianLxM
9572c8d9fc
Merge remote-tracking branch 'origin/develop' into read-maxtbr-clean
2017-07-27 20:27:48 +02:00
AdrianLxM
e79dc4fb66
only set icons when initialized
2017-07-27 16:31:09 +02:00
Johannes Mockenhaupt
17b0e7d71a
Fix some typos.
2017-07-27 14:35:56 +02:00
AdrianLxM
c41b12492f
tbr capability retry change
2017-07-27 13:43:50 +02:00
Johannes Mockenhaupt
bd353a7043
BolusCommand: confirm via My Data history the correct amount was delivered.
2017-07-27 13:39:23 +02:00
AdrianLxM
2697ac9420
battery and insulinstate
2017-07-27 12:20:59 +02:00
AdrianLxM
e34009271f
preserve max tbr through app restarts
2017-07-27 09:53:33 +02:00
AdrianLxM
8937fbe574
use pumpdescription.maxTempPercent to cutoff temps
2017-07-26 22:35:13 +02:00
AdrianLxM
13173e48c1
tbr capability in ComboFragment
2017-07-26 22:16:35 +02:00
Johannes Mockenhaupt
b96edc048e
Merge remote-tracking branch 'fork/develop' into stable
...
* fork/develop:
setTBR - check for TBR and RUNTIME
2017-07-26 18:18:10 +02:00
AdrianLxM
76c0b999ff
determine max possible tbr firstshot
2017-07-26 18:11:45 +02:00
Johannes Mockenhaupt
78d2322c14
Typos.
2017-07-26 18:02:21 +02:00
Johannes Mockenhaupt
02c80a924c
SetTbrCommand: remove retry logic, add extra checks for final bolus.
2017-07-26 18:00:18 +02:00
Johannes Mockenhaupt
da69e69570
BolusCommand: remove retry logic, add extra checks for final bolus.
2017-07-26 16:06:58 +02:00
Johannes Mockenhaupt
e1b63a4a74
Command doc.
2017-07-26 15:50:07 +02:00
Johannes Mockenhaupt
d79b221940
CommandException: provide message for printing.
2017-07-26 14:44:28 +02:00
Johannes Mockenhaupt
0516eacfe5
ConfigBuilder.applyAPSResult: log request rate.
2017-07-26 14:44:21 +02:00
AdrianLxM
21b81a5084
setTBR - check for TBR and RUNTIME
2017-07-26 12:19:28 +00:00
AdrianLxM
5569b42ac3
wear wizard percentage
2017-07-26 09:58:51 +02:00
Milos Kozak
4bb3b7c11d
Merge pull request #323 from MilosKozak/nsclient-local-second
...
Nsclient local broadcasts
2017-07-25 19:51:57 +02:00
Milos Kozak
f1e21053b5
use key instead of string
2017-07-25 19:24:51 +02:00
Milos Kozak
d6cb8ef6bc
check for existing value
2017-07-25 19:18:51 +02:00
Milos Kozak
252b24cefe
Merge pull request #313 from MilosKozak/synchronize-nsclientlog
...
synchronize NSClient log
2017-07-25 12:50:48 +02:00
Johannes Mockenhaupt
58505922f2
Merge branch 'fixTBR' into 'combo'
...
fix >500% basal setting
See merge request !3
2017-07-25 09:35:59 +00:00
Sandra Keßler
f68042af66
fix >500% basal setting
2017-07-24 18:39:43 +02:00
Johannes Mockenhaupt
314a551c96
Mark log entries comming from ruffy.
2017-07-24 15:18:16 +02:00
Johannes Mockenhaupt
c8c4cf2813
Add log statement.
2017-07-24 13:30:08 +02:00
Johannes Mockenhaupt
ebd9c0d876
Add wait time between reconnects.
...
Might improve GL#34.
2017-07-24 13:16:35 +02:00
Johannes Mockenhaupt
674fb398b8
Safeguard against communication issues with ruffy.
...
In most cases we can't do much, but we can handle exceptions
and show a notification and message what's wrong, so the user
can try to fix the issue.
Fixes jotomo/AndroidAPS#35 .
2017-07-24 12:59:56 +02:00
Johannes Mockenhaupt
81f3aea42a
Provide basic pump data for upload.
2017-07-24 12:59:56 +02:00
AdrianLxM
3500e92a41
nsclient ackAlarm local
2017-07-24 02:33:29 +02:00
AdrianLxM
d60321b4d1
nsclient alarms local
2017-07-24 02:27:16 +02:00
Johannes Mockenhaupt
e6eee42081
Merge remote-tracking branch 'origin/dev' into combo
...
* origin/dev:
recategorize cp icons
removed unnecessary text colour and fixed indentation
layout indentation
Moving some buttons to the right categories
removed empty ghost files
remove duplicate IDs and indentation fix
Picture renaming (#311 )
2017-07-24 02:25:28 +02:00
Johannes Mockenhaupt
6a0273046d
Comment on English being the only supported pump language so far.
2017-07-24 02:24:48 +02:00
AdrianLxM
a4864c3d06
nsclient cal local
2017-07-24 02:09:26 +02:00
AdrianLxM
194a817332
nsclient devicestatus local
2017-07-24 02:06:05 +02:00
AdrianLxM
fe57d4a61d
nsclient mbg local
2017-07-24 02:02:54 +02:00
AdrianLxM
82b99e1708
nsclient status local
2017-07-24 02:00:46 +02:00
AdrianLxM
759154e578
nsclient profile local
2017-07-24 01:58:23 +02:00
AdrianLxM
7a171bd949
nsclient sgv local
2017-07-24 01:55:01 +02:00
AdrianLxM
38100e758e
nsclient treatments local
2017-07-24 01:50:27 +02:00
AdrianLxM
796b7ecdf2
rename package lowercase
2017-07-24 00:12:53 +02:00
Johannes Mockenhaupt
5e5c837949
Clean up comment.
2017-07-23 23:42:44 +02:00
Johannes Mockenhaupt
cc715cf76f
Notes, typo.
2017-07-23 17:51:08 +02:00
Johannes Mockenhaupt
9826c1d953
Bugfix: NPE when refreshing pump status without a profile set.
...
The base basal rate is a different thing than a TBR rate, when a TBR
is running the PumpStatus has a tbrRate, when no TBR is running
there's no TBR rate, so don't display the base basal rate.
2017-07-23 14:07:46 +02:00
AdrianLxM
5e1e48be0a
Allow prime/fill
2017-07-23 00:24:27 +00:00
Johannes Mockenhaupt
27187b5e75
Bugfix: More reliable way to determine if the connection is ready to execute comands.
2017-07-22 20:02:35 +02:00
Johannes Mockenhaupt
9cdd988bff
Bugfix: sleep *inside* the loop.
...
Whops, maxing out a core, draining the battery.
2017-07-22 17:53:55 +02:00
Johannes Mockenhaupt
fcd6f4ea0e
jotomo/AndroidAPS#29 Don't raise alarm on 'double cancellation'.
2017-07-22 11:36:52 +02:00
Johannes Mockenhaupt
a153b59d5d
Increase timeouts.
...
90s until timeout due to no menu updates
60s timeout for operations (waitForMenuToBeLeft, verifyMenuIsDisplayed).
2017-07-22 11:34:28 +02:00
Johannes Mockenhaupt
b3a7585a52
Note an pump sluggishness.
2017-07-22 11:07:35 +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
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
