Johannes Mockenhaupt
add3011e4b
Update pref descriptions
...
(cherry picked from commit 13e358a)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
a76fbefee8
Add pref to disable all pump comm alerts.
...
(cherry picked from commit f074a5b)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
516a8c044b
Move RuffyScripter to PumpCombo package.
...
(cherry picked from commit 7875ac0)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
c8c445c608
Add option to skip small TBR changes, add summaries to prefs.
...
(cherry picked from commit a76b03a)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
58757735f8
Refactor.
...
(cherry picked from commit 06a454d)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
c96122cbed
Move confirmAlert method to scripter.
...
(cherry picked from commit f018d42)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
b1d000eae3
SetTbrCommand: extract confirrmAlert method.
...
(cherry picked from commit 329ff14)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
9b6cd23cdd
Experimental options: for specifc prefs, always check experimental options are turned on.
...
While the specific prefs are disabled when disabling experimental options, they can still be turned on.
(cherry picked from commit 6270239)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
81b97b5278
Add option to ignore setting a TBR as long as it does't occur twice in a row.
...
(cherry picked from commit 238e85c)
2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt
6019323740
Work around curentMenu being null, maybe.
...
(cherry picked from commit da49be0)
2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt
4aac46f2bc
Cleanup.
...
(cherry picked from commit e7fe202)
2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt
17dd6df527
Move config options to preferences.
...
(cherry picked from commit 24657ed)
2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt
21a37c9247
Add experimental option to avoid one vibration after bolusing.
...
(cherry picked from commit 104777c)
2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt
9649682ae3
Don't raise alerts if loop is disabled.
...
(cherry picked from commit dc7fd2b)
2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt
9d6ff73b34
SetTbrCommand: extract method refactoring and minor cleanup.
2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt
bf9369babc
Move readDuration method to SetTbrCommand.
2017-10-17 11:27:20 +02:00
Johannes Mockenhaupt
99c2f797ea
Fix imports.
2017-09-18 22:58:18 +02:00
Johannes Mockenhaupt
1bd5dc3719
Merge remote-tracking branch 'origin/dev' into develop
...
* origin/dev: (53 commits)
bump 1.53
BG & IOB contribution on by default in wizard
check for NaN
Revert "Rounding issues visible in nightscout insulin field"
Clarified boolean logic with parentheses :)
loadEvents after bolus in separate thread
use notification for bolus delivery failed message when window has been destroyed
fix null pointer exception
Added cases to accept both a.m./p.m. and AM/PM
split JSON arrays to 50 elements
Update strings.xml
Changed rounding to use BigDecimals to avoid noisy long doubles in output
Revert "Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts."
Changed how time strings are parsed to fix a problem where PM times were being saved as the AM version any time toSeconds was called
Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts.
Removed unused imports
Rounding fix
VirtualPump: set PumpEnactResult.enacted.
Use correct units for low/high from TT.
Remove duplicate logging.
...
# Conflicts:
# app/build.gradle
# app/src/main/java/info/nightscout/androidaps/MainApp.java
# app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
# app/src/main/res/values/strings.xml
2017-09-18 22:54:35 +02:00
Milos Kozak
cd7c7733ea
bump 1.53
2017-09-18 21:59:01 +02:00
Milos Kozak
b797530c9d
BG & IOB contribution on by default in wizard
2017-09-18 21:57:35 +02:00
Milos Kozak
d2815e4045
check for NaN
2017-09-18 21:52:06 +02:00
Milos Kozak
2eca4ba90c
Merge pull request #423 from MilosKozak/revert-421-dev
...
Revert "Rounding issues visible in nightscout insulin field"
2017-09-18 21:24:39 +02:00
Milos Kozak
d7f8d75d06
Revert "Rounding issues visible in nightscout insulin field"
2017-09-18 21:24:22 +02:00
Milos Kozak
a98d2e846f
Merge pull request #419 from dylanleonard/feature_time_spinner_fix
...
Time Spinner Local Profile Fix
2017-09-18 21:06:34 +02:00
Dylan Leonard
d8590fe8f1
Clarified boolean logic with parentheses :)
2017-09-18 15:04:46 -04:00
Milos Kozak
bf748f3d4b
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-09-18 20:56:42 +02:00
Milos Kozak
c53b5918ab
Merge pull request #415 from jotomo/tt-in-wizard
...
TT in wizard
2017-09-18 20:56:26 +02:00
Milos Kozak
8785bc63d5
loadEvents after bolus in separate thread
2017-09-18 20:54:53 +02:00
Milos Kozak
c2afa328e3
Merge branch 'dev' into tt-in-wizard
2017-09-18 20:44:54 +02:00
Milos Kozak
42ee7c668e
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-09-18 20:43:24 +02:00
Milos Kozak
8daf9e5c2c
use notification for bolus delivery failed message when window has been destroyed
2017-09-18 20:40:03 +02:00
Milos Kozak
17fa2617f7
fix null pointer exception
2017-09-18 20:23:05 +02:00
Dylan Leonard
4f5987b72a
Added cases to accept both a.m./p.m. and AM/PM
2017-09-18 14:20:28 -04:00
Milos Kozak
3f7819937b
split JSON arrays to 50 elements
2017-09-18 20:10:53 +02:00
Milos Kozak
aa89e8f886
Merge pull request #421 from wouterla/dev
...
Rounding issues visible in nightscout insulin field
2017-09-18 19:46:40 +02:00
Milos Kozak
6b9d457b73
Merge pull request #422 from boysim/dev
...
Dev
2017-09-18 19:36:30 +02:00
boysim
81aadcc1be
Update strings.xml
2017-09-17 17:02:27 +02:00
Wouter Lagerweij
02c2213545
Changed rounding to use BigDecimals to avoid noisy long doubles in output
2017-09-17 14:27:49 +02:00
Dylan Leonard
db4d203437
Revert "Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts."
...
This reverts commit 4bda222786
2017-09-16 20:02:08 -04:00
Dylan Leonard
91f0c21306
Changed how time strings are parsed to fix a problem where PM times were being saved as the AM version any time toSeconds was called
2017-09-16 19:30:07 -04:00
Dylan Leonard
4bda222786
Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts.
2017-09-16 19:27:10 -04:00
Wouter Lagerweij
aaa3f648d0
Removed unused imports
2017-09-17 00:56:00 +02:00
Wouter Lagerweij
e350c8c3c3
Rounding fix
2017-09-17 00:53:16 +02:00
boysim
9d62d498df
Merge pull request #4 from MilosKozak/dev
...
Dev
2017-09-16 23:07:56 +02:00
Milos Kozak
01002f11e7
Merge pull request #416 from jotomo/vpump-enact
...
VirtualPump: set PumpEnactResult.enacted.
2017-09-14 10:06:01 +02:00
Johannes Mockenhaupt
cb3b472488
VirtualPump: set PumpEnactResult.enacted.
...
(cherry picked from commit ec49bc3)
2017-09-13 13:16:48 +02:00
boysim
c2dbed5174
Merge pull request #3 from MilosKozak/dev
...
Dev
2017-09-12 21:26:02 +02:00
Johannes Mockenhaupt
07b04b8abf
Use correct units for low/high from TT.
2017-09-12 01:23:38 +02:00
Milos Kozak
69b04fdf26
Merge pull request #413 from samihusseingit/dev
...
Dev
2017-09-11 20:12:51 +02:00
Milos Kozak
1a986ce199
Merge pull request #414 from jotomo/logging-and-stuff
...
Logging and stuff
2017-09-11 10:14:15 +02:00
