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 |
|
|
Sandra Keßler
|
d89b914bc2
|
removed Log from SetTbrCommand
|
2017-08-12 13:31:47 +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 |
|
|
Sandra Keßler
|
e2b09f9e42
|
recovered merge/unmerge damage
|
2017-08-11 17:35:58 +02:00 |
|
|
Sandra Keßler
|
92b342b89a
|
add an additional wait
|
2017-08-11 17:35:58 +02:00 |
|
|
Sandra Keßler
|
6a8b39ca4f
|
forgot in last commit
|
2017-08-11 17:35:58 +02:00 |
|
|
Sandra Keßler
|
6acc25978b
|
Small fix for slow Set error
|
2017-08-11 17:35:58 +02:00 |
|
|
Sandra Keßler
|
bd0a298168
|
fix maybe long duration before setting tbr
|
2017-08-11 17:35:58 +02:00 |
|
|
Sandra Keßler
|
e20084c97f
|
change step calculation and fix time setting (got the actual vs requested time wrong)
|
2017-08-11 17:35:58 +02:00 |
|
|
Sandra Keßler
|
29b5ad9696
|
modify Waits/timeouts to better Set tar with short Menu timeouts
|
2017-08-11 17:35:58 +02:00 |
|
|
Sandra Keßler
|
b1a7083371
|
add Logs to setTbrCommand
|
2017-08-11 17:35:58 +02:00 |
|
|
Johannes Mockenhaupt
|
089295188f
|
Revert merge which was committed due to a misunderstanding.
|
2017-08-11 17:35:58 +02:00 |
|
|
Sandra Keßler
|
6dba4e4956
|
fix >500% basal setting
|
2017-08-11 17:35:58 +02:00 |
|
|
Timm Korte
|
e7249bf72e
|
Merge remote-tracking branch 'milosremote/dev' into develop
|
2017-08-10 11:13:21 +02:00 |
|
|
Milos Kozak
|
61a208f937
|
Merge pull request #349 from winni67/dev
Dev
|
2017-08-10 08:34:55 +02:00 |
|
|
Winfried Kuiper
|
5b43f11a3f
|
Update strings.xml
Confirmation=Bestätigung statt Konfiguration (configuration)
|
2017-08-09 22:12:09 +02:00 |
|
|
Winfried Kuiper
|
99a0edfa06
|
Update strings.xml
Missing units in german translation
|
2017-08-09 22:03:59 +02:00 |
|
|
Winfried Kuiper
|
4ce643ae08
|
Merge pull request #5 from MilosKozak/dev
Dev
|
2017-08-09 21:55:03 +02:00 |
|
|
Milos Kozak
|
57f5e5a92d
|
add bolus metadata when reading pump history
|
2017-08-08 23:14:56 +02:00 |
|
|
Milos Kozak
|
bbc68b2266
|
synchronized getAutosensData
|
2017-08-08 15:55:31 +02:00 |
|
|
Milos Kozak
|
2f8ca8bb04
|
fix setting zero temp
|
2017-08-08 15:06:31 +02:00 |
|
|
Milos Kozak
|
cfe51757a1
|
Merge pull request #345 from AdrianLxM/wear-versionnumber-settings
Version-Number in settings
|
2017-08-08 12:03:38 +02:00 |
|
|
AdrianLxM
|
7bc0a18f6e
|
Version-Number in settings
|
2017-08-08 02:06:46 +02:00 |
|
|
Timm Korte
|
8182f99bd2
|
add userRequested parameter to cancelTBR as needed in current AAPS dev
|
2017-08-07 22:25:57 +02:00 |
|
|
Savek-CC
|
f3044a7cbb
|
Merge branch 'feature_90-110-percent_savek-cc' into 'develop'
change cancel to 90 or 110 percent basal depending on previous running temp
See merge request !14
|
2017-08-07 20:18:44 +00:00 |
|
|
Timm Korte
|
07822811ac
|
Merge remote-tracking branch 'milosremote/dev' into develop
|
2017-08-07 22:16:37 +02:00 |
|
|
Milos Kozak
|
3bfecd6da8
|
check for existing
|
2017-08-07 16:13:09 +02:00 |
|
|
Milos Kozak
|
2ae0028495
|
Swedish
|
2017-08-07 14:06:11 +02:00 |
|
|
Savek-CC
|
e01c8740c2
|
Merge branch 'mainline' into 'develop'
update develop from changes introduced to stable / mainline
See merge request !15
|
2017-08-06 22:37:39 +00:00 |
|
|
Savek-CC
|
d520643d45
|
Merge branch 'develop' into 'mainline'
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
|
2017-08-06 22:35:07 +00:00 |
|
|
Timm Korte
|
59e9502f22
|
change cancel to 90 or 110 percent basal depending on previous running temp
|
2017-08-07 00:27:23 +02:00 |
|
|
Johannes Mockenhaupt
|
c524e2a685
|
Revert merge which was committed due to a misunderstanding.
|
2017-08-06 21:47:17 +02:00 |
|
|
Milos Kozak
|
a40afd0948
|
1.5g
|
2017-08-06 14:28:01 +02:00 |
|
|
Milos Kozak
|
848863aca5
|
calculateFromTreatmentsAndTempsSynchronized
|
2017-08-06 14:25:25 +02:00 |
|
|
Milos Kozak
|
f1f7a6ca6c
|
check for null
|
2017-08-06 14:14:03 +02:00 |
|
|
Milos Kozak
|
066283a4b0
|
add SMB flag to treatments
|
2017-08-06 12:19:25 +02:00 |
|
|
Milos Kozak
|
6de154d16d
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into move-to-range-in-profile
|
2017-08-06 11:43:13 +02:00 |
|