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

3801 commits

Author SHA1 Message Date
Johannes Mockenhaupt a36a9b0746
Move check for running setProfile command to KeepAlive. 2018-03-28 22:49:43 +02:00
Johannes Mockenhaupt 014864f0db
Trigger fabric event on user request, not queuing time. 2018-03-28 22:12:14 +02:00
Johannes Mockenhaupt 52c6d209af
Clean up initial profile push to pump. 2018-03-28 21:20:56 +02:00
Milos Kozak 259b5fa818
Merge pull request #809 from MilosKozak/tdds-again-merged 
Tdds again merged
 2018-03-28 17:35:23 +02:00
Milos Kozak fc2da20743 fix conflict 2018-03-28 10:25:58 +02:00
Milos Kozak e9b499314d PUMP SMS command, connect to pump before reporting SMS STATUS 2018-03-28 10:22:10 +02:00
Milos Kozak 7b43971618 fix NPE 2018-03-27 21:49:10 +02:00
Milos Kozak 27c4fe3309 fix NPE 2018-03-27 21:43:35 +02:00
Milos Kozak e49d430a50 revert DetailedBulusInflo cloning 2018-03-27 20:16:33 +02:00
Milos Kozak cb4b117152 fix extended bolus NS upload 2018-03-27 20:00:34 +02:00
Milos Kozak 3567320788 fix test 2018-03-27 19:45:44 +02:00
Milos Kozak eaecf48577 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-03-27 16:41:44 +02:00
Milos Kozak 95f2e5d913 IobTotalTest 2018-03-27 16:41:37 +02:00
Milos Kozak 6aa568a03e
Merge pull request #812 from jotomo/cleanups 
Cleanups
 2018-03-27 16:38:49 +02:00
Johannes Mockenhaupt dffdc49c3b
SMB fragement: trim superflous newlines. 2018-03-27 14:52:36 +02:00
Johannes Mockenhaupt da6f6dfe72
Clean up missed spots w.r.t. to FabricPrivacy transition. 2018-03-27 14:52:31 +02:00
Milos Kozak 689fda5969 IobTest 2018-03-27 14:36:43 +02:00
Milos Kozak 1b9b20cd41 1st ProfileSwitch must be with zero duration, ProfileIntervalsTest 2018-03-27 14:19:52 +02:00
Milos Kozak 0a87b0ede7 MealDataTest 2018-03-26 22:59:04 +02:00
Milos Kozak f8c9fac7b1 NonOverlapingIntervalsTest 2nd 2018-03-26 22:55:38 +02:00
Milos Kozak cc436a09d9 TempBasal, TempTarget refactor; NonOverlapingIntervalsTest 2018-03-26 22:37:53 +02:00
Milos Kozak a4cb4cbbd5 OverlapingIntervalsTest 2018-03-26 19:46:18 +02:00
Milos Kozak 21c6827cf4 more GlucoseStatusTests 2018-03-26 17:47:25 +02:00
Milos Kozak d071ca5b88 GlucoseStatusTest & fix 2018-03-26 16:51:25 +02:00
Milos Kozak 5c5b8ee2f0 DetailedBolusInfo test & fix 2018-03-26 13:25:53 +02:00
Milos Kozak 482d4f4454 1.60b-dev 2018-03-26 11:07:50 +02:00
Milos Kozak cf619aa1fa nicer scale on basal graph 2018-03-26 11:07:16 +02:00
Milos Kozak d357b00ca6 display activate button properly 2018-03-26 10:56:56 +02:00
Milos Kozak f0e779cb1f set axisWidth based on dpi 2018-03-26 10:53:14 +02:00
Milos Kozak 8e6953cc92 activate button on NSProfile fragment 2018-03-26 09:25:57 +02:00
AdrianLxM 6c20d9b6c6 TDD 13 mergeconflict AbstractDanaPlugin 2018-03-26 08:51:17 +02:00
AdrianLxM 4a4982f6b8 TDD 12 mergeconflict Insight renaming 2018-03-26 08:47:44 +02:00
Milos Kozak 545debde92 fix displaying nsprofile 2018-03-26 08:46:26 +02:00
AdrianLxM a5d0ec45cc Merge remote-tracking branch 'milosremote/dev' into tdds-again-merged 2018-03-26 08:39:24 +02:00
Milos Kozak d5e60fa16f fix negative correction in wizard 2018-03-26 07:49:09 +02:00
Milos Kozak afe3d68a10 display SMB reasons 2018-03-25 23:56:52 +02:00
Milos Kozak 4d6d7941ac try to catch getProfile errors 2018-03-25 18:51:16 +02:00
Milos Kozak afb0249072 try to catch iobcalculation error 2018-03-25 18:03:55 +02:00
Milos Kozak ca12124c10 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-03-25 17:33:17 +02:00
Milos Kozak f939994afa more synchronized access in treatments 2018-03-25 17:33:03 +02:00
Milos Kozak 8c5a2ab524
Merge pull request #799 from jotomo/prime-fill-refresh 
Prime/fill button refresh and some drive-by improvements
 2018-03-25 16:10:39 +02:00
