caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity
2570 commits 1 branch 20 tags 140 MiB
Commit graph

2229 commits

Author SHA1 Message Date
Milos Kozak
fa24368701 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-09-02 10:26:07 +02:00
Milos Kozak
7801db5a29 fix danar bolus step 2017-09-02 10:25:46 +02:00
AdrianLxM
15a40cba80 Split treatments into smaller packages before broadcasting 2017-09-01 14:02:47 +02:00
fedor apanasenko
ed8582b36a update russian 2017-09-01 10:37:59 +03:00
Milos Kozak
46f111076f Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-08-31 22:01:25 +02:00
Milos Kozak
db952759e1 Insulin fragments consolidation 2017-08-31 22:00:45 +02:00
Milos Kozak
c312b51fcf consolidate DanaR fragments 2017-08-31 19:32:28 +02:00
Radoslav Radev
e1c4074663 Update strings.xml 2017-08-31 09:09:26 +03:00
Milos Kozak
7da8b2de5c visibility icon 2017-08-29 21:40:06 +02:00
Milos Kozak
7dfe77dc9c single line in configbuilder 2017-08-29 19:47:32 +02:00
Milos Kozak
13b8a9ecf2 Merge pull request #404 from kakoni/master 
Adding out_units support for determine-basal.js
 2017-08-29 18:23:36 +02:00
Milos Kozak
981a96aa16 ConfigBuilder layout 2017-08-29 17:59:46 +02:00
Karri Niemelä
034faa4f6e Adding support out_units 2017-08-29 15:06:53 +03:00
Johannes Mockenhaupt
448f527525
Splitted boluses: add a wait, so that boluses are delivered with 40s between them. 2017-08-28 21:02:37 +02:00
Johannes Mockenhaupt
f903b83315
Simplify. 2017-08-28 20:32:41 +02:00
Johannes Mockenhaupt
7d5571ffd2
SetTbrCommand: rewrite inputing duration. 
Inputs all steps at once, including 'alignment' step, thereby removing a wait
between the initial step and subsequent step where a bad timing could
break the command.
 2017-08-28 20:13:20 +02:00
Johannes Mockenhaupt
4c313a6a14
Small cleanup. 
(cherry picked from commit b0b533e)
 2017-08-28 12:43:12 +02:00
Johannes Mockenhaupt
6f8e0fc257
Remove hack to cancel a request for a TBR that is already running (localized issue). 
(cherry picked from commit a671536)
 2017-08-28 12:43:11 +02:00
Johannes Mockenhaupt
cff4bc1abe
Add temporary fix for edge case resulting in SetTbrCommand failing to set TBR_DURATION, where duration is not correctly pumped up to a multiple of 15. 
(cherry picked from commit df9952f)
 2017-08-28 12:43:09 +02:00
Johannes Mockenhaupt
a53564fcae
Add wait in loop to check for update from pump. 
(cherry picked from commit fe8d09e)
 2017-08-28 12:43:08 +02:00
Johannes Mockenhaupt
11332391b8
Clean up (Cancellable)BolusCommands, to use dynamic scroll wait as well. 
(cherry picked from commit 711cc58)
 2017-08-28 12:43:06 +02:00
Johannes Mockenhaupt
03ff15d533
Remove unused test class. 2017-08-28 00:57:47 +02:00
Johannes Mockenhaupt
381a26119b
Crap, don't enable experimental bolus by default. 2017-08-28 00:33:33 +02:00
Johannes Mockenhaupt
a42b671965
Update version. 2017-08-27 20:40:29 +02:00
Johannes Mockenhaupt
e3a732d53d
Small refactoring. 2017-08-27 20:30:58 +02:00
Johannes Mockenhaupt
b85f5324de
Restore bolus splitting hack. 2017-08-27 19:37:43 +02:00
Johannes Mockenhaupt
ecd05bef2d
Make new BolusCommand configurable. 2017-08-27 19:11:17 +02:00
Johannes Mockenhaupt
b53db22ae1
Report bolus delivered if the pump raised a warning/error during delivery. 
Most likely this is due to a low cartridge warning, but might also be an occlusion alert.
This lets the alarm ring and asks the user to check it. The treatment is also recorded in
the db as enacted.

(cherry picked from commit 6cc017a)
 2017-08-27 19:08:27 +02:00
Johannes Mockenhaupt
fea1309fa3
Cleanup merge. 2017-08-27 19:05:33 +02:00
Johannes Mockenhaupt
3d2732a68e
Restore bolus comands alongside. 2017-08-27 19:05:08 +02:00
Johannes Mockenhaupt
95fda165a3
Merge fixes without changes to behaviour. 2017-08-27 18:49:24 +02:00
Johannes Mockenhaupt
e399fac8dc
Try to be clever about slow screen updates when scrolling. 2017-08-27 18:45:25 +02:00
Johannes Mockenhaupt
ad44b356c4
Revert "Try building against ruffy stable, 8dae0c0fedd5e371e85da3433a07aaab27b05db0" 
This reverts commit 8720c08cdd4a7f89b77816d849da9c585fb8f1ef.
 2017-08-27 18:45:24 +02:00
