Commit graph

14902 commits

Author SHA1 Message Date
Johannes Mockenhaupt f0d9f0e86a
Don't rebind ruffy and retry command in case of failure.
RuffyService is now immeditately rebound when connection was lost,
therefore retrying a command after blindly rebinding the service
doesn't make sense anymore,more so given that ruffy is less prone
to crashing now.
2017-08-15 14:03:01 +02:00
Johannes Mockenhaupt 8178b6ff00 Merge branch 'post-tbr-cancel-check' into 'develop'
SetTbrCommand: fix check in main menu after cancelling TBR.

See merge request !17
2017-08-15 11:45:02 +00:00
Johannes Mockenhaupt ec508b55c4
SetTbrCommand: fix check in main menu after cancelling TBR.
The percentage attribute is displayed with a value of 100, though it's not visible on the display. This change just checks the no duration is displayed to verify no TBR is currently running.
2017-08-15 13:18:42 +02:00
Milos Kozak 4c490c32f7 Merge pull request #361 from MilosKozak/oref-insulincurves
Oref Insulincurves
2017-08-15 10:13:50 +02:00
Milos Kozak 151165809e Dutch language 2017-08-14 21:57:49 +02:00
AdrianLxM ee7b3cca22 insulincurves - notification on short DIA 2017-08-14 20:41:24 +02:00
AdrianLxM f23c3e7ae1 insulincurves - forgotten string updated 2017-08-14 16:44:39 +02:00
AdrianLxM 707d5a480c insulincurves - rename peak to peak time 2017-08-14 16:02:07 +02:00
AdrianLxM 94fbd620f4 insulincurves - remove unused base fragment 2017-08-14 15:53:47 +02:00
AdrianLxM ced1da09cf insulincurves - i18n 2017-08-14 15:25:37 +02:00
AdrianLxM 13cd7dbda1 insulincurves - ActivityGraph fix double plotting 2017-08-14 15:25:21 +02:00
AdrianLxM 085caddeee insulincurves - freepeak 2017-08-14 15:24:55 +02:00
AdrianLxM 63d46aed56 insulincurves - minimum 5 2017-08-14 15:24:41 +02:00
AdrianLxM a538160e76 insulincurves - rapid and ultra both with adjustable dia 2017-08-14 15:24:30 +02:00
AdrianLxM 8adff150f7 AdriAPS diaadaption 2017-08-14 15:23:39 +02:00
AdrianLxM b8496e3208 insulincurves - working with default params 2017-08-14 15:22:27 +02:00
Milos Kozak 82d3289602 add oref1 asssets 2017-08-14 12:20:12 +02:00
Milos Kozak 2d2ccde6e4 log Bundle 2017-08-14 12:11:53 +02:00
Timm Korte e9672ff4aa adjust setTempBasalAbsolute interface to include the new upstream 'force' parameter 2017-08-14 00:05:40 +02:00
Timm Korte 882f9d7869 Merge remote-tracking branch 'milosremote/dev' into develop 2017-08-13 23:57:07 +02:00
Milos Kozak c2733fb992 Merge pull request #358 from jotomo/logging-linenumber
Logging: Print filename and line instead of logger name.
2017-08-13 23:54:29 +02:00
Johannes Mockenhaupt d49356a922
Logging: Print filename and line instead of logger name. 2017-08-13 21:31:21 +02:00
Milos Kozak 377b711896 Merge pull request #352 from diabetesdt1/patch-1
Update strings.xml
2017-08-13 20:31:54 +02:00
Milos Kozak a49a496651 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into force 2017-08-13 20:31:45 +02:00
Milos Kozak d4642b3958 do not enforce stop for v2 driver 2017-08-13 20:31:15 +02:00
Milos Kozak 2a2b5dbb31 Merge pull request #357 from savek-cc/logfile-name
change logfile name pattern
2017-08-13 15:55:53 +02:00
Timm Korte bbb03d0ac1 change logfile name pattern to still be rotated once a day but include the hour-minute-seconds as timestamp in the filename 2017-08-13 14:34:19 +02:00
Timm Korte 8caaeeff2a change logfile name pattern to still be rotated once a day but include the hour-minute-seconds as timestamp in the filename 2017-08-13 14:32:37 +02:00
Johannes Mockenhaupt 6732d4ff75 Merge branch 'tbrDurationFix' into 'develop'
Tbr duration fix

See merge request !16
2017-08-12 14:04:06 +00:00
Johannes Mockenhaupt bb0bea98c3
Don't ignore exceptions when binding the ruffy service. 2017-08-12 16:01:05 +02:00
Johannes Mockenhaupt ead8508760
Format code. 2017-08-12 16:00:05 +02:00
Johannes Mockenhaupt d75a04c985
After setting/cancelling TBR also check main menu state after cancel. 2017-08-12 15:22:55 +02:00
Johannes Mockenhaupt 49aa63bd31
More verbose logging, some notes added. 2017-08-12 15:22:55 +02:00
Johannes Mockenhaupt 5a1d2d495d
Rename RuffyScripter.waitScreen -> waitForScreenUpdate. 2017-08-12 15:22:55 +02:00
Johannes Mockenhaupt fc5b4cd93b
Some logging. 2017-08-12 15:22:55 +02:00
Johannes Mockenhaupt f763eb246b
Use 1.5g-combo-dev as version. 2017-08-12 15:22:55 +02:00
Johannes Mockenhaupt d3058f6063
Let an unexpected warning/error escalate rather than hide it. 2017-08-12 15:22:55 +02:00
Johannes Mockenhaupt 2f3d362240
Use SystemClock.sleep() instead of Thread.sleep() throughout. 2017-08-12 15:22:55 +02:00
Johannes Mockenhaupt 306a2787d0
Throw CommandException instead of Exception. 2017-08-12 15:22:55 +02:00
Sandra Keßler bdbf151efe add full Menu Output to debug 2017-08-12 15:10:14 +02:00
Sandra Keßler 389eae93c5 renamed goToMainMenuScreen to gotToMainTypeMenu to make it clevrer that Menu.isMaintype is meant, deactivates getBasal for now 2017-08-12 14:15:04 +02:00
Timm Korte 6bbb785574 rename 'userRequested' to 'force' as parameter to cancelTempBasal in order to have the same naming as with setTempBasalAbsolute 2017-08-12 13:36:35 +02:00
Sandra Keßler d89b914bc2 removed Log from SetTbrCommand 2017-08-12 13:31:47 +02:00
AdrianLxM f861546e12 Quickfix to avoid crashes after staleData merge 2017-08-12 11:20:56 +02:00
Sandra Keßler 59ee67a353 add Logger logs 2017-08-12 09:29:07 +02:00
Sandra Keßler 92ca9aaede some Small improvements 2017-08-12 00:27:30 +02:00
Sandra Keßler 3fd6884d03 just rewrote SetTbrCommand to be a scripted command, maybe fixed some errors along the way, Runs very smooth on my shitty pump 2017-08-12 00:12:11 +02:00
Sandra Keßler abe4c1ff3a return immidiatly if we are in correct menu 2017-08-11 23:59:05 +02:00
Sandra Keßler 1c1ea14b3c remove old handler if it was set 2017-08-11 23:58:45 +02:00
Timm Korte 8db9cb8887 add cancelTempBasal to setTempBasal if forced 2017-08-11 23:06:35 +02:00