Johannes Mockenhaupt 7c959ce335
Create careportal events with explicit time. 2018-03-25 15:43:48 +02:00
Johannes Mockenhaupt 593174d6d2
Revert all changes to NSUpload. 2018-03-25 15:39:34 +02:00
Milos Kozak 51e0774021 prevent creating careportal event of the same time 2018-03-25 15:02:51 +02:00
Johannes Mockenhaupt 8a2d49b833
Fix the correct method. 2018-03-24 20:13:50 +01:00
Johannes Mockenhaupt 5a6af7f6d5
Unbreak NSUpload.updateProfileSwitch methods. 2018-03-24 20:03:45 +01:00
Milos Kozak 2cfa2ae8cf overview graph rendering update 2018-03-24 18:10:57 +01:00
Milos Kozak bcf71d70dc increase font size 2018-03-24 17:33:23 +01:00
Milos Kozak b2db393436 fix rendering in nsclient mode 2018-03-24 17:21:55 +01:00
Milos Kozak 1dfa8eb1a4 hide deviation slope 2018-03-24 17:10:33 +01:00
Milos Kozak 62d775b78e DEV warning only for APS builds 2018-03-24 17:09:56 +01:00
Milos Kozak 9af8672cab Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-03-24 15:14:40 +01:00
Milos Kozak 90390c91ab fix NPE when profile doesn't exists 2018-03-24 15:13:31 +01:00
Johannes Mockenhaupt 7694c80da9
Fix format specifiers in Spanish translation. 2018-03-24 10:53:46 +01:00
Milos Kozak 3d710dcf46 fix rendering TT in mmol 2018-03-23 23:55:38 +01:00
Johannes Mockenhaupt a4e9cb4976
Fixes. 2018-03-23 23:15:38 +01:00
Johannes Mockenhaupt 8a7776fd74
Code dedup. 2018-03-23 23:07:01 +01:00
Johannes Mockenhaupt 3700ad9813
Ensure new Careportal entries don't use the same second. 2018-03-23 23:06:57 +01:00
Johannes Mockenhaupt 9838e2fabb
Rework prime/fill button. 2018-03-23 23:06:57 +01:00
Johannes Mockenhaupt e5bfa1fb1d
Show boluses with the precision the pump actually supports. 2018-03-23 23:02:35 +01:00
Milos Kozak 22f50198fc rename nsclientinternal -> nsclient 2018-03-23 22:44:37 +01:00
Milos Kozak cbd60cfdbe synchronized access to log in nsclient 2018-03-23 22:37:27 +01:00
Milos Kozak 22d617cbc0 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-03-23 20:53:44 +01:00
Milos Kozak 4502ed6807 1.60a-dev 2018-03-23 20:53:25 +01:00
Milos Kozak 9f67ad6b62 synchronized access to treatment data 2018-03-23 20:52:41 +01:00
Milos Kozak 044a3fc10f LoopPluginTest 2018-03-23 20:10:45 +01:00
Milos Kozak 30f09dc416 show constraints on LoopFragment 2018-03-23 18:23:19 +01:00
Milos Kozak 661595792f rename InsightPump -> Insight 2018-03-23 17:51:05 +01:00
Milos Kozak 15d8719508 collect most limited reason along with all reasons 2018-03-23 17:36:49 +01:00
Milos Kozak 3f5808eca3 show max basal limit on smb fragment 2018-03-23 09:59:07 +01:00
Milos Kozak ad8ff15cdc getMax... constraints functions 2018-03-22 23:20:10 +01:00
Milos Kozak 0f531a9954 objectives cleanup & basal hard limits to constraints 2018-03-22 23:05:00 +01:00
Milos Kozak ba09538f46 AMA - Autosens cleanup 2018-03-22 22:18:40 +01:00
Milos Kozak ae57241833 use default functions in constraint interface 2018-03-22 21:31:32 +01:00
Milos Kozak 76ee3c51e4 applyMaxIOBConstraints refactor & tests 2018-03-22 21:13:26 +01: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 c68ab9f1ca applyBasalPercentConstraints refactor & tests part2 2018-03-21 22:06:28 +01:00
Milos Kozak e2ea44a8a8 applyBasalPercentConstraints reactor & tests part1 2018-03-21 20:24:02 +01:00
Milos Kozak ca70cbdaec
Merge branch 'dev' into newconstraints 2018-03-21 10:48:23 +01:00
Milos Kozak 272fdb4747
Merge pull request #779 from jotomo/loop-results 
Loop results
 2018-03-21 10:44:13 +01:00
