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

1723 commits

Author SHA1 Message Date
Johannes Mockenhaupt c11455dff1
Make the BolusProgress dialog a bit more self-contained. 
(cherry picked from commit 75db72a)
 2017-09-09 16:41:21 +02:00
Johannes Mockenhaupt c227e0e5fa
Dead code be gone. 
(cherry picked from commit bb626ce)
 2017-09-09 16:41:16 +02:00
Johannes Mockenhaupt 5c3ec9a086
Use SystemClock.sleep instead of Thread.sleep. 
Gets rid of all those pointless InterruptedException catching.

(cherry picked from commit 6acaa2b)
 2017-09-09 16:41:11 +02:00
Johannes Mockenhaupt c50fad81bb
Log exceptions in catch blocks rather than printing to console. 
The default code used by Android Studio when generating a
try/catch can be altered in Settings under
    Editor->File and Code Templates->Catch Statement body
to
    log.error("Unhandled exception", e);
to also do this for newly generated code.

(cherry picked from commit c2ae29f)

(cherry picked from commit 6031a25)
 2017-09-09 16:41:06 +02:00
Johannes Mockenhaupt 627cb8e9b2
WizardDialog: don't persist state of tt checkbox, default to false. 
This assumes that a default is not useful, as it needs to be decided
whether this is needed on each case (using tt when bolusing to
start eating soon, but not using it when bolusing for the meal
at the end of a tt).
 2017-09-09 16:37:08 +02:00
Johannes Mockenhaupt b1e3b45ce9
Add temp target to Wizard dialog 
Also, store checkboxes' state as prefereces.

(cherry picked from commit 6e1c66e)
 2017-09-09 16:30:17 +02:00
Milos Kozak e3ae7bbeaf Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-09-05 22:47:37 +02:00
Milos Kozak 98848b61ec send max 30 at once to NS 2017-09-05 22:47:10 +02:00
SMUSTAF1 1fd99a9582 changing the color of the bolus value, for visual clarify and confirmation. Reducing errors. 2017-09-05 13:29:43 +02:00
Milos Kozak 90496d0a02 Merge pull request #410 from jotomo/ok-cancel-profile-change-refresh 
Use OK/Cancel buttons for 'profile changes refresh from NS' dialog in…
 2017-09-03 17:13:43 +02:00
Johannes Mockenhaupt 3bebea37ae
Use OK/Cancel buttons for 'profile changes refresh from NS' dialog in Treatments tab. 2017-09-03 01:53:30 +02:00
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
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
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 381a26119b
Crap, don't enable experimental bolus by default. 2017-08-28 00:33:33 +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 95fda165a3
Merge fixes without changes to behaviour. 2017-08-27 18:49: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 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 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 9349662f8e
Rename ReadPumpStateCommand -> GetPumpStateCommand. 2017-08-27 18:05:04 +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 ba967df2e3 disable careportal buttons until profile is set 2017-08-27 11:44:39 +02:00
Milos Kozak b02b1829ad put back sensitivity plugins 2017-08-26 21:26:40 +02:00
Milos Kozak 3369ce1759 temporary remove untested plugin for release 2017-08-26 20:42:25 +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 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
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 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
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 2f3d362240
Use SystemClock.sleep() instead of Thread.sleep() throughout. 2017-08-12 15:22:55 +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
AdrianLxM f861546e12 Quickfix to avoid crashes after staleData merge 2017-08-12 11:20:56 +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
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
Milos Kozak f703c82ca7 microbolus calculation 2017-08-10 17:28:41 +02:00
Timm Korte e7249bf72e Merge remote-tracking branch 'milosremote/dev' into develop 2017-08-10 11:13:21 +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
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 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 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 1604b85d34 Merge branch 'dev' into move-to-range-in-profile 2017-08-05 14:48:41 +02:00
Johannes Mockenhaupt 8aabc346c0
Update ComboPlugin.cancelTempBasal to user newly added userRequested param. 2017-08-05 13:06:10 +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 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
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 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 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
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
Milos Kozak 668008e1c1 cancel current temp before activating superbolus 2017-07-31 19:53:09 +02:00
Sandra Keßler 14fdc14807 maybe better error recovery? 2017-07-31 12:59:03 +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
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
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
AdrianLxM 76c0b999ff determine max possible tbr firstshot 2017-07-26 18:11:45 +02:00
Johannes Mockenhaupt 0516eacfe5
ConfigBuilder.applyAPSResult: log request rate. 2017-07-26 14:44:21 +02:00
AdrianLxM 5569b42ac3 wear wizard percentage 2017-07-26 09:58:51 +02:00
Milos Kozak 4bb3b7c11d Merge pull request #323 from MilosKozak/nsclient-local-second 
Nsclient local broadcasts
 2017-07-25 19:51:57 +02:00
