Commit graph

178 commits

Author SHA1 Message Date
AdrianLxM
1e1a58468f TDD 01 2018-03-19 19:08:51 +01:00
Milos Kozak
7f0918d147
Merge pull request #770 from jotomo/new-bg-processing
Trigger loop only for new and current BGs from the active BG source
2018-03-18 20:47:28 +01:00
Johannes Mockenhaupt
643f3aee6c
Merge branch 'dev' into dev-merge 2018-03-18 20:20:40 +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
Milos Kozak
f7621c4cc5 Profile tests 2018-03-18 15:02:21 +01:00
Milos Kozak
3f29ca3b96 more checks for null profile 2018-03-17 18:07:22 +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
Johannes Mockenhaupt
a7ca483565
Rename isActiveBgSource -> isFromActiveBgSource. 2018-03-17 13:36:52 +01:00
Johannes Mockenhaupt
ad3bf19e4c
Handle received EventNewBg depending on args.
(cherry picked from commit 79b7a7b)
2018-03-17 13:28:49 +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
Milos Kozak
2cd7a8e8df
Merge pull request #738 from MilosKozak/unify-target
Unify target
2018-03-10 21:19:49 +01:00
AdrianLxM
6904cb8807
Merge pull request #702 from McHoffi/McHoffi-SMBnotify_true
enable SMB notify by default
2018-03-08 15:17:28 +01:00
AdrianLxM
b880a9bb10 unify target calculation 2 2018-03-08 15:04:48 +01:00
AdrianLxM
d2919f9577 Merge remote-tracking branch 'jotomoremote/watch-updater-service-worker-thread' into watchsmb2 2018-03-04 19:25:26 +01:00
Johannes Mockenhaupt
d679481698
Remove unused method. 2018-03-01 16:12:41 +01:00
Johannes Mockenhaupt
8f813d52fa
WatchUpdaterService: process requests in a separate thread.
Previously, requests were executed on the main thread (base class
is Service, not IntentService), which prompted Android to kill
AAPS multiple times a day due to timeouts (of currently unknown
origins).

(cherry picked from commit 5ae45d5)
2018-03-01 16:12:41 +01:00
AdrianLxM
436e03aa03 wear only print valid boluses 2018-02-24 18:10:59 +01:00
AdrianLxM
6d3048a9b1 wear predictions update on loop run 2018-02-24 17:58:05 +01:00
Johannes Mockenhaupt
87a7249997
Watch: don't bother pump with carbs if pump doesn't support it. 2018-02-21 21:09:23 +01:00
AdrianLxM
c22c22f1d7 wear settings for predictions 2018-02-21 15:56:13 +01:00
AdrianLxM
c6a3efb60e wear adaptive prediction timeframe 2018-02-21 14:23:52 +01:00
AdrianLxM
88ea215f66 add boluses to wear payload 2018-02-20 12:27:47 +01:00
McHoffi
6ed8aceff3
Update WearPlugin.java 2018-02-19 20:52:10 +01:00
Johannes Mockenhaupt
1e3f6dd192
Disable wear plugin by default. 2018-02-18 02:20:49 +01:00
AdrianLxM
a23c76f473
Merge branch 'dev' into smb-wear2 2018-02-14 15:03:45 +01:00
AdrianLxM
c821ef97d8 option to enable wear/SMB notifications 2018-02-14 15:02:04 +01:00
AdrianLxM
7270b0b2f5 no wear vibrations on SMB 2018-02-14 14:59:26 +01:00
Milos Kozak
0ab2d5ba38 unstatic IobCobCalculatorPlugin 2018-02-12 19:49:08 +01:00
Milos Kozak
fa2e46fbe5 remove CPP profile 2018-02-11 23:02:21 +01:00
Milos Kozak
943205c782 HardLimits refactor 2018-02-11 22:41:10 +01:00
Milos Kozak
6312b81e10 Merge branch 'smb060' into dev 2018-02-02 10:51:13 +01:00
AdrianLxM
96668cbf9b
check for null profile 2018-02-01 18:45:48 +01:00
Johannes Mockenhaupt
6fa1badcdb
Clean up parsing of SMB result and applying the requests. 2018-01-29 03:13:57 +01:00
Milos Kozak
a3e6794138 check for no profile 2018-01-25 11:09:58 +01:00
Milos Kozak
7fdc146b91 getLastAutosensData improvement and logging 2018-01-16 19:28:25 +01:00
AdrianLxM
c3d14b506d allow old data on the wf 2018-01-04 16:20:49 +01:00
Andrew Warrington
8b37826335 Steampunk watch face - improvement of the units switching functionality (less time spent on "?" on glucose dial). 2018-01-03 10:41:18 +01:00
Andrew Warrington
7475b1ba3a Merge remote-tracking branch 'origin/dev' into watchfaces 2018-01-01 22:36:07 +01:00
Milos Kozak
d2753e0dad another cob fix 2018-01-01 14:38:37 +01:00
AdrianLxM
fb2271e758
Merge pull request #568 from MilosKozak/AdrianLxM-patch-3
Wear: No guard for RS
2017-12-30 22:20:37 +01:00
Andrew Warrington
c43afd9d28 Merge remote-tracking branch 'origin/dev' into watchfaces 2017-12-28 01:03:02 +01:00
AdrianLxM
bd4e51e1f9
Merge pull request #546 from andrew-warrington/dev
Always show basal rates on watch, whether temporary or normal.
2017-12-27 23:17:52 +01:00
AdrianLxM
774203605f
Wear: No guard for RS 2017-12-27 21:19:57 +01:00
Milos Kozak
e2f6e6a450
Merge pull request #547 from MilosKozak/wear-noFakebolusProgressDismiss2
don't show single connection timeouts on the watch
2017-12-25 20:44:39 +01:00
Andrew Warrington
176c5f46ff Ensure basal rate shown as a percentage if required according to user preferences. 2017-12-21 09:50:16 +01:00
Milos Kozak
0d7e950b73
Merge pull request #505 from jotomo/sync-to-pump
Remove sync to pump pref, always sync
2017-12-20 10:49:47 +01:00
AdrianLxM
3342d9daa3 don't show single connection timeouts on the watch 2017-12-19 14:47:55 +01:00
Andrew Warrington
b180569695 Show watch basal rates, whether temporary or normal. 2017-12-18 21:58:02 +01:00