Milos Kozak 7a5d8e2ec9 use US locale in tests 2018-03-21 07:51:27 +01:00
Milos Kozak 51ca4cc8c6 show failed tests at the end of travis log 2018-03-21 07:41:03 +01:00
Milos Kozak ad7ec4daca fix tests 2018-03-20 23:47:37 +01:00
Milos Kozak 15ebfc1193 applyBasalConstraints reactor & tests 2018-03-20 22:09:22 +01:00
Johannes Mockenhaupt e117527257
Revert "Merge pull request #770 from jotomo/new-bg-processing" 
This reverts commit 7f0918d147, reversing
changes made to 3f04d10f79.
 2018-03-20 19:05:12 +01:00
Milos Kozak d62a836f6c
resistant adult max bolus 25U 2018-03-20 10:07:52 +01:00
AdrianLxM fd1e78acef TDD 11 - fix DanaR 2018-03-19 23:15:13 +01:00
Milos Kozak c2cfe4e7ea isSMBModeEnabled reactor & tests 2018-03-19 23:14:04 +01:00
Milos Kozak 26ecc3dd60 isAMAModeEnabled reactor & tests 2018-03-19 22:59:25 +01:00
Milos Kozak f8a3b7aee7 isAutosensModeEnabled reactor & tests 2018-03-19 22:36:08 +01:00
Milos Kozak f6fdef7986 isClosedLoopAllowed & isLoopInvokationAllowed tests 2018-03-19 22:20:42 +01:00
AdrianLxM fcf8569b1e TDD 10 - split list and cumulative 2018-03-19 21:54:50 +01:00
AdrianLxM 9177307c37 TDD 09 - fix no data 2018-03-19 21:14:28 +01:00
AdrianLxM 088841ae23 TDD 08 - fix crash on empty 2018-03-19 20:23:45 +01:00
AdrianLxM b6b7955dde TDD 07 2018-03-19 20:03:15 +01:00
AdrianLxM e0dac6f24e TDD 06 2018-03-19 19:49:48 +01:00
AdrianLxM 954f73eabd TDD 05 2018-03-19 19:10:54 +01:00
AdrianLxM db7526a7b5 TDD 04 2018-03-19 19:10:40 +01:00
AdrianLxM f33b4d4838 TDD 03 2018-03-19 19:10:24 +01:00
AdrianLxM 8700f20d5f TDD 02 - combo 2018-03-19 19:10:09 +01:00
AdrianLxM 1e1a58468f TDD 01 2018-03-19 19:08:51 +01:00
AdrianLxM f4cebd8a7c Merge remote-tracking branch 'milosremote/newconstraints' into newconstraints2 2018-03-19 18:49:26 +01:00
AdrianLxM 01a9e76827 refactor a bit 2018-03-19 18:45:23 +01:00
Milos Kozak 7178e1573a fix CommandQueueTest 2018-03-19 18:44:11 +01:00
Milos Kozak ce63655097 move constraints interface functions from ConfigBuilder to ConstraintsChecker class 2018-03-19 18:21:02 +01:00
Milos Kozak 52ffcba047 generic Constraint type 2018-03-19 17:38:48 +01:00
Milos Kozak 326229ebbb limitClosedLoop & remove openloop flavor 2018-03-19 17:06:22 +01:00
Johannes Mockenhaupt 86b25174e2
Combo: unbreak basal rate conversion. 
This aligns the combo with the changes from the nodefaultprofile
merge.
 2018-03-19 15:59:23 +01:00
