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
Milos Kozak
73b6235188
APSRequest Answers event
2017-08-11 22:46:08 +02:00
Timm Korte
7839299530
add force parameter to setTempBasalAbsolute in order to force setting of a 0 temp for disconnecting the pump - instead of calling cancel as introduced in a24cbfda50
2017-08-11 22:08:33 +02:00
Milos Kozak
2770e93ed4
Merge pull request #337 from RoumenGeorgiev/dev
...
Alarm for StaleData
2017-08-11 18:45:52 +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
diabetesdt1
8cd24fd919
Update strings.xml
...
Replaced "Empfindlichkeit" with "Sensitivität"
2017-08-11 13:28:39 +02:00
diabetesdt1
a69a94a384
Update strings.xml
2017-08-11 12:48:15 +02:00
diabetesdt1
15fc53530d
Update strings.xml
...
Changed Nightscout to NS back (but not on the short Text).
Add more Translations.
Overview-Notification used and not "Popup-Notification".
Removed on short Names the ".
I think "treatment" = "Behandlung" sounds wrong :-|
2017-08-11 12:43:46 +02:00
diabetesdt1
0b62669079
Update strings.xml
...
typo fixed
2017-08-11 07:30:53 +02:00
Milos Kozak
26fbd450b0
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into sv
2017-08-10 22:39:25 +02:00
Milos Kozak
3ca058ce60
SV language cleanup
2017-08-10 22:33:38 +02:00
diabetesdt1
d78928a264
Update strings.xml
...
typo fixed and empty strings removed
2017-08-10 21:40:03 +02:00
diabetesdt1
c5b5d65efc
Update strings.xml
2017-08-10 21:29:41 +02:00
diabetesdt1
8df0ccdbb1
Update strings.xml
...
rollback language-names
2017-08-10 21:28:09 +02:00
diabetesdt1
33f5e97ac6
Update strings.xml
...
add more german translation and typos fixed
2017-08-10 21:12:56 +02:00
Milos Kozak
3a574c3803
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-08-10 17:28:57 +02:00
Milos Kozak
f703c82ca7
microbolus calculation
2017-08-10 17:28:41 +02:00
Milos Kozak
dae82d49fb
Merge remote-tracking branch 'patrik/dev' into sv
2017-08-10 16:29:42 +02:00
ellabellakaramella
0766ac812c
SV translation
2017-08-10 15:15:40 +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
