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
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
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
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
RoumenGeorgiev
122efb1b8e
Fix for getting double of alarmTimeagoWarnMins
2017-08-07 20:06:15 +03:00
RoumenGeorgiev
1dd9086924
added snoozing if bgReadingAgo is smaller than threshold
2017-08-07 18:53:56 +03: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
RoumenGeorgiev
4f054907cb
Merge pull request #1 from MilosKozak/dev
...
Dev
2017-08-07 09:17:07 +03: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
6ab6f82b10
more debug on setting temp basal
2017-08-06 11:42:20 +02:00
Milos Kozak
4e4088f164
remove unneeded strings
2017-08-05 18:47:01 +02:00
Milos Kozak
4fda4fd547
convert target values to mdgl before passing to openaps
2017-08-05 18:14:10 +02:00
Milos Kozak
e295c8a2dc
target range change confirm dialog
2017-08-05 18:09:19 +02:00
Milos Kozak
f834b3b7e0
remove unneeded texts
2017-08-05 17:43:31 +02:00
Milos Kozak
1604b85d34
Merge branch 'dev' into move-to-range-in-profile
2017-08-05 14:48:41 +02:00
Johannes Mockenhaupt
dbad306766
Resolve merge issue.
2017-08-05 13:23:15 +02:00
Johannes Mockenhaupt
0ef8fd9994
Some polish.
2017-08-05 13:11:07 +02:00
Johannes Mockenhaupt
8aabc346c0
Update ComboPlugin.cancelTempBasal to user newly added userRequested param.
2017-08-05 13:06:10 +02:00
Johannes Mockenhaupt
8369893428
Fix if-statement.
2017-08-05 12:35:05 +02:00
Johannes Mockenhaupt
134bc32dac
Merge remote-tracking branch 'fork/tbrDurationFix-90-110-cancel' into stable
...
* fork/tbrDurationFix-90-110-cancel:
change ComboPlugin to change basal to 90 or 110 percent instead of cancel - depending on previous tbr
missing stuf :/
add unused (but tested) command to get basal rate from Profile 1
update setTBRCommand to way faster methods in scripter
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)
add back key
make keypress wait up to 2000ms for key response
add type of menu to MenuType (main or sub menu)
- 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
change Version info
exceptions
maybe better error recovery?
alternate setTBR based on StateMachine
more time
increase Button Timing to 200ms
wait till we get something currentDuration % 15 == 0
slow pump fix
if umbind fails while service is dead, bind would never be called
# Conflicts:
# app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java
2017-08-05 11:42:14 +02:00
Johannes Mockenhaupt
fc97bb7666
Add TODO/notes.
2017-08-05 11:33:02 +02:00
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
RoumenGeorgiev
222c357456
Added check for enabled openAPS stale data alarm in NS
2017-08-05 11:58:49 +03:00
RoumenGeorgiev
ad122153a9
added openAPSEnabledAlerts()
...
check for OpenAPS alerts enabled
2017-08-05 11:26:12 +03:00
RoumenGeorgiev
3d9df4e18e
Using equals() instead of == on line 1811
2017-08-05 11:20:09 +03: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
RoumenGeorgiev
cdee9bf703
Get staleData setting from NS first
2017-08-04 17:04:57 +03:00
RoumenGeorgiev
aff62d86b1
Changed name of button to snooze if it's staleDataAlarm
2017-08-04 16:43:46 +03:00
RoumenGeorgiev
714a292d78
fixed wrong pasting
2017-08-04 15:05:09 +03:00
RoumenGeorgiev
837dcdb23b
If alarm is staledata dismis snoozes it
2017-08-04 14:51:25 +03:00
RoumenGeorgiev
82541a50e4
Added functions for snoozing and unsnoozing
2017-08-04 14:49:46 +03:00
RoumenGeorgiev
a8b17a1f22
adding staleDataThreshold as snooze time
2017-08-04 14:48:44 +03: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
RoumenGeorgiev
529d267b9d
Added check for staleData and notification
...
with every loop
2017-08-04 12:29:48 +03:00
RoumenGeorgiev
232590e707
Added staleData
2017-08-03 18:48:45 +03:00
RoumenGeorgiev
74bb05a654
added staledataalarm
2017-08-03 17:14:14 +03: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
AdrianLxM
23abc0e4e5
Some more German
2017-08-02 00:08:56 +02:00
AdrianLxM
5d51b8f0f9
Some more German
2017-08-01 23:56:16 +02:00
AdrianLxM
e30e62e9ab
Some German translations, remove unused strings, App name for all
2017-08-01 23:46:58 +02:00
Radoslav Radev
39891bbad9
Update strings.xml
2017-08-01 23:29:23 +03:00
Milos Kozak
e933650330
CS translations
2017-08-01 22:17:39 +02:00
Milos Kozak
9cf5c6b6c3
hide all overview buttons by default
2017-08-01 20:52:23 +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
Sandra Keßler
4147e7f6a1
change Version info
2017-07-31 21:45:03 +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
f6b1887fd2
Logging: Print filename and line instead of logger name.
2017-07-26 15:26:44 +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
7a572d2341
1.5f
2017-07-25 22:53:55 +02:00
