Commit graph

104 commits

Author SHA1 Message Date
Milos Kozak 54c83dc374 L.class 2018-07-29 14:39:56 +02:00
Milos Kozak 6e902cb9ca PUMP logging 2018-07-28 23:38:39 +02:00
Milos Kozak bfccda21cb QUEUE logging cleanup 2018-07-27 12:17:29 +02:00
Johannes Mockenhaupt 33b66e2ce7
Revert "Merge pull request #1131 from jotomo/901"
This reverts commit 268dec0059, reversing
changes made to ab41541c69.
2018-06-29 22:43:54 +02:00
Johannes Mockenhaupt 53b9d5cae3
Fix column type. 2018-06-23 01:27:37 +02:00
Johannes Mockenhaupt 49b84fb550
Reject SMB if bolus is queued/running or outdated. Fixes 1068. 2018-06-21 00:32:23 +02:00
Milos Kozak ecdbe2ac37 setUserOptions cleanup 2018-06-12 23:43:04 +02:00
Roumen Georgiev 06507bab2c update method names 2018-06-12 12:41:40 +03:00
Roumen Georgiev 978d94499f update method names 2018-06-12 11:03:23 +03:00
Roumen Georgiev 01012d817c getting userOptions from v2 2018-06-12 10:29:47 +03:00
Milos Kozak 04fffae811 addd setUserOption to Queue (Dana pumps) 2018-06-06 18:29:40 +02:00
Johannes Mockenhaupt 25aa6f859f
On bolus cancel request, cancel all boluses. Partially addresses #646. 2018-05-13 23:57:40 +02:00
Johannes Mockenhaupt d15ada5cd9
Combo: Fix visual glitch in fragment. 2018-05-04 21:27:54 +02:00
AdrianLxM 5c8e99b191 dismiss bolus progress dialog when Queue is empty 2018-05-04 12:24:37 +02:00
AdrianLxM 5aa3a88c7f remove direct access to sResources 9 2018-05-02 13:59:27 +02:00
AdrianLxM 3979913a6d remove direct access to sResources 4 2018-05-02 13:46:38 +02:00
Milos Kozak c15a4b5efe fix wrong error dialog when only carbs are delivered (R,KoreanR) 2018-04-23 15:24:32 +02:00
AdrianLxM 69c8eea53b
Enforce TBRs on enforceNew 2018-04-20 18:05:37 +02:00
AdrianLxM dd8d907f4f fix TT units 2018-04-18 16:23:40 +02:00
AdrianLxM 2561c3f8b6 Carbs only treatments in Queue 2018-04-18 16:13:02 +02:00
Milos Kozak 80e81b1c25 fix NPE 2018-04-12 09:53:14 +02:00
Milos Kozak 828b20e358 optimize notifications & overview, fix reporting profile update 2018-04-05 23:42:27 +02:00
Milos Kozak a615553047 check for profile already set before notification 2018-04-05 10:02:57 +02:00
Milos Kozak 3cfc9c16fe check 3min timeout SMB right before execution 2018-04-01 22:33:32 +02:00
Milos Kozak 89ee73ef7d fix state when new thread was not started during waiting for pump disconnection 2018-04-01 12:34:41 +02:00
Milos Kozak 0a03798de9 move treatments interface out of ConfigBuilder 2018-04-01 11:09:58 +02:00
Milos Kozak 3b3662af80 Merge branch 'dev' into wip 2018-03-31 00:39:35 +02:00
Milos Kozak bcb733e42c Plugins refactor 2018-03-31 00:36:03 +02:00
Johannes Mockenhaupt 52c6d209af
Clean up initial profile push to pump. 2018-03-28 21:20:56 +02:00
AdrianLxM a5d0ec45cc Merge remote-tracking branch 'milosremote/dev' into tdds-again-merged 2018-03-26 08:39:24 +02:00
Milos Kozak 1aba9a2564 applyCarbsConstraints refactor & tests 2018-03-22 10:31:07 +01:00
Milos Kozak 15158fb5ea applyBolusConstraints refactor & tests 2018-03-21 23:01:30 +01:00
Milos Kozak e2ea44a8a8 applyBasalPercentConstraints reactor & tests part1 2018-03-21 20:24:02 +01:00
Milos Kozak 15ebfc1193 applyBasalConstraints reactor & tests 2018-03-20 22:09:22 +01:00
AdrianLxM 1e1a58468f TDD 01 2018-03-19 19:08:51 +01:00
Milos Kozak ce63655097 move constraints interface functions from ConfigBuilder to ConstraintsChecker class 2018-03-19 18:21:02 +01:00
Johannes Mockenhaupt 643f3aee6c
Merge branch 'dev' into dev-merge 2018-03-18 20:20:40 +01:00
Milos Kozak 106de14f9a
Merge branch 'dev' into nodefaultprofile 2018-03-18 19:58:36 +01:00
Johannes Mockenhaupt 89d59584d5
Merge remote-tracking branch 'origin/dev' into dev-merge
* origin/dev:
  prepend line feed like suggested on jamoto code review
  Rename method to reflect jomoto code review
  Unit tests are always in engmode
  Fix boolean stuff in accordance to code review with adrian
  Cleanup boolean algrabra, add method for environment retrieval from logcontexxt
  Determine directory from logback
  more checks for null profile
  Disallow profile store on pump if on dev branch but not in engineering mode
  Disable profile switch if not in Engineering mode and on dev branch
  Add info to About dialog when engineering mode is enabled.
  On start, show notification if on dev-branch, but not EM, so CL is disabled.
  Add basic Engineering mode.

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/MainActivity.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java
#	app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
#	app/src/main/res/values/strings.xml
2018-03-18 19:47:23 +01:00
Markus M. May f0bec534fa Rename method to reflect jomoto code review 2018-03-18 17:38:05 +01:00
Milos Kozak df3c226d5a notify by SMS on new ProfileSwitch instead of profile 2018-03-18 10:35:37 +01:00
Markus M. May 9b020f68db Correct merge 2018-03-17 20:52:19 +01:00
Johannes Mockenhaupt 8457cd3843
Merge remote-tracking branch 'origin/dev' into combo-dev-merge
* origin/dev:
  check for null profile
  remove profile dependency from pump drivers, TRB optimalization
  split enacting TRB and SMB
