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

3544 commits

Author SHA1 Message Date
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
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
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
Johannes Mockenhaupt
a398d95bb4
Add info to About dialog when engineering mode is enabled. 2018-03-12 23:03:14 +01:00
Johannes Mockenhaupt
637b0c6189
On start, show notification if on dev-branch, but not EM, so CL is disabled. 2018-03-12 23:01:58 +01:00
Milos Kozak
8219332a2c do not pass DIA to SMB determine_basal 2018-03-12 22:23:15 +01:00
Milos Kozak
4ff09a0125 show Dana model properly after communication error 2018-03-12 22:16:10 +01:00
Milos Kozak
5b064cd8f8
Merge pull request #756 from TebbeUbben/dev 
Read maximum basal and bolus amount from pump
 2018-03-12 21:46:29 +01:00
Milos Kozak
e134b94f13 fix deviation slope calculations 2018-03-12 21:13:48 +01:00
TebbeUbben
ffb7b068a8 Read maximum basal and bolus amount from pump 2018-03-12 20:53:39 +01:00
Milos Kozak
30d12622f7 update maxIOB hard limits 2018-03-12 17:59:42 +01:00
Milos Kozak
eb2b6f9bd8 Allow bolus record only in new treatment dialog 2018-03-12 17:52:52 +01:00
Milos Kozak
fc070c95a7 use safeGetString 2018-03-12 11:22:19 +01:00
Milos Kozak
601dbc1036 JsonHelper test 2018-03-12 11:12:41 +01:00
Milos Kozak
a5830cc452 Merge branch 'foodrefactor' into dev 2018-03-12 10:56:14 +01:00
Milos Kozak
38999d6598 food code cleanup 2018-03-12 10:53:23 +01:00
Tebbe Ubben
d4ede0a5b3
Merge branch 'dev' into dev 2018-03-11 22:59:11 +01:00
TebbeUbben
8fd68a082c Show bolus progress 2018-03-11 22:53:18 +01:00
TebbeUbben
21dbeb299e Missing import statement 2018-03-11 21:00:08 +01:00
AdrianLxM
3068089297
Insight: add treatment to progress event 2018-03-11 20:56:11 +01:00
AdrianLxM
f2d6b92394
Merge pull request #750 from TebbeUbben/dev 
Improved rounding
 2018-03-11 18:34:10 +01:00
TebbeUbben
ccabb099f0 Improved rounding 2018-03-11 17:52:53 +01:00
Milos Kozak
3ad783260b max_daily_basal min value 0.1 -> 0.05 2018-03-11 17:17:34 +01:00
Milos Kozak
bd03c678d1
Merge pull request #748 from TebbeUbben/dev 
Added some debug lines and missing digit in isThisProfileSet
 2018-03-11 16:54:55 +01:00
TebbeUbben
46a1be97f7 Added some debug lines and missing digit in isThisProfileSet 2018-03-11 16:42:47 +01:00
Milos Kozak
2c21571cf4 fix NPE 2018-03-11 16:38:30 +01:00
Milos Kozak
6cf849ce76 allow 30min basal rates when pump supports it 2018-03-11 16:03:21 +01:00
Roumen Georgiev
60c4986ffa
Removed unneeded conversion to Md/dl which leads to a mgDl targets always 2018-03-11 09:06:50 +02:00
Milos Kozak
6117ac97cf
Merge pull request #745 from TebbeUbben/dev 
Update to SightRemote 1.4.0
 2018-03-10 23:39:52 +01:00
AdrianLxM
1aaec9142c
Merge pull request #746 from swissalpine/patch-3 
Better layout of the Calculator Dialogue (German)
 2018-03-10 22:37:09 +01:00
Milos Kozak
13933e6bb7 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-03-10 22:19:27 +01:00
swissalpine
203288e93a
Better layout of the Calculator Dialogue (German) 
The string "15-Min.-Trend" was too long, at least on my phone.
 2018-03-10 22:12:16 +01:00
TebbeUbben
51da08bf97 Undo history sync delay change 2018-03-10 21:27:50 +01:00
TebbeUbben
7329d3abff Merge branch 'dev' of https://github.com/TebbeUbben/AndroidAPS into dev 2018-03-10 21:24:04 +01:00
TebbeUbben
cd309780d1 Update to Asclepenius 
Ability to change basal profile
 2018-03-10 21:21:53 +01:00
Milos Kozak
2cd7a8e8df
Merge pull request #738 from MilosKozak/unify-target 
Unify target
 2018-03-10 21:19:49 +01:00
Milos Kozak
39c2d690e4 CS translations 2018-03-10 20:47:17 +01:00
Milos Kozak
8a197f41dc Merge branch 'dialogmmol' into dev 2018-03-10 19:25:41 +01:00
Milos Kozak
ec1c43b905 carbs dialog: defaults for mmol, i18n 2018-03-10 19:22:31 +01:00
Milos Kozak
951ad26590 cleanup 2018-03-10 17:58:45 +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
5a5e0ca8b6
Merge pull request #734 from MilosKozak/watchsmb2 
Watchface overhaul
 2018-03-08 15:10:53 +01:00
AdrianLxM
b880a9bb10 unify target calculation 2 2018-03-08 15:04:48 +01:00
AdrianLxM
768f61bc07 unify target calculation 2018-03-08 15:04:38 +01:00
AdrianLxM
5f614b4072 TT unify target calculation 2018-03-08 15:04:30 +01:00
swissalpine
2d797e8ce3
Update StatuslinePlugin.java 2018-03-06 16:23:56 +01:00
swissalpine
237d55ee85
Add whitespace to xDrip status line 
... which was removed by the last fix.
 2018-03-06 11:21:44 +01:00
Johannes Mockenhaupt
090e1b13f8
Add basic Engineering mode. 
- Insight plugin disabled unless EM enabled
- Closed loop constrainted unless EM enabled.
 2018-03-05 22:45:00 +01:00
AdrianLxM
414f92bdf8 no double whitespace 2018-03-05 20:50:21 +01:00
AdrianLxM
118cdb3dce
buttons gone by default in smallheight 
... same as on default layout
 2018-03-04 20:12:33 +01:00
AdrianLxM
cdb58ed143
newinsulin dialog wrap content 2018-03-04 19:57:21 +01:00
AdrianLxM
5a4967e544
newcarb dialog wrap content 2018-03-04 19:56:34 +01:00
AdrianLxM
d2919f9577 Merge remote-tracking branch 'jotomoremote/watch-updater-service-worker-thread' into watchsmb2 2018-03-04 19:25:26 +01:00
PoweRGbg
ca9150ba5b more readable low TT message 2018-03-04 16:06:54 +02:00
PoweRGbg
37b96d7e31 remove unused import (RadioButton) 2018-03-04 15:59:17 +02:00