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

1667 commits

Author SHA1 Message Date
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
Johannes Mockenhaupt e29ef5ffce
Update treatment history when setting/cancelling a TBR. 2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt a27bb28e87
ComboPlugin.deliverTreatment: return command message as comment in PumpEnactResult. 
Important when there's an error.
 2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt 76578872d1
ComoPlugin.deliverTreatment: take more time. 
Even if not interacting with the pump, AAPS calculator doesn't dismiss the
dialog if we return within the first 5s.
 2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt d39d58913d
Implement #8, add treatment to history. 2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt 1c1a28f0a8
Ignore requests to issue BolusCommands for zero units. 2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt 5f1ab4e45c
Set duration in PumpEnactResult when issuing SetTbrCommand. 2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt 6842abd157
Provide fake current basal rate. 2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt 3b50a5ae70
Update Combo PumpDescription w.r.t extended bolus. 2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt 7cb0268afc
Disconnect after issuing comand to Combo. 2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt 481c63fa57
Initial work on the ComboPlugin. 2017-07-18 20:54:59 +02:00
Johannes Mockenhaupt ab9908438e
Add Combo short name. 2017-07-18 20:54:57 +02:00
Milos Kozak 30b7697002
adjust combo driver for latest changes 2017-07-18 20:54:14 +02:00
Milos Kozak e9f5241821
add missing interface functions to combo 2017-07-18 20:54:14 +02:00
Milos Kozak 253c2a34e5
combo plugin skeleton 2017-07-18 20:54:13 +02:00
AdrianLxM c79a5725fd Update InsulinFastactingProlongedFragment.java 
... in case DIA has changed.
 2017-07-18 13:19:43 +02:00
AdrianLxM 741f6bd866 Update InsulinFastactingFragment.java 
... in case DIA has changed
 2017-07-18 13:18:41 +02:00
Johannes Mockenhaupt 7eacd5021c
Use target ranges from profile, rather than fixed values from prefs. 2017-07-18 13:04:15 +02:00
Johannes Mockenhaupt 435ec55580
Extract SubscriberFragment base class. 2017-07-18 12:59:25 +02:00
Johannes Mockenhaupt 7c6bdc0b31
Have most fragments update their content in onResume. 2017-07-18 12:38:42 +02:00
AdrianLxM e0c1f65b8b wear tdd weighted 2017-07-17 22:40:05 +02:00
AdrianLxM 50c26f28fd wear TDD status 2017-07-17 22:39:48 +02:00
AdrianLxM 387cfcccaf wear menu simplification 2017-07-17 22:39:00 +02:00
AdrianLxM 0d1ff3d721 ns client quickfix now catch all 2017-07-16 16:49:26 +02:00
AdrianLxM c64c5f5401 NS client quickfix - catch even more 2017-07-16 16:38:01 +02:00
AdrianLxM d5599f1f00 catch TransactionTooLargeException 2017-07-16 16:00:04 +02:00
AdrianLxM b79beda971 wear pass through overview notifications 2017-07-15 16:03:04 +02:00
AdrianLxM cb08d1d76b TT new "old" logic for temp targets 2017-07-15 13:37:48 +02:00
AdrianLxM 9eaba98dfa TT refactor OverlappingIntervals to two classes with an abstract superclass Intervals 2017-07-15 13:37:48 +02:00
Johannes Mockenhaupt 80124e6d7b
Bolus wizard: use PumpDescription to round final bolus to a value compatible with the pump. 2017-07-14 23:52:16 +02:00
Milos Kozak 0e6a93df90 Merge pull request #279 from AdrianLxM/cpp-wear2 
Cpp wear
 2017-07-12 08:18:57 +02:00
Milos Kozak 3e9734188b check for array size 2017-07-11 11:27:14 +02:00
Milos Kozak e33d757975 Merge pull request #277 from AdrianLxM/refactor-profileswitch 
extract method for new ProfileSwitch
 2017-07-10 08:13:07 +02:00