2018-03-17 13:51:40 +01:00
Milos Kozak 1e359184a9 check for null profile 2018-03-17 08:12:07 +01:00
Milos Kozak b6ce7c03c6 remove profile dependency from pump drivers, TRB optimalization 2018-03-16 16:53:38 +01:00
Johannes Mockenhaupt db00404e43
Merge commit 'origin/dev^' into combo-dev-merge
* commit 'origin/dev^': (313 commits)
  cleanup
  draw profile in dana profile viewer
  optimize imports
  draw basal in profile viewer
  BG autobackfill configurable
  travis 2nd try
  Save new profile when updating it
  Add environment variable to handle testCoverage
  do not pass DIA to SMB determine_basal
  show Dana model properly after communication error
  fix deviation slope calculations
  Read maximum basal and bolus amount from pump
  update maxIOB hard limits
  Allow bolus record only in new treatment dialog
  use safeGetString
  JsonHelper test
  food code cleanup
  Show bolus progress
  Missing import statement
  Insight: add treatment to progress event
  ...
2018-03-16 15:44:54 +01:00
Markus M. May 2c3f28670c Disallow profile store on pump if on dev branch but not in engineering mode 2018-03-15 23:00:08 +01:00
Jamorham 7854a51cc0
Remove commented out old code 2018-02-23 09:15:47 +00:00
JamOrHam bc2f749ef3
Merge branch 'dev' into dev 2018-02-21 13:43:18 +00:00
Jamorham 208c3ed9b1
Don't wake screen in QueueThread use PARTIAL_WAKE_LOCK instead 2018-02-18 15:00:24 +00:00