Milos Kozak 5a96b88499 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into newconstraints 2018-03-19 15:11:50 +01:00
Johannes Mockenhaupt 85d8730eae
Add missing return. 2018-03-19 14:33:57 +01:00
Johannes Mockenhaupt ede1e719d2
CB.applyTBRRequest: enact same-rate TBR ... 
if requested duration is at least 30m longer than the currently
running TBR.
 2018-03-19 14:14:07 +01:00
Johannes Mockenhaupt f918a5f303
More loop results cleanup and i18n. 2018-03-19 14:14:07 +01:00
Johannes Mockenhaupt 706bb913e9
LoopPlugin: fix 'waiting for pump' display for SMB. 2018-03-19 14:14:07 +01:00
Johannes Mockenhaupt d1f1db859b
Translations cleanup. 2018-03-19 14:14:07 +01:00
Johannes Mockenhaupt fad10af11b
Clean ups around PumpEnactResult, APSResult. 2018-03-19 14:08:39 +01:00
Johannes Mockenhaupt 379df79bf8
CB.applySMBRequest: return reason when skipping due to frequency. 2018-03-19 14:08:39 +01:00
Johannes Mockenhaupt 213fc7ccb4
Combo: when suspended, create 0% TBR record, suppress checks. 
Fixes #774
 2018-03-19 14:07:26 +01:00
AdrianLxM 69cfa63fe5 xml-format ro 2018-03-19 13:33:11 +01:00
AdrianLxM 3ade9be7a2 cleanup 2018-03-19 13:32:05 +01:00
Milos Kozak b0a9f678f0 limitRunningLoop constraint 2018-03-19 13:11:25 +01:00
Milos Kozak f413c005f6 CS translations 2018-03-19 10:07:28 +01:00
Milos Kozak 1c413cc49f
Merge pull request #771 from jotomo/remove-pre-bolus 
Next round of button updates
 2018-03-19 09:29:27 +01:00
Milos Kozak 0266a79201 show invalid profiles in treatments tab 2018-03-18 23:41:53 +01:00
Johannes Mockenhaupt da014daec8
Merge branch 'dev' into remove-pre-bolus 2018-03-18 20:48:19 +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
Milos Kozak 106de14f9a
Merge branch 'dev' into nodefaultprofile 2018-03-18 19:58:36 +01:00
Milos Kozak 22d89c3ffc more ProfileTest 2018-03-18 19:59:28 +01:00
Johannes Mockenhaupt 946ce97dc2
Fix app init. 2018-03-18 19:57:28 +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 e916cf4d06 ProfileTest update 2018-03-18 19:15:01 +01:00
Markus M. May 8b7b68003b prepend line feed like suggested on jamoto code review 2018-03-18 17:39:55 +01:00
Markus M. May f0bec534fa Rename method to reflect jomoto code review 2018-03-18 17:38:05 +01:00
Milos Kozak 3ee586b6c0 Profile tests . -> , conversion 2018-03-18 15:09:26 +01:00
Milos Kozak f7621c4cc5 Profile tests 2018-03-18 15:02:21 +01:00
Johannes Mockenhaupt a2ac21ea67
Combo: only reject bolus requests if the requested bolus was delivered 
recently

Since history is being read now (also just before starting to bolus),
it's safe to only reject boluses if the previous request actually
lead to insulin delivery.

Fixes #700.
 2018-03-18 14:36:58 +01:00