AdrianLxM b53c40c4ad cpp-watch update while in backtround 2017-07-10 05:26:24 +02:00
AdrianLxM 7fa8ea7224 cpp-watch working2 2017-07-10 04:46:29 +02:00
AdrianLxM 7f0e611783 cpp watch working1 2017-07-10 04:46:13 +02:00
AdrianLxM 0bff8e2778 extract method for new ProfileSwitch 2017-07-10 04:45:43 +02:00
AdrianLxM 26f3362ffc cpp-watch first roundtrip 2017-07-10 04:45:22 +02:00
AdrianLxM 85d028abff cpp watch openactivity 2017-07-10 04:45:08 +02:00
AdrianLxM 39ee68e62a cpp-watch external-function 2017-07-10 04:44:46 +02:00
AdrianLxM 5ea8cff751 extract method for new ProfileSwitch 2017-07-10 01:25:48 +02:00
Milos Kozak 059ac4040e fix 640g plugin 2017-07-09 23:12:57 +02:00
Milos Kozak 551ff70bc8 forgotten file 2017-07-07 19:35:45 +02:00
Milos Kozak d61d35fa82 move class to correct place 2017-07-07 18:37:15 +02:00
Milos Kozak 8de7e05dd5 weightedaverage sensitivity 2017-07-07 15:08:21 +02:00
Milos Kozak 31e9f3f55c Merge pull request #274 from AdrianLxM/wear-oaps-reason-result 
wear show oaps result/reason
 2017-07-04 12:01:47 +02:00
Milos Kozak 24259470ad Merge pull request #275 from AdrianLxM/fakeextended-fix 
Fake extended fix
 2017-07-04 12:01:12 +02:00
AdrianLxM a45fd1619e fake extended fix 3 2017-07-04 01:43:56 +02:00
AdrianLxM 1922a1b121 fake extended fix 2 2017-07-04 00:17:26 +02:00
Milos Kozak 7b9e5fec1e autosens warning 2017-07-04 00:16:35 +02:00
AdrianLxM 1574d94aa6 fake extended fix 2017-07-04 00:03:50 +02:00
Milos Kozak c75bb0e453 fix sensitivy 2017-07-03 21:21:20 +02:00
Milos Kozak ebf56d0032 double check units are in profile 2017-07-03 11:14:30 +02:00
AdrianLxM e81b217c94 wear show oaps result/reason 2017-07-03 01:47:58 +02:00
Milos Kozak 5a27f9afa1 allow lock screen in nsclient mode 2017-07-03 00:02:54 +02:00
Milos Kozak e0e0a75519 allow ISO format with miliseconds 2017-07-02 12:49:25 +02:00
Milos Kozak e9dba7136d nsclient layout for phones 2017-07-02 11:28:03 +02:00
Milos Kozak d4537a001f check for null profile in watchupdaterservice 2017-06-30 23:59:12 +02:00
Milos Kozak b4ab1d4109 fix types in configbuilder 2017-06-30 21:35:07 +02:00
Milos Kozak 09e5fdc61b sensitivity prefs cleanup 2017-06-30 11:56:36 +02:00
Milos Kozak 448cf7ea85 use default dia when no profile available 2017-06-30 11:18:51 +02:00
Milos Kozak 51b01a0993 split device statuses too before broadcast 2017-06-30 10:57:29 +02:00
Milos Kozak f0c9ce5a00 fix crash when no profile loaded from pump yet 2017-06-30 10:47:30 +02:00
Milos Kozak 38002be73d check for units null 2017-06-30 10:35:05 +02:00
Milos Kozak 63ad0704fa Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-06-30 10:23:31 +02:00
Milos Kozak 1e5f96f841 split treatments to smaller chunks before broadcast 2017-06-30 10:23:24 +02:00
Milos Kozak 9e8c91319e move ns version to about dialog 2017-06-30 09:55:47 +02:00
Milos Kozak 514d6d4dd5 fix crash in instantiating fragment 2017-06-30 09:46:56 +02:00
Milos Kozak 39c6ae5eae fix merge conflict 2017-06-30 09:35:20 +02:00
Milos Kozak fec4e60359 Merge pull request #269 from AdrianLxM/percentagevisualization 
visualize absolute rate emulation as percentage
 2017-06-30 00:00:47 +02:00
AdrianLxM 6bbec3411a absolute as percentage update 2017-06-29 23:36:45 +02:00
Milos Kozak 68f90f0da8 Merge pull request #270 from AdrianLxM/danarstats-historyadaption 
DanaRStats adapt to history and work around gaps
 2017-06-29 22:15:06 +02:00
Milos Kozak b4ea205103 Merge pull request #271 from AdrianLxM/diadivisor 
adapt diadivisor
 2017-06-29 22:14:28 +02:00
