Johannes Mockenhaupt
30372897c0
Generify MainApp.getSpecificPlugin.
2017-08-22 13:47:02 +02:00
Johannes Mockenhaupt
59c7dbef27
Fix some warnings / simplify a bit.
2017-08-22 13:47:02 +02:00
Johannes Mockenhaupt
97d0140614
Remove now unused dia, insulinInterfaceId from Treatment.
2017-08-22 13:47:02 +02:00
AdrianLxM
d5ea2a2f08
correct supercall
2017-08-22 13:26:48 +02:00
AdrianLxM
4d33e1df97
Use bolusstep granularity in fill dialog
2017-08-22 13:02:56 +02:00
AdrianLxM
7ea33c7de4
bugfix: fill as invalid treatments if triggered from phone
2017-08-22 12:57:03 +02:00
AdrianLxM
3f8dea1197
add invalid treatments to charts in "invalid" colour
2017-08-22 12:56:17 +02:00
AdrianLxM
6b0bf5860c
Use bolusstep as step for insulin correction in wizard
2017-08-22 00:41:23 +02:00
Johannes Mockenhaupt
2eb86e1bd8
wip
2017-08-21 18:33:40 +02:00
Johannes Mockenhaupt
6cc73dcc1c
wip
2017-08-20 23:15:24 +02:00
Milos Kozak
33cf707d45
Merge pull request #380 from MilosKozak/dia-divisor-fix
...
Dia divisor / bolussnooze fix
2017-08-20 21:52:42 +02:00
Johannes Mockenhaupt
b162fcce01
wip
2017-08-20 20:47:58 +02:00
Milos Kozak
a18e2b4641
fix of fix :(
2017-08-20 19:42:41 +02:00
Johannes Mockenhaupt
bffcd3ceee
Merge remote-tracking branch 'origin/dev' into develop
...
* origin/dev: (35 commits)
fix displaying target in mmol
Profile.getValuesList: don't add trailing newline.
Fix some warnings.
Use OK/Cancel buttons for profile removal dialog.
static variables -> object variables
Avoid npe if no string is assigned to the profile switch
isValid implementation
Show profile on tap in Treatments->ProfileSwitch
Check for tempbasal not RealTempbasla
Overlapping interval - regard first element on cut
AcceptTempButton visible
show notification on toast alarm
parse 12h format properly
fix index
Show profile switch button in profiles
set pump time only if needed
restrict DIA for expectedDelta
Overlappinginterfals - find first element
Extract method Profile.toTargetRangeString.
Simplify.
...
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
2017-08-19 22:38:58 +02:00
Johannes Mockenhaupt
387ceff525
Add config options:
...
* alternate SetTbrCommand impl (original impl)
* split bolus (quick hack) to split up boluses to slow delivery
2017-08-19 22:29:48 +02:00
AdrianLxM
9c2808bf6f
small refactoring
2017-08-19 20:37:25 +02:00
AdrianLxM
d49eea854c
Multiply time passed instead of divide dia.
2017-08-19 20:12:37 +02:00
Johannes Mockenhaupt
ce4aee67d0
Fix initalizing profile with default values.
2017-08-19 12:28:10 +02:00
Susan
4f3b5f551a
moved the code of the bg update to the top before all the loop logic happens, so there would be no delay
2017-08-18 20:58:54 +02:00
Johannes Mockenhaupt
d851637d4f
more
2017-08-18 11:55:19 +02:00
Milos Kozak
6b8dd5868d
fix displaying target in mmol
2017-08-18 11:46:04 +02:00
Johannes Mockenhaupt
5991f307af
Profile.getValuesList: don't add trailing newline.
2017-08-17 22:01:59 +02:00
Johannes Mockenhaupt
a6351f4455
Fix some warnings.
2017-08-17 22:01:59 +02:00
Johannes Mockenhaupt
4f2357e9fb
Use OK/Cancel buttons for profile removal dialog.
2017-08-17 22:01:59 +02:00
AdrianLxM
5d6327bfaa
static variables -> object variables
2017-08-17 21:34:30 +02:00
AdrianLxM
5769915f8c
Merge remote-tracking branch 'milosremote/profile-switch-viewer' into profile-switch-viewer
2017-08-17 21:29:15 +02:00
AdrianLxM
0cc9ee4193
Avoid npe if no string is assigned to the profile switch
2017-08-17 21:24:31 +02:00
Milos Kozak
ca3d94a8ca
fix merge conflict
2017-08-17 21:21:38 +02:00
Milos Kozak
73c2be5248
isValid implementation
2017-08-17 20:51:24 +02:00
Johannes Mockenhaupt
fabaf7c2ef
more
2017-08-17 19:04:43 +02:00
AdrianLxM
92077dcb6a
Show profile on tap in Treatments->ProfileSwitch
2017-08-17 17:03:08 +02:00
Johannes Mockenhaupt
738dd72f5b
Remove TODOs for extended bolus.
2017-08-17 11:29:25 +02:00
Johannes Mockenhaupt
22e3517cd6
wip cancelling
2017-08-17 11:29:25 +02:00
Johannes Mockenhaupt
a664bdeaaa
Initial take on bolus cancellation.
2017-08-17 11:29:25 +02:00
Johannes Mockenhaupt
c1ecad1ed6
Initial take on bolus progress reporting.
2017-08-17 11:29:25 +02:00
Johannes Mockenhaupt
a230501f74
Add alternative SetTbrCommand for pumps with different behaviour.
2017-08-17 11:29:17 +02:00
Johannes Mockenhaupt
f41d597c07
Formatting.
2017-08-17 10:58:21 +02:00
Johannes Mockenhaupt
b000824b8a
Merge branch 'remove-cmd-retry-with-reconnect' into develop
...
* remove-cmd-retry-with-reconnect:
Don't rebind ruffy and retry command in case of failure.
2017-08-17 10:08:35 +02:00
Johannes Mockenhaupt
a19e49e5f8
Merge remote-tracking branch 'origin/dev' into develop
...
* origin/dev: (27 commits)
Check for tempbasal not RealTempbasla
Overlapping interval - regard first element on cut
AcceptTempButton visible
show notification on toast alarm
parse 12h format properly
fix index
Show profile switch button in profiles
set pump time only if needed
restrict DIA for expectedDelta
Overlappinginterfals - find first element
Extract method Profile.toTargetRangeString.
Simplify.
Overview: format target using unit specific format.
Dutch language
insulincurves - notification on short DIA
insulincurves - forgotten string updated
insulincurves - rename peak to peak time
insulincurves - remove unused base fragment
insulincurves - i18n
insulincurves - ActivityGraph fix double plotting
...
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
2017-08-17 10:08:15 +02:00
AdrianLxM
47e295b3c1
Check for tempbasal not RealTempbasla
2017-08-17 00:42:26 +02:00
AdrianLxM
776ae3f424
Overlapping interval - regard first element on cut
2017-08-16 23:56:14 +02:00
Milos Kozak
6ca44fce84
Merge pull request #367 from MilosKozak/profile-switch-buttons
...
show notification on toast alarm
2017-08-16 22:58:34 +02:00
AdrianLxM
e61d7a4442
show notification on toast alarm
2017-08-16 21:37:33 +02:00
Milos Kozak
b93a153b23
parse 12h format properly
2017-08-16 19:33:41 +02:00
Milos Kozak
7884c98f2f
fix index
2017-08-16 18:26:47 +02:00
Milos Kozak
35db28f013
Merge pull request #365 from MilosKozak/dia-expecteddelta-fix
...
Restrict DIA for expectedDelta
2017-08-16 18:11:37 +02:00
Milos Kozak
69a378bb75
Merge pull request #366 from MilosKozak/profile-switch-buttons
...
Show profile switch button in profiles
2017-08-16 18:11:26 +02:00
AdrianLxM
63793ed358
Show profile switch button in profiles
...
Shows the button to trigger a profile switch button in the profile fragments even when the pump basal cannot be written.
Instead of "SEND TO PUMP" it will then show "ACTIVATE PROFILE".
This has become necessary with the interval logic that needs profile switch events to happen in order to accept a new profile.
2017-08-16 17:56:57 +02:00
Milos Kozak
e005a6172b
set pump time only if needed
2017-08-16 17:26:58 +02:00
AdrianLxM
5fc63d8f16
restrict DIA for expectedDelta
2017-08-16 14:23:22 +02:00
Milos Kozak
e1d2c557af
Merge pull request #364 from MilosKozak/overlappin-intervals-fix
...
Overlappinginterfals - find first element
2017-08-16 08:11:04 +02:00
AdrianLxM
2e382267d4
Overlappinginterfals - find first element
2017-08-15 22:38:48 +02:00
Johannes Mockenhaupt
759afcec7a
Extract method Profile.toTargetRangeString.
2017-08-15 16:12:42 +02:00
Johannes Mockenhaupt
754a0097b9
Simplify.
2017-08-15 15:50:24 +02:00
Johannes Mockenhaupt
6dcdeb2bbc
Overview: format target using unit specific format.
2017-08-15 14:51:09 +02:00
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
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
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
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
b8496e3208
insulincurves - working with default params
2017-08-14 15:22:27 +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
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
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
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