Johannes Mockenhaupt c5ebb696a4
Extract EventNewBg.isCurrent() and use when relevant for decision making. 2018-03-18 11:26:15 +01:00
Milos Kozak 7961a9f00a ver 1.60-dev 2018-03-18 10:36:38 +01:00
Milos Kozak df3c226d5a notify by SMS on new ProfileSwitch instead of profile 2018-03-18 10:35:37 +01:00
Milos Kozak e6a606296d profile comming from NS do not trigger EventNewBasalProfile 2018-03-18 10:14:27 +01:00
Milos Kozak 4f43feb12e allow profile to be null 2018-03-17 23:18:34 +01:00
Johannes Mockenhaupt b54a010614
CarbsButton: replace suspend option with 'hypo tt'. 2018-03-17 22:22:26 +01:00
Johannes Mockenhaupt 17219c08d1
Combo: fragment spacing fix. 2018-03-17 22:12:19 +01:00
Markus M. May 18521d6634 Unit tests are always in engmode 2018-03-17 21:48:58 +01:00
Markus M. May c6e8ab35b6 Fix boolean stuff in accordance to code review with adrian 2018-03-17 21:35:16 +01:00
Markus M. May 0d4e8772a9 Cleanup boolean algrabra, add method for environment retrieval from logcontexxt 2018-03-17 21:23:45 +01:00
Markus M. May 72e8e5fd05 Determine directory from logback 2018-03-17 21:14:01 +01:00
Markus M. May 9b020f68db Correct merge 2018-03-17 20:52:19 +01:00
Johannes Mockenhaupt eae6c73671
Buttons: explicitely state that no action will be taken if nothing selected. 2018-03-17 20:39:58 +01:00
Johannes Mockenhaupt 766fe105b2
InsulinButton: remove broken pre-bolus calculation. 2018-03-17 20:02:24 +01:00
Johannes Mockenhaupt 17d5945a91
Don't run loop for back-filled BG either. 2018-03-17 19:46:15 +01:00
Milos Kozak 9a1d7b2c9f remove duplicated code 2018-03-17 18:46:11 +01:00
Milos Kozak 3f29ca3b96 more checks for null profile 2018-03-17 18:07:22 +01:00
Johannes Mockenhaupt 612fc09e52
Merge remote-tracking branch 'origin/dev' into combo-dev-merge 
* origin/dev:
  Don't overlap time ticks with current time
  history browser chart selection
  Insulin button: allow negative presets, fix adding TT insulin.
  Overview: symetric spacing.
  Carbs button: send carbs to pump if pump supports carbs.
  Carbs button: fix visibility pref, input type, allow negative increments.
  Smallscreen fix
  chart menu 4
  chart menu 3
  chart menu 2
  chart menu 1

# Conflicts:
#	app/src/main/res/values/strings.xml
 2018-03-17 16:45:08 +01:00
Milos Kozak 6e5d5c4a26
Merge pull request #769 from jotomo/button-refinement 
Button refinement
 2018-03-17 15:28:41 +01:00
Milos Kozak 2cd1d2014d
Merge pull request #768 from AdrianLxM/chart-menu2 
Chart menu - also for history-browser
 2018-03-17 15:24:54 +01:00
AdrianLxM 42e1c61c90
Merge pull request #766 from AdrianLxM/chart-menu 
Chart menu
 2018-03-17 14:07:20 +01:00
Johannes Mockenhaupt 30a191c6eb
Combo: ruffyscripter: abort a command if an unparsable menu is encountered. 
This happens when the pump is misconfigured (e.g. quick info is
labeled wrong), or the bolus history has no entries yet.
 2018-03-17 14:06:39 +01:00
Johannes Mockenhaupt 926bea55c0
Combo: align with dev changes. 2018-03-17 13:51:42 +01:00
Johannes Mockenhaupt 1b38c9cf5e
Join pumps under Config.HWPUMPS switch. 2018-03-17 13:51:42 +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 de72fba92e
Combo: update button spacing to match overview. 2018-03-17 13:51:13 +01:00
Johannes Mockenhaupt 6a6359f1ee
Combo: Show count of boluses delivered and TBRs set on pump. 2018-03-17 13:51:13 +01:00
Johannes Mockenhaupt a7ca483565
Rename isActiveBgSource -> isFromActiveBgSource. 2018-03-17 13:36:52 +01:00
Johannes Mockenhaupt 8849df639f
Invoke loop only for new BGs from active BG source. 2018-03-17 13:31:33 +01:00
Johannes Mockenhaupt ad3bf19e4c
Handle received EventNewBg depending on args. 
(cherry picked from commit 79b7a7b)
 2018-03-17 13:28:49 +01:00
