Commit graph

10806 commits

Author SHA1 Message Date
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
Milos Kozak 3a85a6f319
Merge pull request #781 from MilosKozak/newconstraints2
Newconstraints2
2018-03-19 18:57:12 +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
Milos Kozak 3f6a612d42
Merge pull request #780 from jotomo/combo-unbreak-basal-rate-conversion
Combo: unbreak basal rate conversion.
2018-03-19 16:38:14 +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
Milos Kozak 0b95d9ad0b
Merge pull request #778 from jotomo/774-combo-stop-mode-support
Combo: better STOP mode support
2018-03-19 14:24:50 +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
Milos Kozak 94d862fb81
Merge pull request #777 from AdrianLxM/cleanups
Cleanups
2018-03-19 14:00:16 +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
Milos Kozak 3f04d10f79
Merge pull request #775 from jotomo/dev-merge
Merge remaining development combonents
2018-03-18 20:45:00 +01:00
Johannes Mockenhaupt 643f3aee6c
Merge branch 'dev' into dev-merge 2018-03-18 20:20:40 +01:00
Milos Kozak 11ab3c40f8
Merge pull request #773 from MilosKozak/nodefaultprofile
allow profile to be null
2018-03-18 20:18:29 +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
AdrianLxM 18018630a8
Merge pull request #772 from triplem/engmode
Enable engineering mode
2018-03-18 19:38:12 +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