Milos Kozak f1e21053b5 use key instead of string 2017-07-25 19:24:51 +02:00
Milos Kozak d6cb8ef6bc check for existing value 2017-07-25 19:18:51 +02:00
Milos Kozak 252b24cefe Merge pull request #313 from MilosKozak/synchronize-nsclientlog 
synchronize NSClient log
 2017-07-25 12:50:48 +02:00
Johannes Mockenhaupt 58505922f2 Merge branch 'fixTBR' into 'combo' 
fix >500% basal setting

See merge request !3
 2017-07-25 09:35:59 +00:00
Sandra Keßler f68042af66 fix >500% basal setting 2017-07-24 18:39:43 +02:00
Johannes Mockenhaupt 674fb398b8
Safeguard against communication issues with ruffy. 
In most cases we can't do much, but we can handle exceptions
and show a notification and message what's wrong, so the user
can try to fix the issue.

Fixes jotomo/AndroidAPS#35.
 2017-07-24 12:59:56 +02:00
Johannes Mockenhaupt 81f3aea42a
Provide basic pump data for upload. 2017-07-24 12:59:56 +02:00
AdrianLxM 3500e92a41 nsclient ackAlarm local 2017-07-24 02:33:29 +02:00
AdrianLxM d60321b4d1 nsclient alarms local 2017-07-24 02:27:16 +02:00
Johannes Mockenhaupt e6eee42081
Merge remote-tracking branch 'origin/dev' into combo 
* origin/dev:
  recategorize cp icons
  removed unnecessary text colour and fixed indentation
  layout indentation
  Moving some buttons to the right categories
  removed empty ghost files
  remove duplicate IDs and indentation fix
  Picture renaming (#311)
 2017-07-24 02:25:28 +02:00
AdrianLxM a4864c3d06 nsclient cal local 2017-07-24 02:09:26 +02:00
AdrianLxM 194a817332 nsclient devicestatus local 2017-07-24 02:06:05 +02:00
AdrianLxM fe57d4a61d nsclient mbg local 2017-07-24 02:02:54 +02:00
AdrianLxM 82b99e1708 nsclient status local 2017-07-24 02:00:46 +02:00
AdrianLxM 759154e578 nsclient profile local 2017-07-24 01:58:23 +02:00
AdrianLxM 7a171bd949 nsclient sgv local 2017-07-24 01:55:01 +02:00
AdrianLxM 38100e758e nsclient treatments local 2017-07-24 01:50:27 +02:00
AdrianLxM 796b7ecdf2 rename package lowercase 2017-07-24 00:12:53 +02:00
Johannes Mockenhaupt cc715cf76f
Notes, typo. 2017-07-23 17:51:08 +02:00
Johannes Mockenhaupt 9826c1d953
Bugfix: NPE when refreshing pump status without a profile set. 
The base basal rate is a different thing than a TBR rate, when a TBR
is running the PumpStatus has a tbrRate, when no TBR is running
there's no TBR rate, so don't display the base basal rate.
 2017-07-23 14:07:46 +02:00
AdrianLxM 5e1e48be0a Allow prime/fill 2017-07-23 00:24:27 +00:00
Johannes Mockenhaupt e45acab420
Return original exception in case retry fails as well. 2017-07-22 02:13:34 +02:00
AdrianLxM 0b6c9845fa synchronize NSClient log 2017-07-22 01:43:33 +02:00
Johannes Mockenhaupt d0d3e46e03
Log exception when automatically retrying command. 2017-07-22 00:44:53 +02:00
Johannes Mockenhaupt 0029fdad01
Combo-specifici hack: Consider a TBR with less than 60 seconds left as completed 
when determining whether to set a new TBR.

Setting a new TBR overrides an running TBR if any, so this won't fail on
the Combo. Without this, a TBR mostly runs out 20 seconds after a loop
iteration (when receiving a SGV), so for that almost 5 minutes to TBR
is set.

Note that this is Combo-specific and needs to be revised when
integrating this with mainline.
 2017-07-21 22:45:47 +02:00
AdrianLxM 10d27f0b6a Picture renaming (#311) 
* adding icons
 2017-07-21 22:24:06 +02:00
Johannes Mockenhaupt 3bd865a870
Merge remote-tracking branch 'origin/dev' into combo 
* origin/dev:
  1.5e
  Let CircadianPercentageProfileFragment inherit from SubscriberFragment.
  Fix after merge-conflict cleanup
  Files renamed
  Added icons for home, actions and care portal screens
  update bg translation
  synchronize interval access from other classes
  remove unnecessary semicolons
  spanish emptiy string
  remove extra strings
  self asignment -> comment
  string comparison
  Add color of chart to corresponding lables/scale
  Update InsulinFastactingProlongedFragment.java
  Update InsulinFastactingFragment.java
  Extract SubscriberFragment base class.
  Have most fragments update their content in onResume.
 2017-07-21 17:42:27 +02:00
Johannes Mockenhaupt d7eee17112
Fix creating treatment record when bolusing (carb only treatment). 2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt 46b1dff334
Make accessing pump/cmd state in Fragment safer. 2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt 63131f73d0
Cleanups. 2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt 29cb1def50
Fix up "Rebind ruffy if there is an exception.". 
Some removals, but more importantly to note that
the commit set pump/command state variables
volatile again.
 2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt 5c36094b8b
Remove some debug code. 2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt d85425e68b
NPE guard. 2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt d5bf5812b7
Rebind ruffy if there is an exception. 2017-07-21 17:40:12 +02:00
AdrianLxM 3d82bdb347 Merge pull request #295 from jotomo/on-resume-update-gui 
On resume update gui
 2017-07-21 16:47:28 +02:00
AdrianLxM 06497a862d Merge pull request #303 from AdrianLxM/synchronize-intervals 
synchronize interval access from other classes
 2017-07-21 16:47:00 +02:00
AdrianLxM 6d1c0feeab Merge pull request #302 from AdrianLxM/cleanups 
Cleanups
 2017-07-21 16:46:48 +02:00
Johannes Mockenhaupt fdc0aea24b
Let CircadianPercentageProfileFragment inherit from SubscriberFragment. 2017-07-21 14:56:14 +02:00
AdrianLxM 42263e979e synchronize interval access from other classes 2017-07-20 02:43:01 +02:00
AdrianLxM b72482601e remove unnecessary semicolons 2017-07-20 01:06:41 +02:00
AdrianLxM 6daff6fae9 self asignment -> comment 2017-07-20 01:05:25 +02:00
AdrianLxM c35b7bb9d6 string comparison 2017-07-20 01:05:05 +02:00
AdrianLxM 03ad898562 Merge branch 'dev' into on-resume-update-gui 2017-07-20 00:17:32 +02:00
AdrianLxM 98bb792264 Add color of chart to corresponding lables/scale 2017-07-19 23:46:32 +02:00
Johannes Mockenhaupt e322b15e1c
debug: setTbrPercent: 5 minute head start 2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt a55756367f
ComboPlugin: use CommandResult.completionTime for treatment entries. 2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt a8ecc85429
ConfigBuilderPlugin.applyApsResult: more verbose logging 
Log whether the pump was asked to set a TBR if if that is skipped
since the pump still runs the requested TBR and for how long.
 2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt a7c77bc177
Add "pump error (message)" as a field in Combo fragement. 2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt 8cdd604b84
Merge remote-tracking branch 'origin/dev' into combo 
* origin/dev:
  bulgarian removed non-translatable
  synchronize interval access
  nsclient remove debug data that puts stress on the broadcast system 3
  nsclient remove debug data that puts stress on the broadcast system 2
  nsclient remove debug data that puts stress on the broadcast system
  Align OpenAS(A)MA fragments with layout of other fragments.
  local broadcasts better setting title
  setting to disable local broadcasts in NSClient
  removed some "unneeded" translations
  wear tdd weighted
  wear TDD status
  wear menu simplification
  Translated latest additions strings.xml
  ns client quickfix now catch all
  NS client quickfix - catch even more
  catch TransactionTooLargeException
  TT new "old" logic for temp targets
  TT refactor OverlappingIntervals to two classes with an abstract superclass Intervals

# Conflicts:
#	app/src/main/res/values/strings.xml
 2017-07-19 19:54:50 +02:00
AdrianLxM f220bb034e Merge pull request #286 from AdrianLxM/temp-target-logic 
Temp target logic
 2017-07-19 19:33:17 +02:00
AdrianLxM e51954cec3 Merge pull request #292 from AdrianLxM/wear-tdd 
Wear tdd
 2017-07-19 19:05:41 +02:00
AdrianLxM 76990b7983 synchronize interval access 2017-07-19 17:39:55 +02:00
AdrianLxM e6ce35485a nsclient remove debug data that puts stress on the broadcast system 3 2017-07-19 16:09:34 +02:00
AdrianLxM 621c32d832 nsclient remove debug data that puts stress on the broadcast system 2 2017-07-19 16:06:36 +02:00
AdrianLxM c1e030d789 nsclient remove debug data that puts stress on the broadcast system 2017-07-19 16:05:13 +02:00
Johannes Mockenhaupt 7b16716b65
Clean up statusSumary, command result and pump status. 2017-07-19 01:53:37 +02:00
Johannes Mockenhaupt 485b99e260
Show last command and pump state better in the Combo tab. 
Gets rid of unhelpful "Unknown error" messaegs.
 2017-07-19 01:33:19 +02:00
Johannes Mockenhaupt 825a87f474
Use OpenAPS-requested duration for TBRs. 2017-07-18 23:57:48 +02:00
AdrianLxM c753873769 setting to disable local broadcasts in NSClient 2017-07-18 22:15:17 +02:00
Johannes Mockenhaupt 14d7043600
Skip fetching initial pump state if ruffy service isn't ready yet. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt f3b508ba2d
Combo tab: refresh on resume 
Since we're not getting events when the fragement is not displayed,
since we're unregistering from event in onPause.
 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt b4950b3037
Provide suspended state information to AAPS. 
AAPS seems to still try to issue commands (like cancel TBR,
though none is running?)), despite showing "Pump suspended"
on the home screen.
With the DanaR, AAPS also tries to run commands when the
pump is suspended, but there, the treatment is logged
as being administered despite the pump not having done that.

Here, the pump response with success=false, enacted=false,
which causes the ComboPlugin class to NOT create any
treatments. No errors are raised, as this is considered a regular
state: no treatments are enacted, overview screen shows
"pump suspended" and the combo beeping away.
That AAPS still tries to issue TBR commands ... that's AAPS'
problem for now. Buttons to issue boluses are hiden though.
 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt 599f3ce23c
Order methods in the order they're called, start Alerter service earlier to make sure it can catch early errors. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt 487e9deb88
Set an error state when the ruffy service can't be bound. 
See code comment.
 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt 36966c8907
Handle the pump being stopped: don't treat it like an error, but don't execute commands either. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt 222ad0a527
Improve display of error state in Combo tab. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt 7fa59c6c16
Combo tab: we have set a TBR duration, we're not showing how much time is remaing, but what has been set. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt e9fa9b1788
Silly me, of course fragments (and everything else) are recreated by Android all the time. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt 29e7ea1966
Don't ignore user requests to update pump data, tweak alerter. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt 5f43f0f147
* Fix stale data in Combo tab after error 
* Add info about last command ran to the Combo tab
* Don't refresh data more than once a minute.
* Specify not only error, but also command that raised the error in
  alert notification
 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt 6faa1614ac
ComboFragment: rename Update Button to Refresh. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt aa98864d65
... this should have gone into earlier commit, the UI one? 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt ecf3866b43
Improve alerter. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt ccffa3bfca
Add alerter thread to ComboPlugin that raises an alarm every 6 minutes (Android will by default silence alarms that go off within less than 5 minutes) when the pump state shows an error condition. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt 362c3681d5
Clean up commands package. 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt d619796019
Improving pump status in the UI (combo tab) 2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt b954ddaa84
Clean up ComoPlugin a bit. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt ccd81c67fd
UI for pump state. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt 83e9ec743e
Properly accessing volatile field pumpState. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt 69e560baee
Cleanup. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt 3aecf0f58b
Be more cautious handling command failures. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt 8dd714b390
UI crimes 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt 8ecf6922f7
Misc improvements: 
* Make command execution (RuffyScripter/ComoboPlugin.runCommand) more robust (I still suck at threading).
* Return all possible states in PumpState
* Add absolute TBR to PumpState
* Add NoOpCommand to fetch state data from pump
* Display returned pump state in Combo fragment/tab.
 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt 69b98c54c6
Polish. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt f6c8f3638b
Reflect reject TBR change in comment. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt 364123c261
Fix carb only treatment. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt d0dabf34da
Fix handling TBR CANCELLED alert, remove ill-advised attempts to fake a command queue and have all commands return a state object. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt 77711b2174
ComboPlugin.runCommand: wait if pump is busy with a command. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt 8bc4cd255a
Don't close connection when other cmds are about to be run. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt f5ef666061
Add timestamp to State and rename to PumpState. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt f28a27a93f
Read pump state. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt 9d8d12fcb9
Cleanups. 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt eab9d8dcd7
Fix reducing duration of OpenAPS TBRs 2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt 30fc385970
Apply pump specific modifications to OpenAPS suggestion in ComboPlugin. 2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt 8b21bb1203
Skip TBR changes smaller than 20%. 
~50 TBR changes in a 6 hour night seem excessive, even if pump was
handicapped by not being connected and thus not having any effect
to work with.
 2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt 8e2cd844a5
Round requested absolute TBR to percent TBR. 2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt a21da8aba7
Remove pointless events about connection status. 2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt 848a32eade
Logging cleanup. 2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt 264e252300
Set last command date. 
Though this is only relevant when starting to fetch data from the pump.
 2017-07-18 20:55:48 +02:00
Johannes Mockenhaupt 336315823e
ComboPlugin.getBaseBasalRate: return profile value. 2017-07-18 20:55:48 +02:00
Johannes Mockenhaupt f34fed1f05
Semi-fix bolusing not logging a treatment when there was an error. 2017-07-18 20:55:47 +02:00