Johannes Mockenhaupt
f70cbbc6c0
Try building against ruffy stable, 8dae0c0fedd5e371e85da3433a07aaab27b05db0 2017-08-27 18:45:24 +02:00
Johannes Mockenhaupt
7bd7c7d035
Workaound for #27 (TBR issued twice). 2017-08-27 18:45:24 +02:00
Johannes Mockenhaupt
0705755368
Revert "Retry with current ruffy." 
This reverts commit f9281c1f996679a2c8065aa52cbb8cb4698353bc.
 2017-08-27 18:45:24 +02:00
Johannes Mockenhaupt
2a80111034
Retry with current ruffy. 2017-08-27 18:45:24 +02:00
Johannes Mockenhaupt
c8f7b535c2
Remove code to determine pump capabilities for the time being. 2017-08-27 18:45:22 +02:00
Johannes Mockenhaupt
40941996c2
Don't provide status JSON until we can provide it properly. 2017-08-27 18:44:55 +02:00
Johannes Mockenhaupt
ff088ddd3f
ComboPlugin: don't implement ConstraintsInterface, ProfileInterface. 2017-08-27 18:44:55 +02:00
Johannes Mockenhaupt
1d53305ff9
Use string resource. 2017-08-27 18:44:55 +02:00
Johannes Mockenhaupt
c2ae0b7289
Cleanup. 2017-08-27 18:44:55 +02:00
Johannes Mockenhaupt
fdab7daf2c
Only display Extended Bolus tab in Treatments if pump supports them. 
(cherry picked from commit e862c35)
 2017-08-27 18:44:30 +02:00
Johannes Mockenhaupt
4046305380
Build against ruffy b916a900c0899ef58ad58c7427d1c30d3c8731f4. 2017-08-27 18:44:30 +02:00
Johannes Mockenhaupt
bc68f2cc1b
Better log output. 2017-08-27 18:44:30 +02:00
Johannes Mockenhaupt
99b98f1dec
Set custom version 2017-08-27 18:44:30 +02:00
Johannes Mockenhaupt
fce696b51d
Cleanup, fix merge issues. 2017-08-27 18:44:28 +02:00
Johannes Mockenhaupt
4d2fa19ad4
Merge branch 'bolus-progress' into rework 
* bolus-progress:
  wip
  wip
  wip
  more
  more
  Remove TODOs for extended bolus.
  wip cancelling
  Initial take on bolus cancellation.
  Initial take on bolus progress reporting.
  Add alternative SetTbrCommand for pumps with different behaviour.
  Formatting.
 2017-08-27 18:43:19 +02:00
Johannes Mockenhaupt
e6ba99b02f
Fix reading blinking values, use alternate SetTbrCommand by default, 
cleanups
 2017-08-27 18:05:05 +02:00
Johannes Mockenhaupt
37523fbdd1
ComboPlugin: Extract fields into ComboPump. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
3fdac4b23e
Small refactoring. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
9f57f82b6a
Remove wait for carb-only treatment. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
c301d6585c
ComboPlugin: implement Constraint, ProfileInterface. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
eb74a24e54
Misc cleanups. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
5eea6d7b8d
Fix waiting between reconnects. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
7a41117a64
Experiments. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
6b19759a9f
Command stubs. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
9349662f8e
Rename ReadPumpStateCommand -> GetPumpStateCommand. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
de693c0f76
Add reservoirLevel to PumpState. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
785a01a056
Extract methods to read blinking values. 2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
7537048a96
Finish injecting scripter. 2017-08-27 18:05:03 +02:00
Johannes Mockenhaupt
3238cf9c35
Remove pumpState arg from Command.execute. 2017-08-27 18:05:03 +02:00
Johannes Mockenhaupt
fe7f831429
Inject scripter into commands. 2017-08-27 18:05:03 +02:00
Johannes Mockenhaupt
04a03dedc3
Extract BaseCommand. 2017-08-27 18:05:03 +02:00
Johannes Mockenhaupt
1d3411ba56
Show connection, execution time in combo fragment. 
(cherry picked from commit 4078c23)
 2017-08-27 12:36:28 +02:00
Milos Kozak
03bf1abdd4 add WakeLock#isHeld() 2017-08-27 11:57:06 +02:00
Milos Kozak
1417410dbb add WakeLock#isHeld() 2017-08-27 11:53:36 +02:00
Milos Kozak
162389a7e0 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-08-27 11:46:25 +02:00
Milos Kozak
ba967df2e3 disable careportal buttons until profile is set 2017-08-27 11:44:39 +02:00
Milos Kozak
c9bfd27d93 Merge pull request #396 from warstar2187/dev 
KR translation update
 2017-08-27 00:38:44 +02:00
