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
32d2a30bf7
Merge pull request #767 from MilosKozak/AdrianLxM-patch-2
...
Don't overlap time ticks with current time
2018-03-17 14:07:59 +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
1738aea4de
Don't overlap time ticks with current time
2018-03-16 23:57:58 +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