Johannes Mockenhaupt 7f45316a24
Add isActiveBg to EventNewBg. 
(cherry picked from commit a8291ff)
 2018-03-17 13:28:47 +01:00
Johannes Mockenhaupt 063505fdb3
Only invoke the loop for new BGs. 2018-03-17 13:27:56 +01:00
Milos Kozak 1e359184a9 check for null profile 2018-03-17 08:12:07 +01:00
AdrianLxM a2ecfa89a0 history browser chart selection 2018-03-16 23:32:17 +01:00
Johannes Mockenhaupt 7c9824e37d
Insulin button: allow negative presets, fix adding TT insulin. 2018-03-16 22:54:38 +01:00
Johannes Mockenhaupt 194c7a2dbc
Overview: symetric spacing. 2018-03-16 22:54:31 +01:00
Johannes Mockenhaupt 8564cf172e
Carbs button: send carbs to pump if pump supports carbs. 2018-03-16 22:11:15 +01:00
Johannes Mockenhaupt 32108a7c2f
Carbs button: fix visibility pref, input type, allow negative increments. 2018-03-16 22:11:15 +01:00
AdrianLxM 90f9bf373c
Smallscreen fix 2018-03-16 21:52:02 +01:00
AdrianLxM 47c6c2d9a8 chart menu 4 2018-03-16 19:26:18 +01:00
AdrianLxM 067b264ae8 chart menu 3 2018-03-16 19:16:47 +01:00
AdrianLxM 21c3853461 chart menu 2 2018-03-16 18:10:13 +01:00
AdrianLxM 32894a092e chart menu 1 2018-03-16 17:23:02 +01:00
Milos Kozak b6ce7c03c6 remove profile dependency from pump drivers, TRB optimalization 2018-03-16 16:53:38 +01:00
Johannes Mockenhaupt 0205dc40b3
Combo: set SMB flag on bolus progress update for wear. 2018-03-16 15:56:31 +01:00
Johannes Mockenhaupt 6bebb30da0
Combo: use PrivacyFabric to align with dev. 2018-03-16 15:52:21 +01:00
Johannes Mockenhaupt 30d522e1a8
Combo: update PumpDescription to align with dev. 2018-03-16 15:49:12 +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
Markus M. May 39aae28101 Disable profile switch if not in Engineering mode and on dev branch 2018-03-15 21:51:43 +01:00
Markus M. May e38f10dba0 Merge jamoto/engineering-mode 2018-03-15 21:10:18 +01:00
Milos Kozak db7671cd23 split enacting TRB and SMB 2018-03-15 18:30:18 +01:00
AdrianLxM 5fd05158ac cleanup 2018-03-15 17:00:57 +01:00
AdrianLxM b481e77008 draw profile in dana profile viewer 2018-03-15 16:56:59 +01:00
AdrianLxM d31c9a6ed6 optimize imports 2018-03-15 14:13:21 +01:00
AdrianLxM 212a9dcc94 draw basal in profile viewer 2018-03-15 14:08:00 +01:00
Milos Kozak e9313c5b28 BG autobackfill configurable 2018-03-14 20:21:48 +01:00
Milos Kozak d25855295d travis 2nd try 2018-03-13 23:48:14 +01:00
Milos Kozak 52d558388d
Merge pull request #758 from triplem/travis_coverage 
Add environment variable to handle testCoverage on travis
 2018-03-13 20:55:32 +01:00
Milos Kozak e92e05cfbd
Merge pull request #759 from TebbeUbben/dev 
Save new profile when updating it to fix "endless loop"
 2018-03-13 20:31:38 +01:00
TebbeUbben 11295b1e96 Save new profile when updating it 2018-03-13 20:15:58 +01:00
Markus M. May b10f8f2fe1 Add environment variable to handle testCoverage 2018-03-13 19:24:08 +01:00
Johannes Mockenhaupt a398d95bb4
Add info to About dialog when engineering mode is enabled. 2018-03-12 23:03:14 +01:00