warstar2187
761f9f5075 Update strings.xml 2017-08-27 06:09:17 +09:00
Radoslav Radev
6bf120e9da Update strings.xml 2017-08-26 22:59:14 +03:00
Milos Kozak
e4c98e6cd1 make dev 1.52 2017-08-26 21:28:08 +02:00
Milos Kozak
b02b1829ad put back sensitivity plugins 2017-08-26 21:26:40 +02:00
Milos Kozak
491378caf5 1.51 bump 2017-08-26 20:42:53 +02:00
Milos Kozak
3369ce1759 temporary remove untested plugin for release 2017-08-26 20:42:25 +02:00
Milos Kozak
40d86eb87a fix strings 2017-08-26 14:37:38 +02:00
Milos Kozak
6ea7549e4f update languages 2017-08-26 12:07:37 +02:00
boysim
196e0bb309 Update strings.xml 2017-08-24 23:18:21 +02:00
Milos Kozak
4e8d92a74b Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-08-23 23:04:10 +02:00
Milos Kozak
ad3d175b02 better handling DetailedBolusInfo in v2 driver 2017-08-23 23:03:28 +02:00
Johannes Mockenhaupt
d100509648
Log action about to be performed before the operation. 2017-08-23 16:38:28 +02:00
Johannes Mockenhaupt
6b99bb8ed1
Log ruffy messages on debug level, see if that helps debug things. 2017-08-23 16:36:31 +02:00
Johannes Mockenhaupt
fdf974cb3c
Better error message on connect attempt failure. 2017-08-23 16:36:20 +02:00
Johannes Mockenhaupt
52d2b425b8
Merge remote-tracking branch 'origin/dev' into develop 
* origin/dev: (21 commits)
  1.5h
  Don't change schema.
  Fix comparing non-primitives.
  Generify MainApp.getSpecificPlugin.
  Fix some warnings / simplify a bit.
  Remove now unused dia, insulinInterfaceId from Treatment.
  correct supercall
  Use bolusstep granularity in fill dialog
  bugfix: fill as invalid treatments if triggered from phone
  add invalid treatments to charts in "invalid" colour
  Use bolusstep as step for insulin correction in wizard
  Update strings.xml
  fix of fix :(
  small refactoring
  Multiply time passed instead of divide dia.
  Update strings.xml
  Fix initalizing profile with default values.
  moved the code of the bg update to the top before all the loop logic happens, so there would be no delay
  Update strings.xml
  Update strings.xml
  ...
 2017-08-23 16:36:06 +02:00
Milos Kozak
d6a27c1af0 1.5h 2017-08-23 13:28:07 +02:00
Milos Kozak
c98cd3c834 Merge pull request #375 from samihusseingit/delay_in_bg_update_onResume 
Delay in bg update on resume
 2017-08-22 20:33:56 +02:00
Milos Kozak
0551f7f16d Merge pull request #387 from MilosKozak/invalid-overview 
Fill treatments in Overview
 2017-08-22 20:20:28 +02:00
Milos Kozak
5b17eee586 Merge pull request #389 from jotomo/cleanups 
Cleanups
 2017-08-22 20:20:10 +02:00
Johannes Mockenhaupt
bde57fde5f
Don't change schema. 2017-08-22 18:28:36 +02:00
Johannes Mockenhaupt
56423028f6
Fix comparing non-primitives. 2017-08-22 13:47:02 +02:00
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
Patrik Nilsson
c91988081f Update strings.xml 
Updated some changes. Milos, I jjust copied the hole SV xml-file. :-)
 2017-08-21 00:01:12 +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
Milos Kozak
ab035e3949 Merge pull request #371 from diabetesdt1/patch-2 
Update strings.xml
 2017-08-20 21:44:21 +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
Milos Kozak
86d791d93f Merge pull request #378 from jotomo/profile-default-values 
Fix initalizing profile with default values.
 2017-08-20 19:08:55 +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
warstar2187
36c25cbd45 Update strings.xml 2017-08-19 21:35:03 +09: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
diabetesdt1
efb9bed3fa Update strings.xml 2017-08-17 22:21:09 +02:00
diabetesdt1
ef42193d95 Update strings.xml 
Contraints translated with "Beschränkungen" (but not in the Config-Builder -> the Option to activate/show the Contraints-Tab)

objectives_*_ updated

dia_too_short updated
 2017-08-17 22:06:10 +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
diabetesdt1
64446f07c5 Update strings.xml 
added more translations, but please review the Objectiv-Strings, it was not so easy, so i hope i have translated it right.
Then, the most german varibles are translated.
 2017-08-17 12:40:14 +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
AdrianLxM
8287fe22cf AcceptTempButton visible 2017-08-16 23:22: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
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
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
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
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
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