AdrianLxM 72fbb73c65 bolusprogress without context 2017-06-29 20:24:19 +02:00
AdrianLxM fcab1a267b adapt diadivisor 2017-06-29 19:39:58 +02:00
Milos Kozak d81bb9bf23 fix bolusprogress dialog size 2017-06-29 19:21:34 +02:00
AdrianLxM 1f9ed574b7 DanaRStats adapt to history and work around gaps 2017-06-29 16:24:17 +02:00
AdrianLxM 16e360f200 visualize absolute rate emulation as percentage 2017-06-29 14:14:40 +02:00
Milos Kozak a8338b2dd1 careportal dialog number picker 2017-06-29 01:37:58 +02:00
Milos Kozak f58f70bdca wizard tweaking 2017-06-28 23:11:17 +02:00
Milos Kozak 39e83f0cfe clean context after fragment is destroyed 2017-06-28 10:24:42 +02:00
Milos Kozak e4d55473a1 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-06-28 09:09:29 +02:00
Milos Kozak 5c5c4243bc check for missing bg direction 2017-06-28 09:09:19 +02:00
Milos Kozak c3876c730b numberpicker in wizard dialog 2017-06-27 23:16:23 +02:00
Milos Kozak 4fc935f0bd bolus dialog numberpickers 2017-06-27 19:14:32 +02:00
Milos Kozak ef4a1feda2 numberpicker in calibration dialog 2017-06-27 17:06:23 +02:00
Milos Kozak 341b0660a8 calibration dialog cancel button 2017-06-27 15:25:11 +02:00
Milos Kozak 311a14e457 typo 2017-06-27 13:59:37 +02:00
Milos Kozak 9fb428c128 fix conflict 2017-06-27 13:52:47 +02:00
Milos Kozak 103836717a fix conflict 2017-06-27 13:51:45 +02:00
Milos Kozak 70374ee341 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-06-27 13:42:45 +02:00
Milos Kozak 50ba9720e1 use container for inflate 2017-06-27 13:42:39 +02:00
Milos Kozak 42b42a90eb another check for null 2017-06-27 11:01:38 +02:00
Milos Kozak ab63c2fb48 better check for app initialization 2017-06-27 10:00:22 +02:00
Milos Kozak 7b1b9c9881 dialog widths 2017-06-27 00:11:23 +02:00
Milos Kozak dbd721319e ns uploader status 2017-06-26 22:39:01 +02:00
Milos Kozak 87fb969d9f ns openaps status 2017-06-26 17:21:39 +02:00
Milos Kozak 36b83e4c8a typo 2017-06-26 13:08:45 +02:00
Milos Kozak 47a9d4b9c8 ns pump status 2017-06-26 12:44:03 +02:00
Milos Kozak 3f641f9c30 carbs absorption settings 2017-06-25 11:16:19 +02:00
Milos Kozak ac98852f79 cut off carbs after 4h 2017-06-24 19:55:49 +02:00
Milos Kozak 129f813de2 reset cache on ConfigBuilderChange event 2017-06-24 15:11:30 +02:00
Milos Kozak 70aaafa616 copy old oref0 sensitivity code 2017-06-24 15:04:22 +02:00
Milos Kozak b39f59f59e remove unneeded fragments 2017-06-24 13:22:50 +02:00
Milos Kozak 5360129e5f sensitivity plugins 2017-06-24 11:04:09 +02:00
Milos Kozak 240f9618f5 Merge branch 'dev' into newautosens 2017-06-21 09:04:38 +02:00
Milos Kozak 3e7c4b1350 NS high & low alarms with sound 2017-06-21 07:28:04 +02:00
Milos Kozak 7f92f42923 cob on overview 2017-06-20 20:30:50 +02:00
Milos Kozak 33de4e8f2a schedule overview update 500ms 2017-06-20 20:13:01 +02:00
Milos Kozak e9898a58c7 show target range as number if equal 2017-06-20 20:10:14 +02:00
Milos Kozak 134efb04bf fix merge conflict 2017-06-20 20:01:09 +02:00
Milos Kozak befdbefa49 fix zero parsing error 2017-06-20 19:58:43 +02:00
Milos Kozak a3757877a3 fix landscape mode 2017-06-20 19:56:25 +02:00
Milos Kozak 80962e33d7 allow to ignore profileswitch events 2017-06-20 19:52:46 +02:00
Milos Kozak c728174858 Merge branch 'dev' into newautosens 2017-06-19 23:13:29 +02:00
Milos Kozak 745f9270ee one more null check 2017-06-19 23:08:56 +02:00
Milos Kozak b185733859 more checks for null 2017-06-19 22:55:56 +02:00
Milos Kozak df3dff1940 revert magic constant 2017-06-19 22:32:54 +02:00
Milos Kozak 4b1263e2e0 small simplify 2017-06-19 16:28:36 +02:00
Milos Kozak 150ef1a8bc Merge branch 'dev' into newautosens 2017-06-19 15:03:35 +02:00
Milos Kozak 6eed701310 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-06-19 14:52:54 +02:00
Milos Kozak 7e1c435374 fix loading danar history 2017-06-19 14:52:46 +02:00
PoweRGbg dcc7112fd8 Update Profile.java 2017-06-19 14:39:49 +03:00
PoweRGbg 6293e89be2 fixed getICList() returning bg units/U to g/hr 2017-06-19 13:10:32 +03:00
Milos Kozak e90812634b work from old autosens branch 2017-06-16 14:37:43 +02:00
Milos Kozak b67d8be1ef dia as primitive 2017-06-16 09:14:57 +02:00
Milos Kozak c78399ded0 cache created objects in profilestore 2017-06-16 09:06:35 +02:00
Milos Kozak 49ef46936b optimize refreshing gui 2017-06-16 08:37:07 +02:00
Milos Kozak 43231cc362 use System.currentTimeMillis() 2017-06-15 23:12:12 +02:00
Milos Kozak 26daffa692 use primitives in inner loops 2017-06-15 22:55:07 +02:00
Milos Kozak 5408562d84 use phone name in devicestatus 2017-06-15 09:45:10 +02:00
Milos Kozak a2aa8d8bc6 bucketed data for non 5min interval 2017-06-15 00:34:42 +02:00
Milos Kozak 2642a12829 schedule correct scheduleExtendedBolusChange 2017-06-14 22:18:01 +02:00
Milos Kozak 9ce78881fb log initiator in loop 2017-06-14 22:12:36 +02:00
Milos Kozak b14cf480cf add duration to profile switch dialogs 2017-06-14 20:41:55 +02:00
Milos Kozak ae2bbf76e5 fix duplicating carb entries 2017-06-14 19:49:01 +02:00
Milos Kozak 0b322e53fc nsclient plugin tweaking 2017-06-13 21:25:50 +02:00
Milos Kozak 745a3cf874 reuse profile object 2017-06-13 19:37:31 +02:00
Milos Kozak 2c2b6c21a1 cancel temp basal in the same connection 2017-06-13 18:47:54 +02:00
Milos Kozak 3a95325039 fix sms reply text 2017-06-13 16:51:59 +02:00
Milos Kozak d3de51cc88 optimize dia 2017-06-13 15:06:41 +02:00
Milos Kozak 2a1fe205ee optimize nsclient logging 2017-06-13 12:17:54 +02:00
Milos Kozak afca896f23 optimize getUnits() & detecting faked extended 2017-06-13 12:08:30 +02:00
Milos Kozak 1de64f06c2 simplify danar activities, fix profiles 2017-06-12 23:31:50 +02:00
Milos Kozak 6fca923275 fix profileswitch reloads 2017-06-12 13:11:16 +02:00
Milos Kozak 0f40670c24 create singleton from NSstatus 2017-06-12 11:15:03 +02:00
Milos Kozak b41a942d11 update supported NS & NSclient versions 2017-06-12 09:30:04 +02:00
Milos Kozak 148f4d43f9 detect faking by extended boluses in nsclient mode 2017-06-12 09:15:51 +02:00
Milos Kozak 77659e20e7 ns alarms & getBasal fix 2017-06-11 17:22:54 +02:00
Milos Kozak bf953f1240 fix maxdailybasal calculation 2017-06-11 14:29:02 +02:00
Milos Kozak 39224f421a fix extended bolus step 2017-06-11 13:37:38 +02:00
Milos Kozak b603fce8c7 do not add empty iob series 2017-06-11 12:44:42 +02:00
Milos Kozak f6650e33e4 remove test buttons 2017-06-10 22:04:59 +02:00
Milos Kozak 723c90c32d optimize rendering 2017-06-10 21:51:58 +02:00
Milos Kozak e6f173f305 fix merge conflict 2017-06-10 13:43:02 +02:00
Milos Kozak 6ce35bc36a Merge branch 'history' of https://github.com/MilosKozak/AndroidAPS into history 2017-06-10 13:41:36 +02:00
Milos Kozak f65d75e553 specify source at detailedbolusinfo 2017-06-10 13:39:51 +02:00