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
d47b067855
Updated SightParser library
2018-03-10 21:25:14 +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
AdrianLxM
7d8674aa61
fix 5m-impact parameter - always was 0
2018-03-02 21:09:09 +01:00
Roumen Georgiev
6443502808
reduced if...else to single line as Adrian suggested
2018-03-02 16:41:25 +02:00
Roumen Georgiev
ea29b6ad82
propper conversion from MMOL to MgDl
2018-03-02 16:33:53 +02:00
Roumen Georgiev
6c75b1b317
more readable var names and
2018-03-02 15:28:32 +02:00
Roumen Georgiev
e923bf2156
As Adrian asked .... Profile.toMgDl()
2018-03-02 15:09:03 +02:00
Roumen Georgiev
f3a12be0be
renaming ESMCheckbox to startEsTTCheckbox
2018-03-02 14:53:19 +02:00
Roumen Georgiev
9dd129bbe6
Revert "Update MainApp.java"
...
This reverts commit d3a7176209
2018-03-02 10:37:12 +02:00
Roumen Georgiev
ab39536876
Only one TT can be selected
2018-03-02 10:12:05 +02:00
Milos Kozak
ed11bb1d70
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-03-02 00:00:09 +01:00
Milos Kozak
c61fcdbe3f
allow 15 & 30 pump disconnection
2018-03-01 23:59:44 +01:00
PoweRGbg
b3a10b47ce
undo the RadioButton tests
2018-03-01 21:57:30 +02:00
PoweRGbg
3edec79b8d
fixing identation and equals() to ==
2018-03-01 21:41:52 +02:00
PoweRGbg
2fb0e6edc1
format using the Profile class method and Constants
2018-03-01 18:40:06 +02:00
PoweRGbg
c6a46129df
format using the Profile class method and Constants
2018-03-01 18:38:56 +02:00
PoweRGbg
65ddf5ced5
format using the Profile class method and Constants
2018-03-01 18:31:29 +02:00
Johannes Mockenhaupt
d679481698
Remove unused method.
2018-03-01 16:12:41 +01:00
Johannes Mockenhaupt
8f813d52fa
WatchUpdaterService: process requests in a separate thread.
...
Previously, requests were executed on the main thread (base class
is Service, not IntentService), which prompted Android to kill
AAPS multiple times a day due to timeouts (of currently unknown
origins).
(cherry picked from commit 5ae45d5)
2018-03-01 16:12:41 +01:00
Roumen Georgiev
bea486d816
Don't show confirmation on empty message/input
2018-03-01 16:57:36 +02:00
Roumen Georgiev
38933ac323
Adding Eating soon TT check to carbs
...
I use that a lot for meal anouncement only
2018-03-01 16:27:52 +02:00
Roumen Georgiev
9456a24655
Adding Eating soon mode to options
2018-03-01 16:22:05 +02:00
Milos Kozak
75a6366115
translations cleanup
2018-03-01 15:08:55 +01:00
Roumen Georgiev
d3a7176209
Update MainApp.java
2018-03-01 15:20:00 +02:00
Roumen Georgiev
5b003c62e2
added fix for mmol profiles & targets
2018-03-01 14:07:35 +02:00
AdrianLxM
e5e76113cc
Disable Insight by default
2018-03-01 11:09:57 +01:00
Roumen Georgiev
7ca1fdc36e
removed unused var
2018-03-01 11:54:24 +02:00
Roumen Georgiev
9baea01225
Not everybody's profile & targets are in mg/dl :)
2018-03-01 11:32:00 +02:00
Milos Kozak
bd6fab3ca3
Merge pull request #721 from jamorham/floatmaxbasal
...
Make openapsama_current_basal_safety_multiplier Double instead of Int
2018-02-26 10:46:29 +01:00
Jamorham
805548dd1e
Make openapsama_current_basal_safety_multiplier Double instead of Integer
2018-02-25 21:30:11 +00:00
Milos Kozak
e93cfacb4f
fix insulin pattern
2018-02-25 21:55:22 +01:00
Milos Kozak
a1a3b14b18
fix displaying profile name if Ignore profile switch is checked
2018-02-25 21:13:27 +01:00
Milos Kozak
f62cac1b66
make new i & c buttons visible by default
2018-02-25 17:52:30 +01:00
Milos Kozak
7b91f0d490
allow to open G5 app from CGM button
2018-02-25 17:33:46 +01:00
Milos Kozak
e544d44799
overview layout cleanup
2018-02-25 16:20:20 +01:00
Milos Kozak
6eed00fae7
add xdrip icon to cgm button
2018-02-25 15:45:43 +01:00
Milos Kozak
32f2f4d6fa
Merge branch 'g5cal' into buttons
2018-02-25 15:31:43 +01:00
Milos Kozak
cb8fc905bb
catch if G5 app is missing
2018-02-25 15:23:25 +01:00
Milos Kozak
7e49f9039c
access overview preferences from configbuilder
2018-02-25 11:15:26 +01:00
Milos Kozak
a7da0bb67a
Merge pull request #719 from jotomo/buttons
...
Moar buttons.
2018-02-25 11:05:21 +01:00
Milos Kozak
b18c16ce3b
Merge pull request #708 from jotomo/watch-carb-only-request
...
Watch: don't bother pump with carbs if pump doesn't support it.
2018-02-25 10:10:09 +01:00
AdrianLxM
436e03aa03
wear only print valid boluses
2018-02-24 18:10:59 +01:00
AdrianLxM
6d3048a9b1
wear predictions update on loop run
2018-02-24 17:58:05 +01:00
Milos Kozak
31f7670f43
Merge pull request #716 from jamorham/dev
...
Improve Insight Connector life-cycle handling
2018-02-23 22:26:52 +01:00
Jamorham
4b630a1ac6
Remove inactive experimental code
2018-02-23 09:16:48 +00:00
Jamorham
7854a51cc0
Remove commented out old code
2018-02-23 09:15:47 +00:00
Jamorham
cd95a0f5dd
Insight: better connector lifecycle handling
2018-02-23 09:00:08 +00:00
Simon Pauwels
fcb59477a0
Merge pull request #34 from MilosKozak/combo
...
23 feb
2018-02-23 08:33:59 +01:00
Milos Kozak
9d3c69e1b4
Merge pull request #709 from jamorham/dev
...
Add Fabric Privacy option
2018-02-23 07:30:46 +01:00
Jamorham
b989cf5a3c
Revert NSClient service to previous for PR
2018-02-22 13:27:43 +00:00
Jamorham
9d985ec3b7
Add FabricPrivacy
2018-02-22 12:30:36 +00:00
Milos Kozak
dbab6b6809
Merge pull request #705 from jamorham/dev
...
Updated Insight plugin
2018-02-21 22:56:02 +01:00
Johannes Mockenhaupt
87a7249997
Watch: don't bother pump with carbs if pump doesn't support it.
2018-02-21 21:09:23 +01:00
Johannes Mockenhaupt
b6b86e8f4a
Show SMBs in graph on lower end of target area.
2018-02-21 16:54:57 +01:00
AdrianLxM
c22c22f1d7
wear settings for predictions
2018-02-21 15:56:13 +01:00
JamOrHam
bc2f749ef3
Merge branch 'dev' into dev
2018-02-21 13:43:18 +00:00
AdrianLxM
c6a3efb60e
wear adaptive prediction timeframe
2018-02-21 14:23:52 +01:00
Jamorham
67b397b417
Insight: preemptive connection preference option
2018-02-21 12:23:19 +00:00
Milos Kozak
1cb92861b5
Chinese to menu
2018-02-20 17:04:15 +01:00
AdrianLxM
88ea215f66
add boluses to wear payload
2018-02-20 12:27:47 +01:00
Milos Kozak
59744fbd1d
fix NPE
2018-02-19 23:28:07 +01:00
McHoffi
6ed8aceff3
Update WearPlugin.java
2018-02-19 20:52:10 +01:00
McHoffi
21d6745d02
Update pref_wear.xml
2018-02-19 20:50:17 +01:00
McHoffi
293eff837b
Update pref_wear.xml
2018-02-19 20:49:53 +01:00
McHoffi
9dcd1c70d5
Update pref_wear.xml
2018-02-19 20:48:54 +01:00
Milos Kozak
220c099591
last connection fix RS,Rv2
2018-02-19 20:37:51 +01:00
Milos Kozak
d3c23f6c33
allow to override zero base basal on combo
2018-02-19 10:44:15 +01:00
Milos Kozak
eeeda92857
do not add 30s to carbs time in Rv2 and RS
2018-02-19 07:44:31 +01:00
Milos Kozak
a063fb05b4
G5 calibration button
2018-02-19 00:22:27 +01:00
Milos Kozak
dc35c9f6b3
fix typos
2018-02-18 22:56:46 +01:00
Milos Kozak
92c7f2ee75
log pump unreachable
2018-02-18 22:55:04 +01:00
boysim
5c9173d14b
Added Dutch combo translations
2018-02-18 18:19:46 +01:00
Jamorham
2f1efc7d06
Duplicate Visibility fix from dev
2018-02-18 15:07:36 +00:00
Jamorham
208c3ed9b1
Don't wake screen in QueueThread use PARTIAL_WAKE_LOCK instead
2018-02-18 15:00:24 +00:00
Jamorham
9a76cdb3a1
Insight: add preemptive connection, keep-alive, statistics
2018-02-18 14:57:28 +00:00
Jamorham
448ebbc7bf
Add FeatureRunning event triggered by activities
2018-02-18 14:27:30 +00:00
Johannes Mockenhaupt
a42d95df14
Unbreak unit test.
2018-02-18 13:33:24 +01:00
Milos Kozak
8812428078
Merge pull request #690 from triplem/rework_configbuilder
...
Minor cleanup based on feedback of jomoto
2018-02-18 12:51:02 +01:00
Johannes Mockenhaupt
71dfb6d314
Set combo version.
2018-02-18 12:42:18 +01:00
Milos Kozak
0fe287bb79
Merge pull request #689 from AdrianLxM/smb-wear2
...
no wear vibrations on SMB (optional)
2018-02-18 12:39:36 +01:00
Milos Kozak
bc440817b8
Merge pull request #691 from swissalpine/patch-2
...
Set a higher hard limit for IC ratio
2018-02-18 12:36:10 +01:00
Johannes Mockenhaupt
832138398f
Crappy hack to deal with applying the first profile switch.
2018-02-18 11:53:41 +01:00
Johannes Mockenhaupt
bf2e567f9c
Moar buttons.
2018-02-18 11:06:36 +01:00
Johannes Mockenhaupt
1e3f6dd192
Disable wear plugin by default.
2018-02-18 02:20:49 +01:00
AdrianLxM
36b838fc49
remove switch-missing notification on profile switch
2018-02-18 02:13:21 +01:00
AdrianLxM
7b3d370564
Notification on missing profile switch
2018-02-18 01:10:27 +01:00
AdrianLxM
59a1e007ad
block if no profile switch is set
2018-02-18 00:55:37 +01:00
Johannes Mockenhaupt
d155616c0b
Minor fixes.
2018-02-17 21:08:36 +01:00
Johannes Mockenhaupt
256bb09775
Set version.
2018-02-17 20:50:33 +01:00
Johannes Mockenhaupt
2bccf13213
Add shortname for G5.
2018-02-17 15:40:56 +01:00
Johannes Mockenhaupt
52aa27de05
Sanity check bolus timestamp on start, after bolusing.
2018-02-16 17:33:59 +01:00
swissalpine
2613f6735f
Set a higher hard limit for IC ratio
...
As written in a comment and in the AAPS thread, I think the new upper hard limit of the IC ratio is to low, for childs but also for me (that's why I found the problem).
I run a profile with IC = 60 g when I do long lasting sports activities, the limit of 40 is much to low - and I'm shure that there are childs which have a higher IC ratio in real life. I propose the value of 100 which is relativly compared not as high as the hard limit MAXISF = 720 mg/dl.
2018-02-16 06:43:47 +01:00
Markus M. May
b5969d4279
Minor cleanup based on feedback of jomoto
2018-02-15 20:33:03 +01:00
AdrianLxM
a23c76f473
Merge branch 'dev' into smb-wear2
2018-02-14 15:03:45 +01:00
AdrianLxM
c821ef97d8
option to enable wear/SMB notifications
2018-02-14 15:02:04 +01:00
AdrianLxM
7270b0b2f5
no wear vibrations on SMB
2018-02-14 14:59:26 +01:00
Milos Kozak
bf6e3a9061
run calculation after interval change
2018-02-14 07:47:22 +01:00
Johannes Mockenhaupt
223d22795a
Set version 1.57-combo-csv2-beta-4.
2018-02-13 21:18:01 +01:00
Johannes Mockenhaupt
df4ad822fc
Make new behaviour configurable, default on.
...
(cherry picked from commit f807592
2018-02-13 20:44:58 +01:00
Johannes Mockenhaupt
1cd4e72541
Create NS-anouncements for error dialogs and local alerts.
...
(cherry picked from commit 0df796d
2018-02-13 20:44:50 +01:00
Johannes Mockenhaupt
c5e0eb9968
Don't disconnect after history read when queue is busy.
...
Temporary hack, ComboPlugin.runCommand will still run commands
synchronously.
2018-02-13 20:44:36 +01:00
Johannes Mockenhaupt
aae9f7d153
Show notification to check pump date if last bolus is older than 24h.
2018-02-13 20:44:36 +01:00
Johannes Mockenhaupt
3ff56c7fa2
Disable unfinished dialogs.
2018-02-13 19:30:48 +01:00
Milos Kozak
4cdadaf0c4
IobCobPlugin specify loading time
2018-02-13 19:12:02 +01:00
Milos Kozak
31d493d8ae
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-02-13 18:38:55 +01:00
Milos Kozak
3e06b6a4ed
Merge pull request #687 from jotomo/error-announcements
...
Create NS-anouncements for error dialogs and local alerts.
2018-02-13 18:08:14 +01:00
Milos Kozak
f063fb94d1
Update strings.xml
2018-02-13 18:06:26 +01:00
Johannes Mockenhaupt
f8075927f2
Make new behaviour configurable, default on.
2018-02-13 00:34:24 +01:00
Jamorham
d3bf4fd026
History intent updates for Asclepius compatibility
2018-02-12 21:27:35 +00:00
Milos Kozak
6470f7a63e
Update strings.xml
2018-02-12 20:18:44 +01:00
Milos Kozak
5225276259
Update strings.xml
2018-02-12 20:15:47 +01:00
Milos Kozak
a6a937ba20
IobCobCalculatorPlugin as a param for GraphData
2018-02-12 20:07:39 +01:00
Milos Kozak
0ab2d5ba38
unstatic IobCobCalculatorPlugin
2018-02-12 19:49:08 +01:00
Milos Kozak
da777d9660
HistoryBrowser fill space by bggraph
2018-02-12 19:39:45 +01:00
Johannes Mockenhaupt
0df796d3f4
Create NS-anouncements for error dialogs and local alerts.
2018-02-12 15:42:58 +01:00
Milos Kozak
97834e3fef
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-02-12 13:44:57 +01:00
Milos Kozak
5d408daefd
remove displaying deviation slope
2018-02-12 13:42:50 +01:00
Johannes Mockenhaupt
b6c5326524
NotificationStore: clean up access to store, avoid potential deadlock.
2018-02-12 12:43:23 +01:00
Johannes Mockenhaupt
ee1efa4f7f
NotificationStore: add synchronisation when accessing internal store.
2018-02-12 11:15:59 +01:00
Milos Kozak
d92a7e8ef1
Merge branch 'history' into dev
2018-02-11 23:46:20 +01:00
Milos Kozak
fa2e46fbe5
remove CPP profile
2018-02-11 23:02:21 +01:00
Milos Kozak
943205c782
HardLimits refactor
2018-02-11 22:41:10 +01:00
Milos Kozak
5dd0f70686
Merge pull request #682 from jotomo/insight-hide-your-constraint
...
Only show Insight as pump plugin in config tab.
2018-02-11 21:09:54 +01:00
Milos Kozak
0a69a1ab2f
FR language
2018-02-11 21:00:09 +01:00
Johannes Mockenhaupt
e80559c948
Only show insight as pump plugin in config tab.
2018-02-11 19:51:03 +01:00
Milos Kozak
e4891683b5
fix NPE in profile
2018-02-11 14:40:07 +01:00
Milos Kozak
23396ed80b
Merge pull request #675 from triplem/configbuilder
...
Refactoring ConfigBuilder - cleanup fragment visibility
2018-02-10 23:48:07 +01:00
Johannes Mockenhaupt
f88894ea02
Clean up some Combo strings.
2018-02-10 19:07:03 +01:00
swissalpine
db07723e8a
Update strings.xml
2018-02-10 17:59:31 +01:00
Johannes Mockenhaupt
d40a4bf57e
Merge pull request #55 from AdrianLxM/comborc01
...
links unten in über
2018-02-10 15:19:17 +01:00
Milos Kozak
359b8401b2
Merge pull request #678 from jamorham/dev
...
Updates to Insight plugin
2018-02-10 15:13:35 +01:00
AdrianLxM
c5057f3d5a
remove unused import
2018-02-10 14:55:29 +01:00
AdrianLxM
4587a47840
add links to about
2018-02-10 14:53:43 +01:00
Johannes Mockenhaupt
573c818eb7
Combo: Answer detected TBR mismatches.
2018-02-10 14:33:44 +01:00
Jamorham
046de51496
Insight few small changes
2018-02-10 09:29:23 +00:00
Johannes Mockenhaupt
5b63008774
Set version 1.58-combo.
2018-02-08 22:47:41 +01:00
Markus M. May
a1bb67d425
Refactoring ConfigBuilder - cleanup fragment visibility
2018-02-08 22:23:48 +01:00
Johannes Mockenhaupt
0cbf65d2d4
Set version.
2018-02-08 22:19:26 +01:00
Johannes Mockenhaupt
89c832b5aa
Use pager sound instead of smoke detector alarm for bolus error.
...
(cherry picked from commit 6767d8b
2018-02-08 22:18:41 +01:00
Johannes Mockenhaupt
1985ed379d
Add mute button to error dialog.
...
So that users needn't hastily close the dialog to stop the sound
and then not being able to read the actual message.
(cherry picked from commit 43755f0
2018-02-08 22:18:38 +01:00
Johannes Mockenhaupt
7fa51a9248
Revert: Combo: retry twice to establish connection before giving up.
...
Only increases number of failed connection attempts.
2018-02-08 22:15:36 +01:00
Milos Kozak
538f70a725
Merge pull request #669 from MilosKozak/AdrianLxM-bolusDelivered
...
Don't treat an extended bolus as bolus if it emulates basal
2018-02-08 21:08:10 +01:00
Milos Kozak
5c7c430ee4
Merge pull request #673 from jotomo/bolus-error-dialog-sound
...
Bolus error dialog / sound
2018-02-08 21:07:21 +01:00
Milos Kozak
6f487aded5
Merge pull request #674 from jotomo/ext-bolus-query-race-condition
...
Avoid race condition using active extended bolus.
2018-02-08 21:06:26 +01:00
Johannes Mockenhaupt
f888e0d7ab
Avoid race condition using active extended bolus.
...
(cherry picked from commit 5b7c0cc)
2018-02-08 20:44:42 +01:00
Simon Pauwels
9c95a75ede
Added dutch translations ( #52 )
2018-02-07 23:17:50 +01:00
Johannes Mockenhaupt
483ecadede
Fix dutch translation for Combo's last bolus, minor cleanup.
...
(cherry picked from commit c0cf06a)
2018-02-07 22:53:59 +01:00
Johannes Mockenhaupt
46ea4be4eb
ComboFragment: display last bolus regardless of age.
...
(cherry picked from commit 197874e)
2018-02-07 22:51:15 +01:00
Johannes Mockenhaupt
6b36dd27d8
Don't create a cancel record for requests to cancel a TBR when none is running.
...
(cherry picked from commit a46b475)
2018-02-07 22:08:16 +01:00
Johannes Mockenhaupt
6767d8b767
Use pager sound instead of smoke detector alarm for bolus error.
2018-02-07 20:32:09 +01:00
Johannes Mockenhaupt
43755f071d
Add mute button to error dialog.
...
So that users needn't hastily close the dialog to stop the sound
and then not being able to read the actual message.
2018-02-07 20:32:09 +01:00
Johannes Mockenhaupt
6fb5f5bad4
Check result.success when hard cancelling TBR.
...
(cherry picked from commit 654f984)
2018-02-07 15:30:02 +01:00
Jamorham
bda1866c6d
Do our own history merging for TBRs
2018-02-07 13:36:06 +00:00
AdrianLxM
599b04c4ff
Don't treat an extended bolus as bolus if it emulates basal
2018-02-06 19:31:04 +01:00
Johannes Mockenhaupt
b435bb3cd5
Update version.
2018-02-06 00:51:40 +01:00
Johannes Mockenhaupt
c781601cbb
Commit missing string.
2018-02-06 00:04:24 +01:00
Johannes Mockenhaupt
e9f0fa3c04
Warn when finding multiple boluses in the same minute with same amount.
...
Not much can be done if the user manages to bolus multiple boluses
within the same minute, with the same amount. This should almost
never happen, but if it does, at least warn the user one of those
boluses isn't accounted for wrt to IOB.
2018-02-05 23:58:19 +01:00
Johannes Mockenhaupt
a861afa208
Log bolus amount when saving to DB failed.
2018-02-05 23:19:43 +01:00
AdrianLxM
0c0f68d510
Merge pull request #666 from MilosKozak/AdrianLxM-VPdefault
...
Don't enable Insight by default
2018-02-05 23:16:48 +01:00
Johannes Mockenhaupt
5b21844423
Did it again.
2018-02-05 23:14:25 +01:00
Johannes Mockenhaupt
e812c7119f
Fix setting 'pumpHistoryChanged'.
2018-02-05 23:14:25 +01:00
Johannes Mockenhaupt
f07017a4f6
Document global state variables.
2018-02-05 23:14:25 +01:00
Jamorham
693c3ef8ad
Store in history exactly what we enact
2018-02-05 22:11:26 +00:00
AdrianLxM
8e69573710
Merge pull request #668 from savek-cc/careportal-bg-update
...
fix display unit when updating careportal entry for historic bg value
2018-02-05 22:47:46 +01:00
Timm Korte
9713836e69
fix display unit when updating careportal entry for historic bg value
2018-02-05 22:35:08 +01:00
Jamorham
6a9b293e49
Improved TBR cancelling
2018-02-05 14:39:55 +00:00
AdrianLxM
36608559af
Don't enable Insight by default
2018-02-05 14:11:54 +01:00
Jamorham
44ba10e00c
Insight treat 100% TBR from absolute as cancel
2018-02-05 11:33:00 +00:00
Milos Kozak
9fd8ad8705
Merge pull request #665 from jotomo/graph-target-line-fix
...
Graph: fix rendering target line for ranges from profiles.
2018-02-04 22:32:33 +01:00
Johannes Mockenhaupt
b5c35dea71
Graph: fix rendering target line for ranges from profiles.
2018-02-04 22:01:30 +01:00
Milos Kozak
4b061d1a51
Merge pull request #652 from savek-cc/careportal-bg-update
...
update bg for treatment in the past via careportal
2018-02-04 21:54:33 +01:00
Milos Kozak
94a6794504
Merge pull request #661 from MilosKozak/move-rhino-lib
...
move rhino to external lib
2018-02-04 21:51:04 +01:00
Johannes Mockenhaupt
5be9bf5a87
Combo: add unit test for calculateFakeBolusDate.
2018-02-04 20:43:31 +01:00
Johannes Mockenhaupt
4937018a9c
Add test options to build.gradle to unbreak unit tests.
2018-02-04 20:40:24 +01:00
Jamorham
1d169bc27f
Better calculation for Absolute basal from Tebbe
2018-02-04 19:14:02 +00:00
Milos Kozak
1471d2bcd5
Merge pull request #639 from triplem/cleanup_libs
...
Remove jniLibs, download on build
2018-02-04 18:18:39 +01:00
Milos Kozak
f094b5cb64
Merge pull request #658 from bogdangorescu/patch-2
...
RO translation
2018-02-04 18:00:37 +01:00
Bog Dan
8c858d2b2d
RO translation - without translatable="false"
...
Removed translatable="false"
2018-02-04 17:55:59 +02:00
Jamorham
501ca5c597
Fix for some TBR cancels getting through
2018-02-04 12:57:10 +00:00
AdrianLxM
316c3da46c
use default repo for rhino
2018-02-04 08:24:12 +01:00
AdrianLxM
1bac0e573d
move rhino to external lib
2018-02-04 07:27:02 +01:00
Johannes Mockenhaupt
8c25bc4002
Answers cleanup.
2018-02-04 01:29:27 +01:00
Johannes Mockenhaupt
6b4b044cd6
Remove nested layout for better performance.
2018-02-04 00:36:08 +01:00
Johannes Mockenhaupt
f573265bc2
Add target line to graph.
...
Uses the middle if a range is specified to show what the loop
aims for.
2018-02-04 00:34:14 +01:00
Bog Dan
27bf66b501
RO translation
...
Added RO translation
2018-02-04 01:24:18 +02:00
Johannes Mockenhaupt
87771e8753
A few fixes.
2018-02-03 23:44:17 +01:00
Johannes Mockenhaupt
956a611af4
Fix checking/updating history.
...
(cherry picked from commit 5413a0f)
2018-02-03 22:07:42 +01:00
Johannes Mockenhaupt
2a5c28cf6b
ReadQuickInfoCommand: only read as many boluses as are available.
...
(cherry picked from commit 7857abb)
2018-02-03 22:07:41 +01:00
Johannes Mockenhaupt
183edfcc09
When checking for changed pump history, compare the last two records.
...
This ensures changes are also detected if a bolus was added on the
pump within the same minute of the previous record.
2018-02-03 20:03:30 +01:00
Johannes Mockenhaupt
1e8e2a59fd
ReadHistoryCommand: fetch records including the requested timestamp.
...
To ensure we retrieve records with the same timestamp.
2018-02-03 19:56:27 +01:00
Johannes Mockenhaupt
6fded4c1bd
ComboPlugin.deliverBolus: avoid creating boluses within the same minute.
2018-02-03 19:32:00 +01:00
Johannes Mockenhaupt
72e4cd29c4
Extend ReadQuickInfoCommand to read more history records.
...
Also remove switch to forego quick info, which really isn't the cause
of the infamous bug, but is now required with the updated history
check logic against timestamp dups.
(cherry picked from commit 18aa827)
2018-02-03 19:31:01 +01:00
Johannes Mockenhaupt
ec4280bc2e
Fix creating a seconds-based bolus record based on minute and bolus.
...
(cherry picked from commit f8848be)
2018-02-03 19:26:35 +01:00
Johannes Mockenhaupt
f6c5b95904
Merge remote-tracking branch 'origin/master' into combo-scripter-v2
...
* origin/master:
Revert "Update strings.xml"
bump 1.58
Update strings.xml
Add issue template.
Enhance insulin plugin test
filter null BT devices
BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete.
BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete.
ES translations
Dana plugin refactoring
KO language cleanup
Update strings.xml
Update strings.xml
Bg translation
add RO language
CS translations
ButterKnife to Dana fragment
bump 1.57a-dev
Add a unit test for Insulin Plugin
# Conflicts:
# app/build.gradle
# app/src/main/res/values-de/strings.xml
# app/src/main/res/values-nl/strings.xml
# app/src/main/res/values/strings.xml
2018-02-03 16:45:29 +01:00
Johannes Mockenhaupt
435c4dee85
Create Answer events when adding bolus to DB fails.
...
(cherry picked from commit 947ea4f)
2018-02-03 16:33:52 +01:00
Johannes Mockenhaupt
6c9effd027
Minor cleanup to reduce merge noise.
...
(cherry picked from commit 4015f73)
2018-02-03 16:33:50 +01:00
Johannes Mockenhaupt
f49f3c7e4b
Clean up string resources.
...
(cherry picked from commit 4adcffc)
2018-02-03 16:33:40 +01:00
Timm Korte
c33232108d
remote unused import
2018-02-03 14:57:36 +01:00
Timm Korte
c4a5285c24
update bg for treatment in the past via careportal
2018-02-03 12:00:59 +01:00
AdrianLxM
b21fac92e9
revert min_5m_carbimpact to int
2018-02-02 22:46:52 +01:00
AdrianLxM
4f05917467
autosens deactivated -> 1
2018-02-02 22:45:18 +01:00
Milos Kozak
0832ae9491
Merge pull request #648 from jotomo/do-not-loop-for-smb-treatment-change
...
Do not loop for SMB treatment change
2018-02-02 22:26:49 +01:00
Johannes Mockenhaupt
5adaff6bc6
Don't run loop on treatment change if it's an SMB.
2018-02-02 21:27:05 +01:00
Johannes Mockenhaupt
eedd2ee28b
Add bg/treatment to EventNewBG/EventTreatmentChange.
2018-02-02 19:04:28 +01:00
Jamorham
8e2fe7eaec
Insight ConstraintsInterface and Mstatus response type
2018-02-02 15:09:20 +00:00
Milos Kozak
9797f6e5f4
fix NPE
2018-02-02 15:33:19 +01:00
Milos Kozak
bb21f2ae7b
fix NPE
2018-02-02 15:31:25 +01:00
Milos Kozak
d9cfe15b87
fix rendering absolute basal line
2018-02-02 14:44:56 +01:00
Johannes Mockenhaupt
a07a4beaf8
Combo: update timestampOfLastKnownPumpBolusRecord after bolusing.
2018-02-02 11:59:11 +01:00
Milos Kozak
6312b81e10
Merge branch 'smb060' into dev
2018-02-02 10:51:13 +01:00
Johannes Mockenhaupt
1f06d801a2
Combo: retry twice to establish connection before giving up.
...
(cherry picked from commit a16560a)
2018-02-02 10:06:04 +01:00
Cukrovka
af5dc7cc7b
Update strings.xml
...
Oprava diakritiky.
2018-02-02 09:36:03 +01:00
Milos Kozak
411add616b
Merge pull request #632 from jamorham/dev
...
Add Insight Pump Plugin
2018-02-02 09:21:57 +01:00
Milos Kozak
87722abb64
Merge pull request #640 from MilosKozak/spanishmerge
...
Spanishmerge
2018-02-02 09:18:07 +01:00
Milos Kozak
72eed13932
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-02-02 09:17:51 +01:00
Milos Kozak
727ace4cc1
check for NPE
2018-02-02 09:17:26 +01:00
Johannes Mockenhaupt
26e7834093
Clean up, no behavioral changes and a bigger bed.
2018-02-02 00:40:24 +01:00
AdrianLxM
aca422dfb6
remove duplicates
2018-02-01 23:55:08 +01:00
Milos Kozak
c953086e3d
Merge branch 'smb-events' into 'smb060'
...
Let IobCob handle EventNewBg and loop act on IobCob result.
See merge request MilosKozak/AndroidAPS!379
2018-02-01 22:13:59 +00:00
Milos Kozak
90b0e6d84a
Merge branch 'dev' into smb060
2018-02-01 23:02:00 +01:00
Milos Kozak
36cb4fc474
recover deviation slope calculation
2018-02-01 22:57:58 +01:00
Jamorham
cdb3bc24c2
Use Config.DANAR to enable Insight
2018-02-01 21:37:21 +00:00
AdrianLxM
cea99a968f
small fixes
2018-02-01 22:09:57 +01:00
AdrianLxM
2e44734b61
Merge branch 'dev' into spanishmerge
2018-02-01 22:07:06 +01:00
AdrianLxM
276784c799
Merge branch 'patch-1' of https://github.com/CaroGo/AndroidAPS into dev180127
2018-02-01 22:02:27 +01:00
Markus M. May
b7ec90ca07
Remove java file object
2018-02-01 21:25:37 +01:00
Markus M. May
6d8c0770c3
Rework copying of libs
2018-02-01 21:11:28 +01:00
Milos Kozak
65ad55ef98
Merge pull request #638 from MilosKozak/AdrianLxM-wearnullprofile
...
check for null profile
2018-02-01 20:23:42 +01:00
Milos Kozak
463031bd31
FR language
2018-02-01 20:17:42 +01:00
Markus M. May
629b626306
Download jniLibs as dependency, delete on clean (in gradle)
2018-02-01 20:09:29 +01:00
AdrianLxM
96668cbf9b
check for null profile
2018-02-01 18:45:48 +01:00
Jamorham
b3c0daaeae
Enable isRefillingCapable
2018-02-01 17:39:28 +00:00
Milos Kozak
416c9f817b
fix smb iob calculation
2018-02-01 17:12:19 +01:00
Milos Kozak
d088bfccc8
remove unused microBolusInsulin
2018-02-01 16:35:04 +01:00
Jamorham
6a12b0a931
Use bolus id for history entry
2018-02-01 14:37:16 +00:00
Jamorham
73ea3628b2
Extracted insight strings
2018-02-01 10:33:54 +00:00
Milos Kozak
fa46798fdf
remove unused microBolusIOB
2018-02-01 10:57:05 +01:00
Milos Kozak
e779dbf221
fix merge conflict
2018-02-01 10:29:00 +01:00
Milos Kozak
f3769521a5
bump 1.59-dev
2018-02-01 10:25:28 +01:00
Milos Kozak
2157022735
bump 1.58
2018-01-31 23:21:02 +01:00
CaroGo
815247dabb
Update strings.xml
...
I did a few changes...
2018-01-31 16:51:00 +01:00
Jamorham
7f73c59530
Nightscout + UI performance improvements
2018-01-31 14:23:22 +00:00
Johannes Mockenhaupt
79f993cd26
Set version.
2018-01-31 15:13:43 +01:00
Johannes Mockenhaupt
d336c176fb
Update some descriptions.
2018-01-31 14:07:47 +01:00
Johannes Mockenhaupt
c62ca89931
Fix adding a partial bolus to treatments.
2018-01-31 14:00:59 +01:00
Johannes Mockenhaupt
b32351145a
Fix 'last bolus' not being displayed on start.
2018-01-31 13:55:25 +01:00
Johannes Mockenhaupt
98d666098b
Remove now unused PumpState.delivered field.
2018-01-31 13:54:42 +01:00
Johannes Mockenhaupt
1ba3a85655
Add DetailedBolusInfo.copy() method.
2018-01-31 13:54:15 +01:00
Johannes Mockenhaupt
1aee181f62
RuffyScripter: fix reading basal rate when no TBR is active
2018-01-31 12:54:25 +01:00
Johannes Mockenhaupt
344984e201
Fix recording partially delivered boluses.
2018-01-31 12:36:41 +01:00
Johannes Mockenhaupt
5bb8bdde3e
BolusCommand: don't check pump history on cancel, ComboPlugin.deliverBolus has that responsibility now.
2018-01-31 11:59:30 +01:00
Johannes Mockenhaupt
47ce9d8561
Revert "Set custom version."
...
This reverts commit cd7af6c5fe
2018-01-31 11:56:12 +01:00
Jamorham
d07d9d309e
Implement additional methods
2018-01-31 09:53:31 +00:00
Johannes Mockenhaupt
8be8f961ae
Answer ruffy warnings.
...
(cherry picked from commit b73a822)
2018-01-31 02:02:02 +01:00
Johannes Mockenhaupt
4defd40023
RuffyScripter: clean up answers.
...
(cherry picked from commit 0c30e1b)
2018-01-31 01:35:31 +01:00
Jamorham
ce0650a495
Check remote protocol version
2018-01-31 00:33:10 +00:00
Jamorham
c3b07d2a0f
Match library refactoring
2018-01-31 00:31:55 +00:00
Johannes Mockenhaupt
6108e9f17a
Fix basal rate check.
2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt
1107d00571
Fix pump state display during init.
...
(cherry picked from commit 3967c4b)
2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt
6981c0fec6
Pump needs rest.
...
(cherry picked from commit 2e88fb9)
2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt
154902acdc
Fix ReadHistoryCommand not reading errors, TDDs.
2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt
e790c87940
Cleanups and strings.
2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt
34db941c29
Remove unused code to import TBRs from the pump.
2018-01-31 00:59:23 +01:00
Johannes Mockenhaupt
3db7aedb06
Fix activity indicator during on-connect-checks.
2018-01-31 00:09:38 +01:00
Johannes Mockenhaupt
c7cccf3220
Read quick info first when checking history.
2018-01-31 00:08:39 +01:00
Johannes Mockenhaupt
ecd16c26b8
ComboFragment: disable buttons when running.
2018-01-31 00:04:17 +01:00
Johannes Mockenhaupt
d08958e43f
Remove dead ruffyscripter code.
2018-01-30 23:16:45 +01:00
Johannes Mockenhaupt
a8cca7fcea
Remove duplication in ruffyscripter commands.
2018-01-30 23:16:27 +01:00
Milos Kozak
fada51c380
Merge pull request #597 from triplem/test
...
Add a unit test for Insulin Plugin
2018-01-30 22:47:33 +01:00
Markus M. May
be6047066a
Remove libs from this repository - moved to another one
2018-01-30 22:06:49 +01:00
Markus M. May
a6f65f5d33
Enhance insulin plugin test
2018-01-30 19:52:57 +01:00
Markus M. May
f68d8f1626
Cleanup Refactoring
2018-01-30 19:33:10 +01:00
AdrianLxM
3a0d5d73f8
filter null BT devices
2018-01-30 01:02:21 +01:00
Jamorham
ff0256345f
Display more live pump data
2018-01-29 22:55:53 +00:00
Milos Kozak
af3b77e646
history browser initial work
2018-01-29 22:48:47 +01:00
Jamorham
ef2189fec6
Insight faux cancel tbr option
2018-01-29 21:31:06 +00:00
Markus M. May
2a1bfe1f6c
merge changes on foodhelper
2018-01-29 22:23:20 +01:00
Markus M. May
9a7e57f0a0
rename event to stay in compliance to naming conventions
2018-01-29 22:20:18 +01:00
Markus M. May
147448afca
#557 - Encapsulate food plugin
2018-01-29 22:20:18 +01:00
Markus M. May
7d669fbeb8
Make food working, adopt category selection slightly
2018-01-29 22:20:18 +01:00
Markus M. May
a78652f737
This needs to get reverted, but for testing purposes...
2018-01-29 22:20:18 +01:00
Markus M. May
f31eabcefe
Minor update to show off the possiblities for the refactoring. This is just a short step, major improvements are still to come.
2018-01-29 22:20:18 +01:00
Markus M. May
9cb019f5ca
#557 - showoff of possible refactorings - see REFACTOR.md for additonal details
2018-01-29 22:20:18 +01:00
Johannes Mockenhaupt
1e22599979
Fix format specifier.
2018-01-29 21:07:22 +01:00
Johannes Mockenhaupt
33ad68d26a
Fix string.
2018-01-29 20:13:53 +01:00
Milos Kozak
9255b93800
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into history
2018-01-29 20:06:16 +01:00
Milos Kozak
b11e301391
ES translations
2018-01-29 20:05:16 +01:00
Johannes Mockenhaupt
216359312a
Minor non-code tweaks.
2018-01-29 20:02:18 +01:00
Johannes Mockenhaupt
2468f23e97
ComboFragment: i18n last bolus.
2018-01-29 20:02:18 +01:00
Johannes Mockenhaupt
5fbd9097d8
Rename ReadReservoirLevelAndLastBolus to ReadQuickInfoCommand.
2018-01-29 20:02:17 +01:00
Johannes Mockenhaupt
739e52dc47
Remove CommandResult.lastBolus in favour of CR.history.bolusHistory.
2018-01-29 20:01:53 +01:00
Roumen Georgiev
5e24289387
show output in mmol like in AMA
2018-01-29 16:43:45 +00:00
Milos Kozak
1eba5b79b8
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-01-29 13:28:36 +01:00
Johannes Mockenhaupt
3adda9bf6e
Clean up bolus delivery code.
2018-01-29 13:18:49 +01:00
Milos Kozak
c2dc3f9848
Merge branch 'danas' into smb060
2018-01-29 12:01:53 +01:00
Milos Kozak
af31c29134
Merge branch 'dev' into smb060
2018-01-29 12:01:02 +01:00
Milos Kozak
d6f9dd819c
Merge branch 'smb-misc' into 'smb060'
...
Smb misc
See merge request MilosKozak/AndroidAPS!381
2018-01-29 10:50:27 +00:00
Milos Kozak
e55f88a255
Merge branch 'smb-apsresult' into 'smb060'
...
Clean up parsing OpenAPS result and applying it
See merge request MilosKozak/AndroidAPS!383
2018-01-29 10:46:40 +00:00
Milos Kozak
4cef8db54b
Dana plugin refactoring
2018-01-29 11:24:03 +01:00
Johannes Mockenhaupt
038ea06abc
Log history reads.
...
(cherry picked from commit 7326f29)
2018-01-29 10:08:28 +01:00
Johannes Mockenhaupt
449dbd79f7
Rename TBR to 'temp basal'
2018-01-29 03:14:10 +01:00
Johannes Mockenhaupt
6fa1badcdb
Clean up parsing of SMB result and applying the requests.
2018-01-29 03:13:57 +01:00
Johannes Mockenhaupt
0655e4e676
SMB: clean up APSResult.toSpanned a bit.
...
(cherry picked from commit 10d7c79)
2018-01-29 03:13:57 +01:00
Johannes Mockenhaupt
b1fd66aae5
Make TreatmentsPlugin.getLastBolusTime robust.
...
Ignore carb-only treatments, ignore future records.
(cherry picked from commit cba015e)
2018-01-29 03:05:12 +01:00
Jamorham
742ee5b762
Insight plugin updates
2018-01-28 23:16:30 +00:00
Johannes Mockenhaupt
2b995a8a73
RufyfScripter: log active/previous command in error routines.
2018-01-28 23:56:27 +01:00
Johannes Mockenhaupt
864100299d
Set activity indicator for refresh button.
2018-01-28 23:39:57 +01:00
Johannes Mockenhaupt
262fdf92c8
Check pump basal rate matches cached profile, force re-read otherwise.
2018-01-28 23:39:53 +01:00
Jamorham
afd7fc5769
Update sightparser library
2018-01-28 22:36:24 +00:00
Jamorham
07cdee0533
Insight CancelBolusTaskRunner refactor
2018-01-28 22:35:26 +00:00
Milos Kozak
f54452515b
KO language cleanup
2018-01-28 23:29:33 +01:00
Johannes Mockenhaupt
9f5ffc6646
Actually do something with the basal rate profile after force-reading.
2018-01-28 23:23:44 +01:00
Jamorham
c019b4c533
Insight Cstatus add success helper
2018-01-28 22:04:21 +00:00
Jamorham
cbe827ac07
Add History Receivers
2018-01-28 22:03:40 +00:00
Jamorham
9a8521b809
Insight Live History
2018-01-28 21:52:58 +00:00
Jamorham
e704f130bc
Add Insight HistoryLogAdapter
2018-01-28 21:52:18 +00:00
Johannes Mockenhaupt
eb7ec24335
Don't read pump TBR history.
2018-01-28 22:33:05 +01:00
Johannes Mockenhaupt
cd7af6c5fe
Set custom version.
2018-01-28 22:31:43 +01:00
Johannes Mockenhaupt
3fde47d283
Move ruffyscripter to combo plugin package.
2018-01-28 22:16:58 +01:00
Johannes Mockenhaupt
6c4c662c31
Remove RuffyCommandsV1Impl.
2018-01-28 22:14:31 +01:00
Johannes Mockenhaupt
10d2b8739f
Log commands to Fabric.
2018-01-28 22:10:11 +01:00
Johannes Mockenhaupt
34af5bc20b
Source code from ruffyscripter, ruffy-spi modules.
2018-01-28 22:03:32 +01:00
Johannes Mockenhaupt
6609eb6be5
Cleanup.
2018-01-28 21:56:56 +01:00
Johannes Mockenhaupt
302d3494d2
Covering 105% of all failure cases.
2018-01-28 19:53:44 +01:00
Johannes Mockenhaupt
9ba6f2144b
Strings fix-up.
2018-01-28 19:30:59 +01:00
Johannes Mockenhaupt
3b7045227e
Only check reservoir level before bolus if data is available.
2018-01-28 19:04:46 +01:00
Johannes Mockenhaupt
bd87a893c2
Best effort to handle multiple boluses within the same minute.
...
(cherry picked from commit cc9094f)
2018-01-28 18:59:07 +01:00
Johannes Mockenhaupt
3a95c3c4d9
More work for bolusing with pump history records.
...
(cherry picked from commit 4bc3e42)
2018-01-28 17:06:16 +01:00
Johannes Mockenhaupt
8c27b32d07
Let "Initializing" be a pump state, not an action.
2018-01-28 15:48:17 +01:00
Johannes Mockenhaupt
cd385a3217
ComboFragment: deal with resevoir levels being available or not.
2018-01-28 15:43:50 +01:00
Johannes Mockenhaupt
e3abe04545
Bring back last bolus to combo fragment.
...
(cherry picked from commit 108349e)
2018-01-28 15:30:36 +01:00
Johannes Mockenhaupt
5de588b540
Enable reading reservoir level units.
...
This partially reverts commit b4998feee1
2018-01-28 15:27:59 +01:00
Johannes Mockenhaupt
b3a60eb5ab
Initial work on basing boluses on pump history.
2018-01-28 15:22:41 +01:00
warstar2187
c297ce88bb
Update strings.xml
2018-01-28 11:01:56 +09:00
warstar2187
76d606fddf
Update strings.xml
2018-01-28 10:51:09 +09:00
Johannes Mockenhaupt
3be65319d7
AlarmSoundService: don't set volume to 100% if music is playing.
...
Have mercy with my ears.
2018-01-27 20:12:17 +01:00
Johannes Mockenhaupt
db5ee7067a
PumpEnactResult.toSpanned: add SMBs, handle SMB-only enact.
2018-01-27 19:58:37 +01:00
Johannes Mockenhaupt
7e264b1bfd
Let IobCob handle EventNewBg and loop act its result.
2018-01-27 19:04:03 +01:00
Radoslav Radev
d4fe03ac30
Bg translation
2018-01-27 16:12:51 +02:00
Milos Kozak
b4d13c727e
let nsclient bg source be with advanced filtering temporary
2018-01-27 15:07:15 +01:00
Milos Kozak
5b11c5630c
hide deviation slope graphs
2018-01-27 14:47:35 +01:00
Milos Kozak
296d5059d6
SMB options in preferences
2018-01-27 14:47:04 +01:00
Milos Kozak
4af8e14417
Merge branch 'dev' into smb060
2018-01-27 13:47:41 +01:00
Milos Kozak
ce3c888246
add RO language
2018-01-27 13:40:19 +01:00
Jamorham
2c9cd89ff3
Add unit test
2018-01-26 22:44:12 +00:00
Jamorham
b831fd7dfb
Insight Temporary basal absolute
2018-01-26 22:34:43 +00:00
Jamorham
f036ca4547
Attempt to eliminate duplicate connectors
2018-01-26 22:27:04 +00:00
Jamorham
3150e7d00f
Add double rounding helper
2018-01-26 22:26:29 +00:00
Milos Kozak
b2d9ad8986
Merge branch 'dev' into smb060
2018-01-26 22:49:25 +01:00
Milos Kozak
d634ee7d4b
CS translations
2018-01-26 22:10:27 +01:00
Jamorham
0966bea1e8
InsightPumpFragment: add redundant casting for travis
2018-01-26 17:17:04 +00:00
Jamorham
ee0a53976f
StatusItemViewAdapter add redundant casting for travis
2018-01-26 17:10:43 +00:00
Jamorham
f30efd0224
Insight fragment use status list
2018-01-26 16:59:14 +00:00
Jamorham
076685992c
Insight status list and connector
2018-01-26 16:58:19 +00:00
Jamorham
f2cfc3cdbd
Update helpers
2018-01-26 16:56:09 +00:00
Jamorham
2f7dc11b9f
Update Insight fragment layouts
2018-01-26 16:46:09 +00:00
Milos Kozak
e5d20ca996
ButterKnife to Dana fragment
2018-01-26 17:18:40 +01:00
Jamorham
31b0ce21e5
StatusItem ui elements
2018-01-26 16:12:37 +00:00
Johannes Mockenhaupt
3d1f8c0893
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
Disable release build checks until wear lib upgrade (#620 ).
Rv2,RS: use safe carb diff 30s
2018-01-26 16:19:45 +01:00
Milos Kozak
a7a4693e9c
Merge pull request #621 from jotomo/disable-release-checks
...
Disable release build checks until wear lib upgrade (#620 ).
2018-01-26 16:18:48 +01:00
Johannes Mockenhaupt
3100447167
Disable release build checks until wear lib upgrade ( #620 ).
2018-01-26 15:57:26 +01:00
Milos Kozak
d8a6c0d111
Rv2,RS: use safe carb diff 30s
2018-01-26 15:47:45 +01:00
Johannes Mockenhaupt
61bb6aa1ba
Combo: declare as not supporting carb infos.
2018-01-26 13:53:50 +01:00
Johannes Mockenhaupt
372e435761
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
Fix format specifiers in Spanish translation, add MainApp.gs(id, args).
travis accept license manually
Push carbs only to pumps supporting storing carbs.
travis to 27.0.2
sdk27 & butterknife
2018-01-26 13:53:42 +01:00
Johannes Mockenhaupt
4a1970926c
Cleanup.
2018-01-26 13:53:17 +01:00
Milos Kozak
98e850b1b3
Merge branch 'dev' into smb060
2018-01-26 11:54:09 +01:00
Jamorham
8fa0de19c2
Insight async add wake locking
2018-01-26 10:31:11 +00:00
Jamorham
11fcfb88d4
More helper methods
2018-01-26 10:29:56 +00:00
Milos Kozak
6be2988e31
Merge pull request #619 from MilosKozak/sdk27
...
Sdk27
2018-01-26 10:14:21 +01:00
Milos Kozak
3c1e18d5d2
Merge pull request #617 from jotomo/push-carbs-to-supported-pumps-only
...
Push carbs only to pumps supporting storing carbs.
2018-01-26 10:10:16 +01:00
Jamorham
69da0cf57a
Always connected option
2018-01-25 23:21:42 +00:00
Jamorham
4be1f52254
Cancels for TBR + extended
2018-01-25 23:21:11 +00:00
Jamorham
8ee75c5c72
Try to get missing status
2018-01-25 23:20:14 +00:00
Jamorham
07d17ede5f
Lower reconnect threshold
2018-01-25 21:26:11 +00:00
Jamorham
d421ceffa6
Insight automatic reconnector
2018-01-25 20:55:55 +00:00
Jamorham
c8ba4076c6
Update Helpers
2018-01-25 20:55:02 +00:00
Johannes Mockenhaupt
0067eb75d5
Fix format specifiers in Spanish translation, add MainApp.gs(id, args).
2018-01-25 20:28:21 +01:00
Johannes Mockenhaupt
5dcf214d08
Fix German translation.
2018-01-25 20:10:21 +01:00
Jamorham
54e2f7a712
Current work in progress
2018-01-25 17:30:16 +00:00
Jamorham
8cf159a6a7
Insight async callback handling
2018-01-25 17:23:57 +00:00
Johannes Mockenhaupt
947203b107
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
fix not attached to the activity
check for no profile
check for no profile
Fix namespace errors.
Add missing ids to other overview layouts.
Overview: make checkbox labels toggle state as well.
minimum of 30 min for unreachable alert
2018-01-25 16:06:22 +01:00
Johannes Mockenhaupt
ed1226ae67
Push carbs only to pumps supporting storing carbs.
2018-01-25 13:22:01 +01:00
Milos Kozak
91bd21131d
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-01-25 11:27:17 +01:00
Milos Kozak
ca01168474
Merge pull request #611 from MilosKozak/min_unreachable
...
minimum of 30 min for unreachable alert
2018-01-25 11:24:09 +01:00
Milos Kozak
1ba793304f
Merge pull request #616 from jotomo/check-that-box
...
Overview: make checkbox labels toggle state as well.
2018-01-25 11:23:06 +01:00
Milos Kozak
8d792a24db
bump 1.57a-dev
2018-01-25 11:21:27 +01:00
Milos Kozak
893c64e2e4
fix not attached to the activity
2018-01-25 11:17:23 +01:00
Milos Kozak
a3e6794138
check for no profile
2018-01-25 11:09:58 +01:00
Milos Kozak
7be0bfb27e
check for no profile
2018-01-25 11:06:35 +01:00
Johannes Mockenhaupt
c469edb5a3
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
2018-01-25 03:28:06 +01:00
Johannes Mockenhaupt
f7ed34532a
Fabric-Log combo init to get an idea of user count.
2018-01-25 03:28:06 +01:00
Jamorham
8f1feefce9
Add sightparser library
2018-01-24 21:18:34 +00:00
Jamorham
c85854fe93
initial InsightPumpPlugin rough and untested
2018-01-24 21:12:12 +00:00
Milos Kozak
bd5c7c396f
sdk27 & butterknife
2018-01-24 21:54:24 +01:00
Jamorham
979dc2d5e2
More pieces for Insight Pump
2018-01-24 16:51:05 +00:00
Milos Kozak
801182eccd
fix cob calculation for history records
2018-01-24 17:03:45 +01:00
Johannes Mockenhaupt
0f98c49876
Fix namespace errors.
2018-01-24 16:54:29 +01:00
Johannes Mockenhaupt
2a4f1950b3
Add missing ids to other overview layouts.
2018-01-24 16:53:40 +01:00
Jamorham
7a4bc3b694
Initial bits for Insight Pump
2018-01-24 14:18:31 +00:00
Johannes Mockenhaupt
3a02f01374
Overview: make checkbox labels toggle state as well.
2018-01-24 14:10:17 +01:00
Johannes Mockenhaupt
01d49f9e52
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
fix storing food to the database
remove forgotten log
delete all dbrequests from query
2018-01-24 02:15:45 +01:00
Johannes Mockenhaupt
ae1707ead3
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
log RS history
RS: reset isConnected & isConnecting on error
RS BLE modifications
2018-01-24 02:06:02 +01:00
Milos Kozak
8a45422135
Merge branch 'dev' into cobthread
2018-01-24 00:00:23 +01:00
Milos Kozak
b6f3fae487
fix storing food to the database
2018-01-23 23:14:39 +01:00
Milos Kozak
9663dd499e
remove forgotten log
2018-01-23 23:01:04 +01:00
Milos Kozak
d4ddfbb942
Merge branch 'dev' into cobthread
2018-01-23 22:04:42 +01:00
Milos Kozak
c2a7747167
use getAutosensData(toTime) in oref0 sensitivity
2018-01-23 22:02:17 +01:00
Milos Kozak
de7789bec0
delete all dbrequests from query
2018-01-23 21:43:48 +01:00
Milos Kozak
48211aaa30
cob calculation thread
2018-01-23 20:58:48 +01:00
Milos Kozak
9c78595c80
log RS history
2018-01-23 18:19:18 +01:00
Milos Kozak
d6201eec17
Merge pull request #563 from MilosKozak/jellyRS
...
WIP: RS BLE modifications
2018-01-23 13:58:47 +01:00
Milos Kozak
4d474ddbdb
RS: reset isConnected & isConnecting on error
2018-01-23 13:59:33 +01:00
Johannes Mockenhaupt
80f13553dc
Add missing placeholder in Dutch translation.
2018-01-23 12:45:47 +01:00
Johannes Mockenhaupt
0eba153d8a
Combo: add 'base basal rate' to fragment.
...
(cherry picked from commit 2873da5)
2018-01-23 02:13:11 +01:00
Johannes Mockenhaupt
b7f8913cae
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
Careportal DB browser
fix rendering treatments with duration
more autosens logging
cancel extending bolus on pump disconnection
set maxiob=0 only for objective 4
fix stopping bolus connection error
2018-01-23 02:04:02 +01:00
Milos Kozak
52e4496add
Careportal DB browser
2018-01-22 21:49:01 +01:00
Milos Kozak
d033407ba7
fix rendering treatments with duration
2018-01-22 19:12:22 +01:00
Milos Kozak
f835c272ad
more autosens logging
2018-01-22 17:18:18 +01:00
Milos Kozak
f5a2c5bcd2
cancel extending bolus on pump disconnection
2018-01-21 23:38:24 +01:00
Milos Kozak
ef2a565c18
set maxiob=0 only for objective 4
2018-01-21 23:20:41 +01:00
Milos Kozak
1c65a88e49
fix stopping bolus connection error
2018-01-21 22:51:30 +01:00
Johannes Mockenhaupt
17d7eaa883
Fix missing/extra string resources.
2018-01-21 20:28:43 +01:00
AdrianLxM
3962808626
minimum of 30 min for unreachable alert
2018-01-21 19:05:04 +01:00
Johannes Mockenhaupt
0553754d8f
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
synchronized access to basal_v
2018-01-21 17:01:27 +01:00
Milos Kozak
fa48720f0e
Merge branch 'dev' into smb060
2018-01-21 15:58:54 +01:00
Milos Kozak
eedc38fbcf
synchronized access to basal_v
2018-01-21 15:56:07 +01:00
Johannes Mockenhaupt
8fda1a678f
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
better handling of wrong profiles
2018-01-21 14:13:46 +01:00
Milos Kozak
e5ede788ba
Merge branch 'dev' into smb060
2018-01-21 13:38:21 +01:00
Milos Kozak
060895b33f
better handling of wrong profiles
2018-01-21 13:37:38 +01:00
Johannes Mockenhaupt
e4ad33659b
Add missing formatters in Dutch translation.
...
(cherry picked from commit 90dcc9d)
2018-01-21 12:12:58 +01:00
Johannes Mockenhaupt
20c218ae9a
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
Overview: move checkboxes before label.
fix pump unreachable for virtual pump
getLastAutosensData improvement and logging
remove readstatus prior every command
bump 1.57-dev
better log build verison to Fabric
# Conflicts:
# app/build.gradle
2018-01-19 21:05:37 +01:00
Johannes Mockenhaupt
8109900e9b
Overview: move checkboxes before label.
...
(cherry picked from commit 4825e16)
2018-01-19 20:13:53 +01:00
Milos Kozak
97e0aaa380
fix pump unreachable for virtual pump
2018-01-16 23:28:09 +01:00
Milos Kozak
7fdc146b91
getLastAutosensData improvement and logging
2018-01-16 19:28:25 +01:00
Milos Kozak
54ac28bdf9
typo fix
2018-01-15 16:56:30 +01:00
Johannes Mockenhaupt
0569addc55
Set enableSMB_always if using a non-noisy BG source.
2018-01-15 14:03:37 +01:00
Johannes Mockenhaupt
0e4c72e790
Fix check for DexcomG5 Bg source.
2018-01-15 13:58:25 +01:00
Milos Kozak
c501d8e3c5
Merge branch 'smb060' of https://gitlab.com/MilosKozak/AndroidAPS into smb060
2018-01-15 12:47:28 +01:00
Milos Kozak
91a6c7a96c
Merge branch 'dev' into smb060
2018-01-15 12:46:50 +01:00
Johannes Mockenhaupt
723bcc4ee3
Remove 'queued activities' from ComboFragment.
...
(cherry picked from commit 57a4449)
2018-01-15 11:11:58 +01:00
Milos Kozak
5a00b68f68
remove readstatus prior every command
2018-01-14 21:42:36 +01:00
Milos Kozak
99d83a60f4
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-01-14 17:12:35 +01:00
Milos Kozak
44381288f4
bump 1.57-dev
2018-01-14 17:12:18 +01:00
Milos Kozak
89b7b9c24a
better log build verison to Fabric
2018-01-14 17:11:39 +01:00
Johannes Mockenhaupt
d54b99c559
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
Cleanup gradle build files
Add null check in ConfigBuildPlugin.getTempBasalFromHistory.
Avoid race condition checking for an active TBR.
Steampunk watch face: Chart readability improvement; point size increases when chert is highly zoomed in (less than 3 hours shown).
# Conflicts:
# app/build.gradle
2018-01-13 23:18:44 +01:00
Milos Kozak
12fe8bcfdd
Merge branch 'dev' into smb060
2018-01-13 22:50:41 +01:00
Milos Kozak
24909bf59c
Merge branch 'smb060' of https://gitlab.com/MilosKozak/AndroidAPS into smb060
2018-01-13 22:50:10 +01:00
Milos Kozak
390cef5174
remainingCATime fix
2018-01-13 22:49:58 +01:00
Milos Kozak
fdbd2a2cb1
Merge pull request #596 from jotomo/tbr-active-check-race-condition
...
Avoid race condition checking for an active TBR.
2018-01-13 22:43:41 +01:00
Milos Kozak
4f9df99ffb
Merge pull request #601 from jotomo/combo-strings
...
Add strings for the Combo pump, including some renames.
2018-01-13 22:29:46 +01:00
Markus M. May
f5cc2debd7
Cleanup gradle build files
2018-01-13 21:34:38 +01:00
Johannes Mockenhaupt
7d4d6374be
Merge branch 'combo-strings' into combo-scripter-v2
...
* combo-strings:
Add strings for the Combo pump, including some renames.
# Conflicts:
# app/src/main/res/values/strings.xml
2018-01-11 21:48:01 +01:00
Johannes Mockenhaupt
be8534db51
Add strings for the Combo pump, including some renames.
...
Some virtualpump_* strings have been renamed to pump_* since they're
now used for multiple pumps.
2018-01-11 21:47:30 +01:00
Johannes Mockenhaupt
61174d1b0a
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
Update build.gradle
update badge
more round tests
coverage
2018-01-11 17:50:07 +01:00
AdrianLxM
51ca0e0d12
Update build.gradle
2018-01-11 14:14:53 +01:00
Milos Kozak
1d5d44e008
Merge pull request #598 from MilosKozak/coverage
...
Coverage
2018-01-11 00:09:07 +01:00
Milos Kozak
99eef3b19a
more round tests
2018-01-10 23:57:02 +01:00
Johannes Mockenhaupt
864a5e6d81
Missing string resources (en/de).
2018-01-10 23:41:56 +01:00
Simon Pauwels
0ffc61a1ba
Added dutch combo translations ( #42 )
...
* Added and improved Dutch translations
* typo fix
* double string removal
* Typo fix
* added translations
* Update strings.xml
* Added Dutch combo translations
2018-01-10 23:36:20 +01:00
Milos Kozak
a430a7d70d
coverage
2018-01-10 23:31:31 +01:00
swissalpine
8f91f37f73
Übersetzungen RUN und STOP MODE
2018-01-10 23:24:49 +01:00
Johannes Mockenhaupt
27dcb40f48
Add null check in ConfigBuildPlugin.getTempBasalFromHistory.
2018-01-10 22:44:18 +01:00
Markus M. May
d4365a2352
Add a unit test for Insulin Plugin
2018-01-10 22:11:20 +01:00
Johannes Mockenhaupt
b4998feee1
Disable reading reservoir level units.
2018-01-10 15:05:17 +01:00
Johannes Mockenhaupt
9ece407f32
Integrate dutch translation with Combo changes.
...
The lesson to learn here: don't rename string resources in a long-
running branch, but do it after the merge.
Note that Multiwave is a Combo-specific term, the more general
term to describe the combination of a bolus and an extended
bolus is combo bolus, ironically and confusingly ;-)
2018-01-10 11:37:42 +01:00
Johannes Mockenhaupt
0c0a58f16b
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
typo and added dutch translations
2018-01-10 11:20:15 +01:00
Johannes Mockenhaupt
06d949cd82
Avoid race condition checking for an active TBR.
2018-01-10 10:48:44 +01:00
Simon Pauwels
2df19b85a5
typo and added dutch translations
2018-01-09 21:16:37 +01:00
Johannes Mockenhaupt
9a74b0fb95
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
fix canceling temp in open loop mode. credits to @warstar2187
prevent basal updated messages on virtual pump
added BolusWizardTest
prefill profile switch JSON from local store if not exists
PARTIAL_WAKE_LOCK for NSClientService
2018-01-09 20:59:37 +01:00
Milos Kozak
70e22487b2
fix canceling temp in open loop mode. credits to @warstar2187
2018-01-09 19:47:32 +01:00
Milos Kozak
1ce6f32c39
Merge branch 'dev' into smb060
2018-01-09 19:45:45 +01:00
Milos Kozak
bdd1a85d26
fix canceling temp in open loop mode. credits to @warstar2187
2018-01-09 19:44:42 +01:00
Milos Kozak
7e625918ac
Merge branch 'dev' into smb060
2018-01-08 14:27:39 +01:00
Milos Kozak
d7dfe8942e
prevent basal updated messages on virtual pump
2018-01-08 14:27:27 +01:00
Milos Kozak
144315ba61
pass enableSMB_always to determinebasal
2018-01-08 14:19:21 +01:00
Milos Kozak
db3369865a
Merge branch 'dev' into smb060
2018-01-08 14:09:23 +01:00
Milos Kozak
6ebd6bcdc0
Merge branch 'nsc' into dev
2018-01-08 14:09:02 +01:00
Milos Kozak
b31504ac83
Merge pull request #590 from kuchjir/BolusWizard_fix_for_bg_bellow_targetBGLow
...
added BolusWizardTest
2018-01-07 22:58:22 +01:00
kuchjir
e5b21ccc3e
added BolusWizardTest
2018-01-07 22:16:08 +01:00
Milos Kozak
fbb120673f
Merge branch 'dev' into smb060
2018-01-07 15:32:14 +01:00
Milos Kozak
1ff99c4814
prefill profile switch JSON from local store if not exists
2018-01-07 15:29:50 +01:00
Johannes Mockenhaupt
968431d931
i18n reservoir unit.
2018-01-07 13:02:50 +01:00
Milos Kozak
ab89e16acd
PARTIAL_WAKE_LOCK for NSClientService
2018-01-07 12:09:23 +01:00
Johannes Mockenhaupt
d72c243140
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
check 30min interval only for basal rates
2018-01-07 11:38:51 +01:00
Johannes Mockenhaupt
117b79619b
Check reservoir level before bolus and abort if not enough left.
2018-01-07 11:27:28 +01:00
Johannes Mockenhaupt
836abd74ab
Read reservoir level.
2018-01-07 11:21:56 +01:00
Milos Kozak
8cf69006b2
check 30min interval only for basal rates
2018-01-07 11:13:02 +01:00
Johannes Mockenhaupt
3369d84de8
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
basal updated notification
Dialogs usability tweaks
2018-01-06 16:27:02 +01:00
AdrianLxM
6c53fd11e9
Merge pull request #586 from MilosKozak/basalupdate-notif
...
basal updated notification
2018-01-06 09:10:00 +01:00
AdrianLxM
4dd238097f
basal updated notification
2018-01-06 07:37:39 +01:00
AdrianLxM
b9ad3a71fd
Dialogs usability tweaks
2018-01-06 06:52:30 +01:00
Johannes Mockenhaupt
3aafcc9854
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
Cockpit watch face: Double-tap opens MainMenuActivity
prevent processing incomplete profiles
set defaults for display range
actual bg in objective 1
warn if wrong profile is detected
2018-01-06 00:30:04 +01:00
Milos Kozak
144292576a
Merge branch 'dev' into watchfaces-steampunk
2018-01-05 11:36:48 +01:00
Milos Kozak
aff0e6f5a8
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-01-04 23:12:40 +01:00
Milos Kozak
b7df21c7d0
prevent processing incomplete profiles
2018-01-04 23:12:35 +01:00
Johannes Mockenhaupt
ead299442a
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
allow old data on the wf
request new data on preference change
accept local NS data broadcast even when ns_upload_only is selected
remove logging
2018-01-04 21:38:19 +01:00
Milos Kozak
955ecc6d64
set defaults for display range
2018-01-04 21:33:18 +01:00
AdrianLxM
95bca1a92d
actual bg in objective 1
2018-01-04 18:53:38 +01:00
AdrianLxM
468426bd31
Merge pull request #581 from MilosKozak/watchfaces-steampunk
...
request new data on preference change
2018-01-04 17:41:30 +01:00
AdrianLxM
c3d14b506d
allow old data on the wf
2018-01-04 16:20:49 +01:00
Milos Kozak
d7200d1e8e
warn if wrong profile is detected
2018-01-04 11:06:57 +01:00
Milos Kozak
4643cdc3b9
accept local NS data broadcast even when ns_upload_only is selected
2018-01-04 09:45:17 +01:00
Milos Kozak
a08a6cbb70
patch SMB determine_basal to not produce error
2018-01-03 22:59:26 +01:00
Milos Kozak
ed3f076bd7
Merge branch 'dev' into smb060
2018-01-03 22:40:34 +01:00
Milos Kozak
de1475dbba
remove logging
2018-01-03 22:28:48 +01:00
Milos Kozak
230ec7177b
Merge branch 'dev' into smb060
2018-01-03 21:22:38 +01:00
Johannes Mockenhaupt
bf25af8c42
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
Check activity != null before drawing graph.
2018-01-03 21:18:12 +01:00
Johannes Mockenhaupt
f09d68ad59
Check activity != null before drawing graph.
2018-01-03 20:58:49 +01:00
Milos Kozak
ff5d42522c
Merge branch 'dev' into smb060
2018-01-03 20:31:36 +01:00
Johannes Mockenhaupt
abdad220f6
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
improve GUI response
narrower temp basal line for steampunk watchface
darker and gracile steampunk-chart
Steampunk: Enabled chart zoom with double-tap on bottom 1/3 of screen - xml files.
Steampunk: Enabled chart zoom with double-tap on bottom 1/3 of screen.
move steampunk md to main dir
Addition of a file linking to the location of the Steampunk source photoshop file. File is not included in the repository as it exceeds Github's 25 mb limit.
Steampunk watch face - improvement of the units switching functionality (less time spent on "?" on glucose dial).
Steampunk watch face - unit testing complete.
Steampunk watchface: Updated graphics for more accuracy / brighter background, enabled double-tap, corrected issue when changing from mg/dL to mmol/L (glucose would show as "low").
Steampunk watchface (moto360 support - ignores the chin)
Steampunk watchface (mmol support) Includes delta granularity in the watch preferences.
Steampunk watchface (interim commit)
Steampunk watch face addition of mmol/L drawable
Steampunk watch face layout changes
Steampunk watch face (for testing)
Steampunk watch face (not yet functional)
Steampunk watch face (not yet functional)
2018-01-03 20:16:50 +01:00
Milos Kozak
094737adde
improve GUI response
2018-01-03 19:59:18 +01:00
AdrianLxM
0b76290091
Merge pull request #578 from andrew-warrington/watchfaces
...
Steampunk watch face
2018-01-03 19:58:40 +01:00
Johannes Mockenhaupt
fd8f2c0801
Clean up unintended diversions from upstream.
2018-01-03 19:07:10 +01:00
Johannes Mockenhaupt
53a8cd4eac
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
missing file
illegalState crash fix
combo-bolus-fix
2018-01-03 18:28:17 +01:00
Johannes Mockenhaupt
c125e9265f
Strings: TDD.
2018-01-03 16:57:56 +01:00
Johannes Mockenhaupt
2946e2a485
Merge remote-tracking branch 'swissalpine/patch-2' into combo-scripter-v2
...
* swissalpine/patch-2:
Update strings.xml
# Conflicts:
# app/src/main/res/values-de/strings.xml
2018-01-03 16:26:35 +01:00
AdrianLxM
e0abd1b816
Merge remote-tracking branch 'andrewremote/watchfaces' into watchfaces-steampunk
2018-01-03 13:53:38 +01:00
AdrianLxM
28a52b3ab7
Merge pull request #574 from MilosKozak/illegalstate-fix
...
illegalState crash fix
2018-01-03 13:45:31 +01:00
Andrew Warrington
8b37826335
Steampunk watch face - improvement of the units switching functionality (less time spent on "?" on glucose dial).
2018-01-03 10:41:18 +01:00
swissalpine
5fdd88ae75
Shortname: OBJ -> ZIEL
2018-01-03 09:42:49 +01:00
swissalpine
61cc7fc64e
Historie statt Historik
...
"Historik" meint "Geschichtswissenschaft" bzw. die "Lehre von der historischen Methode der Geschichtswissenschaft". "Historie" meint das zwar auch, ist aber insgesamt ein wenig weiter gefasst und meint (bildungssprachlich) auch allgemein die Geschichte, nicht nur die Wissenschaft.
2018-01-03 09:38:17 +01:00
swissalpine
fd27e6c9f8
Delete unnecessary / not used translated strings
...
In this branch this 4 lines are not used, but indeed in Milos dev branch. This lines make it impossible to compile the app.
2018-01-03 09:16:20 +01:00
AdrianLxM
1bbd9012cb
Merge pull request #37 from jotomo/the-clock-strikes-midnight
...
Correctly infer pump date when crossing midnight. Fixes #35 .
2018-01-02 13:28:30 +01:00
Milos Kozak
cc1cd675c7
Merge pull request #573 from MilosKozak/combo-bolus-fix
...
combo-bolus-fix
2018-01-02 10:05:20 +01:00
Andrew Warrington
7475b1ba3a
Merge remote-tracking branch 'origin/dev' into watchfaces
2018-01-01 22:36:07 +01:00
Johannes Mockenhaupt
8e659f5f97
A few minor corrections on the German translation.
2018-01-01 19:11:49 +01:00
Johannes Mockenhaupt
eb51e43d70
Remove duplicate strings after merge.
2018-01-01 16:04:35 +01:00
Johannes Mockenhaupt
8eeb8b748c
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
update German
Revised German Translation
2018-01-01 16:02:05 +01:00
AdrianLxM
c8fa729d8d
update German
2018-01-01 15:45:01 +01:00
swissalpine
bccfd66874
Update strings.xml
2018-01-01 15:16:23 +01:00
swissalpine
62da90011a
Revised German Translation
2018-01-01 15:10:38 +01:00
Johannes Mockenhaupt
cbf005a11e
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
another cob fix
2018-01-01 15:07:34 +01:00
Milos Kozak
d2753e0dad
another cob fix
2018-01-01 14:38:37 +01:00
Johannes Mockenhaupt
1617d6698d
Update ComboPlugin for updated ContstraintsInterface.
2018-01-01 13:26:16 +01:00
Johannes Mockenhaupt
8fb8182f4f
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
Objectives update
2018-01-01 13:25:36 +01:00
AdrianLxM
3bfffdb1b0
brackets on string format
2018-01-01 01:23:30 +01:00
AdrianLxM
4a01b14b35
missing file
2017-12-31 16:51:44 +01:00
AdrianLxM
e190f1b9ef
illegalState crash fix
2017-12-31 16:44:13 +01:00
Milos Kozak
d27d1b1821
Objectives update
2017-12-31 12:24:51 +01:00
Johannes Mockenhaupt
8ee95077a8
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
fix objective 1
upload aps status and iob when loop is suspended
fully offline CP
Queue: synchronize creating queue thread to avoid multiple threads.
Wear: No guard for RS
2017-12-31 11:41:41 +01:00
Milos Kozak
458d812e2e
fix objective 1
2017-12-31 11:07:21 +01:00
Milos Kozak
fcbe8555a6
upload aps status and iob when loop is suspended
2017-12-31 10:22:18 +01:00
AdrianLxM
d3127bc97b
Merge pull request #571 from MilosKozak/offline-treatments
...
fully offline CP
2017-12-31 09:52:29 +01:00
AdrianLxM
3a7fe56f64
combo-bolus-fix
2017-12-31 09:50:51 +01:00
Milos Kozak
7b0a4d2ce7
Merge pull request #570 from jotomo/queue-starts
...
Queue: synchronize creating queue thread to avoid multiple threads.
2017-12-31 09:27:27 +01:00
Johannes Mockenhaupt
a6b938d98a
Correctly infer pump date when crossing midnight. Fixes #35 .
...
(cherry picked from commit bda2551)
2017-12-31 00:27:41 +01:00
AdrianLxM
937872e80c
fully offline CP
2017-12-30 23:01:25 +01:00
AdrianLxM
fb2271e758
Merge pull request #568 from MilosKozak/AdrianLxM-patch-3
...
Wear: No guard for RS
2017-12-30 22:20:37 +01:00
Johannes Mockenhaupt
99f3fb6216
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
autofix error in profile
2017-12-30 19:59:39 +01:00
Johannes Mockenhaupt
58d5c25703
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
missing cob fix
missing inheritance
2017-12-30 19:57:53 +01:00
Milos Kozak
f3db104979
autofix error in profile
2017-12-30 19:56:37 +01:00
Johannes Mockenhaupt
5ecc0ea430
Fix crash in Combo fragment when accessing resoures.
2017-12-30 19:53:22 +01:00
Milos Kozak
8c213cbc11
missing cob fix
2017-12-30 19:42:07 +01:00
Milos Kozak
b39fe2ee5e
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-12-30 16:25:18 +01:00
Milos Kozak
cc50a6fb99
missing inheritance
2017-12-30 16:25:08 +01:00
Johannes Mockenhaupt
f658da42a7
Abort bolusing when reading initial state fails.
...
Otherwise request time is zero and and any old bolus will be regarded
as the last bolus delivered when recovery kicks in.
Also add a safety check to not count a bolus bigger than the
requested bolus as a partially delivered bolus.
2017-12-30 15:51:26 +01:00
Johannes Mockenhaupt
facdc51f6f
Queue: synchronize creating queue thread to avoid multiple threads.
2017-12-29 16:36:19 +01:00
Andrew Warrington
c43afd9d28
Merge remote-tracking branch 'origin/dev' into watchfaces
2017-12-28 01:03:02 +01:00
Johannes Mockenhaupt
d0f876659e
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
Ensure basal rate shown as a percentage if required according to user preferences.
Show watch basal rates, whether temporary or normal.
2017-12-28 00:15:05 +01:00
AdrianLxM
bd4e51e1f9
Merge pull request #546 from andrew-warrington/dev
...
Always show basal rates on watch, whether temporary or normal.
2017-12-27 23:17:52 +01:00
AdrianLxM
774203605f
Wear: No guard for RS
2017-12-27 21:19:57 +01:00
Johannes Mockenhaupt
f970e5e20e
Minor cleanups.
2017-12-27 21:16:03 +01:00
Johannes Mockenhaupt
0e61032dec
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
wear update
RS create bond
add scrollview
QuickWizard detailed settings
# Conflicts:
# app/src/main/res/values/strings.xml
2017-12-27 18:19:51 +01:00
Milos Kozak
3df0e8f9ce
Merge branch 'dev' into smb060
2017-12-27 18:02:06 +01:00
Johannes Mockenhaupt
ee1236c4e4
ComboPlugin: assume valid BR unless proven otherwise.
...
(cherry picked from commit bc93a4b)
2017-12-27 13:04:35 +01:00
Johannes Mockenhaupt
3333d7a6b7
Clean up all the basal rate sanity checks.
...
* Disable loop entirely if no valid basal rate is set on the pump.
Neither closed nor open loop mode makes sense without it.
* Check active BR before updating the pump profile
* Show 'loop disabled' state in Combo fragement.
* Cancel active TBR when basal profile switch to profile != 1
is detected or when an unsupported bolus is active.
2017-12-27 12:49:04 +01:00
Johannes Mockenhaupt
728abbe224
Clean up strings.xml, finish German translation.
2017-12-27 12:28:01 +01:00
Johannes Mockenhaupt
88b3857fb9
Clean up pump init.
2017-12-27 12:28:01 +01:00
Johannes Mockenhaupt
6af28479d6
Disable loop if unsupported basal rate profile is selected. Fixes #31 .
2017-12-27 12:28:01 +01:00
AdrianLxM
79d05488c3
RS create bond
2017-12-27 02:24:26 +01:00
Johannes Mockenhaupt
c84ba24c77
Provide message when setting basal profile fails. Fixes #29 .
2017-12-27 01:33:54 +01:00
Johannes Mockenhaupt
715ffa28d2
Remove empty Combo prefs.
2017-12-27 01:33:42 +01:00
Johannes Mockenhaupt
3266cb4944
Don't show ComboPlugin as constraints plugin.
2017-12-27 01:33:38 +01:00
Milos Kozak
0ab259f61f
Merge branch 'dev' into smb060
2017-12-26 01:22:49 +01:00
Milos Kozak
72d6c4494b
add scrollview
2017-12-26 01:22:35 +01:00
Milos Kozak
162e73e64d
Merge branch 'dev' into smb060
2017-12-26 00:35:16 +01:00
Milos Kozak
8fdd16c305
QuickWizard detailed settings
2017-12-26 00:27:34 +01:00
Johannes Mockenhaupt
a8e0a4dfe8
Merge remote-tracking branch 'origin/dev' into csv2-staging
...
* origin/dev:
don't show single connection timeouts on the watch
2017-12-25 20:52:16 +01:00
Milos Kozak
e2f6e6a450
Merge pull request #547 from MilosKozak/wear-noFakebolusProgressDismiss2
...
don't show single connection timeouts on the watch
2017-12-25 20:44:39 +01:00
AdrianLxM
e50c6fc8ed
RS BLE modifications
2017-12-25 20:39:14 +01:00
Johannes Mockenhaupt
ea5629fc86
Merge remote-tracking branch 'origin/dev' into csv2-staging
...
* origin/dev:
fix non smooth ratio graph
fix of fix
fix wrong button type
fix doubled percentage when comming from NS
proper select last used profile
when using profile percentage limit basal rate to minimal value supported by pump
SingleClickButton
RS fix crash when pairing is not confirmed on pump
Double -> double
use joda-time
Use autosensdata for wizard instead of APSResult
2017-12-25 20:29:32 +01:00
Milos Kozak
dd58952b42
Merge pull request #548 from MilosKozak/COB-Wizard-idea
...
Use autosensdata for wizard instead of APSResult
2017-12-25 19:22:02 +01:00
Milos Kozak
b0bf9b5c79
Merge branch 'dev' into smb060
2017-12-25 17:01:53 +01:00
Milos Kozak
f968ec630c
fix non smooth ratio graph
2017-12-25 17:01:31 +01:00
Johannes Mockenhaupt
d081345da2
Define lowest non-zero basal rate as minimum basal rate for the Combo.
2017-12-25 11:05:51 +01:00
Milos Kozak
ae30046c95
Merge branch 'dev' into smb060
2017-12-23 11:18:37 +01:00
Milos Kozak
3ce260dfe9
fix of fix
2017-12-23 11:18:17 +01:00
Milos Kozak
51de0f16c1
Merge branch 'dev' into smb060
2017-12-23 11:07:48 +01:00
Milos Kozak
6e09bfbbe4
fix wrong button type
2017-12-23 11:07:29 +01:00
Milos Kozak
7380065bd9
Merge branch 'dev' into smb060
2017-12-22 21:11:38 +01:00
Milos Kozak
2bb37a4bfc
fix doubled percentage when comming from NS
2017-12-22 21:03:36 +01:00
Milos Kozak
248d3d1697
proper select last used profile
2017-12-22 20:34:53 +01:00
Milos Kozak
93b954fffe
when using profile percentage limit basal rate to minimal value supported by pump
2017-12-22 20:17:31 +01:00
Milos Kozak
600e2ade1c
SingleClickButton
2017-12-22 19:50:16 +01:00
Milos Kozak
0851581f7f
Merge branch 'dev' into smb060
2017-12-22 12:03:11 +01:00
Milos Kozak
25667bc79e
RS fix crash when pairing is not confirmed on pump
2017-12-22 11:57:59 +01:00
Johannes Mockenhaupt
7073688920
Update ComboPlugin to match updated PumpInterface.
2017-12-22 10:46:54 +01:00
Johannes Mockenhaupt
bd0ae23e30
Merge branch 'dev' into csv2-staging
...
* dev:
fix disconnecting pump
format output date to be displayed on iDevices correctly
BolusWizard use 0 for insulin correction if in range
LocalProfile TimeListEdit min, max
remove string with no default translation
Rv2,RS fix loading events
initialize lastCommandTime too after BT reset
allow to read status after every command
2017-12-22 10:39:30 +01:00
Milos Kozak
e77e7ffbbd
Merge branch 'smb060' of https://gitlab.com/MilosKozak/AndroidAPS into smb060
2017-12-22 10:35:33 +01:00
Milos Kozak
99e5a39b33
Merge branch 'dev' into smb060
2017-12-22 10:34:45 +01:00
Milos Kozak
5bc6ea04c2
Double -> double
2017-12-22 03:27:13 +01:00
Milos Kozak
31975396a2
use joda-time
2017-12-22 02:55:40 +01:00
Milos Kozak
74abdc0271
fix disconnecting pump
2017-12-22 01:35:52 +01:00
Milos Kozak
6b23ba10bd
format output date to be displayed on iDevices correctly
2017-12-22 00:37:22 +01:00
Milos Kozak
a5c4495a5d
BolusWizard use 0 for insulin correction if in range
2017-12-22 00:17:46 +01:00
Milos Kozak
771f9eac1a
LocalProfile TimeListEdit min, max
2017-12-22 00:12:40 +01:00
Johannes Mockenhaupt
42418d4146
ComboFragment: make warning/error bold for a better readability.
...
On lower DPI devices they're already bold, but on higher DPI devices
the yellow "Low" is hardly discernible from white.
(cherry picked from commit 693ba73)
2017-12-21 22:45:27 +01:00
Johannes Mockenhaupt
6a3184bc39
ComboFragment: use history icon for history, not bolus icon.
2017-12-21 11:36:25 +01:00
Andrew Warrington
176c5f46ff
Ensure basal rate shown as a percentage if required according to user preferences.
2017-12-21 09:50:16 +01:00
Milos Kozak
fb12c0bc96
enable SMB for G5
2017-12-21 09:02:49 +01:00
Milos Kozak
cb2368f535
Merge branch 'dev' into smb060
2017-12-21 08:58:33 +01:00
AdrianLxM
2d2bd6d77a
remove string with no default translation
2017-12-21 08:26:55 +01:00
Milos Kozak
2bdda9af43
Rv2,RS fix loading events
2017-12-21 07:45:56 +01:00
Milos Kozak
5d3b307672
Merge branch 'dev' into smb060
2017-12-20 22:37:29 +01:00
Milos Kozak
adff0329dd
initialize lastCommandTime too after BT reset
2017-12-20 20:55:14 +01:00
Milos Kozak
0f43e95644
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-12-20 20:45:35 +01:00
Milos Kozak
63b0efede3
allow to read status after every command
2017-12-20 20:45:21 +01:00
Johannes Mockenhaupt
3b43e4d06a
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
RS enable BT before scanning
BG viewer
NSOffline remove from queue as well
NS offline
# Conflicts:
# app/src/main/res/values/strings.xml
2017-12-20 20:21:12 +01:00
Milos Kozak
beb87acc9f
Merge pull request #552 from MilosKozak/nsoffline
...
Nsoffline
2017-12-20 20:17:30 +01:00
Milos Kozak
c33dd1e7d7
RS enable BT before scanning
2017-12-20 19:50:44 +01:00
Johannes Mockenhaupt
4094b0dd61
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
wait a few sec before disconnection for another command
2017-12-20 19:42:13 +01:00
Milos Kozak
70f4b72ff9
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-12-20 18:26:52 +01:00
Milos Kozak
096b2e93a3
wait a few sec before disconnection for another command
2017-12-20 18:26:47 +01:00
Johannes Mockenhaupt
7c04f528cc
Revert "Handle edge case of setting basal rate in range 0.00 - 0.05."
...
This reverts commit 2054e76cde
2017-12-20 18:06:50 +01:00
Johannes Mockenhaupt
7651107167
Merge branch 'bolus-progress-dialog' into 'smb060'
...
Only show progress dialog for normal boluses, not SMBs.
See merge request MilosKozak/AndroidAPS!375
2017-12-20 16:58:33 +00:00
Johannes Mockenhaupt
c5089d821e
Merge branch 'disappearing-predections-checkbox' into 'smb060'
...
Overview: fix predictions checkbox disappearing after unchecking it.
See merge request MilosKozak/AndroidAPS!370
2017-12-20 16:58:12 +00:00
Johannes Mockenhaupt
2955dd7ec6
Only show progress dialog for normal boluses, not SMBs.
...
(cherry picked from commit b3d4607)
2017-12-20 17:42:39 +01:00
Johannes Mockenhaupt
57944fb4b5
Merge remote-tracking branch 'origin/dev' into smb060
...
* origin/dev:
Actions tab: show profile switch button for single profile too.
Old NS-Version non-urgent
Add SP to imports
refactor cancelAlarm back to KeepAliveReceiver
push next alert on read status
G5 upload to xdrip
fake Esel new file
fake Esel
Apply bolus constraint before applying.
Rv2,RS: always load last 45 min
remove wear-overview notifications as replaced by system notifications
Remove missed reference to pref in NSProfilePlugin.
Remove 'sync to profile' pref.
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
2017-12-20 17:28:08 +01:00
Johannes Mockenhaupt
3880c5ff61
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
Actions tab: show profile switch button for single profile too.
Old NS-Version non-urgent
2017-12-20 16:46:35 +01:00
Milos Kozak
3975ce4cbe
Merge pull request #551 from jotomo/profile-switch-on-actions-tab
...
Actions tab: show profile switch button for single profile too.
2017-12-20 16:45:10 +01:00
Johannes Mockenhaupt
2054e76cde
Handle edge case of setting basal rate in range 0.00 - 0.05.
2017-12-20 16:40:45 +01:00
Johannes Mockenhaupt
d1085c876e
Actions tab: show profile switch button for single profile too.
2017-12-20 16:31:28 +01:00
AdrianLxM
81ca35515f
Old NS-Version non-urgent
2017-12-20 14:34:30 +01:00
Johannes Mockenhaupt
a3db2136e1
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
Remove missed reference to pref in NSProfilePlugin.
Remove 'sync to profile' pref.
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfilePlugin.java
2017-12-20 13:28:41 +01:00
Milos Kozak
eb34345ee2
Merge pull request #539 from jotomo/queue-bolus-constraints
...
Apply bolus constraint before issuing the bolus
2017-12-20 13:25:02 +01:00
Johannes Mockenhaupt
40edb9ff5c
Don't update pump basal profile during startup.
...
* Avoids issues of no profile being set yet
* Making startup take minutes
* KeepAlive will update profile as needed every 5m.
2017-12-20 13:01:24 +01:00
Milos Kozak
0d7e950b73
Merge pull request #505 from jotomo/sync-to-pump
...
Remove sync to pump pref, always sync
2017-12-20 10:49:47 +01:00
Johannes Mockenhaupt
181338e9e2
Another NPE check for failure scenarios.
2017-12-20 00:04:14 +01:00
AdrianLxM
e11a4f6d42
Use autosensdata for wizard instead of APSResult
2017-12-19 22:41:43 +01:00
Johannes Mockenhaupt
715366b2b4
Don't consider pump initialized if updating basal profile on start failed.
2017-12-19 22:24:46 +01:00
Johannes Mockenhaupt
0e20a148e2
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
Add SP to imports
refactor cancelAlarm back to KeepAliveReceiver
push next alert on read status
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java
2017-12-19 21:18:18 +01:00
AdrianLxM
3342d9daa3
don't show single connection timeouts on the watch
2017-12-19 14:47:55 +01:00
AdrianLxM
88adc31dbc
Add SP to imports
2017-12-19 07:16:41 +01:00
Johannes Mockenhaupt
28961da253
Declare profile switches being supported by the Combo.
2017-12-19 00:00:00 +01:00
Andrew Warrington
b180569695
Show watch basal rates, whether temporary or normal.
2017-12-18 21:58:02 +01:00
Johannes Mockenhaupt
9eefae4f67
Merge branch 'queue-bolus-constraints' into combo-scripter-v2
...
* queue-bolus-constraints:
Apply bolus constraint before applying.
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
2017-12-18 21:06:31 +01:00
Johannes Mockenhaupt
8e68a23225
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
G5 upload to xdrip
fake Esel new file
fake Esel
Rv2,RS: always load last 45 min
remove wear-overview notifications as replaced by system notifications
# Conflicts:
# app/src/main/res/values/strings.xml
2017-12-18 20:22:26 +01:00
AdrianLxM
00f13d0479
refactor cancelAlarm back to KeepAliveReceiver
2017-12-17 15:46:43 +01:00
AdrianLxM
9bd0a1f144
push next alert on read status
2017-12-17 15:46:33 +01:00
Johannes Mockenhaupt
34f3428d99
ComboPlugin.setTempBasal: clean up, fix potential bug.
...
(cherry picked from commit 41c45a1)
2017-12-17 15:39:38 +01:00
Andrew Warrington
a0983a99b9
Merge remote-tracking branch 'origin/dev' into watchfaces
2017-12-17 11:52:34 +01:00
AdrianLxM
ca9b68da0d
refactor cancelAlarm back to KeepAliveReceiver
2017-12-17 01:40:27 +01:00
AdrianLxM
14810a142d
push next alert on read status
2017-12-17 01:37:27 +01:00
Johannes Mockenhaupt
fd71ab6b68
Update fake reservoir numbers to trigger default NS warnings.
...
(cherry picked from commit 6e5f9fc)
2017-12-16 12:09:44 +01:00
Johannes Mockenhaupt
92d0630c55
Fix partial bolus displayed in error popup.
2017-12-15 23:05:09 +01:00
Johannes Mockenhaupt
a6a87d0790
Minor fixes and polish around bolus cancellation.
2017-12-15 10:41:07 +01:00
Milos Kozak
8cb4921bab
BG viewer
2017-12-15 01:03:31 +01:00
Milos Kozak
a05c1f947e
Merge branch 'nsoffline' into bgsource
2017-12-14 23:35:01 +01:00
Milos Kozak
5f60e7cf2b
G5 upload to xdrip
2017-12-14 21:49:11 +01:00
AdrianLxM
9602bde6a1
fake Esel new file
2017-12-13 22:39:44 +01:00
AdrianLxM
0151dbd496
fake Esel
2017-12-13 22:14:47 +01:00
Johannes Mockenhaupt
b6bc957813
Minor tewaks and cleanups.
2017-12-13 21:37:44 +01:00
Johannes Mockenhaupt
618e00d71d
Update bolus progress dialog when recovery kicks in.
2017-12-13 21:22:13 +01:00
Johannes Mockenhaupt
67eb6b20ed
Handle errors when reading the history for verification fails.
2017-12-13 20:42:43 +01:00
Johannes Mockenhaupt
25f46fe601
Cleanup.
2017-12-13 20:42:43 +01:00
Johannes Mockenhaupt
7eb40653b2
The pump doesn't accept connections while a bolus delivery is in progress.
...
Remove the code which checked for a bolus delivery in progress
and waited.
2017-12-13 20:42:43 +01:00
Johannes Mockenhaupt
a169245dc3
On bolusing failure, attempt verify by reading last bolus from history.
2017-12-13 20:39:08 +01:00
Milos Kozak
fa4e80444d
NSOffline remove from queue as well
2017-12-13 20:03:24 +01:00
Johannes Mockenhaupt
71355f0421
Typo that typo and other minor cleanups.
2017-12-13 16:29:53 +01:00
Milos Kozak
2a284ce052
Merge pull request #532 from AdrianLxM/adrain156work01
...
remove wear-overview notifications as replaced by system notifications
2017-12-13 00:00:20 +01:00
Andrew Warrington
9e6f124097
Steampunk watchface (interim commit)
2017-12-12 23:17:25 +01:00
Johannes Mockenhaupt
f6721f628c
Apply bolus constraint before applying.
2017-12-12 22:30:42 +01:00
Milos Kozak
e14272c083
Rv2,RS: always load last 45 min
2017-12-12 18:18:41 +01:00
Johannes Mockenhaupt
f83dd1cb67
Unbreak RuffyCommandsV1Impl.readHistory, cleanups.
2017-12-12 00:57:04 +01:00
Milos Kozak
b98c321cbc
NS offline
2017-12-12 00:12:35 +01:00
Milos Kozak
b1c4f28eb7
OpenAPS 0.6.0 1st part
2017-12-11 18:45:04 +01:00
Milos Kozak
c714fead24
add deliverAt safety
2017-12-10 17:04:22 +01:00
Milos Kozak
890ef5978b
safety check for multiple SMBs
2017-12-10 16:25:56 +01:00
Milos Kozak
20414c81c9
update minDeviationSlope default val
2017-12-10 16:14:10 +01:00
Milos Kozak
8822dcecd3
update smb execution in configbuilder
2017-12-10 15:48:28 +01:00
Johannes Mockenhaupt
a5ea94de7d
Fix #12 : properly update TBR from pump on mismatch.
2017-12-10 14:11:07 +01:00
Johannes Mockenhaupt
ca9fe3e755
Fixes around bolus cancellation.
2017-12-10 01:39:58 +01:00
Milos Kozak
cd1327fc9e
Merge branch 'dev' into smb
2017-12-10 00:36:47 +01:00
Johannes Mockenhaupt
fe281b9224
Minor cleanups.
2017-12-09 22:40:51 +01:00
Johannes Mockenhaupt
26fa63d571
ComboFragment: always show refresh button.
...
To allow force starting a conecting attempt if the pump is still
in disconnected state.
2017-12-09 22:08:38 +01:00
Johannes Mockenhaupt
471beae14c
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
remove unused imports
adapt wear actions to command queue
RS report unsupported firmware
removing the whole if() statement
fix NPE when profile not loaded
fix of extended bolus size
Added profile's target BG in NSClient mode
2017-12-09 19:51:07 +01:00
Johannes Mockenhaupt
c386d0ba03
Fix TDDS dialog title.
2017-12-09 19:46:28 +01:00
Johannes Mockenhaupt
3316ab2081
ComboFragment: use queue to refresh state, explicit disconnects for tdd/alert.s
2017-12-09 19:46:28 +01:00
Johannes Mockenhaupt
8699d9a384
Add missing listener registration.
2017-12-09 19:46:28 +01:00
Johannes Mockenhaupt
27e9cfda6f
Overhaul Combo tab buttons and dialogs.
2017-12-09 19:46:28 +01:00
Johannes Mockenhaupt
063a5ba6b9
Only read Tdd and Alerts through buttons on Combo tab, not treatment history.
2017-12-09 19:45:58 +01:00
Johannes Mockenhaupt
b164793f42
Shorten/make clearer message on pump clock being off.
2017-12-09 19:44:28 +01:00
Johannes Mockenhaupt
a7f07b26f9
Pump time warning: urgency level based on how much the time is off.
2017-12-09 19:43:53 +01:00
AdrianLxM
4d356096cf
Check pump time not last connection time
2017-12-09 19:43:53 +01:00
Johannes Mockenhaupt
d2f2266a2b
Re-add warning if pump time is off (needed for basal rates).
2017-12-09 19:43:53 +01:00
Johannes Mockenhaupt
cf142a4538
Merge pull request #4 from jotomo/verify-record-date-after-bolus-cancel
...
Verify and return delivered bolus amount in BolusCommand
2017-12-09 19:41:16 +01:00
Milos Kozak
88defc9f7b
Merge pull request #533 from AdrianLxM/adrian156work01
...
adapt wear actions to command queue
2017-12-09 17:36:16 +01:00
Johannes Mockenhaupt
b409b737e5
On connect, take over TBR CANCELLED warning and raise message. Fixes #9 .
2017-12-09 17:33:11 +01:00
AdrianLxM
21f91b9b29
remove unused imports
2017-12-08 14:58:13 +01:00
Johannes Mockenhaupt
f09464e5d6
Move detection of partial bolus delivery to BolusCommand.
...
Have BolusCommand verify delivered bolus if needed and return the
actually delivered bolus amount. This makes more sense now,
given history is only read if unavoidable.
2017-12-08 12:56:15 +01:00
Milos Kozak
e8c3a0cf91
Merge pull request #525 from PoweRGbg/patch-5
...
Added profile's target BG in NSClient mode
2017-12-08 08:20:37 +01:00
AdrianLxM
874915e7b4
adapt wear actions to command queue
2017-12-08 06:00:49 +01:00
Milos Kozak
696dd4c592
Merge branch 'dev' into smb
2017-12-07 23:54:37 +01:00
Johannes Mockenhaupt
a38afe7a2a
Merge pull request #2 from AdrianLxM/ghostbusters
...
bend translations
2017-12-07 22:04:15 +01:00
AdrianLxM
795292d891
bend translations
2017-12-07 20:51:17 +01:00
Milos Kozak
dc3c853aca
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-12-07 18:48:18 +01:00
Milos Kozak
9d7e2f1bec
RS report unsupported firmware
2017-12-07 18:48:05 +01:00
Johannes Mockenhaupt
81bde2cbde
Set version to 1.56-combo-csv2-test
2017-12-07 18:20:11 +01:00
Johannes Mockenhaupt
87ab6432c6
Revert "Custom: Disable Crashlytics."
...
This reverts commit 015a852ab5
2017-12-07 18:19:27 +01:00
AdrianLxM
0013050860
remove wear-overview notifications as replaced by system notifications
2017-12-07 17:07:32 +01:00
Roumen Georgiev
1d8dd5e35e
removing the whole if() statement
2017-12-07 17:11:54 +02:00
Milos Kozak
d3e11d9331
Merge pull request #530 from PoweRGbg/patch-7
...
fix of extended bolus size
2017-12-07 15:24:55 +01:00
AdrianLxM
aea47420e1
fix NPE when profile not loaded
2017-12-07 10:40:00 +01:00
Roumen Georgiev
242ed7217a
fix of extended bolus size
2017-12-07 10:08:26 +02:00
Johannes Mockenhaupt
60d6f305b5
Debug code.
2017-12-06 19:31:51 +01:00
Johannes Mockenhaupt
de06c54f1d
Minor cleanups in ComboPlugin.
2017-12-06 17:14:30 +01:00
Johannes Mockenhaupt
b0d55b09d4
Minor cleanups around the Command queue.
2017-12-06 17:14:30 +01:00
Johannes Mockenhaupt
86b63cb27d
Combo tab: show command queue if non-empty.
2017-12-06 17:14:30 +01:00
Milos Kozak
648b918e3a
Merge pull request #528 from jotomo/log-packages
...
Log full class name (not just filename), so logs can be filtered by p…
2017-12-06 14:16:20 +01:00
Johannes Mockenhaupt
51b51c159c
Clean up earlier merge blunder.
2017-12-06 12:12:25 +01:00
Johannes Mockenhaupt
ab456d5966
Remove missed reference to pref in NSProfilePlugin.
2017-12-06 12:05:39 +01:00
Johannes Mockenhaupt
d58bb75d01
Add missing synchronized so guard works properly.
2017-12-06 12:01:59 +01:00
Johannes Mockenhaupt
7d07982181
Log full class name (not just filename), so logs can be filtered by package name.
2017-12-06 11:53:51 +01:00
Johannes Mockenhaupt
b548d092d1
Remove unneeded dependencies.
2017-12-06 11:50:44 +01:00
Johannes Mockenhaupt
d21a2bd691
Overview: fix predictions checkbox disappearing after unchecking it.
2017-12-06 11:35:58 +01:00
Johannes Mockenhaupt
32b7df39f9
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
Update strings.xml
Update strings.xml
2017-12-06 11:34:32 +01:00
AdrianLxM
525adddc5e
Merge pull request #527 from osodebailar/dev
...
Dev
2017-12-06 10:18:43 +01:00
Johannes Mockenhaupt
5caec45760
Fix add bolus record from pump history when bolus was cancelled.
2017-12-05 23:41:22 +01:00
Johannes Mockenhaupt
0f034dd662
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
check for duration in json
untranslatable strings
greek language
check for null
queue logging
2017-12-05 23:19:05 +01:00
Johannes Mockenhaupt
960cb92789
Remove idle-disconnect-monitor and let the command queue take care of that.
2017-12-05 23:17:05 +01:00
Milos Kozak
7be5c041cc
Merge pull request #526 from MilosKozak/untranslatable
...
untranslatable strings greek
2017-12-05 22:37:34 +01:00
Milos Kozak
455383cfd5
check for duration in json
2017-12-05 22:08:37 +01:00
AdrianLxM
50cbff6fa4
untranslatable strings
2017-12-05 22:08:14 +01:00
Johannes Mockenhaupt
21fc05a707
Remove ComboPlugin.checkHistory().
2017-12-05 21:48:13 +01:00
Johannes Mockenhaupt
f9867c69fb
Remove warning if pump time is off.
2017-12-05 21:46:12 +01:00
Johannes Mockenhaupt
7b88ec9e93
Device-Status: provide pseudo-levels or reservoir.
2017-12-05 21:07:49 +01:00
Milos Kozak
a293f86978
Merge branch 'dev' into smb
2017-12-05 17:36:44 +01:00
Milos Kozak
a47fe757b9
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-12-05 17:03:58 +01:00
Milos Kozak
188762519c
greek language
2017-12-05 17:03:40 +01:00
Milos Kozak
1adbee5c9e
check for null
2017-12-05 10:42:10 +01:00
Johannes Mockenhaupt
23874ebbd6
Remove 'sync to profile' pref.
...
(cherry picked from commit 01c52e7
2017-12-05 10:00:31 +01:00
Roumen Georgiev
5e597f03d0
Added profile's target BG in NSClient mode
2017-12-05 09:23:57 +02:00
Milos Kozak
202d260ad2
Merge branch 'dev' into smb
2017-12-05 07:34:48 +01:00
Milos Kozak
6c714261d0
queue logging
2017-12-05 07:34:34 +01:00
Johannes Mockenhaupt
01c52e753c
Remove 'sync to profile' pref.
2017-12-05 01:24:43 +01:00
Johannes Mockenhaupt
ada5301361
Cleanups.
2017-12-05 01:08:36 +01:00
Johannes Mockenhaupt
68af342eeb
Update combo stuff to work with new queue.
2017-12-05 00:54:08 +01:00
Johannes Mockenhaupt
e7d49f2300
Merge branch 'no-history-for-you' into combo-scripter-v2
...
* no-history-for-you:
When bolusing, only read history in case of error or cancellation.
Cleanups.
Remove lastBolus, reservoirLevel.
Use timestamp for TBR, not pump minutes.
Rework checkAndResolveTbrMismatch to update from pump to AAPS only.
ComboFragment: move forced history read to long-pressing the TDD button.
More steps towards reducing comms amount.
Don't check pump history, clean up usage of pumpHistoryLastChecked, mark stuff to disable.
Remove last bolus, units display of reservoir level from Combo fragment.
# Conflicts:
# app/src/main/res/values/strings.xml
2017-12-05 00:34:22 +01:00
Johannes Mockenhaupt
bf9f877b3d
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev: (68 commits)
max connection time to 120 sec
make chart zoomable again
fix NPE
lowest priority for background calculations
wear timestamps long
remove unneeded code
fix landscape overview
synchronized wait
fix build tools for travis
try to fix travis
upgrade build tools
R: resolve thread deadlock during bolus stop
remove unsupported code from korean pump
handle bolus stop prior to delivery correctly
fix translations
better logging
Revert unnecessary change.
Send OpenAPS timestamp to watch rather than minAgo, for more accurate updates on watch face.
gradle update
parse more iso formats
...
# Conflicts:
# app/build.gradle
# app/src/main/AndroidManifest.xml
# app/src/main/java/info/nightscout/androidaps/Config.java
# app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
# app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsFragment.java
# app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java
# app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewExtendedBolusDialog.java
# app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/DismissNotificationService.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/NotificationStore.java
# app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfilePlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfilePlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/DanaRSService.java
# app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java
# app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java
# app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java
# app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java
# app/src/main/res/values/strings.xml
# app/src/main/res/xml/pref_others.xml
# app/src/main/res/xml/pref_wear.xml
# gradle/wrapper/gradle-wrapper.properties
# wear/build.gradle
2017-12-05 00:32:47 +01:00
Johannes Mockenhaupt
98ba0fbf87
When bolusing, only read history in case of error or cancellation.
2017-12-05 00:21:58 +01:00
Johannes Mockenhaupt
8c04d12904
Cleanups.
2017-12-05 00:21:58 +01:00
Johannes Mockenhaupt
85e20a8977
Remove lastBolus, reservoirLevel.
2017-12-05 00:08:42 +01:00
Johannes Mockenhaupt
4c1c1c43a3
Use timestamp for TBR, not pump minutes.
2017-12-05 00:08:42 +01:00
Johannes Mockenhaupt
1735842e57
Rework checkAndResolveTbrMismatch to update from pump to AAPS only.
2017-12-05 00:08:42 +01:00
Johannes Mockenhaupt
141c116db6
ComboFragment: move forced history read to long-pressing the TDD button.
...
To avoid accidentally doing this when a short press on Refresh was
intended.
2017-12-05 00:08:42 +01:00
Milos Kozak
1986594877
hide deviation slope graph
2017-12-04 23:34:55 +01:00
Milos Kozak
ef16174e5b
fix NPE
2017-12-04 23:31:35 +01:00
Milos Kozak
d4d194f7f0
Merge branch 'dev' into smb
2017-12-04 23:30:24 +01:00
AdrianLxM
17867478fb
Merge pull request #524 from MilosKozak/watchfaces
...
Watchfaces Andrew
2017-12-04 23:19:52 +01:00
Milos Kozak
bce6d976b0
max connection time to 120 sec
2017-12-04 20:26:57 +01:00
AdrianLxM
2f235385e0
fix NPE
2017-12-04 20:04:58 +01:00
Milos Kozak
620c56e4cb
lowest priority for background calculations
2017-12-04 19:57:09 +01:00
AdrianLxM
c83f966d92
wear timestamps long
2017-12-04 18:40:13 +01:00
Milos Kozak
23e37a8be7
remove unneeded code
2017-12-04 18:13:20 +01:00
AdrianLxM
aefb0d62df
Merge pull request #522 from MilosKozak/dev
...
Dev
2017-12-04 17:53:36 +01:00
Milos Kozak
34fe8d8b60
Merge branch 'staledata' into dev
2017-12-04 13:02:23 +01:00
Milos Kozak
812583059a
Merge pull request #512 from PoweRGbg/patch-3
...
ProfileSwitch on graph depending on ScreenSize
2017-12-04 12:49:01 +01:00
AdrianLxM
53723411c4
fix landscape overview
2017-12-04 10:42:34 +01:00
Johannes Mockenhaupt
fe40ebd4a5
More steps towards reducing comms amount.
...
(cherry picked from commit 3ba6079)
2017-12-03 23:06:57 +01:00
Johannes Mockenhaupt
471c813bb4
Don't check pump history, clean up usage of pumpHistoryLastChecked, mark stuff to disable.
...
(cherry picked from commit bcd1ac3)
2017-12-03 22:48:06 +01:00
Johannes Mockenhaupt
0c7b2e1953
Remove last bolus, units display of reservoir level from Combo fragment.
...
(cherry picked from commit 42847cb)
2017-12-03 22:48:06 +01:00
Johannes Mockenhaupt
afdcf0b1c5
Remove combo pairing stubs.
2017-12-03 22:47:55 +01:00
Johannes Mockenhaupt
1b91684c65
Enforce low-suspend loop mode rather than disabling loop on usage violation. Because.
2017-12-03 22:26:02 +01:00
Johannes Mockenhaupt
1e19f19cd2
Hide buttons on Combo tab until plugin is initialized.
2017-12-03 22:25:43 +01:00
AdrianLxM
42c61f4e6f
synchronized wait
2017-12-03 21:58:35 +01:00
Milos Kozak
5a12d15c8c
upgrade build tools
2017-12-03 21:15:12 +01:00
Milos Kozak
4c3e26d19c
R: resolve thread deadlock during bolus stop
2017-12-03 20:10:54 +01:00
Milos Kozak
2b2d729f42
remove unsupported code from korean pump
2017-12-03 19:55:23 +01:00
Milos Kozak
4185bb347d
handle bolus stop prior to delivery correctly
2017-12-03 19:34:01 +01:00
Milos Kozak
9e0241aebc
fix translations
2017-12-03 19:12:07 +01:00
Milos Kozak
5d217cf1b3
better logging
2017-12-03 19:02:11 +01:00
Andrew Warrington
eea5082278
Revert unnecessary change.
2017-12-03 19:01:56 +01:00
Andrew Warrington
9dca53f968
Send OpenAPS timestamp to watch rather than minAgo, for more accurate updates on watch face.
2017-12-03 18:53:52 +01:00
Andrew Warrington
cefe93d0a0
Merge remote-tracking branch 'origin/dev' into watchfaces
2017-12-03 17:48:36 +01:00
Milos Kozak
f25334273a
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-12-03 17:34:58 +01:00
Milos Kozak
0101bc0a81
parse more iso formats
2017-12-03 17:34:29 +01:00
AdrianLxM
7777143b07
scrollable overview on Jelly
2017-12-03 17:30:20 +01:00
AdrianLxM
7958dc9dce
jelly overview
2017-12-03 13:55:54 +01:00
AdrianLxM
0a8d89db8a
Merge remote-tracking branch 'roumenremote/patch-3' into roumen-overview
2017-12-03 11:48:14 +01:00
AdrianLxM
07c1084287
Merge branch 'watchfaces' into dev
2017-12-02 21:45:39 +01:00
Milos Kozak
38ecd88f6c
Merge pull request #513 from AdrianLxM/btwatchdog-pr
2017-12-02 16:19:46 +01:00
AdrianLxM
14bb0e6ac4
Only do pump alarms in APS mode
2017-12-02 10:21:42 +01:00
Milos Kozak
8a7f0f22d9
min NS version 0.10.2
2017-12-01 22:51:25 +01:00
AdrianLxM
98777579c8
delta granularity and NPE fix
2017-12-01 20:32:26 +01:00
Milos Kozak
67c89f5d98
distinguish between common and SMB bolus in queue
2017-12-01 18:41:24 +01:00
Milos Kozak
622ac15c50
Merge branch 'dev' into smb, fix compile, add queue features
2017-12-01 18:13:05 +01:00
Milos Kozak
faea3a5147
RS proper evaluate extended bolus result
2017-12-01 17:37:49 +01:00
Milos Kozak
2a04505862
fix compile
2017-12-01 16:18:46 +01:00
AdrianLxM
090127012c
Merge branch 'dev' into btwatchdog-pr
2017-12-01 14:03:44 +01:00
AdrianLxM
09dac632f9
bluetooth watchdog
2017-12-01 13:57:53 +01:00
AdrianLxM
4b063a7766
fix SP for long with string-ressource-id
2017-12-01 13:49:50 +01:00
Milos Kozak
aa210970ec
Merge branch 'g5' into dev
2017-12-01 10:18:53 +01:00
Milos Kozak
77e855ec61
fix NPE
2017-12-01 10:18:27 +01:00
Roumen Georgiev
ecbac7ea96
Make ProfileSwitch text 20% larger
2017-12-01 10:30:18 +02:00
Andreas
29d9d20605
Update strings.xml
...
Add german text for local alerts
2017-12-01 08:03:33 +01:00
Andreas
e07c5fb50d
Update strings.xml
...
Change "Temp basal" to "Temp Basal"
2017-11-30 15:04:40 +01:00
Roumen Georgiev
d683ea2f0c
All labes scaled
...
COB is not here
2017-11-30 11:28:26 +02:00
Roumen Georgiev
24b9326602
Update PointsWithLabelGraphSeries.java
2017-11-30 09:57:16 +02:00
Roumen Georgiev
418a7f7094
ProfileSwitch depending on ScreenSize
...
Text size in ProfileSwitch events depends on screen resolution
2017-11-30 09:45:18 +02:00
Milos Kozak
04742c60cd
G5 fix time value
2017-11-29 23:00:41 +01:00
Milos Kozak
b73e12b731
G5: accept arrays
2017-11-29 17:22:45 +01:00
Milos Kozak
7fc9efde40
G5 offline/uploader
2017-11-29 16:07:26 +01:00
Roumen Georgiev
c56330cae7
Less than, not moreThan15
2017-11-29 09:21:55 +02:00
Milos Kozak
b1a214b9e7
Merge branch 'dev' into dev
2017-11-28 21:50:32 +01:00
Milos Kozak
d1aec1ff18
Localalerts settings by adrian
2017-11-28 21:48:46 +01:00
Milos Kozak
7d5d327c5d
fix compile
2017-11-28 21:06:50 +01:00
Milos Kozak
9b135cc4e4
Merge branch 'queue' into dev
2017-11-28 20:52:49 +01:00
Milos Kozak
694e90960e
reenable RS driver
2017-11-28 20:52:24 +01:00
Milos Kozak
b4187c84ed
bump 1.56-dev
2017-11-28 20:51:54 +01:00
Milos Kozak
bf4ffaed8f
bump 1.55
2017-11-28 20:31:31 +01:00
Milos Kozak
70621837d9
disable RS driver
2017-11-28 20:29:30 +01:00
Milos Kozak
b8df1fcec4
Merge branch 'dev' into queue
2017-11-28 20:27:58 +01:00
Roumen Georgiev
542cedff9d
check for sgv older than 15 mins
2017-11-28 16:29:18 +02:00
Roumen Georgiev
723cb33497
Disabling staledata alarm on new sgv values fromNSClient
2017-11-28 16:15:25 +02:00
Roumen Georgiev
eb593a4557
Update Notification.java
2017-11-28 16:09:23 +02:00
Andrew Warrington
dcf79c710c
Update following testing! Bug fixes:
...
- Detailed IOB always shown in older watch faces (fixed)
- Cockpit: Loop graphic stays red once set (fixed)
Design changes:
- AAPSv2: Changed spacing of status and cob/time/iob lines to use layout_weight instead of padding (more dynamic)
- Removed decimal point in delta strings when BG is in mg/dL to gain space so everything fits with all options switched on. This will affect older watch faces.
- Changed to 1 decimal point in BGI to gain space. This will affect older watches as well.
- Changed order of preferences to match screen layout more closely
New features:
- Exposed BGI as an individual item in dataMap & added to BaseWatchFace + AAPSv2
2017-11-28 09:24:52 +01:00
Johannes Mockenhaupt
b03202f3d3
Bug notes.
...
(cherry picked from commit c553626)
2017-11-27 11:46:17 +01:00
Johannes Mockenhaupt
dc6c91fd87
Set Source.PUMP when setting/cancelling TBR.
...
While technically, the history isn't read, we can be reasonably
sure a TBR was set/cancelled by reading the main menu (and for
TBR starts that's the only way to do so). Reading the history
might cause (more) problems with the pump's minute-precision
and not yield much safety. Besides, command mode is expected
to take over yesterday.
(cherry picked from commit 04fb1c8)
2017-11-26 21:51:34 +01:00
Johannes Mockenhaupt
383750d5e8
Set Source.PUMP when bolusing (already reading from history).
...
(cherry picked from commit d747415)
2017-11-26 21:51:33 +01:00
Johannes Mockenhaupt
720e64e541
Fix checkTbrMismatch tolerance for TBRs up to 2m off.
...
(cherry picked from commit 46c1e00)
2017-11-26 16:47:19 +01:00
Johannes Mockenhaupt
ffb5ee3b22
Show min/avg/max in Combo TDD dialog.
...
(cherry picked from commit 348b53a)
2017-11-26 12:52:23 +01:00
Johannes Mockenhaupt
b46165e52a
Abort reading all pump data if history read fails.
...
(cherry picked from commit 9f679bc)
2017-11-26 12:52:22 +01:00
Johannes Mockenhaupt
9ce57e7076
Fix bolus verification.
2017-11-26 03:04:13 +01:00
Johannes Mockenhaupt
a0ba857279
Move WarningOrErrorCode class to parent package.
...
(cherry picked from commit 38922ba)
2017-11-25 21:19:21 +01:00
Johannes Mockenhaupt
c36eac1ff3
More logging around bolusing.
...
(cherry picked from commit df89b7f)
2017-11-25 21:19:20 +01:00
Johannes Mockenhaupt
0f8442d65c
Issue a history read when bolusing fails.
...
(cherry picked from commit cafed14)
2017-11-25 21:19:19 +01:00
Johannes Mockenhaupt
1d83abc0d2
Fix rejecting multiple TBRs.
...
(cherry picked from commit c1e9800)
2017-11-25 19:36:15 +01:00
Johannes Mockenhaupt
1e9d0d08c3
Reject requents to enact TBRs if one was already started within this minute.
...
(cherry picked from commit 3805413)
2017-11-25 13:20:08 +01:00
Johannes Mockenhaupt
e13f29e615
Use correct key in prefs.
2017-11-25 02:25:02 +01:00
Johannes Mockenhaupt
b148b334b2
Adhere to 'Sync to profile' setting in ConfigBuilder.
2017-11-25 02:11:01 +01:00
Johannes Mockenhaupt
ac935b19de
SetTempBasal: if requested percentage is rounded to 100%, do a soft cancel instead.
2017-11-25 00:52:33 +01:00
Johannes Mockenhaupt
5e79900411
Small robustness improvements.
2017-11-24 23:03:34 +01:00
Johannes Mockenhaupt
1a00f8c661
Treatments tab: display extended bolus tab if active pump supports it or if there are any extended bolus records.
2017-11-24 21:28:34 +01:00
Johannes Mockenhaupt
44ccbc06a0
Retry reading/writing basal profile, cleanups, notes.
2017-11-24 21:11:55 +01:00
Johannes Mockenhaupt
28f31414ba
Update pump profile during Combo init.
2017-11-23 20:54:28 +01:00
AdrianLxM
5b9fd6fd78
set basal rate overview notifications
2017-11-23 03:06:10 +01:00
AdrianLxM
b3f0951d1f
isThisProfileSet - same behaviour on uninitialized pump as DanaR
2017-11-23 02:19:29 +01:00
AdrianLxM
3f10c316a4
combo set basal: account for different granularity > 1 U/h
2017-11-23 01:47:14 +01:00
Johannes Mockenhaupt
61d1028011
Update local basal profile after setting it on pump.
2017-11-22 22:42:47 +01:00
Johannes Mockenhaupt
1a8c0fcf52
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
Cancel ongoing notification when plugin is disabled.
Fix typo in fragment name.
Nitpicky symmetry.
PersistentNotification unregister workaround.
Make PumpEnactResult fluent.
Minor code cleanup.
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/data/PumpEnactResult.java
# app/src/main/java/info/nightscout/androidaps/plugins/Persistentnotification/PersistentNotificationPlugin.java
2017-11-22 22:17:57 +01:00
Johannes Mockenhaupt
83be0a8315
Setting basal rate on pump (combo side).
2017-11-22 22:16:28 +01:00
Milos Kozak
a13661400f
DanaRv2 queue & pump autodection
2017-11-22 22:09:58 +01:00
AdrianLxM
681add11a9
remove translations without english default
2017-11-22 21:06:31 +01:00
Milos Kozak
8818afe033
KoreanDanaR queue
2017-11-22 20:11:25 +01:00
Milos Kozak
dfd0218a6a
Merge branch 'dev' into queue
2017-11-22 19:44:16 +01:00
Milos Kozak
a9f1acf7a7
Merge pull request #502 from jotomo/combo-extractions
...
Combo extractions
2017-11-22 19:36:59 +01:00
Johannes Mockenhaupt
e28e5685f6
Cancel ongoing notification when plugin is disabled.
2017-11-22 19:13:56 +01:00
Johannes Mockenhaupt
9f946229bc
Slightly improve the dialogs.
2017-11-22 14:48:05 +01:00
Johannes Mockenhaupt
cf430b84cf
Extract some string resources.
2017-11-22 14:27:29 +01:00
Johannes Mockenhaupt
1e4070e862
Fix typo in fragment name.
2017-11-22 11:34:23 +01:00
Johannes Mockenhaupt
5690772946
Nitpicky symmetry.
2017-11-22 11:33:26 +01:00
Johannes Mockenhaupt
d202976251
PersistentNotification unregister workaround.
2017-11-22 11:32:41 +01:00
Johannes Mockenhaupt
9442c56eb8
Make PumpEnactResult fluent.
2017-11-22 11:30:48 +01:00
Johannes Mockenhaupt
60324ac6c6
Minor code cleanup.
2017-11-22 11:30:38 +01:00
Johannes Mockenhaupt
c6ad1b59f3
Clean up string resources.
2017-11-22 11:27:49 +01:00
Johannes Mockenhaupt
813f857306
Rename fragment 'error history' -> 'alert history'.
2017-11-22 11:17:18 +01:00
Johannes Mockenhaupt
2861509d07
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires before next loop iteration.
BolusProgressDialog: hide stop button once pressed.
fix RU translation
use MIN_DIA instead of DEFAULT_DIA
2017-11-22 10:56:57 +01:00
Milos Kozak
62527ab33b
Merge pull request #500 from jotomo/prevent-gaps-in-tbr
...
ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires bef…
2017-11-22 10:52:15 +01:00
Milos Kozak
63dbe2bd52
Merge pull request #501 from jotomo/hide-stop-button-once-pressed
...
BolusProgressDialog: hide stop button once pressed.
2017-11-22 10:51:39 +01:00
Johannes Mockenhaupt
4c66199142
Cleanups based on Android Studio analysis.
2017-11-22 00:53:37 +01:00
Johannes Mockenhaupt
8b81925ccb
Only raise notification to check pump time when the latter could be read.
2017-11-22 00:44:56 +01:00
Johannes Mockenhaupt
b4d2d9f71d
Rename 'error' to 'alert' when referring to Combo pump alerts.
2017-11-22 00:41:56 +01:00
Johannes Mockenhaupt
a8a7d47da2
ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires before next loop iteration.
2017-11-22 00:22:02 +01:00
Johannes Mockenhaupt
b49a4c57ba
BolusProgressDialog: hide stop button once pressed.
2017-11-22 00:20:50 +01:00
Johannes Mockenhaupt
b27ee06ebe
Fix issues during history read.
2017-11-22 00:05:59 +01:00
Milos Kozak
252c0b3db9
DanaR queue driver
2017-11-21 23:00:53 +01:00
Milos Kozak
f134163a76
Merge branch 'dev' into queue
2017-11-21 22:31:56 +01:00
Johannes Mockenhaupt
066d138e59
Double comparisons.
2017-11-21 22:31:28 +01:00
Milos Kozak
a6bf18244a
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-11-21 22:31:22 +01:00
Milos Kozak
ca44ae9a0b
fix RU translation
2017-11-21 22:31:02 +01:00
Milos Kozak
4007049118
use MIN_DIA instead of DEFAULT_DIA
2017-11-21 22:29:50 +01:00
Milos Kozak
d2cba61354
allign dana plugin code
2017-11-21 19:27:43 +01:00
Johannes Mockenhaupt
bf52352224
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
missing return
log profiles if different
fix setting of TRB when low basal rate is running
fix format and add test for fromISODateString
use mills from status if available
2017-11-21 10:57:11 +01:00
Johannes Mockenhaupt
d6938c20e6
Updating README.
2017-11-21 10:53:47 +01:00
Johannes Mockenhaupt
426379c6d3
Remoe SetBasalProfileCommand.
...
Too slow, unclear usage (ProfileInterface), likely superseeded soon.
2017-11-21 09:45:34 +01:00
Johannes Mockenhaupt
4b1a774544
Optimize fetching full history.
2017-11-21 00:43:17 +01:00
Johannes Mockenhaupt
63607d169d
Polish dialogs.
2017-11-21 00:36:01 +01:00
Johannes Mockenhaupt
1b50b43fbb
Add headers to dialogs.
2017-11-21 00:22:16 +01:00
Johannes Mockenhaupt
75855f3f05
Implement reading basal profile.
2017-11-20 23:55:00 +01:00
Johannes Mockenhaupt
971a97a9e3
Some minor tweaks.
2017-11-20 23:53:39 +01:00
Milos Kozak
3ab235f829
refactor pump interface out of ConfigBuilder, remove handlers
2017-11-20 23:39:12 +01:00
Johannes Mockenhaupt
3cccf287da
Only update pumpState cache if menu could be read.
2017-11-20 21:36:25 +01:00
Johannes Mockenhaupt
dbd442e8ea
ComboPlugin.checkTbrMismatch: allow for deviations
...
to compensenate inprecise times used by pump for tbr duration.
2017-11-20 18:59:59 +01:00
Milos Kozak
21ae42d37b
Merge branch 'dev' into queue
2017-11-20 17:50:49 +01:00
Milos Kozak
1335887957
Merge branch 'dev' into dev2
2017-11-20 17:40:45 +01:00
Milos Kozak
2f0599fbc7
missing return
2017-11-20 17:38:06 +01:00
Milos Kozak
d8d8b150b6
Merge branch 'dev2' into queue
2017-11-20 17:34:03 +01:00
Milos Kozak
973b9d50c1
Merge branch 'dev' into dev2
2017-11-20 17:28:15 +01:00
Milos Kozak
0f0f39dfb4
log profiles if different
2017-11-20 17:26:03 +01:00
Milos Kozak
777aedd5db
fix setting of TRB when low basal rate is running
2017-11-20 15:25:44 +01:00
Milos Kozak
297617467e
fix format and add test for fromISODateString
2017-11-20 13:34:13 +01:00
Milos Kozak
d8798e0bcf
use mills from status if available
2017-11-20 13:23:25 +01:00
Johannes Mockenhaupt
aadb7c5728
Update TODO, javadoc.
2017-11-19 23:30:23 +01:00
Johannes Mockenhaupt
dafb6d225b
Display active alert in Combo tab.
2017-11-19 21:25:37 +01:00
Johannes Mockenhaupt
9d3625e78c
Show bolus/TBR percent and duration with activity.
2017-11-18 23:29:46 +01:00
Johannes Mockenhaupt
46fdd47ac0
Fixes and cleanups.
2017-11-18 21:32:01 +01:00
Johannes Mockenhaupt
2c0975994d
Fixes.
2017-11-18 18:33:46 +01:00
Johannes Mockenhaupt
9459dfe321
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
...
* origin/dev:
Remove dead code.
Ctors Android-style.
Fix NPE initialising MyPreferencesFragment.
RS fix last bolus time
RS remove duplicated message
RS fix extended bolus result
show timeshift if not zero
CS translation
removed unneeded code
long click on name to open settings
add link to advanced settings
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
2017-11-18 17:46:20 +01:00
Johannes Mockenhaupt
99db38a8e0
Fix displaying connection problems in Combo tab.
2017-11-18 17:43:33 +01:00
Johannes Mockenhaupt
deb566c1bd
Align ComboPlugin with merged changes.
2017-11-18 16:42:56 +01:00
Johannes Mockenhaupt
d92540a17c
Merge remote-tracking branch 'adrian/localalerts-settings' into combo-scripter-v2
...
* adrian/localalerts-settings:
remove already commented out code
upper case literals
use correct setting
Don't alarm while disconnected
disconnect state
remove deprecated wear notification settings
no-urgent notification title
presnooze missed readings/pump on startup
system notifications for non-urgent
Notification bugfixes
use ID as request code
guard double clicks
refactor notifications: subpackage
initialized only when maxBasal >0
Dismiss notification service
local alert thresholds as settings
Extract local alerts for unreachable pump, missed BG readings.
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/NotificationStore.java
# app/src/main/res/values/strings.xml
2017-11-18 16:42:20 +01:00
Johannes Mockenhaupt
f03b9669d5
Minor improvements.
2017-11-18 16:41:25 +01:00
Johannes Mockenhaupt
b85b6f85f4
Major cleanup and some new features.
...
* PumpState.timestamp: round to second (format used in DB)
* Raise notification about wrong pump clock time since setting
clock isn't possible with current ruffy
* Set TempBasal.pumpId when setting/cancelling TBR
* Checking state of pump on connect
* Better checks whether pump is ready to execute command
* Rework dynamic command timeout
* Confirm benign warnings on connect and turn into notifications
* Some groundwork for reading/setting basal profile
* Check pump history every 15m
2017-11-18 13:19:04 +01:00
Johannes Mockenhaupt
76cc08c1a9
BolusProgressDialog: hide stop button once pressed.
2017-11-16 00:23:37 +01:00
Andrew Warrington
bc485a4783
Refactor of BaseWatchFace.java in order to allow greater flexibility in presenting or removing data from various watch faces.
...
Inclusion of Home2 ("AAPSv2") watch face for round.
2017-11-15 23:07:44 +01:00
Johannes Mockenhaupt
5ed97d297f
Minor code cleanup.
2017-11-15 11:23:20 +01:00
Johannes Mockenhaupt
e27730229e
Update TODO-Combo, nicer icon in fragment.
2017-11-14 10:43:36 +01:00
Johannes Mockenhaupt
21a2c688c6
Cleanups.
2017-11-13 23:05:49 +01:00
Johannes Mockenhaupt
104cead555
Lots of work around properly reading pump history.
2017-11-13 23:05:49 +01:00
Johannes Mockenhaupt
a52e159bf6
Fire EventInitializationChanged after pump init.
2017-11-13 23:05:49 +01:00
Johannes Mockenhaupt
c22d18eabc
ComboFragment: alert button for pump alerts (instead of alarms).
2017-11-13 23:05:49 +01:00
Johannes Mockenhaupt
ef0c5b9138
Dialog cleanups.
2017-11-13 23:05:49 +01:00
Johannes Mockenhaupt
c21799fe0f
Treatments tab: display extended bolus tab if active pump supports it or there are any ext bolus records.
2017-11-13 23:05:49 +01:00
Johannes Mockenhaupt
e0df4646f9
Remove dead code.
2017-11-13 01:12:23 +01:00
Johannes Mockenhaupt
5839ad6a93
Ctors Android-style.
2017-11-13 01:12:15 +01:00
Johannes Mockenhaupt
9a4acbe052
Fix NPE initialising MyPreferencesFragment.
2017-11-13 01:12:05 +01:00
Andrew Warrington
45a26da8b3
Inclusion of the new watch face "AAPSv2" which: 1) has larger text, 2) shows COB, 3) allows to choose between showing phone battery level (AAPS) or rig battery level (OpenAPS) via watch Settings menu.
...
Most changes are either minor or are completely new files. The largest changes were to the WatchUpdaterService.java, which required several new blocks of code in order to expose COB, IOB, and current temp basal independently of the main status string.
2017-11-12 21:46:32 +01:00
Johannes Mockenhaupt
9606df13b7
Fix false error popup when cancelling bolus after confirmation on the pump, during the wait before delivery starts.
2017-11-12 02:06:32 +01:00
Johannes Mockenhaupt
11777f8b7f
Cleanups.
2017-11-12 00:58:16 +01:00
Johannes Mockenhaupt
02af439dd7
Minor tweaks.
2017-11-12 00:37:03 +01:00
Milos Kozak
7374545046
refactor all deliverTreatment
2017-11-12 00:08:25 +01:00
Johannes Mockenhaupt
c11086d9ea
Stuff:
...
* Read all history
* Simple viewer for TDDs, errors
* Clean up cancelling TBR (incomplete)
* Initializing pump robustness
2017-11-12 00:01:01 +01:00
Milos Kozak
620a54a31b
bolus from wizard to queue
2017-11-11 23:44:30 +01:00
Milos Kozak
c7faf2a5e7
bolus progress dialog during connection
2017-11-11 23:03:31 +01:00
Milos Kozak
25aa5094a4
alarm for failed bolus
2017-11-11 22:32:00 +01:00
Johannes Mockenhaupt
3072a42cd7
Initial dialog to display pump alerts.
2017-11-11 21:44:00 +01:00
Johannes Mockenhaupt
9804f004f5
Remove unreachable code.
2017-11-11 17:29:39 +01:00
Johannes Mockenhaupt
a9970a9efe
Cleanups
2017-11-11 16:52:07 +01:00
Johannes Mockenhaupt
ee6f29dd75
Revert more local alerts
2017-11-11 16:29:46 +01:00
Milos Kozak
a5227fc773
add bolus sound
2017-11-11 16:20:34 +01:00
Johannes Mockenhaupt
2f8febabb8
Remove debris of localalerts to make upstream re-integration only a minor PITA, maybe.
2017-11-11 16:15:03 +01:00
Johannes Mockenhaupt
fb65aca081
ComboFragment: hack to make battery display look pretty before init.
2017-11-11 16:13:06 +01:00
Johannes Mockenhaupt
355a973727
Empty activity instead of 'Idle' in combo tab.
2017-11-11 16:12:19 +01:00
Milos Kozak
86b11edd58
RS connection and status reading
2017-11-11 14:05:29 +01:00
Johannes Mockenhaupt
e6a29e5214
Reorder items in fragments.
2017-11-10 02:23:21 +01:00
Johannes Mockenhaupt
7163fbae54
ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires before next loop iteration.
2017-11-10 01:26:17 +01:00
Johannes Mockenhaupt
5d077c329a
fix the fix with the fix from the fix that fixes the fix.
2017-11-10 01:16:01 +01:00
Johannes Mockenhaupt
bfc6f0b618
another fi
2017-11-10 00:59:40 +01:00
Johannes Mockenhaupt
5ce956b5fc
quick fix for cancelling tbr to fake neutral temp.
2017-11-10 00:57:40 +01:00
Johannes Mockenhaupt
8983143bff
Cleanup.
2017-11-10 00:57:40 +01:00
Milos Kozak
a186ce6468
more command queue code
2017-11-10 00:27:18 +01:00
AdrianLxM
d0806802eb
compile fixes
2017-11-10 00:19:13 +01:00
Johannes Mockenhaupt
a17cff7adf
Some work around refreshing pump data.
2017-11-08 23:41:53 +01:00
Milos Kozak
d40e0c97c4
simplify active pump access where possible
2017-11-08 23:40:54 +01:00
Johannes Mockenhaupt
cc6db3a059
Some ComboFragment cleanups.
2017-11-08 23:31:40 +01:00
Milos Kozak
8bae1a18e4
CommandQueue
2017-11-08 22:22:51 +01:00
Milos Kozak
3a773feeeb
RS fix last bolus time
2017-11-08 19:23:48 +01:00
Milos Kozak
676dfcc5d1
RS remove duplicated message
2017-11-08 19:18:17 +01:00
Milos Kozak
30f16c7d3e
RS fix extended bolus result
2017-11-08 19:13:44 +01:00
AdrianLxM
ec81f124e9
remove already commented out code
2017-11-08 18:53:33 +01:00
Johannes Mockenhaupt
ff3707d201
Fix NPE initialising MyPreferencesFragment, part 2
2017-11-08 15:07:10 +01:00
Johannes Mockenhaupt
cda621f32b
Disable loop when selected basal rate is not 1.
2017-11-08 14:28:02 +01:00
Johannes Mockenhaupt
dd98d9f7ae
wip
2017-11-08 10:43:11 +01:00
Johannes Mockenhaupt
324b68717f
Fix NPE initialising MyPreferencesFragment.
2017-11-08 10:20:49 +01:00
Milos Kozak
0af51bb6ea
show timeshift if not zero
2017-11-07 13:24:08 +01:00
Johannes Mockenhaupt
5bd2911754
wip ..
2017-11-07 09:36:21 +01:00
Johannes Mockenhaupt
445392ee69
add pretty time dep.
2017-11-07 09:22:29 +01:00
AdrianLxM
4e53b4b1a4
upper case literals
2017-11-07 00:00:38 +01:00
AdrianLxM
d6b534b3b6
use correct setting
2017-11-06 23:47:39 +01:00
Johannes Mockenhaupt
be5f7e68a7
unsafe usage checks update.
2017-11-06 23:15:16 +01:00
AdrianLxM
a864703c76
Don't alarm while disconnected
2017-11-06 22:24:25 +01:00
AdrianLxM
b9ad90a51b
disconnect state
2017-11-06 22:04:48 +01:00
AdrianLxM
ccad0c18b1
remove deprecated wear notification settings
2017-11-06 21:44:01 +01:00
AdrianLxM
f2e44e8ab9
no-urgent notification title
2017-11-06 21:38:42 +01:00
AdrianLxM
2e6a136de6
presnooze missed readings/pump on startup
2017-11-06 20:32:33 +01:00
AdrianLxM
2f56687e82
system notifications for non-urgent
2017-11-06 20:16:17 +01:00
AdrianLxM
2b06e9e63e
Notification bugfixes
2017-11-06 17:12:33 +01:00
AdrianLxM
ef425563bf
use ID as request code
2017-11-06 15:24:52 +01:00
AdrianLxM
e4f15c0e0d
guard double clicks
2017-11-06 15:07:39 +01:00
AdrianLxM
8c8674ed63
refactor notifications: subpackage
2017-11-06 14:26:06 +01:00
AdrianLxM
3ea4bfaf37
initialized only when maxBasal >0
2017-11-06 14:16:50 +01:00
AdrianLxM
d990d59ddf
Dismiss notification service
2017-11-06 14:09:03 +01:00
AdrianLxM
87ea412516
local alert thresholds as settings
2017-11-06 12:58:44 +01:00
AdrianLxM
ffd912e32b
Merge remote-tracking branch 'jotomoremote/local-alerts' into localalerts-settings
2017-11-06 11:56:41 +01:00
Johannes Mockenhaupt
8b7725c076
add pretty time dep
...
(cherry picked from commit 8ac2aba)
2017-11-05 21:52:45 +01:00
Andrew Warrington
d70860bd97
Inclusion of the new watch face "AAPSv2" which: 1) has larger text, 2) shows COB, 3) allows to choose between showing phone battery level (AAPS) or rig battery level (OpenAPS) via watch Settings menu.
...
Most changes are either minor or are completely new files. The largest changes were to the WatchUpdaterService.java, which required several new blocks of code in order to expose COB, IOB, and current temp basal independently of the main status string.
2017-11-05 21:41:50 +01:00
Johannes Mockenhaupt
7c44761f25
WIP
2017-11-04 17:42:47 +01:00
Johannes Mockenhaupt
011409a6e5
Minor cleanups.
2017-11-03 23:40:57 +01:00
Johannes Mockenhaupt
6ba57ff1f7
WIP Cleaning up ComboPlugin/Ruffyscripter.cancelTbr
2017-11-03 22:04:48 +01:00
Johannes Mockenhaupt
598fbe40cc
Unsource ruffy.
2017-11-03 22:04:48 +01:00
Johannes Mockenhaupt
142878a22b
Fix getting resources string in fragment.
2017-11-03 21:41:20 +01:00
Johannes Mockenhaupt
f9a7d6fe20
Use PumpEnactResult's fluent interface in Combo plugin.
2017-11-03 14:40:01 +01:00
Johannes Mockenhaupt
49885afb39
Refresh entire pump state when long-pressing Combo tab's refresh button.
2017-11-03 14:23:47 +01:00
Milos Kozak
5ad564e0e3
CS translation
2017-11-03 10:13:23 +01:00
Milos Kozak
e063f3a2cb
removed unneeded code
2017-11-02 18:03:40 +01:00
Milos Kozak
a7077a8a6a
long click on name to open settings
2017-11-02 17:47:41 +01:00
Milos Kozak
20c66e3b6f
add link to advanced settings
2017-11-02 17:39:25 +01:00
Johannes Mockenhaupt
604a9e664a
Reject requests to bolus the same amount within 60s.
2017-11-02 15:37:19 +01:00
Johannes Mockenhaupt
fe45b917be
Align Combo with recent preferences updates.
2017-11-01 23:25:37 +01:00
Johannes Mockenhaupt
f569163d19
Merge remote-tracking branch 'origin/dev2' into combo-v2
...
* origin/dev2: (26 commits)
add getPreferenceId to food plugin
preferences update
use DateUtil#agoString
use DateUtil#untilString
timeframe strings
Show remaining time of TT
NSTreatments NPE fix
Cleanup.
Revert "Debug: wider thread column in log to improve readability."
Disable event logging by default.
Log summary after 10s, then every 60s.
Log receivers of event.
Log source of event.
Debug: wider thread column in log to improve readability.
Better log messages for events.
Group events in type hierarchy related to the LoopPlugin.
Remove dead NSPingAck class.
Let event classes extend Event(UpdageGui) classes.
Add base event class.
Log posted events.
...
2017-11-01 21:39:45 +01:00
Milos Kozak
a1c6704ae9
Merge branch 'dev2' into smb
2017-11-01 20:50:14 +01:00
Milos Kozak
a162343cd4
add getPreferenceId to food plugin
2017-11-01 20:47:16 +01:00
Milos Kozak
f67bd291cd
Merge branch 'dev' into dev2
2017-11-01 20:44:24 +01:00
Milos Kozak
60699eddbb
preferences update
2017-11-01 20:43:59 +01:00
Milos Kozak
00152eaffa
Merge pull request #490 from MilosKozak/tt-remaining
...
Show remaining time of TT
2017-11-01 18:29:54 +01:00
Milos Kozak
f7871e64e0
Merge pull request #489 from MilosKozak/NPE-fix
...
NSTreatments NPE fix
2017-11-01 18:29:34 +01:00
Milos Kozak
440be77de0
Merge pull request #488 from jotomo/events
...
Event logging
2017-11-01 18:29:14 +01:00
Johannes Mockenhaupt
4da160a951
Disable closed loop under unsafe conditions.
2017-11-01 10:55:09 +01:00
Johannes Mockenhaupt
8d3947dc7f
Initial bolus syncing.
2017-10-31 19:30:25 +01:00
Johannes Mockenhaupt
744d24cbcf
DatabaseHelper: add getTreatmentByDate.
2017-10-31 19:28:32 +01:00
Johannes Mockenhaupt
74bbab9cf1
More bolus work.
2017-10-31 14:46:46 +01:00
Johannes Mockenhaupt
ab900fda6c
Refresh tab after pump init.
2017-10-31 14:46:06 +01:00
Johannes Mockenhaupt
69648ecf30
Make bolusing safe.
2017-10-31 12:47:53 +01:00
Johannes Mockenhaupt
efc298bf90
Make PumpEnactResult fluent.
2017-10-31 12:47:41 +01:00
Johannes Mockenhaupt
f64e00fc79
Auto-retrying repeatable commands when there's a connection loss.
2017-10-31 11:05:07 +01:00
Johannes Mockenhaupt
88f500417d
Cleanup: ComboFragement.
2017-10-31 11:02:14 +01:00
Johannes Mockenhaupt
9121aa5217
Bolus cancellation for all stages.
2017-10-31 11:01:58 +01:00
Johannes Mockenhaupt
522b5e9e1b
Clean up string resource names.
2017-10-30 21:42:14 +01:00
Johannes Mockenhaupt
2198747feb
NPE fix.
2017-10-30 19:52:26 +01:00
Johannes Mockenhaupt
75bc2cd940
NotificationStore: extract key string.
2017-10-30 19:49:16 +01:00
Johannes Mockenhaupt
9bae22f551
Tweaking ComboFragment's Last Connection.
2017-10-30 19:49:16 +01:00
Johannes Mockenhaupt
a920946cd1
Extract local alerts for unreachable pump, missed BG readings.
2017-10-30 17:48:22 +01:00
Johannes Mockenhaupt
79d7ec5467
Add prefs for local alerts.
2017-10-30 16:49:21 +01:00
Johannes Mockenhaupt
bffd1239c0
Disable reading history while incomplete.
2017-10-30 16:20:43 +01:00
Johannes Mockenhaupt
550ed57ca5
KeepAliveReceiver: clean up, categorize Android notification as alarm so it plays sound even in silent mode.
2017-10-30 16:20:08 +01:00
Johannes Mockenhaupt
d423c8ae2a
Add pref to raise urgent alarms as system notifications.
2017-10-30 03:04:41 +01:00
Johannes Mockenhaupt
bdc61765ce
KeepAliveReceiver: sanitize pump disconnected/missed readings alarms.
...
* Don't raise alarm on application start
* Re-raise alert only every ~30 min, not every 5 min.
2017-10-30 02:02:01 +01:00
Johannes Mockenhaupt
a2460180f9
Remove unclear error message field from CommandResult, use codes from pump warnings/errors.
2017-10-29 21:19:03 +01:00
Johannes Mockenhaupt
6b6d252173
Day 1
...
* Some UI rework
* Start removing (retry) logic from ruffyscripter to ComboPlugin
* Cleanups all over
* Remove TDD stuff, this can be done independently of a pump
* New SPI/API methods confirmAlert, readReservoirLevelAndLastBolus
* Add warning and error codes from Combo manual
* Rework commands to just execute an action (verification will be in
ComboPlugin eventually, together with retry logic)
* Rework commands to update state in field as command progresses
rather than returnin/throwing.
* Initial version reading bolus and error history (no DB sync yet).
2017-10-29 11:36:35 +01:00
AdrianLxM
f9ed104fe3
use DateUtil#agoString
2017-10-29 02:08:43 +02:00
AdrianLxM
3121fa3e84
use DateUtil#untilString
2017-10-29 02:07:17 +02:00
AdrianLxM
9e8752b096
timeframe strings
2017-10-29 02:06:06 +02:00
Johannes Mockenhaupt
394a42837a
Set source/target version to 1.8 for Java 8 features with Studio 3.0.
...
See https://developer.android.com/studio/write/java8-support.html
for what is supported with our currently used SDK 23 target.
2017-10-28 13:43:25 +02:00
Johannes Mockenhaupt
255e9d0dff
Move initialized flag to ComoPump class.
2017-10-28 13:12:55 +02:00
Johannes Mockenhaupt
4befa38d46
Close bolus progress dialog better in case of error.
2017-10-28 11:46:54 +02:00
AdrianLxM
7d82870203
Show remaining time of TT
2017-10-28 02:16:30 +02:00
Johannes Mockenhaupt
36d5c4d806
Clean up ComboFragment, related string resources.
2017-10-28 00:47:45 +02:00
Johannes Mockenhaupt
c53936a7ac
Revert inadvertent change to keepAlive interval.
2017-10-28 00:19:18 +02:00
Johannes Mockenhaupt
b6a62dedae
Fix merge conflict.
2017-10-27 22:26:47 +02:00
Johannes Mockenhaupt
d237c46ca8
Merge remote-tracking branch 'origin/dev' into combo-v2
...
* origin/dev: (26 commits)
fix RS response code
use max absorption time for AAPS and weighted average sensitivity detection
log.debug -> log.error on RS comm
read status after bolus
RS connectivity & bolus improvement
Better bolusing with different speeds (R & Rv2)
Detailed onscreen history logging
Split to smaller pieces
Update strings.xml
Sensitivity logging optional
RS synchronized change
fix displaying XX:30 time intervals
CS translations
allow to use actual profile in wizard
getUnits from active profile not interface
Update strings.xml
Update strings.xml
Update dutch
Update strings.xml
Update strings.xml
...
2017-10-27 22:24:38 +02:00
Johannes Mockenhaupt
4bc970091e
More i18n.
2017-10-27 21:51:15 +02:00
Johannes Mockenhaupt
a8061b410c
Clean up pump init.
2017-10-27 19:40:44 +02:00
Johannes Mockenhaupt
a1d6834bce
KeepAliveReceiver: check pump only if initialized already.
2017-10-27 19:39:51 +02:00
Johannes Mockenhaupt
eed3773b49
Combo i18n.
2017-10-27 17:19:10 +02:00
AdrianLxM
88e22c5f17
NSTreatments NPE fix
...
When the dialog was open and the phone goes to sleep/lock screen, Android may garbage collect and options is no longer available. -> NPE
I think as quick fix it is ok to not show a dialog at all. If the user stopped using the dialog and lets the phone sleep for a longer while with the phone going to sleep... he can open it again, if he wants it.
2017-10-27 16:56:17 +02:00
Johannes Mockenhaupt
b47559647f
wip
2017-10-27 00:03:01 +02:00
Milos Kozak
b5f843d901
getLastSBMTime -> getLastBolusTime
2017-10-26 22:12:15 +02:00
Milos Kozak
dfd657ce2d
remove wrong imports
2017-10-26 21:29:38 +02:00
Milos Kozak
e71ce02131
fix merge conflict
2017-10-26 21:23:23 +02:00
Milos Kozak
8a6e811c95
Merge branch 'dev' into dev2
2017-10-26 21:13:10 +02:00
Milos Kozak
ae47183459
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-10-26 21:12:37 +02:00
Milos Kozak
26b216a8ee
fix RS response code
2017-10-26 20:40:24 +02:00
Johannes Mockenhaupt
91df07ca8f
Cleanup.
2017-10-26 17:35:46 +02:00
Johannes Mockenhaupt
79316bf948
Revert "Debug: wider thread column in log to improve readability."
...
This reverts commit 5fe2d19e6363c4efcaad90fe5aa627b58d230cd1.
2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
e5cb5386e3
Disable event logging by default.
2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
82dd8c2c5e
Log summary after 10s, then every 60s.
2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
785a8f21de
Log receivers of event.
2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
9a1d7fd512
Log source of event.
2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
a6ae3ddd2d
Debug: wider thread column in log to improve readability.
2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
d830096482
Better log messages for events.
2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
9d10563bd9
Group events in type hierarchy related to the LoopPlugin.
2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
3e24a6069d
Remove dead NSPingAck class.
2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
302ed69564
Let event classes extend Event(UpdageGui) classes.
2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
8ad223e5e1
Add base event class.
2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
5a446c9ab5
Log posted events.
2017-10-26 16:54:46 +02:00
Johannes Mockenhaupt
e895ba65eb
KeepAliveReceiver: proper Notification ids.
2017-10-26 01:09:46 +02:00
Johannes Mockenhaupt
4539b5a9e5
KeepAliveReceiver: add alarm for missed readings.
2017-10-26 01:09:37 +02:00
Johannes Mockenhaupt
001a56728d
KeepAliveReceiver: add alarm sound to 'pump unreachable' notification.
2017-10-26 01:09:31 +02:00
Johannes Mockenhaupt
7b3f474b58
Upgrade to Android Studio 3.0.
2017-10-25 22:49:50 +02:00
AdrianLxM
707d2df345
No explicit service start
2017-10-25 20:10:59 +02:00
Johannes Mockenhaupt
4767809931
Start KeepAliveService after pump init.
2017-10-25 20:10:24 +02:00
AdrianLxM
41dcf8d6f4
Merge remote-tracking branch 'milosremote/dev' into servicestart
2017-10-25 19:57:00 +02:00
AdrianLxM
f3872cd934
Merge pull request #465 from jotomo/j2v8-removal
...
J2v8 removal
2017-10-25 19:56:29 +02:00
Johannes Mockenhaupt
e620878d17
KeepAliveReceiver: raise notification when pump couldn't be reached for 25m.
2017-10-25 18:30:06 +02:00
Johannes Mockenhaupt
d907a1b6b3
Force refresh every 15 min (previously 30).
2017-10-25 18:20:38 +02:00
Johannes Mockenhaupt
22bac709fb
Cleanups around ComboPlugin.refreshDataFromPump.
2017-10-25 18:17:19 +02:00
Johannes Mockenhaupt
5ba68a86f0
Log full class name (not just filename), so logs can be filtered by package name.
2017-10-25 18:17:18 +02:00
Johannes Mockenhaupt
68a3dbbf33
Start KeepAliveService after pump init.
2017-10-25 18:16:38 +02:00
Johannes Mockenhaupt
ec383bb082
Remove the alerter and related prefs.
2017-10-25 16:27:55 +02:00
Johannes Mockenhaupt
e09d337c02
ComboFragment: colours and text for last connection.
2017-10-25 15:42:38 +02:00
Johannes Mockenhaupt
fa81f57d9f
ComboPlugin.deliverTreatment: don't update progress dialog for non-interactive SMBs.
2017-10-25 15:11:27 +02:00
Johannes Mockenhaupt
34861960ea
Bolus command: ensure the progress dialog is always closed.
2017-10-25 15:11:27 +02:00
Milos Kozak
3e6fcabfab
Merge branch 'dev2' into smb
2017-10-25 11:38:45 +02:00
Milos Kozak
4f0bbda847
Merge branch 'dev' into dev2
2017-10-25 11:38:12 +02:00
Milos Kozak
7c99157d89
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-10-25 11:37:19 +02:00
Milos Kozak
606973d4ad
use max absorption time for AAPS and weighted average sensitivity detection
2017-10-25 11:37:05 +02:00
Johannes Mockenhaupt
551ca92201
Remove cast to DetermineBasalResultAMA for predictions.
2017-10-24 23:14:45 +02:00
Milos Kozak
9de332e997
Merge branch 'dev2' into smb
2017-10-24 21:09:17 +02:00
Milos Kozak
f673d3a721
Merge branch 'dev' into dev2
2017-10-24 21:08:54 +02:00
Milos Kozak
8b020d72cd
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-10-24 21:08:13 +02:00
Milos Kozak
2fb707b9ed
log.debug -> log.error on RS comm
2017-10-24 21:08:03 +02:00
Milos Kozak
2925c16fb9
comment minDeviationSlope
2017-10-24 17:50:44 +02:00
Milos Kozak
29b075e700
display minDeviationSlope
2017-10-24 17:15:49 +02:00
Milos Kozak
fe0376206e
fix merge conflict
2017-10-24 11:46:27 +02:00
Milos Kozak
441c2beffc
read status after bolus
2017-10-24 09:19:03 +02:00
Milos Kozak
1ad409754f
move preparing graph series to extra class #2
2017-10-23 22:41:12 +02:00
Milos Kozak
d180d088f0
fix merge conflict
2017-10-22 21:11:31 +02:00
Johannes Mockenhaupt
2d8b3a7cb8
wip
2017-10-22 10:40:24 +02:00
AdrianLxM
4e5a374b9c
include smb into basal iob
2017-10-22 02:20:11 +02:00
AdrianLxM
755c82898c
SMB Rhino
2017-10-21 22:38:07 +02:00
Johannes Mockenhaupt
300a4609f8
Clean up prefs.
2017-10-21 20:24:17 +02:00
Milos Kozak
3cdca93b30
RS connectivity & bolus improvement
2017-10-21 20:09:21 +02:00
Johannes Mockenhaupt
73d5db43ed
Nitpicky symmetry.
2017-10-21 19:17:04 +02:00
Milos Kozak
7dd678c917
Better bolusing with different speeds (R & Rv2)
2017-10-21 18:55:56 +02:00
Milos Kozak
8e82e341fd
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-10-21 18:07:30 +02:00
Milos Kozak
39af399ea4
Merge pull request #478 from RadoslavR/patch-48
...
Update strings.xml
2017-10-21 18:06:44 +02:00
Milos Kozak
a8751bf35a
Detailed onscreen history logging
2017-10-21 18:05:19 +02:00
Johannes Mockenhaupt
fc60edc15a
wip
2017-10-21 17:44:16 +02:00
McHoffi
986eab041d
Merge pull request #1 from MilosKozak/dev
...
Dev
2017-10-21 17:43:33 +02:00
McHoffi
9c7c583aed
Split to smaller pieces
2017-10-21 17:41:01 +02:00
AdrianLxM
7ed7a2e8c4
Merge remote-tracking branch 'milosremote/dev' into smb-rhino
2017-10-21 17:06:57 +02:00
Radoslav Radev
075b74ec84
Update strings.xml
2017-10-21 17:11:25 +03:00
Johannes Mockenhaupt
cb438934b6
WIP: Pairing
2017-10-21 13:50:19 +02:00
Johannes Mockenhaupt
015a852ab5
Custom: Disable Crashlytics.
...
(cherry picked from commit 7890f6b)
(cherry picked from commit 1374739)
2017-10-21 13:37:42 +02:00
Milos Kozak
dbf5a5e577
Sensitivity logging optional
2017-10-21 13:14:06 +02:00
Johannes Mockenhaupt
6cb1d5c0bd
ComboFragment, set "Initializing" as initial status.
2017-10-21 11:22:40 +02:00
Milos Kozak
881a745e32
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-10-20 21:36:56 +02:00
Johannes Mockenhaupt
e2d684ac33
PersistentNotification unregister workaround.
2017-10-20 20:15:37 +02:00
Johannes Mockenhaupt
950d1b62db
Undo "explicit pump initalization."
2017-10-20 20:09:58 +02:00
Johannes Mockenhaupt
87c1c4b112
More sync prototyping.
2017-10-20 18:51:15 +02:00
Milos Kozak
01d6f1594a
RS synchronized change
2017-10-20 17:37:06 +02:00
Johannes Mockenhaupt
1aa2ce48a1
First steps to syncing full pump state with AAPS.
2017-10-20 15:24:11 +02:00
Johannes Mockenhaupt
491caadd71
Check for active alerts on the pump, confirm and re-raise in AAPS.
2017-10-20 15:23:16 +02:00
Johannes Mockenhaupt
57be9bb9b1
Explicit pump initialization.
...
(cherry picked from commit d8b244a)
2017-10-20 15:10:24 +02:00
Milos Kozak
e545f75d69
fix displaying XX:30 time intervals
2017-10-20 11:34:33 +02:00
Johannes Mockenhaupt
8b8a135804
Add (back) last bolus to ComboFragment.
2017-10-20 01:12:47 +02:00
Johannes Mockenhaupt
4517736122
Add back TBR to ComboFragment.
2017-10-20 00:28:49 +02:00
Johannes Mockenhaupt
c04d746cfc
Remove duplicated code.
2017-10-19 23:30:44 +02:00
Johannes Mockenhaupt
4e978656f5
Trim down ComboFragment.
...
Base basal rate, TBR, last bolus are redundant, they're already displayed on the overview
and the treatment tab. When they're not in sync, that's an error of the ComboPlugin.
2017-10-19 23:11:32 +02:00
Johannes Mockenhaupt
3d6c8ee2a5
Combo Fragment misc.
2017-10-19 23:01:27 +02:00
Johannes Mockenhaupt
71eff7ec79
Add space between number and minute for 'x min ago' template.
2017-10-19 22:59:03 +02:00
Johannes Mockenhaupt
c29b4d13a3
Support pump suspend status (and misc other ...).
2017-10-19 21:31:10 +02:00
Johannes Mockenhaupt
e1c1f4b996
Revert string danar_stats.
2017-10-19 21:31:10 +02:00
Milos Kozak
b76cb755e0
CS translations
2017-10-19 20:37:37 +02:00
Milos Kozak
c258b41f11
allow to use actual profile in wizard
2017-10-19 19:35:35 +02:00
Milos Kozak
65cb095dfd
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-10-19 19:23:52 +02:00
Milos Kozak
0b7832ec60
getUnits from active profile not interface
2017-10-19 19:23:19 +02:00
Milos Kozak
2e32fe51e2
Merge pull request #475 from diabetesdt1/patch-3
...
Update strings.xml
2017-10-19 18:11:52 +02:00
diabetesdt1
51caffa591
Update strings.xml
2017-10-19 16:40:36 +02:00
Milos Kozak
e7fb045f04
Merge pull request #474 from boysim/dev
...
dutch translation update
2017-10-19 16:16:27 +02:00
Johannes Mockenhaupt
4de010b1a2
Strings reuse for pumps.
2017-10-19 16:11:36 +02:00
diabetesdt1
17eec803f4
Update strings.xml
2017-10-19 16:03:31 +02:00
Johannes Mockenhaupt
8fe72e1474
WIP notes, combo fragement expansion
2017-10-19 13:24:18 +02:00
Johannes Mockenhaupt
5fc9da885a
Pairing stub.
2017-10-19 12:16:07 +02:00
Johannes Mockenhaupt
07253b59a0
Refactoring.
2017-10-19 02:56:29 +02:00
Johannes Mockenhaupt
413464f1f1
Overview: add space between insulin and unit letter.
2017-10-19 02:46:06 +02:00
Johannes Mockenhaupt
7797cbd69e
Remove accidential debug wait.
2017-10-19 02:45:39 +02:00
Johannes Mockenhaupt
64c3d452a8
Some ui polish.
2017-10-19 02:45:29 +02:00
Johannes Mockenhaupt
0a67bb73a4
Fix displaying reservoir level on startup.
2017-10-19 00:04:01 +02:00
Milos Kozak
19f107fe53
move preparing graph series to extra class #2
2017-10-18 23:56:13 +02:00
Johannes Mockenhaupt
52d3803275
Source ruffy@eb659b3aa47a1ed699789df7e50e0d80c4640cc3, with pumpdata hackery.
2017-10-18 21:37:11 +02:00
Simon Pauwels
28430d117d
Update dutch
2017-10-18 21:19:12 +02:00
Johannes Mockenhaupt
dca219d900
Fix initializing ruffy service, read reservoir level on init.
2017-10-18 20:53:44 +02:00
Milos Kozak
55b1dcb992
Merge branch 'dev' into dev2
2017-10-18 20:14:14 +02:00
Milos Kozak
fe9fefa601
Update strings.xml
2017-10-18 20:06:35 +02:00
Milos Kozak
d65a2d8f8c
move preparing graph series to extra class
2017-10-18 19:01:39 +02:00
Johannes Mockenhaupt
ab4f46471b
Add RuffyCommands.readPumpState, cleanup, fix.
2017-10-18 18:29:29 +02:00
Johannes Mockenhaupt
e4901f292f
Extract modules ruffy-spi, ruffyscripter.
2017-10-18 14:00:47 +02:00
Johannes Mockenhaupt
e5eba342ba
SPI first draft.
2017-10-18 14:00:47 +02:00
Radoslav Radev
f0ee2b8bed
Update strings.xml
2017-10-18 14:25:34 +03:00
McHoffi
434f4474b5
DE_translations
2017-10-18 11:11:41 +02:00
warstar2187
e3d3664ac2
Update strings.xml
2017-10-18 16:39:55 +09:00
warstar2187
a35262840f
Update strings.xml
2017-10-18 13:49:17 +09:00
Milos Kozak
6ff3d00f3c
Merge remote-tracking branch 'origin/dev' into food
2017-10-17 20:55:55 +02:00
Milos Kozak
13184dcb51
food plugin
2017-10-17 20:55:23 +02:00
Johannes Mockenhaupt
4a91b68ed7
Package refactoring.
2017-10-17 19:45:37 +02:00
Johannes Mockenhaupt
f33d55b092
Trim combo prefs.
2017-10-17 19:37:32 +02:00
Johannes Mockenhaupt
64ecf84174
Cleaning up.
2017-10-17 19:08:56 +02:00
Johannes Mockenhaupt
5ab7e4dbd6
Connect to IRuffyService in RuffyScripter, rather than ComboPlugin.
2017-10-17 19:05:55 +02:00
Johannes Mockenhaupt
142f9cf6a3
Extract SPI.
2017-10-17 18:59:41 +02:00
Johannes Mockenhaupt
5131b8b62f
Remove combo hacks outside of combo plugin.
2017-10-17 12:20:48 +02:00
Johannes Mockenhaupt
357c84e2e2
ComboPlugin singletion.
2017-10-17 12:20:12 +02:00
Johannes Mockenhaupt
41ebabe5e7
Merge remote-tracking branch 'origin/dev' into combo-v2
...
* origin/dev: (126 commits)
ConfigBuilder: hide disabled plugins by default.
sum on name for LP
log to debug not error
logger reformat
logging
rhinoAMA first full run
rhinoAMA first crashfree call
rhino some more cleanups
rhino logging and cleanups
rhino MA looping
rhino first real detemine-basal call
rhino small refactor
NDK filters to work around j2v8 vs. libBleCommandUtil issue.
NewTreatmentDialog: sanitize inputs, fixes #417 .
rhino complex parameter passing
rhino first parameter passing
rhino function passing
first rhino
location permission for BLE scanning
use customized name only for LocalProfile
...
2017-10-17 12:16:43 +02:00
Johannes Mockenhaupt
d123e7b7c0
Remove duplicate values in strings.xml.
2017-10-17 11:40:24 +02:00
Johannes Mockenhaupt
60c9a984b5
Refactor, clean out stuff, add RuffyCommands interface.
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
960586b79d
ExperimentalBolusCommand: update progress when starting to programm the pump.
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
cb24d13cae
Remove GetReservoirLevelCommand, will be a method in the future.
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
f4f91c0b85
Add TODO.
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
09f834d990
Make access to RuffyScripter.currentMenu safer.
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
dc7dd15571
Update pref descriptions.
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
882f400d1e
Disable incomplete parts in ExperimentalBolusCommand.
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
5d10956900
Declare RuffyScripter.currentMenu nullable.
...
(cherry picked from commit fb0c829)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
15bac4d386
Wait for currentMenu to be != null
...
(cherry picked from commit 13b96ec)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
fd7f4ae145
Option to ignore TBR failures: also ignore errors when reading pump state.
...
(cherry picked from commit 82052e8)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
a33d7db471
Refactorings and notes.
...
(cherry picked from commit 8c77f0e)
2017-10-17 11:27:21 +02:00
Johannes Mockenhaupt
0fda86dffa
A little less broken CancellableBolusCommand.
...
(cherry picked from commit 9d56f23)
2017-10-17 11:27:21 +02:00
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
fee19db501
ConfigBuilder: hide disabled plugins by default.
2017-10-16 22:14:49 +02:00
Johannes Mockenhaupt
f7a46d386e
Remove j2v8.
2017-10-16 21:52:06 +02:00
Johannes Mockenhaupt
d77fa9b0cf
Revert "NDK filters to work around j2v8 vs. libBleCommandUtil issue."
...
This reverts commit 7c04787004
2017-10-16 21:48:08 +02:00
Milos Kozak
d1a9398451
Merge pull request #463 from AdrianLxM/mr-profileRhino
...
sum on name for LP
2017-10-16 14:58:41 +02:00
AdrianLxM
414cb5fd8d
sum on name for LP
2017-10-16 12:54:17 +02:00
Milos Kozak
5172a91ca1
Merge pull request #458 from jotomo/gh-417-new-treatment-validation
...
NewTreatmentDialog: sanitize inputs, fixes #417 .
2017-10-16 08:38:30 +02:00
AdrianLxM
dbc5657003
log to debug not error
2017-10-15 23:21:55 +02:00
AdrianLxM
2a8ab96fe3
Merge pull request #461 from AdrianLxM/rhinoAMA
...
Rhino ama
2017-10-15 22:39:54 +02:00
AdrianLxM
3e7b7ced06
logger reformat
2017-10-15 22:34:03 +02:00
AdrianLxM
c499e5977c
logging
2017-10-15 22:27:08 +02:00
AdrianLxM
1c49362415
rhinoAMA first full run
2017-10-15 20:42:36 +02:00
AdrianLxM
1494b7f5b3
rhinoAMA first crashfree call
2017-10-15 19:36:31 +02:00
AdrianLxM
564c882754
rhino some more cleanups
2017-10-15 16:19:29 +02:00
AdrianLxM
d32a874baa
rhino logging and cleanups
2017-10-15 16:10:58 +02:00
AdrianLxM
e65b4bf858
rhino MA looping
2017-10-15 14:06:13 +02:00
AdrianLxM
190305c6df
rhino first real detemine-basal call
2017-10-15 13:00:10 +02:00
AdrianLxM
124ec6e992
rhino small refactor
2017-10-15 11:51:12 +02:00
Johannes Mockenhaupt
7c04787004
NDK filters to work around j2v8 vs. libBleCommandUtil issue.
...
j2v8 only provides files for x86 and arm-v7a while libBleCommandUtil
provides x64 libs as well. This fails to load since x86 & x64 can't be mixed
and Android ends up loading libBleCommandUtil's x64 variant (on a x64
device) and then failing since there's no x64 version of j2v8.
This excludes all libBleCommandUtil ibs except those that match j2v8.
Revert this when we switch away from j2v8.
(cherry picked from commit 09036dc)
2017-10-15 11:19:34 +02:00
Johannes Mockenhaupt
a9adcee974
NewTreatmentDialog: sanitize inputs, fixes #417 .
...
Inputs are now check as they're being made and cleared if they
exceed constraints. This is the same behaviour the Calculator
dialog shows.
2017-10-15 10:45:12 +02:00
AdrianLxM
9008ef6f6f
rhino complex parameter passing
2017-10-15 03:55:03 +02:00
AdrianLxM
303d35118e
rhino first parameter passing
2017-10-15 03:50:18 +02:00
AdrianLxM
81b611ad92
rhino function passing
2017-10-15 03:21:32 +02:00
AdrianLxM
7f2451934c
first rhino
2017-10-15 02:52:57 +02:00
Milos Kozak
1db158670a
location permission for BLE scanning
2017-10-14 13:36:38 +02:00
Milos Kozak
1994cd707c
use customized name only for LocalProfile
2017-10-14 10:39:32 +02:00
Milos Kozak
3b90d02e05
show status on Dana fragment too
2017-10-13 13:31:32 +02:00
Milos Kozak
02c57fb9a3
RS connection improvement
2017-10-13 13:17:17 +02:00
Milos Kozak
c99830968a
adjust enforcing new temp basal on user request
2017-10-13 12:39:34 +02:00
Milos Kozak
f235b5fb02
use basalStep instead of fixed value
2017-10-13 12:07:33 +02:00
Milos Kozak
9a4e457d2b
fix RS events parsing
2017-10-13 11:54:50 +02:00
Milos Kozak
e40033dcb8
formated=false
2017-10-13 09:24:02 +02:00
Milos Kozak
bee60eb0e3
CS translations
2017-10-13 09:16:15 +02:00
Milos Kozak
1f3c54eb73
split sgvs before broadcast
2017-10-13 08:35:29 +02:00
Milos Kozak
6124ef25a4
report wrong alarm data #2
2017-10-13 08:21:37 +02:00
Milos Kozak
91e286b2ae
report wrong alarm data
2017-10-13 08:11:30 +02:00
Milos Kozak
45a2eba0c2
fix NPE
2017-10-13 08:06:27 +02:00
AdrianLxM
71d95bea92
fix ic isf
2017-10-13 02:56:49 +02:00
AdrianLxM
869b3eff5f
Spinner set selection delayed
2017-10-12 23:56:58 +02:00
AdrianLxM
746d71bcff
remove wear flavours
2017-10-12 18:24:48 +02:00
AdrianLxM
f751638a7f
enabling wearcontrols from preferences
2017-10-12 18:01:10 +02:00
AdrianLxM
944e334231
migrate CPP->LP working
2017-10-12 12:44:17 +02:00
AdrianLxM
6f97e52a07
migrate CPP->LP partial
2017-10-12 12:36:06 +02:00
AdrianLxM
45c07d4106
U/h -> U
2017-10-11 23:38:08 +02:00
AdrianLxM
4667a047ea
add sum to basal in lp
2017-10-11 20:57:43 +02:00
AdrianLxM
39b18915d0
Align LP GUI
2017-10-11 20:19:42 +02:00
AdrianLxM
339c33bd75
Spinner - selection events only after first touch
2017-10-11 19:25:09 +02:00
AdrianLxM
374983e1ae
only inflate elements when needed
2017-10-11 07:59:41 +02:00
AdrianLxM
c181aaaf34
Basal sum in label
2017-10-11 02:32:17 +02:00
AdrianLxM
e6565c1911
reuse button on profile switch
2017-10-11 00:25:44 +02:00
AdrianLxM
02369b952b
a little safer<
2017-10-10 22:54:24 +02:00
AdrianLxM
398e950f8e
fix percentage concatenation on profile names
2017-10-10 22:11:06 +02:00
AdrianLxM
549b72b032
fix percentage/shift from watch
2017-10-10 21:51:58 +02:00
AdrianLxM
b60ff8ceef
max timeshift to 23
2017-10-10 20:47:38 +02:00
AdrianLxM
36784b983e
remove cpp import
2017-10-10 20:42:29 +02:00
AdrianLxM
1410b2e706
wear cpp -> general profile
2017-10-10 20:32:43 +02:00
Milos Kozak
982e46d958
prepare profileswitch function for watch
2017-10-10 19:25:21 +02:00
Milos Kozak
77ec52ff23
fix sending profile switch to pump
2017-10-10 19:19:39 +02:00
Milos Kozak
da71cdfca0
Merge branch 'profile' of https://github.com/MilosKozak/AndroidAPS into profile
2017-10-10 19:15:07 +02:00
Milos Kozak
24099222f3
Dana R & v2 speed selection
2017-10-10 19:14:43 +02:00
Milos Kozak
50de4a5979
Merge branch 'profile' of https://github.com/MilosKozak/AndroidAPS into profile
2017-10-10 18:03:50 +02:00
Milos Kozak
d142d2e4f9
resolve RS merge conflict
2017-10-10 16:47:03 +02:00
Milos Kozak
c6392ec625
Merge remote-tracking branch 'origin/dev' into profile
2017-10-09 23:15:02 +02:00
Milos Kozak
9ec3efbaab
fix conflict
2017-10-09 23:14:46 +02:00
Milos Kozak
230dd5f0a8
Merge pull request #451 from jotomo/checkboxes-and-labels-aligned
...
Overview: align checkboxes and labels vertically.
2017-10-09 23:13:16 +02:00
Johannes Mockenhaupt
e586e1389e
Overview: align checkboxes and labels vertically.
2017-10-09 22:37:50 +02:00
Johannes Mockenhaupt
62803f2a4d
Use existing string resource.
2017-10-09 21:18:55 +02:00
Johannes Mockenhaupt
70fefa9b70
NSTreatmentDialog: use same format for ES reason field as for profile.
2017-10-09 21:03:25 +02:00
Milos Kozak
4687b001e0
more cpp functionality to Profile
2017-10-08 14:41:51 +02:00
Johannes Mockenhaupt
c6c5624b85
Singleton OpenAPSSMBPlugin.
2017-10-07 23:05:37 +02:00
Milos Kozak
a617d591b0
fix NPE
2017-10-07 22:29:55 +02:00
Milos Kozak
8f259042d6
fix NPE
2017-10-07 22:24:42 +02:00
Johannes Mockenhaupt
fa1c282699
Merge remote-tracking branch 'origin/dev' into smb
...
* origin/dev: (28 commits)
Singleton & Crashlytics logging part 2
treatments in config builder
Singleton & Crashlytics logging part 1
checkboxes for NS-Client layouts
overview checkboxes cutoff fix
update NP value after manual entry
restore preferences
temp target presets
Rv2 percent fix
korean percent fix
serialize reload of treatments
getTempBasalFromHistory -> getRealTempBasalFromHistory
Do not misinterpret a fake-extended as 0% temp.
In one line
Update danar_fragment.xml
text identation
Add files via upload
Add files via upload
Add files via upload
Add files via upload
...
# Conflicts:
# app/build.gradle
# app/src/main/java/info/nightscout/androidaps/MainApp.java
2017-10-07 21:33:22 +02:00
Milos Kozak
6618d2fef2
fix negative timeshift
2017-10-07 20:42:56 +02:00
Milos Kozak
60086dac8d
Merge remote-tracking branch 'origin/dev' into profile
2017-10-07 18:30:55 +02:00
Milos Kozak
a54b9e52d8
Merge pull request #446 from AdrianLxM/numberpicker-update
...
overview checkboxes cutoff fix
2017-10-07 18:29:56 +02:00
Milos Kozak
c56ecfced6
Merge pull request #447 from AdrianLxM/treatments-configbuilder2
...
treatments in config builder
2017-10-07 18:29:44 +02:00
Milos Kozak
9e7c81613c
Merge branch 'profile' of https://github.com/MilosKozak/AndroidAPS into profile
2017-10-07 18:28:59 +02:00
Milos Kozak
ef645ca600
fix merge conflict
2017-10-07 18:27:20 +02:00
Milos Kozak
d6fb912ff9
Singleton & Crashlytics logging part 2
2017-10-07 17:48:03 +02:00
Johannes Mockenhaupt
da3f02648c
Use SpinnerHelper in TimeListEdit.
...
Resolves the spinner's onItemSelected handler to back invoked
repeatedly on faster devices.
2017-10-07 16:37:24 +02:00
AdrianLxM
046c28856c
treatments in config builder
2017-10-07 01:18:28 +02:00
Milos Kozak
0e763724f6
Singleton & Crashlytics logging part 1
2017-10-06 16:39:59 +02:00
Milos Kozak
a1ca4677c0
log exception
2017-10-06 16:07:41 +02:00
AdrianLxM
10d273dac8
checkboxes for NS-Client layouts
2017-10-06 15:48:32 +02:00
AdrianLxM
333b131c1e
overview checkboxes cutoff fix
2017-10-06 13:53:55 +02:00
Milos Kozak
4db82fd275
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-10-06 13:15:57 +02:00
Milos Kozak
32d6e06b07
Merge pull request #444 from AdrianLxM/temptarget-presets
...
Temptarget presets
2017-10-06 13:15:06 +02:00
Milos Kozak
a670a43346
Merge pull request #445 from AdrianLxM/numberpicker-update
...
update NP value after manual entry
2017-10-06 12:41:34 +02:00
AdrianLxM
1b5ef50eb2
update NP value after manual entry
2017-10-06 03:24:35 +02:00
AdrianLxM
7f403166c7
restore preferences
2017-10-06 03:05:36 +02:00
AdrianLxM
bd93fc1adb
temp target presets
2017-10-06 02:53:23 +02:00
Milos Kozak
e0794a6e7f
fix time shifting
2017-10-05 00:54:35 +02:00
Milos Kozak
f08809ff9e
rename button to activate profile
2017-10-04 23:33:02 +02:00
Milos Kozak
3d58fe6bb5
cleanup
2017-10-04 23:24:56 +02:00
Milos Kozak
96edac5ddf
LocalProfile fix
2017-10-04 23:17:19 +02:00
AdrianLxM
d6089bef73
Rv2 percent fix
2017-10-04 19:39:41 +02:00
AdrianLxM
7ce282dc4e
korean percent fix
2017-10-04 19:38:42 +02:00
Milos Kozak
9f6962cee5
serialize reload of treatments
2017-10-04 18:04:34 +02:00
AdrianLxM
3d2647321b
getTempBasalFromHistory -> getRealTempBasalFromHistory
2017-10-04 16:51:54 +02:00
AdrianLxM
9e2968f21a
Do not misinterpret a fake-extended as 0% temp.
2017-10-04 16:00:48 +02:00
Milos Kozak
8bf5933c88
refactor TimeListEdit
2017-10-04 15:46:23 +02:00
Milos Kozak
6d08a608a2
dana layout
2017-10-03 22:37:53 +02:00
Milos Kozak
58ed0416d1
fix conflict
2017-10-03 22:33:35 +02:00
Milos Kozak
067494fae1
RS hightempbasal
2017-10-03 22:27:06 +02:00
Milos Kozak
2a98a7e9ba
RS bolus code
2017-10-03 21:47:36 +02:00
Milos Kozak
f5dfff7491
RS APS messages
2017-10-03 20:58:09 +02:00
Milos Kozak
3a014949e9
remove firmware check
2017-10-03 18:45:54 +02:00
Milos Kozak
a5730cb982
initialize only with proper protocol
2017-10-02 22:44:10 +02:00
Milos Kozak
97f69c50fd
store pairing key per pump
2017-10-02 22:21:11 +02:00
Milos Kozak
8cecac0a7f
more LocalProfile work
2017-10-02 19:57:41 +02:00
Milos Kozak
1a5b72f745
Fix time parsing
2017-10-02 17:38:45 +02:00
Roumen Georgiev
ef803d6a41
In one line
2017-09-29 15:06:23 +03:00
Roumen Georgiev
e004b95a60
Update danar_fragment.xml
2017-09-29 09:50:07 +03:00
Roumen Georgiev
7444bc11fa
text identation
2017-09-29 09:47:29 +03:00
Roumen Georgiev
2e61bc136f
Add files via upload
2017-09-29 09:44:25 +03:00
Roumen Georgiev
3c0a509541
Add files via upload
2017-09-29 09:43:42 +03:00
Roumen Georgiev
a152f94f53
Add files via upload
2017-09-29 09:42:42 +03:00
Roumen Georgiev
cb982477cd
Add files via upload
2017-09-29 09:41:32 +03:00
Roumen Georgiev
271534a64b
Add files via upload
2017-09-29 09:40:58 +03:00
Roumen Georgiev
92e2008692
Adding button Icons
2017-09-29 09:40:11 +03:00
Milos Kozak
ba54dacffb
1.54-dev
2017-09-25 19:51:05 +02:00
Milos Kozak
8bbee37b70
fix TB & EB is not set
2017-09-25 19:38:27 +02:00
Milos Kozak
73687442c8
Merge branch 'dev' into rs
2017-09-25 19:36:01 +02:00
Milos Kozak
dc6cbadbdf
fix TB & EB is not set
2017-09-25 19:34:49 +02:00
Milos Kozak
d9f59840b6
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into food
2017-09-24 22:47:50 +02:00
Milos Kozak
4fbe7d1000
food database support
2017-09-24 22:47:18 +02:00
Milos Kozak
91b02d4d39
fill dialog refactor & code clean
2017-09-24 14:51:16 +02:00
Milos Kozak
3c7abff88d
remove unused imports
2017-09-24 14:28:26 +02:00
Milos Kozak
1823cd3f24
extended bolus dialog refactor
2017-09-24 13:00:59 +02:00
Milos Kozak
547f09ffbd
allow to view profile from overview
2017-09-24 11:45:32 +02:00
Milos Kozak
c79b750a9c
reactor OptionsToShow
2017-09-24 11:08:04 +02:00
Milos Kozak
082414f0d3
CPP support to profile switch
2017-09-24 10:39:54 +02:00
Milos Kozak
349b27e31a
NS profile fragment shows all profiles
2017-09-23 23:54:43 +02:00
Milos Kozak
6393ee5e10
CPP functionality to Profile.class
2017-09-23 23:12:08 +02:00
Milos Kozak
b3bcb778e0
check for NPE in posted dialogs
2017-09-23 20:12:53 +02:00
Milos Kozak
c3a0f5ddad
split BLE to separate class
2017-09-23 15:03:07 +02:00
Milos Kozak
144a227d14
more progress logging on R
2017-09-23 12:53:41 +02:00
Milos Kozak
8cd8c6b5d9
more progress logging on RS
2017-09-23 12:28:11 +02:00
Milos Kozak
4ed2896f76
remove duplicated code
2017-09-23 10:56:00 +02:00
Johannes Mockenhaupt
7e8e7f0dae
Fix APSResult.toString as well.
...
(cherry picked from commit d485e5b)
2017-09-22 16:00:19 +02:00
Milos Kozak
1eeb1c6f7a
RS history OK
2017-09-22 14:57:23 +02:00
Johannes Mockenhaupt
2750ccbf26
Fix APSResult.toSpanned for SMBs.
...
Adds a missing newline after "SMB: xxx"
(cherry picked from commit d4de9ce)
2017-09-22 09:54:51 +02:00
SMUSTAF1
81fe9ebdcc
Clear the SMS text field if the user removes the old number.
2017-09-20 13:54:05 +02:00
Johannes Mockenhaupt
ce2b1e4d10
Merge remote-tracking branch 'origin/dev' into smb
...
* origin/dev: (40 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/PreferencesActivity.java
# app/src/main/java/info/nightscout/androidaps/plugins/Loop/APSResult.java
# app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java
2017-09-20 13:02:31 +02:00
Milos Kozak
e1903840dd
handle received foods in nsclient
2017-09-20 10:20:50 +02:00
Milos Kozak
60990e500e
Revert "Only do SMB if invoke is from EventNewBG"
...
This reverts commit 6ef4b0c2a9
2017-09-18 21:28:43 +00: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
fdc3c49a2a
fix merge conflits
2017-09-18 22:03:26 +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
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
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
04994924c5
GUI tweaking, small fixes
2017-09-18 18:41:45 +02:00
Milos Kozak
7f4888978e
warn if basal step is not 0.01
2017-09-18 13:28:00 +02:00
Milos Kozak
6cee6c0f51
RS extended disabled warning
2017-09-18 12:59:56 +02:00
Milos Kozak
e3ad396f65
more work on service
2017-09-18 12:57:07 +02:00
Milos Kozak
ee4d8b7748
some work on history
2017-09-18 09:10:27 +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
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
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
Milos Kozak
6662c9dd6c
bolus ok
2017-09-15 13:52:28 +02:00
Roumen Georgiev
6ef4b0c2a9
Only do SMB if invoke is from EventNewBG
2017-09-15 09:33:07 +00:00
Milos Kozak
08fca41b5f
partial bolus code, messages blocked by sleep :(
2017-09-14 22:53:11 +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
Milos Kozak
13fd6136c3
refactor connectivity notifications
2017-09-14 00:29:34 +02:00
Milos Kozak
1bd938c8d5
Merge branch 'smb-source' into 'smb'
...
Set Source.USER for SMB to deliver.
See merge request !363
2017-09-13 11:21:27 +00:00
Johannes Mockenhaupt
a4ebd15dbf
Set Source.USER for SMB to deliver.
2017-09-13 13:19:20 +02:00
Johannes Mockenhaupt
cb3b472488
VirtualPump: set PumpEnactResult.enacted.
...
(cherry picked from commit ec49bc3)
2017-09-13 13:16:48 +02:00
Milos Kozak
e795a8cd99
Revert "Temp fix for not adding SMB boluses to treatments and IOB calculations"
...
This reverts commit 87c993cde1
2017-09-13 07:05:47 +00:00
Roumen Georgiev
87c993cde1
Temp fix for not adding SMB boluses to treatments and IOB calculations
2017-09-13 06:49:48 +00:00
Milos Kozak
ed6cabe7fa
initial RS work
2017-09-13 00:35:03 +02:00
Paul Andrel
88c1248c41
Update determine-basal.js and basal-set-temp.js from Current oref0 dev.
2017-09-12 15:04:04 -04:00
Paul Andrel
936184be60
Update determine-basal.js and basal-set-temp.js from Current oref0 dev.
2017-09-12 15:03:48 -04: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
Roumen Georgiev
1a8edc8372
Update ConfigBuilderPlugin.java - Typo fix on line 598
2017-09-11 13:09:57 +00:00
Johannes Mockenhaupt
936ce42cc0
Remove duplicate logging.
2017-09-10 14:24:00 +02:00
Johannes Mockenhaupt
612efa6a13
Revert "Make the BolusProgress dialog a bit more self-contained."
...
Breaks dismissal of dialog (only one invocation of
EventDismissBolusprogressIfRunning also sets bolusEnded=true).
This reverts commit c11455dff1
2017-09-09 18:16:13 +02:00
Johannes Mockenhaupt
c11455dff1
Make the BolusProgress dialog a bit more self-contained.
...
(cherry picked from commit 75db72a)
2017-09-09 16:41:21 +02:00
Johannes Mockenhaupt
c227e0e5fa
Dead code be gone.
...
(cherry picked from commit bb626ce)
2017-09-09 16:41:16 +02:00
Johannes Mockenhaupt
5c3ec9a086
Use SystemClock.sleep instead of Thread.sleep.
...
Gets rid of all those pointless InterruptedException catching.
(cherry picked from commit 6acaa2b)
2017-09-09 16:41:11 +02:00
Johannes Mockenhaupt
c50fad81bb
Log exceptions in catch blocks rather than printing to console.
...
The default code used by Android Studio when generating a
try/catch can be altered in Settings under
Editor->File and Code Templates->Catch Statement body
to
log.error("Unhandled exception", e);
to also do this for newly generated code.
(cherry picked from commit c2ae29f)
(cherry picked from commit 6031a25)
2017-09-09 16:41:06 +02:00
Johannes Mockenhaupt
627cb8e9b2
WizardDialog: don't persist state of tt checkbox, default to false.
...
This assumes that a default is not useful, as it needs to be decided
whether this is needed on each case (using tt when bolusing to
start eating soon, but not using it when bolusing for the meal
at the end of a tt).
2017-09-09 16:37:08 +02:00
Johannes Mockenhaupt
b1e3b45ce9
Add temp target to Wizard dialog
...
Also, store checkboxes' state as prefereces.
(cherry picked from commit 6e1c66e)
2017-09-09 16:30:17 +02:00
Milos Kozak
e3ae7bbeaf
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-09-05 22:47:37 +02:00
Milos Kozak
98848b61ec
send max 30 at once to NS
2017-09-05 22:47:10 +02:00
SMUSTAF1
1fd99a9582
changing the color of the bolus value, for visual clarify and confirmation. Reducing errors.
2017-09-05 13:29:43 +02:00
Milos Kozak
90496d0a02
Merge pull request #410 from jotomo/ok-cancel-profile-change-refresh
...
Use OK/Cancel buttons for 'profile changes refresh from NS' dialog in…
2017-09-03 17:13:43 +02:00
Johannes Mockenhaupt
3bebea37ae
Use OK/Cancel buttons for 'profile changes refresh from NS' dialog in Treatments tab.
2017-09-03 01:53:30 +02:00
Milos Kozak
fa24368701
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-09-02 10:26:07 +02:00
Milos Kozak
7801db5a29
fix danar bolus step
2017-09-02 10:25:46 +02:00
AdrianLxM
15a40cba80
Split treatments into smaller packages before broadcasting
2017-09-01 14:02:47 +02:00
fedor apanasenko
ed8582b36a
update russian
2017-09-01 10:37:59 +03:00
Milos Kozak
46f111076f
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-08-31 22:01:25 +02:00
Milos Kozak
db952759e1
Insulin fragments consolidation
2017-08-31 22:00:45 +02:00
Milos Kozak
c312b51fcf
consolidate DanaR fragments
2017-08-31 19:32:28 +02:00
Radoslav Radev
e1c4074663
Update strings.xml
2017-08-31 09:09:26 +03:00
Milos Kozak
7da8b2de5c
visibility icon
2017-08-29 21:40:06 +02:00
Milos Kozak
7dfe77dc9c
single line in configbuilder
2017-08-29 19:47:32 +02:00
Milos Kozak
13b8a9ecf2
Merge pull request #404 from kakoni/master
...
Adding out_units support for determine-basal.js
2017-08-29 18:23:36 +02:00
Milos Kozak
981a96aa16
ConfigBuilder layout
2017-08-29 17:59:46 +02:00
Karri Niemelä
034faa4f6e
Adding support out_units
2017-08-29 15:06:53 +03:00
Johannes Mockenhaupt
448f527525
Splitted boluses: add a wait, so that boluses are delivered with 40s between them.
2017-08-28 21:02:37 +02:00
Johannes Mockenhaupt
f903b83315
Simplify.
2017-08-28 20:32:41 +02:00
Johannes Mockenhaupt
7d5571ffd2
SetTbrCommand: rewrite inputing duration.
...
Inputs all steps at once, including 'alignment' step, thereby removing a wait
between the initial step and subsequent step where a bad timing could
break the command.
2017-08-28 20:13:20 +02:00
Milos Kozak
addd6c8232
fix conflict
2017-08-28 19:15:33 +02:00
Johannes Mockenhaupt
4c313a6a14
Small cleanup.
...
(cherry picked from commit b0b533e)
2017-08-28 12:43:12 +02:00
Johannes Mockenhaupt
6f8e0fc257
Remove hack to cancel a request for a TBR that is already running (localized issue).
...
(cherry picked from commit a671536)
2017-08-28 12:43:11 +02:00
Johannes Mockenhaupt
cff4bc1abe
Add temporary fix for edge case resulting in SetTbrCommand failing to set TBR_DURATION, where duration is not correctly pumped up to a multiple of 15.
...
(cherry picked from commit df9952f)
2017-08-28 12:43:09 +02:00
Johannes Mockenhaupt
a53564fcae
Add wait in loop to check for update from pump.
...
(cherry picked from commit fe8d09e)
2017-08-28 12:43:08 +02:00
Johannes Mockenhaupt
11332391b8
Clean up (Cancellable)BolusCommands, to use dynamic scroll wait as well.
...
(cherry picked from commit 711cc58)
2017-08-28 12:43:06 +02:00
Johannes Mockenhaupt
03ff15d533
Remove unused test class.
2017-08-28 00:57:47 +02:00
Johannes Mockenhaupt
381a26119b
Crap, don't enable experimental bolus by default.
2017-08-28 00:33:33 +02:00
Johannes Mockenhaupt
a42b671965
Update version.
2017-08-27 20:40:29 +02:00
Johannes Mockenhaupt
e3a732d53d
Small refactoring.
2017-08-27 20:30:58 +02:00
Johannes Mockenhaupt
b85f5324de
Restore bolus splitting hack.
2017-08-27 19:37:43 +02:00
Johannes Mockenhaupt
ecd05bef2d
Make new BolusCommand configurable.
2017-08-27 19:11:17 +02:00
Johannes Mockenhaupt
b53db22ae1
Report bolus delivered if the pump raised a warning/error during delivery.
...
Most likely this is due to a low cartridge warning, but might also be an occlusion alert.
This lets the alarm ring and asks the user to check it. The treatment is also recorded in
the db as enacted.
(cherry picked from commit 6cc017a)
2017-08-27 19:08:27 +02:00
Johannes Mockenhaupt
fea1309fa3
Cleanup merge.
2017-08-27 19:05:33 +02:00
Johannes Mockenhaupt
3d2732a68e
Restore bolus comands alongside.
2017-08-27 19:05:08 +02:00
Johannes Mockenhaupt
95fda165a3
Merge fixes without changes to behaviour.
2017-08-27 18:49:24 +02:00
Johannes Mockenhaupt
e399fac8dc
Try to be clever about slow screen updates when scrolling.
2017-08-27 18:45:25 +02:00
Johannes Mockenhaupt
ad44b356c4
Revert "Try building against ruffy stable, 8dae0c0fedd5e371e85da3433a07aaab27b05db0"
...
This reverts commit 8720c08cdd4a7f89b77816d849da9c585fb8f1ef.
2017-08-27 18:45:24 +02:00
Johannes Mockenhaupt
f70cbbc6c0
Try building against ruffy stable, 8dae0c0fedd5e371e85da3433a07aaab27b05db0
2017-08-27 18:45:24 +02:00
Johannes Mockenhaupt
7bd7c7d035
Workaound for #27 (TBR issued twice).
2017-08-27 18:45:24 +02:00
Johannes Mockenhaupt
0705755368
Revert "Retry with current ruffy."
...
This reverts commit f9281c1f996679a2c8065aa52cbb8cb4698353bc.
2017-08-27 18:45:24 +02:00
Johannes Mockenhaupt
2a80111034
Retry with current ruffy.
2017-08-27 18:45:24 +02:00
Johannes Mockenhaupt
c8f7b535c2
Remove code to determine pump capabilities for the time being.
2017-08-27 18:45:22 +02:00
Johannes Mockenhaupt
40941996c2
Don't provide status JSON until we can provide it properly.
2017-08-27 18:44:55 +02:00
Johannes Mockenhaupt
ff088ddd3f
ComboPlugin: don't implement ConstraintsInterface, ProfileInterface.
2017-08-27 18:44:55 +02:00
Johannes Mockenhaupt
1d53305ff9
Use string resource.
2017-08-27 18:44:55 +02:00
Johannes Mockenhaupt
c2ae0b7289
Cleanup.
2017-08-27 18:44:55 +02:00
Johannes Mockenhaupt
fdab7daf2c
Only display Extended Bolus tab in Treatments if pump supports them.
...
(cherry picked from commit e862c35)
2017-08-27 18:44:30 +02:00
Johannes Mockenhaupt
4046305380
Build against ruffy b916a900c0899ef58ad58c7427d1c30d3c8731f4.
2017-08-27 18:44:30 +02:00
Johannes Mockenhaupt
bc68f2cc1b
Better log output.
2017-08-27 18:44:30 +02:00
Johannes Mockenhaupt
99b98f1dec
Set custom version
2017-08-27 18:44:30 +02:00
Johannes Mockenhaupt
fce696b51d
Cleanup, fix merge issues.
2017-08-27 18:44:28 +02:00
Johannes Mockenhaupt
4d2fa19ad4
Merge branch 'bolus-progress' into rework
...
* bolus-progress:
wip
wip
wip
more
more
Remove TODOs for extended bolus.
wip cancelling
Initial take on bolus cancellation.
Initial take on bolus progress reporting.
Add alternative SetTbrCommand for pumps with different behaviour.
Formatting.
2017-08-27 18:43:19 +02:00
Johannes Mockenhaupt
e6ba99b02f
Fix reading blinking values, use alternate SetTbrCommand by default,
...
cleanups
2017-08-27 18:05:05 +02:00
Johannes Mockenhaupt
37523fbdd1
ComboPlugin: Extract fields into ComboPump.
2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
3fdac4b23e
Small refactoring.
2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
9f57f82b6a
Remove wait for carb-only treatment.
2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
c301d6585c
ComboPlugin: implement Constraint, ProfileInterface.
2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
eb74a24e54
Misc cleanups.
2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
5eea6d7b8d
Fix waiting between reconnects.
2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
7a41117a64
Experiments.
2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
6b19759a9f
Command stubs.
2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
9349662f8e
Rename ReadPumpStateCommand -> GetPumpStateCommand.
2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
de693c0f76
Add reservoirLevel to PumpState.
2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
785a01a056
Extract methods to read blinking values.
2017-08-27 18:05:04 +02:00
Johannes Mockenhaupt
7537048a96
Finish injecting scripter.
2017-08-27 18:05:03 +02:00
Johannes Mockenhaupt
3238cf9c35
Remove pumpState arg from Command.execute.
2017-08-27 18:05:03 +02:00
Johannes Mockenhaupt
fe7f831429
Inject scripter into commands.
2017-08-27 18:05:03 +02:00
Johannes Mockenhaupt
04a03dedc3
Extract BaseCommand.
2017-08-27 18:05:03 +02:00
Johannes Mockenhaupt
1d3411ba56
Show connection, execution time in combo fragment.
...
(cherry picked from commit 4078c23)
2017-08-27 12:36:28 +02:00
Milos Kozak
03bf1abdd4
add WakeLock#isHeld()
2017-08-27 11:57:06 +02:00
Milos Kozak
1417410dbb
add WakeLock#isHeld()
2017-08-27 11:53:36 +02:00
Milos Kozak
162389a7e0
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-08-27 11:46:25 +02:00
Milos Kozak
ba967df2e3
disable careportal buttons until profile is set
2017-08-27 11:44:39 +02:00
Milos Kozak
c9bfd27d93
Merge pull request #396 from warstar2187/dev
...
KR translation update
2017-08-27 00:38:44 +02:00
warstar2187
761f9f5075
Update strings.xml
2017-08-27 06:09:17 +09:00
Radoslav Radev
6bf120e9da
Update strings.xml
2017-08-26 22:59:14 +03:00
Milos Kozak
e4c98e6cd1
make dev 1.52
2017-08-26 21:28:08 +02:00
Milos Kozak
b02b1829ad
put back sensitivity plugins
2017-08-26 21:26:40 +02:00
Milos Kozak
491378caf5
1.51 bump
2017-08-26 20:42:53 +02:00
Milos Kozak
3369ce1759
temporary remove untested plugin for release
2017-08-26 20:42:25 +02:00
Milos Kozak
40d86eb87a
fix strings
2017-08-26 14:37:38 +02:00
Milos Kozak
6ea7549e4f
update languages
2017-08-26 12:07:37 +02:00
boysim
196e0bb309
Update strings.xml
2017-08-24 23:18:21 +02:00
Milos Kozak
adceef3641
fix merge conflict
2017-08-23 23:42:51 +02:00
Milos Kozak
4e8d92a74b
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-08-23 23:04:10 +02:00
Milos Kozak
ad3d175b02
better handling DetailedBolusInfo in v2 driver
2017-08-23 23:03:28 +02:00
Johannes Mockenhaupt
d100509648
Log action about to be performed before the operation.
2017-08-23 16:38:28 +02:00
Johannes Mockenhaupt
6b99bb8ed1
Log ruffy messages on debug level, see if that helps debug things.
2017-08-23 16:36:31 +02:00
Johannes Mockenhaupt
fdf974cb3c
Better error message on connect attempt failure.
2017-08-23 16:36:20 +02:00
Johannes Mockenhaupt
52d2b425b8
Merge remote-tracking branch 'origin/dev' into develop
...
* origin/dev: (21 commits)
1.5h
Don't change schema.
Fix comparing non-primitives.
Generify MainApp.getSpecificPlugin.
Fix some warnings / simplify a bit.
Remove now unused dia, insulinInterfaceId from Treatment.
correct supercall
Use bolusstep granularity in fill dialog
bugfix: fill as invalid treatments if triggered from phone
add invalid treatments to charts in "invalid" colour
Use bolusstep as step for insulin correction in wizard
Update strings.xml
fix of fix :(
small refactoring
Multiply time passed instead of divide dia.
Update strings.xml
Fix initalizing profile with default values.
moved the code of the bg update to the top before all the loop logic happens, so there would be no delay
Update strings.xml
Update strings.xml
...
2017-08-23 16:36:06 +02:00
Milos Kozak
d6a27c1af0
1.5h
2017-08-23 13:28:07 +02:00
Milos Kozak
01a93a35b9
Merge branch 'dev' into smb
2017-08-22 20:34:38 +02:00
Milos Kozak
c98cd3c834
Merge pull request #375 from samihusseingit/delay_in_bg_update_onResume
...
Delay in bg update on resume
2017-08-22 20:33:56 +02:00
Milos Kozak
e74c2b564a
fix conflicts
2017-08-22 20:25:10 +02:00
Milos Kozak
0551f7f16d
Merge pull request #387 from MilosKozak/invalid-overview
...
Fill treatments in Overview
2017-08-22 20:20:28 +02:00
Milos Kozak
5b17eee586
Merge pull request #389 from jotomo/cleanups
...
Cleanups
2017-08-22 20:20:10 +02:00
Johannes Mockenhaupt
bde57fde5f
Don't change schema.
2017-08-22 18:28:36 +02:00
Johannes Mockenhaupt
56423028f6
Fix comparing non-primitives.
2017-08-22 13:47:02 +02:00
Johannes Mockenhaupt
30372897c0
Generify MainApp.getSpecificPlugin.
2017-08-22 13:47:02 +02:00
Johannes Mockenhaupt
59c7dbef27
Fix some warnings / simplify a bit.
2017-08-22 13:47:02 +02:00
Johannes Mockenhaupt
97d0140614
Remove now unused dia, insulinInterfaceId from Treatment.
2017-08-22 13:47:02 +02:00
AdrianLxM
d5ea2a2f08
correct supercall
2017-08-22 13:26:48 +02:00
AdrianLxM
4d33e1df97
Use bolusstep granularity in fill dialog
2017-08-22 13:02:56 +02:00
AdrianLxM
7ea33c7de4
bugfix: fill as invalid treatments if triggered from phone
2017-08-22 12:57:03 +02:00
AdrianLxM
3f8dea1197
add invalid treatments to charts in "invalid" colour
2017-08-22 12:56:17 +02:00
AdrianLxM
6b0bf5860c
Use bolusstep as step for insulin correction in wizard
2017-08-22 00:41:23 +02:00
Johannes Mockenhaupt
2eb86e1bd8
wip
2017-08-21 18:33:40 +02:00
Milos Kozak
aad168c50f
visualize SMB
2017-08-21 17:42:26 +02:00
Milos Kozak
204c39880f
mark SMB boluses in treatments tab
2017-08-21 17:22:25 +02:00
Milos Kozak
4f16700dc0
provide lastBolusTime
2017-08-21 15:47:37 +02:00
Milos Kozak
ebfc4e3075
colored predictions
2017-08-21 15:36:52 +02:00
Milos Kozak
f5143b2ec4
display UAM prediction
2017-08-21 09:24:17 +02:00
Milos Kozak
ec114c3b38
execute SMB
2017-08-21 08:41:34 +02:00
Patrik Nilsson
c91988081f
Update strings.xml
...
Updated some changes. Milos, I jjust copied the hole SV xml-file. :-)
2017-08-21 00:01:12 +02:00
Johannes Mockenhaupt
6cc73dcc1c
wip
2017-08-20 23:15:24 +02:00
Milos Kozak
466ba2907b
Merge branch 'dev' into smb
2017-08-20 21:53:19 +02:00
Milos Kozak
33cf707d45
Merge pull request #380 from MilosKozak/dia-divisor-fix
...
Dia divisor / bolussnooze fix
2017-08-20 21:52:42 +02:00
Milos Kozak
ab035e3949
Merge pull request #371 from diabetesdt1/patch-2
...
Update strings.xml
2017-08-20 21:44:21 +02:00
Johannes Mockenhaupt
b162fcce01
wip
2017-08-20 20:47:58 +02:00
Milos Kozak
a18e2b4641
fix of fix :(
2017-08-20 19:42:41 +02:00
Milos Kozak
86d791d93f
Merge pull request #378 from jotomo/profile-default-values
...
Fix initalizing profile with default values.
2017-08-20 19:08:55 +02:00
Johannes Mockenhaupt
bffcd3ceee
Merge remote-tracking branch 'origin/dev' into develop
...
* origin/dev: (35 commits)
fix displaying target in mmol
Profile.getValuesList: don't add trailing newline.
Fix some warnings.
Use OK/Cancel buttons for profile removal dialog.
static variables -> object variables
Avoid npe if no string is assigned to the profile switch
isValid implementation
Show profile on tap in Treatments->ProfileSwitch
Check for tempbasal not RealTempbasla
Overlapping interval - regard first element on cut
AcceptTempButton visible
show notification on toast alarm
parse 12h format properly
fix index
Show profile switch button in profiles
set pump time only if needed
restrict DIA for expectedDelta
Overlappinginterfals - find first element
Extract method Profile.toTargetRangeString.
Simplify.
...
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
2017-08-19 22:38:58 +02:00
Johannes Mockenhaupt
387ceff525
Add config options:
...
* alternate SetTbrCommand impl (original impl)
* split bolus (quick hack) to split up boluses to slow delivery
2017-08-19 22:29:48 +02:00
AdrianLxM
9c2808bf6f
small refactoring
2017-08-19 20:37:25 +02:00
AdrianLxM
d49eea854c
Multiply time passed instead of divide dia.
2017-08-19 20:12:37 +02:00
warstar2187
36c25cbd45
Update strings.xml
2017-08-19 21:35:03 +09:00
Johannes Mockenhaupt
ce4aee67d0
Fix initalizing profile with default values.
2017-08-19 12:28:10 +02:00
Susan
4f3b5f551a
moved the code of the bg update to the top before all the loop logic happens, so there would be no delay
2017-08-18 20:58:54 +02:00
Milos Kozak
838deed1e8
Merge branch 'dev' into smb
2017-08-18 12:30:09 +02:00
Johannes Mockenhaupt
d851637d4f
more
2017-08-18 11:55:19 +02:00
Milos Kozak
6b8dd5868d
fix displaying target in mmol
2017-08-18 11:46:04 +02:00
Milos Kozak
a097bf51aa
minDeviationSlope 1st try
2017-08-17 23:37:59 +02:00
diabetesdt1
efb9bed3fa
Update strings.xml
2017-08-17 22:21:09 +02:00
diabetesdt1
ef42193d95
Update strings.xml
...
Contraints translated with "Beschränkungen" (but not in the Config-Builder -> the Option to activate/show the Contraints-Tab)
objectives_*_ updated
dia_too_short updated
2017-08-17 22:06:10 +02:00
Johannes Mockenhaupt
5991f307af
Profile.getValuesList: don't add trailing newline.
2017-08-17 22:01:59 +02:00
Johannes Mockenhaupt
a6351f4455
Fix some warnings.
2017-08-17 22:01:59 +02:00
Johannes Mockenhaupt
4f2357e9fb
Use OK/Cancel buttons for profile removal dialog.
2017-08-17 22:01:59 +02:00
AdrianLxM
5d6327bfaa
static variables -> object variables
2017-08-17 21:34:30 +02:00
AdrianLxM
5769915f8c
Merge remote-tracking branch 'milosremote/profile-switch-viewer' into profile-switch-viewer
2017-08-17 21:29:15 +02:00
Milos Kozak
c36587430c
fix merge conflict
2017-08-17 21:24:50 +02:00
AdrianLxM
0cc9ee4193
Avoid npe if no string is assigned to the profile switch
2017-08-17 21:24:31 +02:00
Milos Kozak
ca3d94a8ca
fix merge conflict
2017-08-17 21:21:38 +02:00
Milos Kozak
73c2be5248
isValid implementation
2017-08-17 20:51:24 +02:00
Johannes Mockenhaupt
fabaf7c2ef
more
2017-08-17 19:04:43 +02:00
AdrianLxM
92077dcb6a
Show profile on tap in Treatments->ProfileSwitch
2017-08-17 17:03:08 +02:00
diabetesdt1
64446f07c5
Update strings.xml
...
added more translations, but please review the Objectiv-Strings, it was not so easy, so i hope i have translated it right.
Then, the most german varibles are translated.
2017-08-17 12:40:14 +02:00
Johannes Mockenhaupt
738dd72f5b
Remove TODOs for extended bolus.
2017-08-17 11:29:25 +02:00
Johannes Mockenhaupt
22e3517cd6
wip cancelling
2017-08-17 11:29:25 +02:00
Johannes Mockenhaupt
a664bdeaaa
Initial take on bolus cancellation.
2017-08-17 11:29:25 +02:00
Johannes Mockenhaupt
c1ecad1ed6
Initial take on bolus progress reporting.
2017-08-17 11:29:25 +02:00
Johannes Mockenhaupt
a230501f74
Add alternative SetTbrCommand for pumps with different behaviour.
2017-08-17 11:29:17 +02:00
Johannes Mockenhaupt
f41d597c07
Formatting.
2017-08-17 10:58:21 +02:00
Johannes Mockenhaupt
b000824b8a
Merge branch 'remove-cmd-retry-with-reconnect' into develop
...
* remove-cmd-retry-with-reconnect:
Don't rebind ruffy and retry command in case of failure.
2017-08-17 10:08:35 +02:00
Johannes Mockenhaupt
a19e49e5f8
Merge remote-tracking branch 'origin/dev' into develop
...
* origin/dev: (27 commits)
Check for tempbasal not RealTempbasla
Overlapping interval - regard first element on cut
AcceptTempButton visible
show notification on toast alarm
parse 12h format properly
fix index
Show profile switch button in profiles
set pump time only if needed
restrict DIA for expectedDelta
Overlappinginterfals - find first element
Extract method Profile.toTargetRangeString.
Simplify.
Overview: format target using unit specific format.
Dutch language
insulincurves - notification on short DIA
insulincurves - forgotten string updated
insulincurves - rename peak to peak time
insulincurves - remove unused base fragment
insulincurves - i18n
insulincurves - ActivityGraph fix double plotting
...
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
2017-08-17 10:08:15 +02:00
AdrianLxM
47e295b3c1
Check for tempbasal not RealTempbasla
2017-08-17 00:42:26 +02:00
AdrianLxM
776ae3f424
Overlapping interval - regard first element on cut
2017-08-16 23:56:14 +02:00
AdrianLxM
8287fe22cf
AcceptTempButton visible
2017-08-16 23:22:14 +02:00
Milos Kozak
6ca44fce84
Merge pull request #367 from MilosKozak/profile-switch-buttons
...
show notification on toast alarm
2017-08-16 22:58:34 +02:00
AdrianLxM
e61d7a4442
show notification on toast alarm
2017-08-16 21:37:33 +02:00
Milos Kozak
b93a153b23
parse 12h format properly
2017-08-16 19:33:41 +02:00
Milos Kozak
e5cc34b975
fix merge conflict
2017-08-16 18:38:14 +02:00
Milos Kozak
7884c98f2f
fix index
2017-08-16 18:26:47 +02:00
Milos Kozak
35db28f013
Merge pull request #365 from MilosKozak/dia-expecteddelta-fix
...
Restrict DIA for expectedDelta
2017-08-16 18:11:37 +02:00
Milos Kozak
69a378bb75
Merge pull request #366 from MilosKozak/profile-switch-buttons
...
Show profile switch button in profiles
2017-08-16 18:11:26 +02:00
AdrianLxM
63793ed358
Show profile switch button in profiles
...
Shows the button to trigger a profile switch button in the profile fragments even when the pump basal cannot be written.
Instead of "SEND TO PUMP" it will then show "ACTIVATE PROFILE".
This has become necessary with the interval logic that needs profile switch events to happen in order to accept a new profile.
2017-08-16 17:56:57 +02:00
Milos Kozak
e005a6172b
set pump time only if needed
2017-08-16 17:26:58 +02:00
AdrianLxM
5fc63d8f16
restrict DIA for expectedDelta
2017-08-16 14:23:22 +02:00
Milos Kozak
e1d2c557af
Merge pull request #364 from MilosKozak/overlappin-intervals-fix
...
Overlappinginterfals - find first element
2017-08-16 08:11:04 +02:00
Milos Kozak
898e162300
initial work on SMB
2017-08-15 23:13:37 +02:00
AdrianLxM
2e382267d4
Overlappinginterfals - find first element
2017-08-15 22:38:48 +02:00
Johannes Mockenhaupt
759afcec7a
Extract method Profile.toTargetRangeString.
2017-08-15 16:12:42 +02:00
Johannes Mockenhaupt
754a0097b9
Simplify.
2017-08-15 15:50:24 +02:00
Johannes Mockenhaupt
6dcdeb2bbc
Overview: format target using unit specific format.
2017-08-15 14:51:09 +02:00
Johannes Mockenhaupt
f0d9f0e86a
Don't rebind ruffy and retry command in case of failure.
...
RuffyService is now immeditately rebound when connection was lost,
therefore retrying a command after blindly rebinding the service
doesn't make sense anymore,more so given that ruffy is less prone
to crashing now.
2017-08-15 14:03:01 +02:00
Johannes Mockenhaupt
ec508b55c4
SetTbrCommand: fix check in main menu after cancelling TBR.
...
The percentage attribute is displayed with a value of 100, though it's not visible on the display. This change just checks the no duration is displayed to verify no TBR is currently running.
2017-08-15 13:18:42 +02:00
Milos Kozak
4c490c32f7
Merge pull request #361 from MilosKozak/oref-insulincurves
...
Oref Insulincurves
2017-08-15 10:13:50 +02:00
Milos Kozak
151165809e
Dutch language
2017-08-14 21:57:49 +02:00
AdrianLxM
ee7b3cca22
insulincurves - notification on short DIA
2017-08-14 20:41:24 +02:00
AdrianLxM
f23c3e7ae1
insulincurves - forgotten string updated
2017-08-14 16:44:39 +02:00
AdrianLxM
707d5a480c
insulincurves - rename peak to peak time
2017-08-14 16:02:07 +02:00
AdrianLxM
94fbd620f4
insulincurves - remove unused base fragment
2017-08-14 15:53:47 +02:00
AdrianLxM
ced1da09cf
insulincurves - i18n
2017-08-14 15:25:37 +02:00
AdrianLxM
13cd7dbda1
insulincurves - ActivityGraph fix double plotting
2017-08-14 15:25:21 +02:00
AdrianLxM
085caddeee
insulincurves - freepeak
2017-08-14 15:24:55 +02:00
AdrianLxM
63d46aed56
insulincurves - minimum 5
2017-08-14 15:24:41 +02:00
AdrianLxM
a538160e76
insulincurves - rapid and ultra both with adjustable dia
2017-08-14 15:24:30 +02:00
AdrianLxM
b8496e3208
insulincurves - working with default params
2017-08-14 15:22:27 +02:00
Milos Kozak
82d3289602
add oref1 asssets
2017-08-14 12:20:12 +02:00
Milos Kozak
2d2ccde6e4
log Bundle
2017-08-14 12:11:53 +02:00
Timm Korte
e9672ff4aa
adjust setTempBasalAbsolute interface to include the new upstream 'force' parameter
2017-08-14 00:05:40 +02:00
Timm Korte
882f9d7869
Merge remote-tracking branch 'milosremote/dev' into develop
2017-08-13 23:57:07 +02:00
Johannes Mockenhaupt
d49356a922
Logging: Print filename and line instead of logger name.
2017-08-13 21:31:21 +02:00
Milos Kozak
377b711896
Merge pull request #352 from diabetesdt1/patch-1
...
Update strings.xml
2017-08-13 20:31:54 +02:00
Milos Kozak
a49a496651
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into force
2017-08-13 20:31:45 +02:00
Milos Kozak
d4642b3958
do not enforce stop for v2 driver
2017-08-13 20:31:15 +02:00
Milos Kozak
2a2b5dbb31
Merge pull request #357 from savek-cc/logfile-name
...
change logfile name pattern
2017-08-13 15:55:53 +02:00
Timm Korte
bbb03d0ac1
change logfile name pattern to still be rotated once a day but include the hour-minute-seconds as timestamp in the filename
2017-08-13 14:34:19 +02:00
Timm Korte
8caaeeff2a
change logfile name pattern to still be rotated once a day but include the hour-minute-seconds as timestamp in the filename
2017-08-13 14:32:37 +02:00
Johannes Mockenhaupt
bb0bea98c3
Don't ignore exceptions when binding the ruffy service.
2017-08-12 16:01:05 +02:00
Johannes Mockenhaupt
ead8508760
Format code.
2017-08-12 16:00:05 +02:00
Johannes Mockenhaupt
d75a04c985
After setting/cancelling TBR also check main menu state after cancel.
2017-08-12 15:22:55 +02:00
Johannes Mockenhaupt
49aa63bd31
More verbose logging, some notes added.
2017-08-12 15:22:55 +02:00
Johannes Mockenhaupt
5a1d2d495d
Rename RuffyScripter.waitScreen -> waitForScreenUpdate.
2017-08-12 15:22:55 +02:00
Johannes Mockenhaupt
fc5b4cd93b
Some logging.
2017-08-12 15:22:55 +02:00
Johannes Mockenhaupt
f763eb246b
Use 1.5g-combo-dev as version.
2017-08-12 15:22:55 +02:00
Johannes Mockenhaupt
d3058f6063
Let an unexpected warning/error escalate rather than hide it.
2017-08-12 15:22:55 +02:00
Johannes Mockenhaupt
2f3d362240
Use SystemClock.sleep() instead of Thread.sleep() throughout.
2017-08-12 15:22:55 +02:00
Johannes Mockenhaupt
306a2787d0
Throw CommandException instead of Exception.
2017-08-12 15:22:55 +02:00
Sandra Keßler
bdbf151efe
add full Menu Output to debug
2017-08-12 15:10:14 +02:00
Sandra Keßler
389eae93c5
renamed goToMainMenuScreen to gotToMainTypeMenu to make it clevrer that Menu.isMaintype is meant, deactivates getBasal for now
2017-08-12 14:15:04 +02:00
Timm Korte
6bbb785574
rename 'userRequested' to 'force' as parameter to cancelTempBasal in order to have the same naming as with setTempBasalAbsolute
2017-08-12 13:36:35 +02:00
Sandra Keßler
d89b914bc2
removed Log from SetTbrCommand
2017-08-12 13:31:47 +02:00
AdrianLxM
f861546e12
Quickfix to avoid crashes after staleData merge
2017-08-12 11:20:56 +02:00
Sandra Keßler
59ee67a353
add Logger logs
2017-08-12 09:29:07 +02:00
Sandra Keßler
92ca9aaede
some Small improvements
2017-08-12 00:27:30 +02:00
Sandra Keßler
3fd6884d03
just rewrote SetTbrCommand to be a scripted command, maybe fixed some errors along the way, Runs very smooth on my shitty pump
2017-08-12 00:12:11 +02:00
Sandra Keßler
abe4c1ff3a
return immidiatly if we are in correct menu
2017-08-11 23:59:05 +02:00
Sandra Keßler
1c1ea14b3c
remove old handler if it was set
2017-08-11 23:58:45 +02:00
Timm Korte
8db9cb8887
add cancelTempBasal to setTempBasal if forced
2017-08-11 23:06:35 +02:00
Milos Kozak
73b6235188
APSRequest Answers event
2017-08-11 22:46:08 +02:00
Timm Korte
7839299530
add force parameter to setTempBasalAbsolute in order to force setting of a 0 temp for disconnecting the pump - instead of calling cancel as introduced in a24cbfda50
2017-08-11 22:08:33 +02:00
Milos Kozak
2770e93ed4
Merge pull request #337 from RoumenGeorgiev/dev
...
Alarm for StaleData
2017-08-11 18:45:52 +02:00
Sandra Keßler
e2b09f9e42
recovered merge/unmerge damage
2017-08-11 17:35:58 +02:00
Sandra Keßler
92b342b89a
add an additional wait
2017-08-11 17:35:58 +02:00
Sandra Keßler
6a8b39ca4f
forgot in last commit
2017-08-11 17:35:58 +02:00
Sandra Keßler
6acc25978b
Small fix for slow Set error
2017-08-11 17:35:58 +02:00
Sandra Keßler
bd0a298168
fix maybe long duration before setting tbr
2017-08-11 17:35:58 +02:00
Sandra Keßler
e20084c97f
change step calculation and fix time setting (got the actual vs requested time wrong)
2017-08-11 17:35:58 +02:00
Sandra Keßler
29b5ad9696
modify Waits/timeouts to better Set tar with short Menu timeouts
2017-08-11 17:35:58 +02:00
Sandra Keßler
b1a7083371
add Logs to setTbrCommand
2017-08-11 17:35:58 +02:00
Johannes Mockenhaupt
089295188f
Revert merge which was committed due to a misunderstanding.
2017-08-11 17:35:58 +02:00
Sandra Keßler
6dba4e4956
fix >500% basal setting
2017-08-11 17:35:58 +02:00
diabetesdt1
8cd24fd919
Update strings.xml
...
Replaced "Empfindlichkeit" with "Sensitivität"
2017-08-11 13:28:39 +02:00
diabetesdt1
a69a94a384
Update strings.xml
2017-08-11 12:48:15 +02:00
diabetesdt1
15fc53530d
Update strings.xml
...
Changed Nightscout to NS back (but not on the short Text).
Add more Translations.
Overview-Notification used and not "Popup-Notification".
Removed on short Names the ".
I think "treatment" = "Behandlung" sounds wrong :-|
2017-08-11 12:43:46 +02:00
diabetesdt1
0b62669079
Update strings.xml
...
typo fixed
2017-08-11 07:30:53 +02:00
Milos Kozak
26fbd450b0
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into sv
2017-08-10 22:39:25 +02:00
Milos Kozak
3ca058ce60
SV language cleanup
2017-08-10 22:33:38 +02:00
diabetesdt1
d78928a264
Update strings.xml
...
typo fixed and empty strings removed
2017-08-10 21:40:03 +02:00
diabetesdt1
c5b5d65efc
Update strings.xml
2017-08-10 21:29:41 +02:00
diabetesdt1
8df0ccdbb1
Update strings.xml
...
rollback language-names
2017-08-10 21:28:09 +02:00
diabetesdt1
33f5e97ac6
Update strings.xml
...
add more german translation and typos fixed
2017-08-10 21:12:56 +02:00
Milos Kozak
3a574c3803
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-08-10 17:28:57 +02:00
Milos Kozak
f703c82ca7
microbolus calculation
2017-08-10 17:28:41 +02:00
Milos Kozak
dae82d49fb
Merge remote-tracking branch 'patrik/dev' into sv
2017-08-10 16:29:42 +02:00
ellabellakaramella
0766ac812c
SV translation
2017-08-10 15:15:40 +02:00
Timm Korte
e7249bf72e
Merge remote-tracking branch 'milosremote/dev' into develop
2017-08-10 11:13:21 +02:00
Winfried Kuiper
5b43f11a3f
Update strings.xml
...
Confirmation=Bestätigung statt Konfiguration (configuration)
2017-08-09 22:12:09 +02:00
Winfried Kuiper
99a0edfa06
Update strings.xml
...
Missing units in german translation
2017-08-09 22:03:59 +02:00
Milos Kozak
57f5e5a92d
add bolus metadata when reading pump history
2017-08-08 23:14:56 +02:00
Milos Kozak
bbc68b2266
synchronized getAutosensData
2017-08-08 15:55:31 +02:00
Milos Kozak
2f8ca8bb04
fix setting zero temp
2017-08-08 15:06:31 +02:00
Timm Korte
8182f99bd2
add userRequested parameter to cancelTBR as needed in current AAPS dev
2017-08-07 22:25:57 +02:00
Savek-CC
f3044a7cbb
Merge branch 'feature_90-110-percent_savek-cc' into 'develop'
...
change cancel to 90 or 110 percent basal depending on previous running temp
See merge request !14
2017-08-07 20:18:44 +00:00
Timm Korte
07822811ac
Merge remote-tracking branch 'milosremote/dev' into develop
2017-08-07 22:16:37 +02:00
RoumenGeorgiev
122efb1b8e
Fix for getting double of alarmTimeagoWarnMins
2017-08-07 20:06:15 +03:00
RoumenGeorgiev
1dd9086924
added snoozing if bgReadingAgo is smaller than threshold
2017-08-07 18:53:56 +03:00
Milos Kozak
3bfecd6da8
check for existing
2017-08-07 16:13:09 +02:00
Milos Kozak
2ae0028495
Swedish
2017-08-07 14:06:11 +02:00
RoumenGeorgiev
4f054907cb
Merge pull request #1 from MilosKozak/dev
...
Dev
2017-08-07 09:17:07 +03:00
Savek-CC
d520643d45
Merge branch 'develop' into 'mainline'
...
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
2017-08-06 22:35:07 +00:00
Timm Korte
59e9502f22
change cancel to 90 or 110 percent basal depending on previous running temp
2017-08-07 00:27:23 +02:00
Johannes Mockenhaupt
c524e2a685
Revert merge which was committed due to a misunderstanding.
2017-08-06 21:47:17 +02:00
Milos Kozak
a40afd0948
1.5g
2017-08-06 14:28:01 +02:00
Milos Kozak
848863aca5
calculateFromTreatmentsAndTempsSynchronized
2017-08-06 14:25:25 +02:00
Milos Kozak
f1f7a6ca6c
check for null
2017-08-06 14:14:03 +02:00
Milos Kozak
066283a4b0
add SMB flag to treatments
2017-08-06 12:19:25 +02:00
Milos Kozak
6ab6f82b10
more debug on setting temp basal
2017-08-06 11:42:20 +02:00
Milos Kozak
4e4088f164
remove unneeded strings
2017-08-05 18:47:01 +02:00
Milos Kozak
4fda4fd547
convert target values to mdgl before passing to openaps
2017-08-05 18:14:10 +02:00
Milos Kozak
e295c8a2dc
target range change confirm dialog
2017-08-05 18:09:19 +02:00
Milos Kozak
f834b3b7e0
remove unneeded texts
2017-08-05 17:43:31 +02:00
Milos Kozak
1604b85d34
Merge branch 'dev' into move-to-range-in-profile
2017-08-05 14:48:41 +02:00
Johannes Mockenhaupt
dbad306766
Resolve merge issue.
2017-08-05 13:23:15 +02:00
Johannes Mockenhaupt
0ef8fd9994
Some polish.
2017-08-05 13:11:07 +02:00
Johannes Mockenhaupt
8aabc346c0
Update ComboPlugin.cancelTempBasal to user newly added userRequested param.
2017-08-05 13:06:10 +02:00
Johannes Mockenhaupt
8369893428
Fix if-statement.
2017-08-05 12:35:05 +02:00
Johannes Mockenhaupt
134bc32dac
Merge remote-tracking branch 'fork/tbrDurationFix-90-110-cancel' into stable
...
* fork/tbrDurationFix-90-110-cancel:
change ComboPlugin to change basal to 90 or 110 percent instead of cancel - depending on previous tbr
missing stuf :/
add unused (but tested) command to get basal rate from Profile 1
update setTBRCommand to way faster methods in scripter
add waitScreen (wait for refresh with timeout), gotToMainMenuScreen (with the help of back and menu navigate to a given main menu), enterMenu (to navigate withhin submenus), and step (send a key repeated)
add back key
make keypress wait up to 2000ms for key response
add type of menu to MenuType (main or sub menu)
- fix Multi connect - add key sent with 2500ms wait on keypress - fix Timing and npes in setTBR - make ruffyScripter not reinit every time - fix menu npe
change Version info
exceptions
maybe better error recovery?
alternate setTBR based on StateMachine
more time
increase Button Timing to 200ms
wait till we get something currentDuration % 15 == 0
slow pump fix
if umbind fails while service is dead, bind would never be called
# Conflicts:
# app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java
2017-08-05 11:42:14 +02:00
Johannes Mockenhaupt
fc97bb7666
Add TODO/notes.
2017-08-05 11:33:02 +02:00
Johannes Mockenhaupt
a5692d1076
Don't attempt to start idleDisconnectMonitor again if RS is restarted.
2017-08-05 11:28:53 +02:00
Johannes Mockenhaupt
4a1684eb92
Merge remote-tracking branch 'origin/dev' into stable
...
* origin/dev:
remove canceltemp button from all layouts and click handling from overview fragment
correct logging
fix cancel real temp basals from actions
color for active temp
remove translated string not in default strings and add flag to cancel method
Some more German
Some more German
Some German translations, remove unused strings, App name for all
Update strings.xml
CS translations
hide all overview buttons by default
move cancel temp to actions
new temp basal dialog refactor
fix virtual pump crash
Disconnect pump: cancel temp before setting new to make sure it will last as expected
remove notes strings as well
remove notes from temp basal upload
cancel current temp before activating superbolus
2017-08-05 11:02:13 +02:00
RoumenGeorgiev
222c357456
Added check for enabled openAPS stale data alarm in NS
2017-08-05 11:58:49 +03:00
RoumenGeorgiev
ad122153a9
added openAPSEnabledAlerts()
...
check for OpenAPS alerts enabled
2017-08-05 11:26:12 +03:00
RoumenGeorgiev
3d9df4e18e
Using equals() instead of == on line 1811
2017-08-05 11:20:09 +03:00
Timm Korte
f22f96c138
change ComboPlugin to change basal to 90 or 110 percent instead of cancel - depending on previous tbr
2017-08-04 22:39:15 +02:00
Sandra Keßler
37a3270a16
missing stuf :/
2017-08-04 17:58:28 +02:00
Sandra Keßler
f790ce6f20
add unused (but tested) command to get basal rate from Profile 1
2017-08-04 17:57:34 +02:00
Sandra Keßler
ac3859dcae
update setTBRCommand to way faster methods in scripter
2017-08-04 16:39:03 +02:00
Sandra Keßler
d35283ad74
add waitScreen (wait for refresh with timeout), gotToMainMenuScreen (with the help of back and menu navigate to a given main menu), enterMenu (to navigate withhin submenus), and step (send a key repeated)
2017-08-04 16:38:25 +02:00
Sandra Keßler
d8ca2771fb
add back key
2017-08-04 16:36:25 +02:00
Sandra Keßler
efb73ba4f2
make keypress wait up to 2000ms for key response
2017-08-04 16:36:12 +02:00
Sandra Keßler
763cc23939
add type of menu to MenuType (main or sub menu)
2017-08-04 16:34:25 +02:00
RoumenGeorgiev
cdee9bf703
Get staleData setting from NS first
2017-08-04 17:04:57 +03:00
RoumenGeorgiev
aff62d86b1
Changed name of button to snooze if it's staleDataAlarm
2017-08-04 16:43:46 +03:00
RoumenGeorgiev
714a292d78
fixed wrong pasting
2017-08-04 15:05:09 +03:00
RoumenGeorgiev
837dcdb23b
If alarm is staledata dismis snoozes it
2017-08-04 14:51:25 +03:00
RoumenGeorgiev
82541a50e4
Added functions for snoozing and unsnoozing
2017-08-04 14:49:46 +03:00
RoumenGeorgiev
a8b17a1f22
adding staleDataThreshold as snooze time
2017-08-04 14:48:44 +03:00
Sandra Keßler
6981276cab
- fix Multi connect
...
- add key sent with 2500ms wait on keypress
- fix Timing and npes in setTBR
- make ruffyScripter not reinit every time
- fix menu npe
2017-08-04 11:53:51 +02:00
RoumenGeorgiev
529d267b9d
Added check for staleData and notification
...
with every loop
2017-08-04 12:29:48 +03:00
RoumenGeorgiev
232590e707
Added staleData
2017-08-03 18:48:45 +03:00
RoumenGeorgiev
74bb05a654
added staledataalarm
2017-08-03 17:14:14 +03:00
AdrianLxM
36e6cb8497
remove canceltemp button from all layouts and click handling from overview fragment
2017-08-03 08:22:59 +02:00
AdrianLxM
053004bbbd
correct logging
2017-08-03 08:20:11 +02:00
AdrianLxM
7a7f75db01
fix cancel real temp basals from actions
2017-08-03 03:22:30 +02:00
AdrianLxM
0ac7357ee9
color for active temp
2017-08-03 03:12:47 +02:00
AdrianLxM
1ac1b77fd4
remove translated string not in default strings and add flag to cancel method
2017-08-03 02:01:52 +02:00
AdrianLxM
23abc0e4e5
Some more German
2017-08-02 00:08:56 +02:00
AdrianLxM
5d51b8f0f9
Some more German
2017-08-01 23:56:16 +02:00
AdrianLxM
e30e62e9ab
Some German translations, remove unused strings, App name for all
2017-08-01 23:46:58 +02:00
Radoslav Radev
39891bbad9
Update strings.xml
2017-08-01 23:29:23 +03:00
Milos Kozak
e933650330
CS translations
2017-08-01 22:17:39 +02:00
Milos Kozak
9cf5c6b6c3
hide all overview buttons by default
2017-08-01 20:52:23 +02:00
Milos Kozak
34d4bec556
move cancel temp to actions
2017-08-01 20:45:57 +02:00
Milos Kozak
9596987b35
new temp basal dialog refactor
2017-08-01 20:02:17 +02:00
Milos Kozak
d2a5939ce3
fix virtual pump crash
2017-08-01 17:53:28 +02:00
Milos Kozak
a24cbfda50
Disconnect pump: cancel temp before setting new to make sure it will last as expected
2017-08-01 17:37:32 +02:00
Milos Kozak
6828e11dd9
remove notes strings as well
2017-08-01 17:25:43 +02:00
Milos Kozak
6f9f72d849
remove notes from temp basal upload
2017-08-01 17:21:32 +02:00
Sandra Keßler
4147e7f6a1
change Version info
2017-07-31 21:45:03 +02:00
Milos Kozak
668008e1c1
cancel current temp before activating superbolus
2017-07-31 19:53:09 +02:00
Sandra Keßler
791d905b14
exceptions
2017-07-31 13:08:10 +02:00
Sandra Keßler
14fdc14807
maybe better error recovery?
2017-07-31 12:59:03 +02:00
Sandra Keßler
58e6791441
alternate setTBR based on StateMachine
2017-07-31 11:52:31 +02:00
Sandra Keßler
3497296b6c
more time
2017-07-31 09:08:12 +02:00
Sandra Keßler
a7165497ea
increase Button Timing to 200ms
2017-07-30 22:49:52 +02:00
Sandra Keßler
7c001e97bf
wait till we get something currentDuration % 15 == 0
2017-07-30 22:25:49 +02:00
Sandra Keßler
bfb6039c16
slow pump fix
2017-07-30 22:25:49 +02:00
Sandra Keßler
1d3fee54e9
if umbind fails while service is dead, bind would never be called
2017-07-30 22:23:01 +02:00
Sandra Keßler
afda4f9254
Merge remote-tracking branch 'refs/remotes/origin/trim-to-max-tbr' into HEAD
2017-07-30 16:21:10 +02:00
Johannes Mockenhaupt
16dc21c7f1
Merge branch 'changeRuffyService' into 'stable'
...
change to support changed IRuffyService
See merge request !7
2017-07-30 11:27:27 +00:00
Johannes Mockenhaupt
27f788424a
Trim requested TBR rate to maximum the pump supports, properly round.
2017-07-30 13:06:52 +02:00
Johannes Mockenhaupt
d672f3c653
Remove hander on ruffy unbind.
2017-07-30 13:03:43 +02:00
AdrianLxM
bfd96b0635
Merge branch 'stable' into '1_5f'
...
# Conflicts:
# app/src/main/res/values/strings.xml
2017-07-29 16:55:55 +00:00
Sandra Keßler
5e845e37f7
change to support changed IRuffyService
2017-07-28 13:41:10 +02:00
AdrianLxM
785e1b323c
refresh-data - make guard condition better readable
2017-07-28 05:48:34 +02:00
AdrianLxM
f680d70548
refresh data greater smaller fix
2017-07-27 23:35:44 +02:00
AdrianLxM
9572c8d9fc
Merge remote-tracking branch 'origin/develop' into read-maxtbr-clean
2017-07-27 20:27:48 +02:00
AdrianLxM
e79dc4fb66
only set icons when initialized
2017-07-27 16:31:09 +02:00
Johannes Mockenhaupt
17b0e7d71a
Fix some typos.
2017-07-27 14:35:56 +02:00
AdrianLxM
c41b12492f
tbr capability retry change
2017-07-27 13:43:50 +02:00
Johannes Mockenhaupt
bd353a7043
BolusCommand: confirm via My Data history the correct amount was delivered.
2017-07-27 13:39:23 +02:00
AdrianLxM
2697ac9420
battery and insulinstate
2017-07-27 12:20:59 +02:00
AdrianLxM
e34009271f
preserve max tbr through app restarts
2017-07-27 09:53:33 +02:00
AdrianLxM
8937fbe574
use pumpdescription.maxTempPercent to cutoff temps
2017-07-26 22:35:13 +02:00
AdrianLxM
13173e48c1
tbr capability in ComboFragment
2017-07-26 22:16:35 +02:00
Johannes Mockenhaupt
b96edc048e
Merge remote-tracking branch 'fork/develop' into stable
...
* fork/develop:
setTBR - check for TBR and RUNTIME
2017-07-26 18:18:10 +02:00
AdrianLxM
76c0b999ff
determine max possible tbr firstshot
2017-07-26 18:11:45 +02:00
Johannes Mockenhaupt
78d2322c14
Typos.
2017-07-26 18:02:21 +02:00
Johannes Mockenhaupt
02c80a924c
SetTbrCommand: remove retry logic, add extra checks for final bolus.
2017-07-26 18:00:18 +02:00
Johannes Mockenhaupt
da69e69570
BolusCommand: remove retry logic, add extra checks for final bolus.
2017-07-26 16:06:58 +02:00
Johannes Mockenhaupt
e1b63a4a74
Command doc.
2017-07-26 15:50:07 +02:00
Johannes Mockenhaupt
f6b1887fd2
Logging: Print filename and line instead of logger name.
2017-07-26 15:26:44 +02:00
Johannes Mockenhaupt
d79b221940
CommandException: provide message for printing.
2017-07-26 14:44:28 +02:00
Johannes Mockenhaupt
0516eacfe5
ConfigBuilder.applyAPSResult: log request rate.
2017-07-26 14:44:21 +02:00
AdrianLxM
21b81a5084
setTBR - check for TBR and RUNTIME
2017-07-26 12:19:28 +00:00
AdrianLxM
5569b42ac3
wear wizard percentage
2017-07-26 09:58:51 +02:00
Milos Kozak
7a572d2341
1.5f
2017-07-25 22:53:55 +02:00
Milos Kozak
4bb3b7c11d
Merge pull request #323 from MilosKozak/nsclient-local-second
...
Nsclient local broadcasts
2017-07-25 19:51:57 +02:00
Milos Kozak
0914e67c11
typo
2017-07-25 19:25:58 +02:00
Milos Kozak
f1e21053b5
use key instead of string
2017-07-25 19:24:51 +02:00
Milos Kozak
d6cb8ef6bc
check for existing value
2017-07-25 19:18:51 +02:00
Milos Kozak
252b24cefe
Merge pull request #313 from MilosKozak/synchronize-nsclientlog
...
synchronize NSClient log
2017-07-25 12:50:48 +02:00
Johannes Mockenhaupt
58505922f2
Merge branch 'fixTBR' into 'combo'
...
fix >500% basal setting
See merge request !3
2017-07-25 09:35:59 +00:00
Sandra Keßler
f68042af66
fix >500% basal setting
2017-07-24 18:39:43 +02:00
Johannes Mockenhaupt
314a551c96
Mark log entries comming from ruffy.
2017-07-24 15:18:16 +02:00
Johannes Mockenhaupt
c8c4cf2813
Add log statement.
2017-07-24 13:30:08 +02:00
Johannes Mockenhaupt
ebd9c0d876
Add wait time between reconnects.
...
Might improve GL#34.
2017-07-24 13:16:35 +02:00
Johannes Mockenhaupt
674fb398b8
Safeguard against communication issues with ruffy.
...
In most cases we can't do much, but we can handle exceptions
and show a notification and message what's wrong, so the user
can try to fix the issue.
Fixes jotomo/AndroidAPS#35 .
2017-07-24 12:59:56 +02:00
Johannes Mockenhaupt
81f3aea42a
Provide basic pump data for upload.
2017-07-24 12:59:56 +02:00
AdrianLxM
3500e92a41
nsclient ackAlarm local
2017-07-24 02:33:29 +02:00
AdrianLxM
d60321b4d1
nsclient alarms local
2017-07-24 02:27:16 +02:00
Johannes Mockenhaupt
e6eee42081
Merge remote-tracking branch 'origin/dev' into combo
...
* origin/dev:
recategorize cp icons
removed unnecessary text colour and fixed indentation
layout indentation
Moving some buttons to the right categories
removed empty ghost files
remove duplicate IDs and indentation fix
Picture renaming (#311 )
2017-07-24 02:25:28 +02:00
Johannes Mockenhaupt
6a0273046d
Comment on English being the only supported pump language so far.
2017-07-24 02:24:48 +02:00
AdrianLxM
a4864c3d06
nsclient cal local
2017-07-24 02:09:26 +02:00
AdrianLxM
194a817332
nsclient devicestatus local
2017-07-24 02:06:05 +02:00
AdrianLxM
fe57d4a61d
nsclient mbg local
2017-07-24 02:02:54 +02:00
AdrianLxM
82b99e1708
nsclient status local
2017-07-24 02:00:46 +02:00
AdrianLxM
759154e578
nsclient profile local
2017-07-24 01:58:23 +02:00
AdrianLxM
7a171bd949
nsclient sgv local
2017-07-24 01:55:01 +02:00
AdrianLxM
38100e758e
nsclient treatments local
2017-07-24 01:50:27 +02:00
AdrianLxM
796b7ecdf2
rename package lowercase
2017-07-24 00:12:53 +02:00
Johannes Mockenhaupt
5e5c837949
Clean up comment.
2017-07-23 23:42:44 +02:00
Johannes Mockenhaupt
cc715cf76f
Notes, typo.
2017-07-23 17:51:08 +02:00
Johannes Mockenhaupt
9826c1d953
Bugfix: NPE when refreshing pump status without a profile set.
...
The base basal rate is a different thing than a TBR rate, when a TBR
is running the PumpStatus has a tbrRate, when no TBR is running
there's no TBR rate, so don't display the base basal rate.
2017-07-23 14:07:46 +02:00
AdrianLxM
5e1e48be0a
Allow prime/fill
2017-07-23 00:24:27 +00:00
AdrianLxM
1c0e97c175
recategorize cp icons
2017-07-22 20:57:30 +02:00
Johannes Mockenhaupt
27187b5e75
Bugfix: More reliable way to determine if the connection is ready to execute comands.
2017-07-22 20:02:35 +02:00
Johannes Mockenhaupt
9cdd988bff
Bugfix: sleep *inside* the loop.
...
Whops, maxing out a core, draining the battery.
2017-07-22 17:53:55 +02:00
AdrianLxM
2e32d12bc0
removed unnecessary text colour and fixed indentation
2017-07-22 14:34:59 +02:00
AdrianLxM
c187bf1575
layout indentation
2017-07-22 14:30:55 +02:00
Roumen Georgiev
54697df358
Moving some buttons to the right categories
2017-07-22 14:27:51 +02:00
Johannes Mockenhaupt
fcd6f4ea0e
jotomo/AndroidAPS#29 Don't raise alarm on 'double cancellation'.
2017-07-22 11:36:52 +02:00
Johannes Mockenhaupt
a153b59d5d
Increase timeouts.
...
90s until timeout due to no menu updates
60s timeout for operations (waitForMenuToBeLeft, verifyMenuIsDisplayed).
2017-07-22 11:34:28 +02:00
Johannes Mockenhaupt
b3a7585a52
Note an pump sluggishness.
2017-07-22 11:07:35 +02:00
AdrianLxM
3d4fa0cebf
remove duplicate IDs and indentation fix
2017-07-22 02:15:55 +02:00
Johannes Mockenhaupt
e45acab420
Return original exception in case retry fails as well.
2017-07-22 02:13:34 +02:00
AdrianLxM
0b6c9845fa
synchronize NSClient log
2017-07-22 01:43:33 +02:00
Johannes Mockenhaupt
d0d3e46e03
Log exception when automatically retrying command.
2017-07-22 00:44:53 +02:00
Johannes Mockenhaupt
7f185557f4
DEBUG: log temp basals that are active when pump receives command to issue a tbr when non is active on the pump.
2017-07-21 22:46:00 +02:00
Johannes Mockenhaupt
0029fdad01
Combo-specifici hack: Consider a TBR with less than 60 seconds left as completed
...
when determining whether to set a new TBR.
Setting a new TBR overrides an running TBR if any, so this won't fail on
the Combo. Without this, a TBR mostly runs out 20 seconds after a loop
iteration (when receiving a SGV), so for that almost 5 minutes to TBR
is set.
Note that this is Combo-specific and needs to be revised when
integrating this with mainline.
2017-07-21 22:45:47 +02:00
AdrianLxM
10d27f0b6a
Picture renaming ( #311 )
...
* adding icons
2017-07-21 22:24:06 +02:00
Johannes Mockenhaupt
3bd865a870
Merge remote-tracking branch 'origin/dev' into combo
...
* origin/dev:
1.5e
Let CircadianPercentageProfileFragment inherit from SubscriberFragment.
Fix after merge-conflict cleanup
Files renamed
Added icons for home, actions and care portal screens
update bg translation
synchronize interval access from other classes
remove unnecessary semicolons
spanish emptiy string
remove extra strings
self asignment -> comment
string comparison
Add color of chart to corresponding lables/scale
Update InsulinFastactingProlongedFragment.java
Update InsulinFastactingFragment.java
Extract SubscriberFragment base class.
Have most fragments update their content in onResume.
2017-07-21 17:42:27 +02:00
Johannes Mockenhaupt
9af2e0af01
Add v2 TODO
2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt
893a604ef9
Fix combo_fragment blunder.
2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt
d7eee17112
Fix creating treatment record when bolusing (carb only treatment).
2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt
46b1dff334
Make accessing pump/cmd state in Fragment safer.
2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt
cb8a22582a
Wait up to 90s before timing out on connection attempt.
...
Might take longer if we need to wait for the pump display to time
out due to recent user activity.
2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt
a28efb4be0
Add "pump error (message)" as a field in Combo fragement.
2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt
63131f73d0
Cleanups.
2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt
29cb1def50
Fix up "Rebind ruffy if there is an exception.".
...
Some removals, but more importantly to note that
the commit set pump/command state variables
volatile again.
2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt
5c36094b8b
Remove some debug code.
2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt
821e31c1c3
Add debug logging.
2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt
a2fad3293d
Fix adding pump state to CommandResult when there are violations.
2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt
d85425e68b
NPE guard.
2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt
d5bf5812b7
Rebind ruffy if there is an exception.
2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt
e526de68ea
Some improvements around connection state.
2017-07-21 17:40:12 +02:00
Johannes Mockenhaupt
bf179cd751
Fail on attempts to cancel non-running TBR.
...
Until we know this would be benign.
We still return 'enacted=true', so AAPS can mark the TBR as finished
to recover from this error state.
2017-07-21 17:28:30 +02:00
AdrianLxM
e381d197cb
1.5e
2017-07-21 16:49:43 +02:00
AdrianLxM
3d82bdb347
Merge pull request #295 from jotomo/on-resume-update-gui
...
On resume update gui
2017-07-21 16:47:28 +02:00
AdrianLxM
06497a862d
Merge pull request #303 from AdrianLxM/synchronize-intervals
...
synchronize interval access from other classes
2017-07-21 16:47:00 +02:00
AdrianLxM
6d1c0feeab
Merge pull request #302 from AdrianLxM/cleanups
...
Cleanups
2017-07-21 16:46:48 +02:00
AdrianLxM
0297f2b75d
Merge pull request #301 from MilosKozak/insulin-colourlables
...
Add color of chart to corresponding lables/scale
2017-07-21 16:46:39 +02:00
Johannes Mockenhaupt
fdc0aea24b
Let CircadianPercentageProfileFragment inherit from SubscriberFragment.
2017-07-21 14:56:14 +02:00
AdrianLxM
31fcf34a2d
Fix after merge-conflict cleanup
2017-07-21 11:59:36 +02:00
PoweRGbg
059e58c640
Files renamed
2017-07-21 11:55:12 +02:00
Milos Kozak
c68eccc328
Merge pull request #306 from boikonur/dev
2017-07-20 20:49:35 +02:00
Boyko Kazakov
3b1407b8dd
Added icons for home, actions and care portal screens
2017-07-20 20:57:45 +03:00
Radoslav Radev
3098f0bdfa
update bg translation
2017-07-20 09:24:35 +03:00
AdrianLxM
42263e979e
synchronize interval access from other classes
2017-07-20 02:43:01 +02:00
AdrianLxM
b72482601e
remove unnecessary semicolons
2017-07-20 01:06:41 +02:00
AdrianLxM
1ba11ed006
spanish emptiy string
2017-07-20 01:06:21 +02:00
AdrianLxM
b5cb68be73
remove extra strings
2017-07-20 01:06:00 +02:00
AdrianLxM
6daff6fae9
self asignment -> comment
2017-07-20 01:05:25 +02:00
AdrianLxM
c35b7bb9d6
string comparison
2017-07-20 01:05:05 +02:00
AdrianLxM
03ad898562
Merge branch 'dev' into on-resume-update-gui
2017-07-20 00:17:32 +02:00
AdrianLxM
98bb792264
Add color of chart to corresponding lables/scale
2017-07-19 23:46:32 +02:00
Johannes Mockenhaupt
a1564d5bb7
RuffyScripter: only set connected variable in rtConnected, rtDisconnected.
...
Hopefully fixes intermittent failures to close the connection, as
idleDisconnectMonitorThread sometimes fails to disconnect
because connected == false.
2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt
e322b15e1c
debug: setTbrPercent: 5 minute head start
2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt
a55756367f
ComboPlugin: use CommandResult.completionTime for treatment entries.
2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt
a8ecc85429
ConfigBuilderPlugin.applyApsResult: more verbose logging
...
Log whether the pump was asked to set a TBR if if that is skipped
since the pump still runs the requested TBR and for how long.
2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt
1cf6448b0e
Add CommandResult.completionTime field and set it in RuffyScripter when the command has finished executing.
2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt
97733848e7
SetTbrCommand: replace static wait with dynamic wait to have completionDate more accurate.
2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt
467cf1e6ed
Pass pre-cmd pump state to command, log it.
2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt
a7c77bc177
Add "pump error (message)" as a field in Combo fragement.
2017-07-19 21:45:28 +02:00
Johannes Mockenhaupt
8cdd604b84
Merge remote-tracking branch 'origin/dev' into combo
...
* origin/dev:
bulgarian removed non-translatable
synchronize interval access
nsclient remove debug data that puts stress on the broadcast system 3
nsclient remove debug data that puts stress on the broadcast system 2
nsclient remove debug data that puts stress on the broadcast system
Align OpenAS(A)MA fragments with layout of other fragments.
local broadcasts better setting title
setting to disable local broadcasts in NSClient
removed some "unneeded" translations
wear tdd weighted
wear TDD status
wear menu simplification
Translated latest additions strings.xml
ns client quickfix now catch all
NS client quickfix - catch even more
catch TransactionTooLargeException
TT new "old" logic for temp targets
TT refactor OverlappingIntervals to two classes with an abstract superclass Intervals
# Conflicts:
# app/src/main/res/values/strings.xml
2017-07-19 19:54:50 +02:00
AdrianLxM
732e225c7d
bulgarian removed non-translatable
2017-07-19 19:50:40 +02:00
AdrianLxM
f220bb034e
Merge pull request #286 from AdrianLxM/temp-target-logic
...
Temp target logic
2017-07-19 19:33:17 +02:00
AdrianLxM
e51954cec3
Merge pull request #292 from AdrianLxM/wear-tdd
...
Wear tdd
2017-07-19 19:05:41 +02:00
Milos Kozak
3475b64e1b
Merge pull request #299 from MilosKozak/dev-nsclient-quickfix
...
NSClient quickfix
2017-07-19 18:53:38 +02:00
AdrianLxM
76990b7983
synchronize interval access
2017-07-19 17:39:55 +02:00
Milos Kozak
62ff62a31f
Merge pull request #290 from PoweRGbg/patch-1
2017-07-19 17:21:15 +02:00
AdrianLxM
e6ce35485a
nsclient remove debug data that puts stress on the broadcast system 3
2017-07-19 16:09:34 +02:00
AdrianLxM
621c32d832
nsclient remove debug data that puts stress on the broadcast system 2
2017-07-19 16:06:36 +02:00
AdrianLxM
c1e030d789
nsclient remove debug data that puts stress on the broadcast system
2017-07-19 16:05:13 +02:00
Johannes Mockenhaupt
c95879e6ad
Align OpenAS(A)MA fragments with layout of other fragments.
...
Removes a margin that makes the top elements jump up and
down when flipping through tabs.
2017-07-19 12:32:18 +02:00
Johannes Mockenhaupt
7b16716b65
Clean up statusSumary, command result and pump status.
2017-07-19 01:53:37 +02:00
Johannes Mockenhaupt
485b99e260
Show last command and pump state better in the Combo tab.
...
Gets rid of unhelpful "Unknown error" messaegs.
2017-07-19 01:33:19 +02:00
Johannes Mockenhaupt
5aacf8410d
Fix CancelTbrCommand to return command resutlt not in PumpState but as part of the CommandResult object.
2017-07-19 01:30:26 +02:00
Johannes Mockenhaupt
825a87f474
Use OpenAPS-requested duration for TBRs.
2017-07-18 23:57:48 +02:00
AdrianLxM
cfe8e0a23a
local broadcasts better setting title
2017-07-18 22:18:10 +02:00
AdrianLxM
c753873769
setting to disable local broadcasts in NSClient
2017-07-18 22:15:17 +02:00
Johannes Mockenhaupt
9927ab4989
Raise an error upon attempting to cancel a TBR when none is active.
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
14d7043600
Skip fetching initial pump state if ruffy service isn't ready yet.
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
f3b508ba2d
Combo tab: refresh on resume
...
Since we're not getting events when the fragement is not displayed,
since we're unregistering from event in onPause.
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
3b287df77d
Check active menu again when retrying inputs.
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
abf9566476
Log exception
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
ebe14fb0cf
BolusCommand: deal with blinking values.
...
How did this not trigger with all the boluses I've issued so far?
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
7fe9ad7910
Add retries for inputing values.
...
Rarely there seem to be timing issues and e.g.
10 button down presses to go from 100% to 0% only goes down to 20%.
Retry two more times in that case, restarting the input process on the
active screen (bolus input, tbr percent/duration input).
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
e52c2a857c
RuffyScripter: log command execution time.
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
7dda253b88
RuffyScripter: when pump is suspended fail all commands but ReadPumpState.
...
Safest way for v1 (which I'm trying to stabilize, not rework ;-) ).
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
bd14b399d5
Comment.
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
b4950b3037
Provide suspended state information to AAPS.
...
AAPS seems to still try to issue commands (like cancel TBR,
though none is running?)), despite showing "Pump suspended"
on the home screen.
With the DanaR, AAPS also tries to run commands when the
pump is suspended, but there, the treatment is logged
as being administered despite the pump not having done that.
Here, the pump response with success=false, enacted=false,
which causes the ComboPlugin class to NOT create any
treatments. No errors are raised, as this is considered a regular
state: no treatments are enacted, overview screen shows
"pump suspended" and the combo beeping away.
That AAPS still tries to issue TBR commands ... that's AAPS'
problem for now. Buttons to issue boluses are hiden though.
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
55e7006967
Remove superfluous code (state is always set later in controlling thread).
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
599f3ce23c
Order methods in the order they're called, start Alerter service earlier to make sure it can catch early errors.
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
487e9deb88
Set an error state when the ruffy service can't be bound.
...
See code comment.
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
02a9ed6eda
Set an active command before establishing a connection.
...
Otherwise the disconnect thread will close the connection
due to inactivity. We could add a variable 'isConnecting',
but I'm not sure if adding another (ruffy-) global state
variable will make things simpler to grasp.
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
c37310685a
Don't count the time establishing a connection towards a command timeout.
...
Note: connection timeouts are also dealt with. They're now (cleanly)
separated: connect- and command-timeouts.
If the pump's display is one due to the user interacting with the pump
directly, the pump needs a display timeout before being ready for an
incoming connection. What I'm trying to say is, it might take some time,
maybe up to 30s to establish a connection in that cause and can thus
easily create a false timeout error.
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
36966c8907
Handle the pump being stopped: don't treat it like an error, but don't execute commands either.
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
222ad0a527
Improve display of error state in Combo tab.
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
7fa59c6c16
Combo tab: we have set a TBR duration, we're not showing how much time is remaing, but what has been set.
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
e9fa9b1788
Silly me, of course fragments (and everything else) are recreated by Android all the time.
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
29e7ea1966
Don't ignore user requests to update pump data, tweak alerter.
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
338d29630c
Notes from manual timing test (yeah, new timeout code seems to work).
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
af4ec4d072
BolusCommand: fix contstraint check (doh!)
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
5f43f0f147
* Fix stale data in Combo tab after error
...
* Add info about last command ran to the Combo tab
* Don't refresh data more than once a minute.
* Specify not only error, but also command that raised the error in
alert notification
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
4dc38e447a
Add first ruffyscripter test (needs ruffy to be available during test somehow).
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
ac10bdc01c
First stab at dynamic timeout.
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
44ae79bd50
Move command argument checking out of ctor into a dedicated method and check prior to execution.
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
6faa1614ac
ComboFragment: rename Update Button to Refresh.
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
5fad9b3a85
Cleanups.
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
20a8350c67
Robustness for RuffyScripter.
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
aa98864d65
... this should have gone into earlier commit, the UI one?
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
ecf3866b43
Improve alerter.
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
c131280e91
RuffyScripter.verifyMenuIsDisplayed: don't call waitForMenuUpdate, menu should already be displayed. If not, wait up to 1 second.
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
ccffa3bfca
Add alerter thread to ComboPlugin that raises an alarm every 6 minutes (Android will by default silence alarms that go off within less than 5 minutes) when the pump state shows an error condition.
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
362c3681d5
Clean up commands package.
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
c63c86f98a
RuffyScripter improvements:
...
* Keep track of connection status rather than relying in IRuffyService.isConnected
* Abort running command if pump stops sending menu updates
* Fail if ruffy goes away (binding becomes invalid), currently only if this happens during disconnect attempts
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
52b9621e29
Paranoia: check we're in the expected menu before each and every button press.
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
d619796019
Improving pump status in the UI (combo tab)
2017-07-18 21:20:40 +02:00
Johannes Mockenhaupt
f7586268c7
Dead code be gone.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
93c0147b23
RuffyScripter: take over connection management. Disconnect after 5s of inactivity. Plus some fixes.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
b954ddaa84
Clean up ComoPlugin a bit.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
ccd81c67fd
UI for pump state.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
2ddccd3c31
RuffyScripter.runCommand: Next shot at understanding threading better.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
83e9ec743e
Properly accessing volatile field pumpState.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
69e560baee
Cleanup.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
4c0944b9f8
Optimize cancelling TBR.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
3aecf0f58b
Be more cautious handling command failures.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
8dd714b390
UI crimes
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
8ecf6922f7
Misc improvements:
...
* Make command execution (RuffyScripter/ComoboPlugin.runCommand) more robust (I still suck at threading).
* Return all possible states in PumpState
* Add absolute TBR to PumpState
* Add NoOpCommand to fetch state data from pump
* Display returned pump state in Combo fragment/tab.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
f251427d1b
Remove ReadStateCommand, all state will be return through the PumpState field on CommandResult, so it's passed back after every command.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
ec6491fcb7
Return absolute TBR rate in PumpState.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
69b98c54c6
Polish.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
9653af5501
RuffyScripter.navigateToMenu: detect if we're wrapping around not finding a menu (likely because it's hidden)
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
7e538cbcf6
Update PumpState s/errorCode/errorMsg/g
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
99830b05b6
Fix detecting error state on connection and fix cancelling TBR.
...
When there's an error, timing is crucial. Waiting for the blinking error code
to be readable hangs the thread running the command.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
f6c8f3638b
Reflect reject TBR change in comment.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
4ff81e885c
Simplify reading alerts (message doesn't blink)
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
e01e85c54f
On connect, check if pump is in an error state.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
364123c261
Fix carb only treatment.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
d0dabf34da
Fix handling TBR CANCELLED alert, remove ill-advised attempts to fake a command queue and have all commands return a state object.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
952aa0e8a2
RuffyScripter.waitForMenuToBeLeft: add timeout.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
77711b2174
ComboPlugin.runCommand: wait if pump is busy with a command.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
d8011aeaa4
Make cancelling TBR more robust to dismiss TBR cancelled alert specifially and only if it is raised.
...
Cancelling a TBR with a runtime < 60s (0:01 in the display) does NOT raise a TBR cancelled alert.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
2c706e7c22
Remove status logging in Ruffy, now done by command.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
8bc4cd255a
Don't close connection when other cmds are about to be run.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
f5ef666061
Add timestamp to State and rename to PumpState.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
f28a27a93f
Read pump state.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
9d8d12fcb9
Cleanups.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
eab9d8dcd7
Fix reducing duration of OpenAPS TBRs
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
e76524a539
Include state in CommandResult.toString.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
375eb46695
ReadStateCommand: properly read TBR %.
2017-07-18 21:20:39 +02:00
Johannes Mockenhaupt
fa039e6961
Note on cancelling TBRs that don't trigger a pump alert.
2017-07-18 21:20:18 +02:00
Johannes Mockenhaupt
0345a01fc1
Make CancelTbrCommand more robust.
2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt
30fc385970
Apply pump specific modifications to OpenAPS suggestion in ComboPlugin.
2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt
5631488cc8
Add ReadStateCommand.
2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt
8b21bb1203
Skip TBR changes smaller than 20%.
...
~50 TBR changes in a 6 hour night seem excessive, even if pump was
handicapped by not being connected and thus not having any effect
to work with.
2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt
a2b3c26b33
Log pump status on connect.
2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt
347890496b
SetTbrCommand: wain for menu update when switching to TBR_DURATION to make it safer, hopefully.
2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt
8c107cb48a
RuffyScripter: Log button presses.
2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt
df58b6d1c2
CancelTbrCommand: log running TBR to be cancelled.
2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt
8e2cd844a5
Round requested absolute TBR to percent TBR.
2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt
a21da8aba7
Remove pointless events about connection status.
2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt
848a32eade
Logging cleanup.
2017-07-18 20:59:56 +02:00
Johannes Mockenhaupt
9674db8d85
CancelTbrCommand: set enacted=true, even when there was no TBR to cancel.
...
This helps recover when there was an issue. AAPS thinks there's a TBR
running and by reporting back 'enacted', the plugin will create a
"Cancel temp" treatment.
2017-07-18 20:55:48 +02:00
Johannes Mockenhaupt
264e252300
Set last command date.
...
Though this is only relevant when starting to fetch data from the pump.
2017-07-18 20:55:48 +02:00
Johannes Mockenhaupt
336315823e
ComboPlugin.getBaseBasalRate: return profile value.
2017-07-18 20:55:48 +02:00
Johannes Mockenhaupt
0729d7a114
RuffyScripter: Abort a running command after 90s timeout
2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt
f34fed1f05
Semi-fix bolusing not logging a treatment when there was an error.
2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt
e29ef5ffce
Update treatment history when setting/cancelling a TBR.
2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt
a27bb28e87
ComboPlugin.deliverTreatment: return command message as comment in PumpEnactResult.
...
Important when there's an error.
2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt
d35d93ed44
RuffyScripter.verifyMenuIsDisplayed: wait a bit longer if needed.
...
Sometimes the pump seems to take a bit longer.
2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt
76578872d1
ComoPlugin.deliverTreatment: take more time.
...
Even if not interacting with the pump, AAPS calculator doesn't dismiss the
dialog if we return within the first 5s.
2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt
d39d58913d
Implement #8 , add treatment to history.
2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt
e07d62bf79
Fix setting TBR when existing TBR has runtime < 15m.
2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt
97f9e99437
toString methods for Commands.
2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt
1c1a28f0a8
Ignore requests to issue BolusCommands for zero units.
2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt
5f1ab4e45c
Set duration in PumpEnactResult when issuing SetTbrCommand.
2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt
6842abd157
Provide fake current basal rate.
2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt
3b50a5ae70
Update Combo PumpDescription w.r.t extended bolus.
2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt
1f5c03b64e
Cleanups.
2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt
7cb0268afc
Disconnect after issuing comand to Combo.
2017-07-18 20:55:47 +02:00
Johannes Mockenhaupt
3280092566
Source ruffy scripter for the time being (already some fixes and tweaks in).
2017-07-18 20:55:44 +02:00
Johannes Mockenhaupt
481c63fa57
Initial work on the ComboPlugin.
2017-07-18 20:54:59 +02:00
Johannes Mockenhaupt
ab9908438e
Add Combo short name.
2017-07-18 20:54:57 +02:00
Milos Kozak
30b7697002
adjust combo driver for latest changes
2017-07-18 20:54:14 +02:00
Milos Kozak
e9f5241821
add missing interface functions to combo
2017-07-18 20:54:14 +02:00
Milos Kozak
253c2a34e5
combo plugin skeleton
2017-07-18 20:54:13 +02:00
PoweRGbg
c3f85faede
removed some "unneeded" translations
2017-07-18 18:10:24 +03:00
AdrianLxM
c79a5725fd
Update InsulinFastactingProlongedFragment.java
...
... in case DIA has changed.
2017-07-18 13:19:43 +02:00
AdrianLxM
741f6bd866
Update InsulinFastactingFragment.java
...
... in case DIA has changed
2017-07-18 13:18:41 +02:00
Johannes Mockenhaupt
7eacd5021c
Use target ranges from profile, rather than fixed values from prefs.
2017-07-18 13:04:15 +02:00
Johannes Mockenhaupt
435ec55580
Extract SubscriberFragment base class.
2017-07-18 12:59:25 +02:00
Johannes Mockenhaupt
7c6bdc0b31
Have most fragments update their content in onResume.
2017-07-18 12:38:42 +02:00
AdrianLxM
e0c1f65b8b
wear tdd weighted
2017-07-17 22:40:05 +02:00
AdrianLxM
50c26f28fd
wear TDD status
2017-07-17 22:39:48 +02:00
AdrianLxM
387cfcccaf
wear menu simplification
2017-07-17 22:39:00 +02:00
PoweRGbg
7216418f44
Translated latest additions strings.xml
2017-07-17 11:37:00 +03:00
AdrianLxM
0d1ff3d721
ns client quickfix now catch all
2017-07-16 16:49:26 +02:00
AdrianLxM
c64c5f5401
NS client quickfix - catch even more
2017-07-16 16:38:01 +02:00
AdrianLxM
d5599f1f00
catch TransactionTooLargeException
2017-07-16 16:00:04 +02:00
Milos Kozak
26ebceb4d9
Merge pull request #288 from AdrianLxM/wear-overviewnotification
2017-07-15 16:31:45 +02:00
Boyko Kazakov
7a2db43347
Added Images for different resolutions
2017-07-15 17:03:38 +03:00
AdrianLxM
b79beda971
wear pass through overview notifications
2017-07-15 16:03:04 +02:00
AdrianLxM
cb08d1d76b
TT new "old" logic for temp targets
2017-07-15 13:37:48 +02:00
AdrianLxM
9eaba98dfa
TT refactor OverlappingIntervals to two classes with an abstract superclass Intervals
2017-07-15 13:37:48 +02:00
Johannes Mockenhaupt
80124e6d7b
Bolus wizard: use PumpDescription to round final bolus to a value compatible with the pump.
2017-07-14 23:52:16 +02:00
Milos Kozak
0e6a93df90
Merge pull request #279 from AdrianLxM/cpp-wear2
...
Cpp wear
2017-07-12 08:18:57 +02:00
Milos Kozak
3e9734188b
check for array size
2017-07-11 11:27:14 +02:00
Milos Kozak
e33d757975
Merge pull request #277 from AdrianLxM/refactor-profileswitch
...
extract method for new ProfileSwitch
2017-07-10 08:13:07 +02:00
AdrianLxM
b53c40c4ad
cpp-watch update while in backtround
2017-07-10 05:26:24 +02:00
AdrianLxM
7fa8ea7224
cpp-watch working2
2017-07-10 04:46:29 +02:00
AdrianLxM
7f0e611783
cpp watch working1
2017-07-10 04:46:13 +02:00
AdrianLxM
0bff8e2778
extract method for new ProfileSwitch
2017-07-10 04:45:43 +02:00
AdrianLxM
26f3362ffc
cpp-watch first roundtrip
2017-07-10 04:45:22 +02:00
AdrianLxM
85d028abff
cpp watch openactivity
2017-07-10 04:45:08 +02:00
AdrianLxM
39ee68e62a
cpp-watch external-function
2017-07-10 04:44:46 +02:00
AdrianLxM
5ea8cff751
extract method for new ProfileSwitch
2017-07-10 01:25:48 +02:00
Milos Kozak
059ac4040e
fix 640g plugin
2017-07-09 23:12:57 +02:00
Milos Kozak
551ff70bc8
forgotten file
2017-07-07 19:35:45 +02:00
Milos Kozak
2724e10c2f
1.5d
2017-07-07 18:39:31 +02:00
Milos Kozak
d61d35fa82
move class to correct place
2017-07-07 18:37:15 +02:00
Milos Kozak
0b5abae44f
fix conflict
2017-07-07 15:10:29 +02:00
Milos Kozak
8de7e05dd5
weightedaverage sensitivity
2017-07-07 15:08:21 +02:00
drnoname82
e12e4ec55e
Update strings.xml
2017-07-07 01:03:20 +02:00
Milos Kozak
31e9f3f55c
Merge pull request #274 from AdrianLxM/wear-oaps-reason-result
...
wear show oaps result/reason
2017-07-04 12:01:47 +02:00
Milos Kozak
24259470ad
Merge pull request #275 from AdrianLxM/fakeextended-fix
...
Fake extended fix
2017-07-04 12:01:12 +02:00
AdrianLxM
a45fd1619e
fake extended fix 3
2017-07-04 01:43:56 +02:00
AdrianLxM
1922a1b121
fake extended fix 2
2017-07-04 00:17:26 +02:00
Milos Kozak
7b9e5fec1e
autosens warning
2017-07-04 00:16:35 +02:00
AdrianLxM
1574d94aa6
fake extended fix
2017-07-04 00:03:50 +02:00
Milos Kozak
c75bb0e453
fix sensitivy
2017-07-03 21:21:20 +02:00
Milos Kozak
ebf56d0032
double check units are in profile
2017-07-03 11:14:30 +02:00
AdrianLxM
e81b217c94
wear show oaps result/reason
2017-07-03 01:47:58 +02:00
Milos Kozak
5a27f9afa1
allow lock screen in nsclient mode
2017-07-03 00:02:54 +02:00
Milos Kozak
e0e0a75519
allow ISO format with miliseconds
2017-07-02 12:49:25 +02:00
Milos Kozak
771ff0d781
1.5c
2017-07-02 11:47:16 +02:00
Milos Kozak
e9dba7136d
nsclient layout for phones
2017-07-02 11:28:03 +02:00
Milos Kozak
d4537a001f
check for null profile in watchupdaterservice
2017-06-30 23:59:12 +02:00
Milos Kozak
b4ab1d4109
fix types in configbuilder
2017-06-30 21:35:07 +02:00
Milos Kozak
4d16b04acd
buttons on overview GONE before profile is loaded
2017-06-30 17:50:30 +02:00
Milos Kozak
37055cd917
allow decimal number in NumberPicker
2017-06-30 17:43:10 +02:00
Milos Kozak
09e5fdc61b
sensitivity prefs cleanup
2017-06-30 11:56:36 +02:00
Milos Kozak
96e4a25f9e
typo
2017-06-30 11:40:12 +02:00
Milos Kozak
448cf7ea85
use default dia when no profile available
2017-06-30 11:18:51 +02:00
Milos Kozak
51b01a0993
split device statuses too before broadcast
2017-06-30 10:57:29 +02:00
Milos Kozak
f0c9ce5a00
fix crash when no profile loaded from pump yet
2017-06-30 10:47:30 +02:00
Milos Kozak
38002be73d
check for units null
2017-06-30 10:35:05 +02:00
Milos Kozak
a8a4ffcab1
ver 1.5b
2017-06-30 10:24:45 +02:00
Milos Kozak
63ad0704fa
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-06-30 10:23:31 +02:00
Milos Kozak
1e5f96f841
split treatments to smaller chunks before broadcast
2017-06-30 10:23:24 +02:00
Milos Kozak
9e8c91319e
move ns version to about dialog
2017-06-30 09:55:47 +02:00
Milos Kozak
514d6d4dd5
fix crash in instantiating fragment
2017-06-30 09:46:56 +02:00
Milos Kozak
39c6ae5eae
fix merge conflict
2017-06-30 09:35:20 +02:00
Milos Kozak
fec4e60359
Merge pull request #269 from AdrianLxM/percentagevisualization
...
visualize absolute rate emulation as percentage
2017-06-30 00:00:47 +02:00
AdrianLxM
6bbec3411a
absolute as percentage update
2017-06-29 23:36:45 +02:00
Milos Kozak
68f90f0da8
Merge pull request #270 from AdrianLxM/danarstats-historyadaption
...
DanaRStats adapt to history and work around gaps
2017-06-29 22:15:06 +02:00
Milos Kozak
b4ea205103
Merge pull request #271 from AdrianLxM/diadivisor
...
adapt diadivisor
2017-06-29 22:14:28 +02:00
AdrianLxM
72fbb73c65
bolusprogress without context
2017-06-29 20:24:19 +02:00
AdrianLxM
fcab1a267b
adapt diadivisor
2017-06-29 19:39:58 +02:00
Milos Kozak
d81bb9bf23
fix bolusprogress dialog size
2017-06-29 19:21:34 +02:00
AdrianLxM
1f9ed574b7
DanaRStats adapt to history and work around gaps
2017-06-29 16:24:17 +02:00
AdrianLxM
16e360f200
visualize absolute rate emulation as percentage
2017-06-29 14:14:40 +02:00
Milos Kozak
a8338b2dd1
careportal dialog number picker
2017-06-29 01:37:58 +02:00
Milos Kozak
f58f70bdca
wizard tweaking
2017-06-28 23:11:17 +02:00
Milos Kozak
39e83f0cfe
clean context after fragment is destroyed
2017-06-28 10:24:42 +02:00
Milos Kozak
e4d55473a1
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-06-28 09:09:29 +02:00
Milos Kozak
5c5c4243bc
check for missing bg direction
2017-06-28 09:09:19 +02:00
Milos Kozak
ea06a90453
1.5a
2017-06-27 23:24:30 +02:00
Milos Kozak
491f0837c8
allow manual input in NumberPicker
2017-06-27 23:23:44 +02:00
Milos Kozak
c3876c730b
numberpicker in wizard dialog
2017-06-27 23:16:23 +02:00
Milos Kozak
4fc935f0bd
bolus dialog numberpickers
2017-06-27 19:14:32 +02:00
Milos Kozak
ef4a1feda2
numberpicker in calibration dialog
2017-06-27 17:06:23 +02:00
Milos Kozak
341b0660a8
calibration dialog cancel button
2017-06-27 15:25:11 +02:00
Milos Kozak
311a14e457
typo
2017-06-27 13:59:37 +02:00
Milos Kozak
9fb428c128
fix conflict
2017-06-27 13:52:47 +02:00
Milos Kozak
103836717a
fix conflict
2017-06-27 13:51:45 +02:00
Milos Kozak
70374ee341
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-06-27 13:42:45 +02:00
Milos Kozak
50ba9720e1
use container for inflate
2017-06-27 13:42:39 +02:00
Milos Kozak
42b42a90eb
another check for null
2017-06-27 11:01:38 +02:00
Milos Kozak
ab63c2fb48
better check for app initialization
2017-06-27 10:00:22 +02:00
Milos Kozak
7b1b9c9881
dialog widths
2017-06-27 00:11:23 +02:00
Milos Kozak
dbd721319e
ns uploader status
2017-06-26 22:39:01 +02:00
Milos Kozak
87fb969d9f
ns openaps status
2017-06-26 17:21:39 +02:00
Milos Kozak
36b83e4c8a
typo
2017-06-26 13:08:45 +02:00
Milos Kozak
47a9d4b9c8
ns pump status
2017-06-26 12:44:03 +02:00
Milos Kozak
3f641f9c30
carbs absorption settings
2017-06-25 11:16:19 +02:00
Milos Kozak
ac98852f79
cut off carbs after 4h
2017-06-24 19:55:49 +02:00
Milos Kozak
129f813de2
reset cache on ConfigBuilderChange event
2017-06-24 15:11:30 +02:00
Milos Kozak
70aaafa616
copy old oref0 sensitivity code
2017-06-24 15:04:22 +02:00
Milos Kozak
b39f59f59e
remove unneeded fragments
2017-06-24 13:22:50 +02:00
Milos Kozak
5360129e5f
sensitivity plugins
2017-06-24 11:04:09 +02:00
Milos Kozak
240f9618f5
Merge branch 'dev' into newautosens
2017-06-21 09:04:38 +02:00
Milos Kozak
3e7c4b1350
NS high & low alarms with sound
2017-06-21 07:28:04 +02:00
Milos Kozak
7f92f42923
cob on overview
2017-06-20 20:30:50 +02:00
Milos Kozak
33de4e8f2a
schedule overview update 500ms
2017-06-20 20:13:01 +02:00
Milos Kozak
e9898a58c7
show target range as number if equal
2017-06-20 20:10:14 +02:00
Milos Kozak
134efb04bf
fix merge conflict
2017-06-20 20:01:09 +02:00
Milos Kozak
befdbefa49
fix zero parsing error
2017-06-20 19:58:43 +02:00
Milos Kozak
a3757877a3
fix landscape mode
2017-06-20 19:56:25 +02:00
Milos Kozak
80962e33d7
allow to ignore profileswitch events
2017-06-20 19:52:46 +02:00
Milos Kozak
c728174858
Merge branch 'dev' into newautosens
2017-06-19 23:13:29 +02:00
Milos Kozak
745f9270ee
one more null check
2017-06-19 23:08:56 +02:00
Milos Kozak
b185733859
more checks for null
2017-06-19 22:55:56 +02:00
Milos Kozak
df3dff1940
revert magic constant
2017-06-19 22:32:54 +02:00
Milos Kozak
4b1263e2e0
small simplify
2017-06-19 16:28:36 +02:00
Milos Kozak
150ef1a8bc
Merge branch 'dev' into newautosens
2017-06-19 15:03:35 +02:00
Milos Kozak
6eed701310
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-06-19 14:52:54 +02:00
Milos Kozak
7e1c435374
fix loading danar history
2017-06-19 14:52:46 +02:00
PoweRGbg
dcc7112fd8
Update Profile.java
2017-06-19 14:39:49 +03:00
PoweRGbg
6293e89be2
fixed getICList() returning bg units/U to g/hr
2017-06-19 13:10:32 +03:00
Milos Kozak
e90812634b
work from old autosens branch
2017-06-16 14:37:43 +02:00
Milos Kozak
b67d8be1ef
dia as primitive
2017-06-16 09:14:57 +02:00
Milos Kozak
c78399ded0
cache created objects in profilestore
2017-06-16 09:06:35 +02:00
Milos Kozak
49ef46936b
optimize refreshing gui
2017-06-16 08:37:07 +02:00
Milos Kozak
43231cc362
use System.currentTimeMillis()
2017-06-15 23:12:12 +02:00
Milos Kozak
26daffa692
use primitives in inner loops
2017-06-15 22:55:07 +02:00
Milos Kozak
fb7af2f317
ns alarm setting in xml
2017-06-15 21:33:45 +02:00
Milos Kozak
5408562d84
use phone name in devicestatus
2017-06-15 09:45:10 +02:00
Milos Kozak
a2aa8d8bc6
bucketed data for non 5min interval
2017-06-15 00:34:42 +02:00
Milos Kozak
2642a12829
schedule correct scheduleExtendedBolusChange
2017-06-14 22:18:01 +02:00
Milos Kozak
9ce78881fb
log initiator in loop
2017-06-14 22:12:36 +02:00
Milos Kozak
b14cf480cf
add duration to profile switch dialogs
2017-06-14 20:41:55 +02:00
Milos Kozak
ae2bbf76e5
fix duplicating carb entries
2017-06-14 19:49:01 +02:00
Milos Kozak
0b322e53fc
nsclient plugin tweaking
2017-06-13 21:25:50 +02:00
Milos Kozak
43b70f9efc
loop, MA, AMA new design
2017-06-13 20:48:53 +02:00
Milos Kozak
745a3cf874
reuse profile object
2017-06-13 19:37:31 +02:00
Milos Kozak
2c2b6c21a1
cancel temp basal in the same connection
2017-06-13 18:47:54 +02:00
Milos Kozak
3a95325039
fix sms reply text
2017-06-13 16:51:59 +02:00
Milos Kozak
d3de51cc88
optimize dia
2017-06-13 15:06:41 +02:00
Milos Kozak
2a1fe205ee
optimize nsclient logging
2017-06-13 12:17:54 +02:00
Milos Kozak
afca896f23
optimize getUnits() & detecting faked extended
2017-06-13 12:08:30 +02:00
Milos Kozak
1de64f06c2
simplify danar activities, fix profiles
2017-06-12 23:31:50 +02:00
Milos Kozak
6fca923275
fix profileswitch reloads
2017-06-12 13:11:16 +02:00
Milos Kozak
0f40670c24
create singleton from NSstatus
2017-06-12 11:15:03 +02:00
Milos Kozak
b41a942d11
update supported NS & NSclient versions
2017-06-12 09:30:04 +02:00
Milos Kozak
148f4d43f9
detect faking by extended boluses in nsclient mode
2017-06-12 09:15:51 +02:00
Milos Kozak
77659e20e7
ns alarms & getBasal fix
2017-06-11 17:22:54 +02:00
Milos Kozak
bf953f1240
fix maxdailybasal calculation
2017-06-11 14:29:02 +02:00
Milos Kozak
39224f421a
fix extended bolus step
2017-06-11 13:37:38 +02:00
Milos Kozak
b603fce8c7
do not add empty iob series
2017-06-11 12:44:42 +02:00
Milos Kozak
f6650e33e4
remove test buttons
2017-06-10 22:04:59 +02:00
Milos Kozak
723c90c32d
optimize rendering
2017-06-10 21:51:58 +02:00
Milos Kozak
e6f173f305
fix merge conflict
2017-06-10 13:43:02 +02:00
Milos Kozak
6ce35bc36a
Merge branch 'history' of https://github.com/MilosKozak/AndroidAPS into history
2017-06-10 13:41:36 +02:00
Milos Kozak
f65d75e553
specify source at detailedbolusinfo
2017-06-10 13:39:51 +02:00
Milos Kozak
dfaf3a07c2
typo
2017-06-08 23:22:43 +02:00
Milos Kozak
4231557c9f
fix axis
2017-06-08 23:18:38 +02:00
Milos Kozak
96d760ba62
fix adding basals to database in danar driver
2017-06-08 22:26:32 +02:00
Milos Kozak
74268675af
optimize overview graph drawing
2017-06-08 22:14:55 +02:00
Milos Kozak
a39f61284a
profileswitch sync & v2 bolus fix
2017-06-08 20:52:33 +02:00
Milos Kozak
e09fba93cb
update graph properly
2017-06-08 20:08:02 +02:00
Milos Kozak
e8be720138
temptarget sync
2017-06-08 19:34:46 +02:00
Milos Kozak
1153c33200
tempbasal & extendedbolus 3way sync
2017-06-08 18:15:17 +02:00
Milos Kozak
4d30ba9cdb
treatments PumpHistory and NS mark
2017-06-07 19:43:19 +02:00
Johannes Mockenhaupt
d00e7f8b00
Clear notification when accepting temp basal.
...
This clears the notification about a new suggested basal when the
temp basal is accepted from within AndroidAPS.
2017-06-07 18:10:08 +02:00
Milos Kozak
e5a326c377
nsclient always use virtual pump, more sync fixes
2017-06-07 18:10:07 +02:00
Milos Kozak
fec56e7c23
fix bug in sync
2017-06-07 08:09:15 +02:00
Milos Kozak
8fab76ee9b
treatments synchronization improvement
2017-06-07 00:11:33 +02:00
Milos Kozak
5931abc860
BgReading optimization
2017-06-06 17:14:17 +02:00
Milos Kozak
a180e182eb
optimize rendering graph
2017-06-06 15:49:41 +02:00
Milos Kozak
8b8a8fcb45
remote time update extra task
2017-06-06 15:06:00 +02:00
Milos Kozak
b8b00dbc81
revert asynctask
2017-06-06 14:49:17 +02:00
Milos Kozak
f93090b012
allow only 1 updategui running
2017-06-06 10:56:26 +02:00
Milos Kozak
17f59df597
gui tweaking, pump battery event
2017-06-06 08:21:11 +02:00
Milos Kozak
7c7638a7a1
extract color resources
2017-06-05 15:34:22 +02:00
Milos Kozak
e0a6db22a2
run rendering calculations on background
2017-06-05 15:16:07 +02:00
Milos Kozak
88b9caa357
absolute basal line
2017-06-05 01:12:36 +02:00
Milos Kozak
dd7e777a24
simplify graph series
2017-06-05 00:50:31 +02:00
Milos Kozak
8934d2d6b9
Merge branch 'history' of https://github.com/MilosKozak/AndroidAPS into history
2017-06-04 22:38:42 +02:00
Milos Kozak
a3db05ec39
v 1.50 & fix conflict
2017-06-04 22:37:58 +02:00
Milos Kozak
ac038a9252
bigger bg dots on tablet
2017-06-04 22:27:36 +02:00
Milos Kozak
013025b750
fix crashing at start
2017-06-04 01:15:11 +02:00
Milos Kozak
1702ce7702
adjusting nsclient mode
2017-06-04 00:46:44 +02:00
Milos Kozak
b40cf99201
gui tweaking
2017-06-03 22:43:35 +02:00
Milos Kozak
1a4e60d3a8
process duration correctly
2017-06-02 23:59:34 +02:00
Milos Kozak
d365fcd6a4
fix bugs & design tweaking
2017-06-02 23:25:11 +02:00
Milos Kozak
6ca4811e8e
profiles visualisation
2017-06-02 12:27:21 +02:00
Milos Kozak
f267c85377
it compiles now with profiles
2017-06-02 10:25:49 +02:00
Milos Kozak
a19a5a442b
some v2 driver tweaking
2017-06-01 20:52:38 +02:00
Milos Kozak
622097aabc
fix wrong merge
2017-06-01 19:33:56 +02:00
Milos Kozak
32084094fd
v 1.46
2017-06-01 18:59:39 +02:00
Milos Kozak
0a2cdff5e5
fix conflict
2017-05-31 09:29:39 +02:00
Milos Kozak
fb4ea156d6
disable loop as a fist action on superbolus
2017-05-31 09:26:08 +02:00
Milos Kozak
496872a58e
resend after 10sec allowed
2017-05-31 09:14:31 +02:00
Milos Kozak
15f44e6085
basic sync for v2
2017-05-30 22:44:26 +02:00
Milos Kozak
b3d18b2537
disable bolus when pump is suspended
2017-05-30 18:23:07 +02:00
Milos Kozak
f5f7d28cc1
temp basal dialog design
2017-05-30 18:10:05 +02:00
Milos Kozak
3861bece54
extended bolus dialog
2017-05-30 15:07:44 +02:00
Milos Kozak
5f6a77983b
Merge branch 'dev' into history
2017-05-29 22:42:17 +02:00
Milos Kozak
9e3edbb530
typo in checkbox handling
2017-05-29 22:36:04 +02:00
Milos Kozak
358de54322
redesign uploading treatments to NS
2017-05-29 21:45:59 +02:00
Milos Kozak
ec76908eca
redesign uploading tb&eb to NS
2017-05-29 19:43:19 +02:00
Milos Kozak
dec627946d
0xE004 DanaRv2 message
2017-05-29 16:45:09 +02:00
Milos Kozak
9032deaaf3
better cache invalidate handling
2017-05-29 15:26:25 +02:00
Milos Kozak
c90de88ec1
better logging & double treatment plugin fix
2017-05-29 13:07:58 +02:00
Milos Kozak
442ff12aa1
initialize treatment data first by another message
2017-05-29 11:39:12 +02:00
Milos Kozak
fa695b9399
Merge branch 'dev' into history
2017-05-29 10:04:09 +02:00
Milos Kozak
e91acf3fed
eliminate multiple resends in nsclient
2017-05-29 10:03:55 +02:00
Milos Kozak
4dff0e3a56
rename treatment interfaace functions to be more clear
2017-05-26 15:33:42 +02:00
Milos Kozak
0371e97391
Merge branch 'dev' into history
2017-05-26 15:06:04 +02:00
Milos Kozak
60a41b7dce
switch order of commands when setting superbolus
2017-05-26 15:02:59 +02:00
Milos Kozak
0973ef97ac
synchronize danar and danarv2 plugins
2017-05-26 14:41:05 +02:00
Milos Kozak
b8b9827b61
synchronize danar and danarkorean plugins
2017-05-26 13:28:27 +02:00
Milos Kozak
4b39578d9c
fix adding contribution from faked extended
2017-05-26 12:07:56 +02:00
Milos Kozak
a9b251ce12
Merge branch 'history' of https://github.com/MilosKozak/AndroidAPS into history
2017-05-26 10:31:46 +02:00
Milos Kozak
559e07904c
remove unneeded call
2017-05-26 10:31:05 +02:00
Milos Kozak
bb4302c02f
Merge branch 'dev' into history
2017-05-26 10:24:48 +02:00
Milos Kozak
0b8499cb7f
Merge pull request #251 from AdrianLxM/historytest1
...
lint disable 'ExtraTranslation'
2017-05-26 10:23:51 +02:00
AdrianLxM
7bf8a31e02
check for unused translations again
2017-05-26 10:11:38 +02:00
AdrianLxM
8b81960ceb
remove unused strings from russion translation
2017-05-26 10:10:57 +02:00
Milos Kozak
650b792099
mark selected tab in treatments
2017-05-26 10:05:42 +02:00
AdrianLxM
cc4419f57a
lint ExtraTranslation
2017-05-26 10:00:41 +02:00
AdrianLxM
99b8e48031
lint ExtraTranslation
2017-05-26 09:58:38 +02:00
Milos Kozak
a066580896
handle faked tempbasals synchronization
2017-05-26 08:54:48 +02:00
Milos Kozak
5fb72181ee
careportal cage, sage, iage
2017-05-25 20:18:29 +02:00
Milos Kozak
87993c6163
return functionality of faking by extended boluses
2017-05-25 17:26:05 +02:00
fedor apanasenko
4406bb3f06
Update strings.xml
2017-05-25 09:51:08 +03:00
Milos Kozak
86af9eab3d
stop extended bolus in actions
2017-05-24 20:37:58 +02:00
Milos Kozak
2ae30fe9b4
temptarget design
2017-05-24 19:42:23 +02:00
Milos Kozak
bb9c68fd4d
Merge remote-tracking branch 'origin/dev' into history
2017-05-24 19:18:30 +02:00
Milos Kozak
45df7ddd26
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-05-24 18:50:10 +02:00
Milos Kozak
f936580734
Russsian language
2017-05-24 18:46:19 +02:00
Milos Kozak
5208f23661
Temptargets under treatments
2017-05-23 23:56:53 +02:00
Milos Kozak
771fbdc303
sync of treatments, tempbasals, extended tested and working
2017-05-23 22:59:06 +02:00
Milos Kozak
8db1bd5ae5
tempbasal ns sync
2017-05-23 20:15:14 +02:00
Milos Kozak
7bed883368
Merge branch 'dev' into history
2017-05-22 22:13:42 +02:00
Milos Kozak
6394421017
boluses working
2017-05-22 22:10:56 +02:00
Milos Kozak
6cd046459a
original treatmens plugin removed, temp basals working
2017-05-22 20:58:05 +02:00
AdrianLxM
6d90f79521
also cancel temp on disable loop plugin
2017-05-22 19:14:57 +02:00
AdrianLxM
448a420fad
cancel temp on suspend loop
2017-05-22 17:39:25 +02:00
Milos Kozak
85e6375026
make all getDao private
2017-05-22 12:52:19 +02:00
Milos Kozak
6004a17594
change database structures
2017-05-21 22:05:03 +02:00
Milos Kozak
3330c6a3fd
Merge branch 'dev' into history
2017-05-21 16:46:13 +02:00
Milos Kozak
462849af12
russian language entry
2017-05-21 10:06:34 +02:00
Milos Kozak
012b6a2c26
v 1.45
2017-05-20 20:42:10 +02:00
Milos Kozak
56d54a6988
italian language
2017-05-20 20:41:23 +02:00
Milos Kozak
6ee6eff759
fix objective 1
2017-05-19 14:15:21 +02:00
Milos Kozak
0a182fb022
v 1.44
2017-05-17 18:54:48 +02:00
Milos Kozak
3ec08ab10f
fix app crash
2017-05-16 20:02:09 +02:00
Milos Kozak
91fa355d8c
remove unneeded code
2017-05-16 18:51:31 +02:00
Milos Kozak
d0ae965054
fix basal rounding for v2
2017-05-16 18:02:58 +02:00
Milos Kozak
8452c42746
fix merge
2017-05-16 18:02:01 +02:00
Milos Kozak
8d2e7a34ae
same workaround for korean danar
2017-05-16 17:58:18 +02:00
Milos Kozak
a362c77afe
fix temp basal netRatio display
2017-05-16 17:57:18 +02:00
Milos Kozak
8c5ce7290d
more work on treatments fragment
2017-05-16 17:48:58 +02:00
AdrianLxM
44c3303e0e
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into xdripstatusline
2017-05-16 16:30:26 +02:00
AdrianLxM
3869b143c4
Workaround for DanaR truncation
2017-05-16 16:29:30 +02:00
Milos Kozak
3ee9bf5ff7
Merge branch 'dev' into history
2017-05-16 15:15:32 +02:00
Milos Kozak
1ad424a178
use Activity instead of FramgmentActivity
2017-05-16 15:15:28 +02:00
Milos Kozak
86c975e9d6
Add Italian language
2017-05-16 13:39:24 +02:00
Milos Kozak
45477f96ee
Merge pull request #243 from AdrianLxM/xdripstatusline
...
basal and bolus step in DanaR Fragment
2017-05-16 13:28:39 +02:00
AdrianLxM
572e726678
basal and bolus step in DanaR Fragment
2017-05-16 13:10:02 +02:00
Milos Kozak
6fff6f63a4
bolus dialog redesign
2017-05-16 12:09:32 +02:00
Milos Kozak
4201709e2a
finish careportal dialog redesign
2017-05-16 11:47:33 +02:00
Milos Kozak
54758d08d8
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-05-16 09:47:23 +02:00
Milos Kozak
894923664e
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into history
2017-05-16 09:46:59 +02:00
Milos Kozak
fd62c572af
more treatments plugin tweaking
2017-05-16 09:46:09 +02:00
Milos Kozak
704ad383e9
careportal layout part1
2017-05-15 21:10:43 +02:00
Milos Kozak
25110cfea4
move database actions from pump to treatments plugin
2017-05-15 18:44:40 +02:00
Milos Kozak
85744548d8
typo in log
2017-05-14 11:48:59 +02:00
Milos Kozak
b1d9e647c6
Merge branch 'dev' into history
2017-05-12 23:14:07 +02:00
Milos Kozak
b19bf628b8
Merge pull request #241 from AdrianLxM/xdripstatusline
...
Get correct calibration value if entered with (onboard) keyboard
2017-05-12 23:12:49 +02:00
Milos Kozak
6a6a02f212
Merge branch 'dev' into history
2017-05-12 23:04:39 +02:00
Milos Kozak
3f4cf57bbc
make all Spiners centered
2017-05-12 23:04:14 +02:00
Milos Kozak
7bbd2cff2d
consolidate DanaR code
2017-05-12 22:40:22 +02:00
Milos Kozak
d641b0edd9
move rest of PumpInterface to TreatmentInterface
2017-05-12 21:21:31 +02:00
Milos Kozak
52177cead1
move part of PumpInterface to TreatmentInterface
2017-05-12 21:07:29 +02:00
AdrianLxM
bb35f58eab
Get correct calibration value if entered with (onboard) keyboard
2017-05-12 18:31:52 +02:00
Milos Kozak
22bb49aa60
hide DanaRv2 constraints
2017-05-12 18:05:22 +02:00
Milos Kozak
863e6454eb
calculate iob based on insulin stored with treatment
2017-05-12 17:57:57 +02:00
Milos Kozak
9fc1d59bd0
allow to enforce Treatment plugin
2017-05-12 17:30:52 +02:00
Milos Kozak
c6830baf8f
Merge branch 'dev' into history
2017-05-12 16:35:07 +02:00
Milos Kozak
abdc1022bf
merge bolus & basal into one plugin
2017-05-12 16:27:33 +02:00
AdrianLxM
a60afbceb9
typo
2017-05-12 16:08:48 +02:00
AdrianLxM
a9e093ad0d
some German translations
2017-05-12 16:06:14 +02:00
AdrianLxM
c88b8eaa9a
make buttons scrollable for small heights
2017-05-12 15:26:16 +02:00
Milos Kozak
eddd8ac56d
Merge branch 'DanaRv2' into history
2017-05-12 13:06:05 +02:00
Milos Kozak
e005d6bd69
Merge branch 'dev' into history
2017-05-12 13:05:57 +02:00
Milos Kozak
831b45fac5
DanaRv2 mod7
2017-05-12 13:05:29 +02:00
Milos Kozak
df424ea5ff
overview buttons
2017-05-12 11:06:33 +02:00
Milos Kozak
19c23a3c02
Merge pull request #238 from AdrianLxM/xdripstatusline
...
No permission to read statusline
2017-05-12 09:22:09 +02:00
AdrianLxM
7517ee4930
No permission to read statusline
2017-05-12 03:54:24 +02:00
Milos Kozak
b782a5b8dc
Merge branch 'dev' into history
2017-05-12 00:39:20 +02:00
Milos Kozak
be4aa1131e
Merge branch 'DanaRv2' into history
2017-05-12 00:39:08 +02:00
Milos Kozak
2610edae55
DanaRv2 Modify 6
2017-05-12 00:38:26 +02:00
Milos Kozak
a0d31b2118
rename identical functions
2017-05-11 18:54:50 +02:00
Radoslav Radev
d58ddf48c6
Update strings.xml
2017-05-11 17:01:49 +03:00
Milos Kozak
7e99ce416a
move buttons back to bottom
2017-05-11 10:59:05 +02:00
Milos Kozak
6b9048cd61
Merge pull request #234 from warstar2187/korean
...
Korean translation update
2017-05-11 09:27:58 +02:00
Milos Kozak
72f3efc39a
disable danarv2 temporary
2017-05-10 21:58:46 +02:00
Milos Kozak
51d52f6b3d
Merge branch 'DanaRv2' into history
2017-05-10 21:53:31 +02:00
Milos Kozak
15127dc4c6
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-05-10 21:37:42 +02:00
Milos Kozak
878e3e0921
use SP
2017-05-10 21:37:34 +02:00
AdrianLxM
201d2df16b
cleanup imports
2017-05-10 16:37:11 +02:00
AdrianLxM
b247b81428
use helper class to query settings
2017-05-10 16:33:41 +02:00
Milos Kozak
5b25d28f42
Merge branch 'dev' into DanaRv2
2017-05-10 14:05:43 +02:00
Milos Kozak
23fd6a6c44
overlappingintervals
2017-05-10 14:00:46 +02:00
AdrianLxM
fc85deb62d
move evaluation of always_use_shortavg setting to the OAPS plugins
...
For the overview and the watch we still may use the standard delta, even if this setting is enabled. (Also good to check that it is the same as in xDrip e.g.)
2017-05-10 01:18:27 +02:00
AdrianLxM
298d7a7d9c
Merge branch 'dev' into xdripstatusline
2017-05-09 23:26:31 +02:00
AdrianLxM
1fa3a2a697
bgi on watch status (optional)
2017-05-09 23:23:37 +02:00
Milos Kozak
a03b5be189
v 1.43
2017-05-09 21:34:00 +02:00
Milos Kozak
77181f6f7f
Handle exceptions in StatusLinePlugin
2017-05-09 21:32:24 +02:00
Milos Kozak
cd16b71759
upload OpenAPS Offline
2017-05-09 21:29:08 +02:00
Milos Kozak
d313df0d19
removing treatments
2017-05-09 20:47:02 +02:00
Milos Kozak
554fb51a75
profile layout
2017-05-09 19:06:59 +02:00
Milos Kozak
84a6554e07
smaller font size on careportal buttons
2017-05-09 18:36:13 +02:00
Milos Kozak
d781c69b94
invalidate autosens on new profile
2017-05-09 16:51:08 +02:00
Milos Kozak
09fea02ed2
Allow to disable NS upload while client is connected
2017-05-09 16:24:53 +02:00
Milos Kozak
ee16fabdfc
DanaRv2 modify 3
2017-05-09 15:53:11 +02:00
Milos Kozak
b30d79c4cb
fix conflicts
2017-05-09 10:46:04 +02:00
Milos Kozak
0048366dcf
fix conflict
2017-05-09 10:14:21 +02:00
Milos Kozak
8d3be5e958
colors on danar fragment
2017-05-08 23:19:11 +02:00
Milos Kozak
6e5d3635c8
using bolus amount from history if comm is interrupted
2017-05-08 23:13:43 +02:00
AdrianLxM
63b9a06431
Send empty status to xDrip when disabled. Send status immediately when enabling plugin.
2017-05-08 16:34:45 +02:00
AdrianLxM
da0334eb19
xdrip statusline reformat
2017-05-08 16:23:59 +02:00
AdrianLxM
67f21537ea
send status to xDrip
2017-05-06 15:18:19 +02:00
Milos Kozak
14a56842ee
allow to change x axis scale
2017-05-04 23:51:04 +02:00
Milos Kozak
05d9f16031
hide label too
2017-05-04 23:22:16 +02:00
Milos Kozak
bd0ff991dd
remember graph settings fix
2017-05-04 21:33:26 +02:00
Milos Kozak
344144d88a
pump status equal size
2017-05-04 21:11:51 +02:00
Milos Kozak
645bcdbb8a
deviations < 2 as equal
2017-05-04 21:09:17 +02:00
Milos Kozak
db5dcc0064
different color for carbs deviations
2017-05-04 20:40:43 +02:00
Milos Kozak
aabcee8ea7
fix conflicts
2017-05-04 19:53:45 +02:00
Milos Kozak
352a2a7475
deviations graph
2017-05-04 19:51:58 +02:00
Milos Kozak
070867af28
menu on top
2017-05-04 19:13:56 +02:00
Milos Kozak
a83ff12ca8
remove unneeded code
2017-05-04 16:30:01 +02:00
Milos Kozak
d145ef907f
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-05-04 15:25:48 +02:00
Milos Kozak
194fd7f0a6
check for null
2017-05-04 15:25:41 +02:00
Milos Kozak
289ad394ce
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-05-03 22:30:12 +02:00
Milos Kozak
6d5f2514d0
remove duplicated string
2017-05-03 18:45:29 +02:00
Milos Kozak
10d5b914f3
check for finished activity
2017-05-03 18:37:00 +02:00
Milos Kozak
573256d7d4
catch missing sms permission
2017-05-03 18:30:18 +02:00
Milos Kozak
37edc19509
check for null
2017-05-03 18:23:33 +02:00
Milos Kozak
037bb09d23
check for null
2017-05-03 18:15:10 +02:00
Milos Kozak
c30977bfd8
Merge pull request #230 from AdrianLxM/adridev3
...
typo insuin->insulin
2017-05-03 08:31:04 +02:00
Milos Kozak
b80c382512
fix exception in sms comm
2017-05-02 22:49:17 +02:00
Milos Kozak
602310b70a
DanaRv2 1st rev
2017-05-02 17:02:30 +02:00
AdrianLxM
9cef4c5a01
typo insuin->insulin
2017-05-01 18:09:53 +02:00
Milos Kozak
1b69771893
report autosens to NS
2017-05-01 14:28:45 +02:00
Milos Kozak
34f83e6b09
fix null pointer exception
2017-05-01 09:18:10 +02:00
Milos Kozak
2fabee85b4
Merge pull request #229 from AdrianLxM/adridev3
...
adaptions to small screen
2017-04-30 22:20:21 +02:00
AdrianLxM
0069f320f8
config builder smallscreen
2017-04-30 21:57:55 +02:00
Milos Kozak
c44ea83165
1.42 bump
2017-04-30 21:36:47 +02:00
AdrianLxM
5dc07012d2
overview smallscreen
2017-04-30 21:34:30 +02:00
Milos Kozak
9ff714ea2d
try to fix cob graph
2017-04-30 21:27:40 +02:00
Milos Kozak
0f1c2bb193
DanaRv2 1st rev
2017-04-30 21:08:00 +02:00
AdrianLxM
01fe3cacc1
Making dialogs scrollable
2017-04-30 20:57:07 +02:00
AdrianLxM
d8fb53de69
Making dialogs scrollable
2017-04-30 20:54:35 +02:00
Milos Kozak
3279c297dc
equal weight
2017-04-30 13:22:16 +02:00
Milos Kozak
2cb6e275c0
allign design of status pills
2017-04-30 13:17:59 +02:00
Milos Kozak
1abdadceca
ver 1.41
2017-04-30 10:24:09 +02:00
Milos Kozak
76993e17e5
handle calculation properly when historical data changed
2017-04-30 10:23:26 +02:00
Milos Kozak
4dd9281276
remove actionbar
2017-04-29 20:16:50 +02:00
Milos Kozak
974e5e0098
pump fragment redesign
2017-04-29 18:11:15 +02:00
Milos Kozak
f641d40722
virtual pump layout
2017-04-29 17:48:45 +02:00
Milos Kozak
66d011665d
configbuilder UI improvement
2017-04-29 16:59:44 +02:00
Milos Kozak
686d6635d3
remove unused code
2017-04-29 15:27:24 +02:00
Milos Kozak
3add216584
more work on autosens
2017-04-29 09:04:25 +02:00
Milos Kozak
5fe3c50171
copy paste bug
2017-04-28 08:27:05 +02:00
Milos Kozak
3552d6aa40
bg value colored
2017-04-27 21:26:53 +02:00
Milos Kozak
0aad00808c
fix temp basal iob calculation
2017-04-27 20:22:04 +02:00
Milos Kozak
5ef034b4fc
cob display
2017-04-26 23:45:40 +02:00
Milos Kozak
638f6bc291
IobCobCalculationPlugin
2017-04-25 16:37:27 +02:00
Milos Kozak
0232229020
fix history iob calculation
2017-04-25 10:48:30 +02:00
warstar2187
dac969b381
Update strings.xml
2017-04-25 10:14:06 +09:00
Milos Kozak
5a3eb0cc25
refresh on context menu
2017-04-24 22:17:45 +02:00
Milos Kozak
7d328f0676
do not trigger refresh too many times
2017-04-24 21:15:27 +02:00
Milos Kozak
7534f54f19
trend in wizard off by default
2017-04-24 19:24:53 +02:00
Milos Kozak
935a9366d9
fix cob in wizard
2017-04-24 17:46:20 +02:00
Milos Kozak
a20e49669a
fix graph library bug
2017-04-24 16:04:31 +02:00
Milos Kozak
0942ffe0fa
fix iob rendering 2
2017-04-24 14:18:54 +02:00
Milos Kozak
80305aae3a
fix iob rendering
2017-04-24 13:24:16 +02:00
Milos Kozak
a07a8755b1
IOB graph
2017-04-24 13:17:14 +02:00
Milos Kozak
1a474f7983
grid gray
2017-04-23 21:14:42 +02:00
Milos Kozak
b8a8bed6c5
remove butterknife at all, remove unused code, overview graph optimalization
2017-04-23 13:45:49 +02:00
Milos Kozak
66c05d8a08
remove butterknife from overview
2017-04-23 10:55:07 +02:00
Milos Kozak
2ce08260bf
do not calculate autosens when no bg data available
2017-04-23 09:47:27 +02:00
Milos Kozak
1a76809f33
more checking for null
2017-04-22 11:27:56 +02:00
Milos Kozak
1f2967e866
superbolus must be explicitly enabled
2017-04-22 11:08:57 +02:00
Milos Kozak
3b34e55fda
CS translations
2017-04-22 10:21:24 +02:00
Milos Kozak
c18fcfda62
revert sdk to 23
2017-04-22 10:18:31 +02:00
Milos Kozak
20f99dffe2
basals rendering redesign
2017-04-22 10:09:54 +02:00
Milos Kozak
a8146da8a8
target range with background color
2017-04-21 23:06:54 +02:00
Milos Kozak
2077b5e081
android support library bug workaround
2017-04-21 18:56:48 +02:00
Milos Kozak
55a2df470e
insulin activity graph
2017-04-21 18:34:40 +02:00
Milos Kozak
7f122f7497
show dia in insulin plugin
2017-04-21 16:13:53 +02:00
Milos Kozak
90a55966b1
Fast Acting Insulin Prolonged
2017-04-21 15:36:49 +02:00
Milos Kozak
17771434aa
upgrade travis & plugin packages
2017-04-21 12:15:08 +02:00
Milos Kozak
51439bbf33
upgrade libraries
2017-04-21 12:03:54 +02:00
Milos Kozak
25491fbac6
Insulin interface
2017-04-21 11:45:25 +02:00
Milos Kozak
04ae55ac63
exit app after import settings
2017-04-16 13:27:01 +02:00
Milos Kozak
781aa6e657
check for null
2017-04-14 16:10:20 +02:00
Milos Kozak
7aa2aa4d24
give some time to service to start in UploadQueue
2017-04-14 16:00:21 +02:00
Milos Kozak
a5d10708e6
check for null in calibration dialog
2017-04-14 15:54:07 +02:00
Milos Kozak
402768cb87
1.33 app start logging optional
2017-04-14 15:33:39 +02:00
Milos Kozak
2413fae0a9
1.32 superbolus & trend contribution in wizard
2017-04-14 14:50:18 +02:00
Milos Kozak
6e90b425f7
ver 1.31 bump
2017-04-09 21:50:53 +02:00
Milos Kozak
3b5ba29489
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-04-09 21:50:11 +02:00
Milos Kozak
387defbfc7
fix sms pref key
2017-04-09 21:50:05 +02:00
Milos Kozak
a203591d44
ver 1.3 bump
2017-04-09 11:47:20 +02:00
Milos Kozak
d41d5f9e6b
loop context menu fix
2017-04-08 20:13:30 +02:00
Radoslav Radev
5fe22eac65
Update strings.xml
2017-04-07 13:53:47 +03:00
Milos Kozak
c5245ae5fd
SMS suspend/resume loop
2017-04-06 21:22:27 +02:00
Milos Kozak
a02da220c9
CS translations
2017-04-05 22:04:55 +02:00
Milos Kozak
f596050239
loop suspend menu
2017-04-05 21:39:39 +02:00
Milos Kozak
42883a81a0
allow return GlucoseStatus with only 1 actual value
2017-04-04 10:29:46 +02:00
Milos Kozak
e5012d8633
Answers for SMS commands
2017-04-04 10:03:15 +02:00
Milos Kozak
5f0de38dfe
1.3rc2
2017-04-01 12:47:18 +02:00
Milos Kozak
d6f31820d9
request battery optimalization whitelisting
2017-03-31 09:21:40 +02:00
Milos Kozak
0cb4ace052
glimp broadcast to manifest
2017-03-28 22:49:56 +02:00
Milos Kozak
fe6ff686b1
fix pump suspended message
2017-03-27 18:37:43 +02:00
Milos Kozak
dc45d01120
changle loading initial status
2017-03-24 23:03:55 +01:00
Milos Kozak
b6016dc084
objective 0 zero days duration
2017-03-24 12:31:28 +01:00
Milos Kozak
c78adb6256
suspended status for korean pump
2017-03-24 12:22:36 +01:00
Milos Kozak
a4f302ee4a
show if pump is suspended
2017-03-24 12:05:12 +01:00
Milos Kozak
32fda0f0df
fix upload virtual pump status
2017-03-23 10:48:49 +01:00
Milos Kozak
8b357ac49e
fix null pointer exception
2017-03-23 10:12:36 +01:00
Milos Kozak
a5b59d5092
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-03-23 10:09:55 +01:00
Milos Kozak
e8edf9eb54
Glimp support
2017-03-21 19:11:39 +01:00
Milos Kozak
f528f1cd83
fix reading glimp bg data
2017-03-18 23:35:43 +01:00
Milos Kozak
7f4db28c41
add sound
2017-03-10 10:42:12 +01:00
Milos Kozak
48d30f2da3
toast out of memory
2017-03-09 22:24:57 +01:00
Milos Kozak
86a7699d8f
copy/paste mistake
2017-03-09 16:34:08 +01:00
Milos Kozak
aa46479cdb
unneeded else
2017-03-09 11:00:29 +01:00
Milos Kozak
96427cf3dc
use onAttach for context in CalibrationDialog
2017-03-09 10:59:11 +01:00
Milos Kozak
7c6d708d06
use onAttach for context in WizardDialog
2017-03-09 10:57:20 +01:00
Milos Kozak
aa8fa729ad
update fabric
2017-03-09 10:25:13 +01:00
Milos Kozak
2c2d837079
fix null pointer exception
2017-03-09 10:20:38 +01:00
Milos Kozak
79ef93a839
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-03-09 09:57:32 +01:00
Milos Kozak
52aa7c1bf8
fix null pointer exception
2017-03-09 09:57:24 +01:00
warstar2187
242428e2cb
Update strings.xml
2017-03-09 04:20:40 +09:00
Milos Kozak
151baa2fb5
enable nsclient internal by default
2017-03-07 11:07:56 +01:00
Milos Kozak
02b90fa6c7
update gradle to 2.3
2017-03-07 10:52:25 +01:00
Milos Kozak
be26db356d
another fix
2017-03-06 18:53:43 +01:00
Milos Kozak
af8e485250
log SafeParse
2017-03-05 20:12:30 +01:00
Milos Kozak
ccca820a95
Merge pull request #205 from slavidex/patch-32
...
Update strings.xml
2017-03-05 15:22:32 +01:00
Milos Kozak
9843f139ad
fixed bugs in autosens
2017-03-05 15:22:35 +01:00
Radoslav Radev
3b129dc7f6
Update strings.xml
2017-03-05 15:58:37 +02:00
Radoslav Radev
a0f2e4f663
Update strings.xml
2017-03-05 15:42:01 +02:00
Radoslav Radev
54f376330a
Update strings.xml
2017-03-05 15:28:20 +02:00
Milos Kozak
9e05c86284
Log hours in sensitivity
2017-03-05 12:12:28 +01:00
Milos Kozak
de9dbf9243
CS translations
2017-03-04 20:55:13 +01:00
Milos Kozak
2af1ab6ac4
more Answers to user actions
2017-03-03 21:12:59 +01:00
Milos Kozak
ebf4697150
log app start
2017-03-02 23:25:55 +01:00
Milos Kozak
79d282d215
add answers
2017-03-02 23:08:40 +01:00
Milos Kozak
c79ccf7ccb
update crashlytics
2017-03-02 23:02:07 +01:00
Milos Kozak
5a45bd3751
remove sample data
2017-03-02 21:17:24 +01:00
Milos Kozak
8c8af1755b
1.3rc1
2017-03-02 21:14:08 +01:00
Milos Kozak
3d521eb75c
nsclient: try to send data immediately
2017-03-02 20:59:18 +01:00
Milos Kozak
d841ff5098
prevent null pointer exception
2017-03-02 20:40:09 +01:00
Milos Kozak
73fbac1bae
fix crash
2017-03-02 20:33:46 +01:00
Milos Kozak
6ecaad7d69
make sure service is running
2017-03-02 20:19:35 +01:00
Milos Kozak
d4070cf99a
check for null
2017-03-01 19:14:42 +01:00
Milos Kozak
9e03087a77
nsclient tweaking
2017-02-28 14:36:44 +01:00
Milos Kozak
2fceb0b891
1.1h
2017-02-25 20:59:46 +01:00
Milos Kozak
a9d8f3f806
queue in db
2017-02-24 13:02:44 +01:00
Milos Kozak
e25fb9845d
hide unneeded labels in nsclient mode
2017-02-23 23:32:26 +01:00
Milos Kozak
ade45d5b4c
hide unlock button if not needed
2017-02-23 23:13:38 +01:00
Milos Kozak
b0c828c93e
nsclient build variant
2017-02-23 20:00:33 +01:00
Milos Kozak
15d6de4701
age from product flavor to prefs
2017-02-22 20:29:41 +01:00
Milos Kozak
d9225ccc8a
fix null object reference
2017-02-22 15:23:16 +01:00
Milos Kozak
87ad140eb5
SMS logging and resource refactor
2017-02-22 14:11:05 +01:00
Milos Kozak
666874c6c4
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-02-22 13:54:50 +01:00
Milos Kozak
efc1988374
uploader battery fix
2017-02-21 14:12:28 +01:00
Milos Kozak
4b6276c0b1
uploader battery always in json
2017-02-21 13:45:33 +01:00
Milos Kozak
2e0f6e8914
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-02-21 13:33:59 +01:00
Milos Kozak
a508b0bbc5
do not postpone status upload
2017-02-21 13:33:52 +01:00
Milos Kozak
615af399f8
remove ping me
2017-02-21 11:17:46 +01:00
Milos Kozak
99b66ab393
connect counter
2017-02-21 10:36:29 +01:00
Milos Kozak
3f84a63213
add delta sign
2017-02-21 10:00:44 +01:00
Milos Kozak
34ed92f8aa
fix displaying delta when not available
2017-02-21 10:00:08 +01:00
AdrianLxM
98edfc57e0
dismiss bolus progress via events
2017-02-20 14:49:38 +01:00
AdrianLxM
686e16de8d
scrollview match parent in width
2017-02-20 13:31:47 +01:00
AdrianLxM
1f464bdae0
Merge remote-tracking branch 'milosremote/dev' into adridev
2017-02-20 13:11:35 +01:00
AdrianLxM
18e2dcffcf
make things scrollable
2017-02-20 13:10:07 +01:00
Milos Kozak
6200584268
hours to fetch fixed
2017-02-20 09:46:55 +01:00
Milos Kozak
352902438c
Merge branch 'nsclient' of https://github.com/MilosKozak/AndroidAPS into nsclient
2017-02-20 08:32:25 +01:00
Milos Kozak
d84632a8a4
uploader battery in device status
2017-02-20 08:32:10 +01:00
Milos Kozak
9ea19fff9b
detect last received date
2017-02-19 23:41:42 +01:00
Milos Kozak
3b1b732d8f
nclient log collection
2017-02-19 20:56:12 +01:00
Milos Kozak
c9a6a44e4b
adjust upload timing
2017-02-19 20:48:10 +01:00
Milos Kozak
d030427b0f
adjust devicestatus upload
2017-02-19 20:41:20 +01:00
Milos Kozak
5f4eb1e4c4
pump status tweaking
2017-02-19 19:15:14 +01:00
Milos Kozak
de124b8e3e
Merge branch 'nsclient' of https://github.com/MilosKozak/AndroidAPS into nsclient
2017-02-19 09:42:28 +01:00
Milos Kozak
9303bd61fd
Merge branch 'dev' into nsclient
2017-02-19 09:41:16 +01:00
Milos Kozak
a2eb76a8b8
handle if bolus progress is not sent
2017-02-19 00:06:29 +01:00
Milos Kozak
e0a9a7ae81
fix carbs logging in driver
2017-02-18 23:12:45 +01:00
AdrianLxM
abaafb87eb
wear show on status when loop is disabled
2017-02-18 18:52:09 +01:00
AdrianLxM
d113d39916
wear setting to show detailed IOB
2017-02-18 18:13:13 +01:00
Milos Kozak
2e15c8b138
add permissions to manifest
2017-02-18 10:41:42 +01:00
Milos Kozak
5d795fbe33
Merge branch 'dev' into nsclient
2017-02-17 22:26:02 +01:00
Milos Kozak
29b4f0063b
better handling readonly permission
2017-02-17 22:12:35 +01:00
Milos Kozak
f33ccf278b
dbupdate/remove, saving queue
2017-02-17 21:24:30 +01:00
Milos Kozak
14e37246c2
nsclient gui and pausing tweaking
2017-02-17 18:14:33 +01:00
Milos Kozak
31364ff07b
ignore dbaccess if nsclient not enabled
2017-02-17 16:41:28 +01:00
Milos Kozak
8a374f1b35
Shared preferences cleanup
2017-02-17 16:16:20 +01:00
Milos Kozak
3216ff636a
preference keys to strings
2017-02-17 13:43:17 +01:00
Milos Kozak
71112a90e2
internal nsclient
2017-02-17 13:18:36 +01:00
Radoslav Radev
09880f029a
Update strings.xml
2017-02-16 16:46:47 +02:00
LadyViktoria
92cd31a0b6
fix key for openapsama_current_basal_safety_multiplier
2017-02-15 14:42:59 +01:00
LadyViktoria
16555347e8
fix key for openapsama_current_basal_safety_multiplier
2017-02-15 13:21:38 +01:00
Milos Kozak
1a3d3eb97c
1.1g
2017-02-14 21:41:39 +01:00
Milos Kozak
dda95dc275
allow to remove treatments from GUI
2017-02-14 21:13:13 +01:00
Milos Kozak
a75c62be35
show notification when aproaching daily limit
2017-02-14 19:47:45 +01:00
Milos Kozak
2e4aec9916
settings password protected
2017-02-14 19:16:34 +01:00
Milos Kozak
5992413cf9
disable quickwizard with if bg is old
2017-02-14 15:50:24 +01:00
Milos Kozak
8001796f4b
virtual pump status upload optional
2017-02-14 15:41:30 +01:00
Milos Kozak
e00045155e
prefill bg value in careportal dialog
2017-02-14 15:09:22 +01:00
Milos Kozak
ac82e2b044
1.1f
2017-02-13 21:06:20 +01:00
Milos Kozak
f9ee3c547a
translations
2017-02-13 21:05:57 +01:00
Milos Kozak
e3edf5cce5
calculate cob 1.5 * DIA to the past
2017-02-13 19:35:01 +01:00
Milos Kozak
c6b3fe9883
Merge pull request #178 from AdrianLxM/wear-bolus5
...
Wear Bolus
2017-02-13 18:13:36 +01:00
Milos Kozak
c31795d2e6
adjust devicestatus upload timings
2017-02-13 17:47:58 +01:00
AdrianLxM
05d40e4af0
wear better toasts
2017-02-13 14:18:23 +01:00
AdrianLxM
665f662f3a
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into pumpstatus2
2017-02-13 02:18:32 +01:00
AdrianLxM
5ce9d257e8
pump shortStatus String in interface
2017-02-13 02:18:25 +01:00
AdrianLxM
e85e651c56
wear full status support and product flavour with/without controls on wear
2017-02-13 01:55:35 +01:00
AdrianLxM
6fcee9ea3f
pump shortStatus String in interface
2017-02-13 00:15:02 +01:00
Milos Kozak
e003ef8368
Merge pull request #175 from LadyViktoria/dev
...
use validation lib in cpp - layout fixes & longer snackbar duration
2017-02-12 22:29:20 +01:00
Milos Kozak
f6ae267bb5
CS translations
2017-02-12 22:28:42 +01:00
Milos Kozak
1f3aee091e
manual invoke of loop in separate thread
2017-02-12 22:02:42 +01:00
viktoria
ba254f8829
Merged branch dev into dev
2017-02-12 20:01:25 +01:00
viktoria
0d02f42714
use validation lib in cpp - layout fixes & longer snackbar duration
2017-02-12 19:51:56 +01:00
Milos Kozak
4e3cc65d5d
handling pump suspend, show pump actions on overview
2017-02-12 19:51:13 +01:00
AdrianLxM
c0b287ba00
wear target statusO
2017-02-12 17:32:53 +01:00
Milos Kozak
351a624b83
small string change
2017-02-12 13:48:03 +01:00
Milos Kozak
dc85bc26fc
typo
2017-02-12 13:45:08 +01:00
AdrianLxM
5e96124a2d
mmol/l fix
2017-02-11 22:27:04 +01:00
AdrianLxM
2e6d754c86
mmol/l fix
2017-02-11 22:26:16 +01:00
AdrianLxM
1f5dd4750a
CPP dismiss info when focus is lost
2017-02-11 22:20:29 +01:00
AdrianLxM
6c5028b4be
CPP dismiss info when focus is lost
2017-02-11 22:18:28 +01:00
AdrianLxM
104c146b2f
Merge pull request #63 from AdrianLxM/patch-16
...
LadyViktoria validation lib plus safety
2017-02-11 21:12:22 +01:00
AdrianLxM
e4c529fa1f
reenable safety function
2017-02-11 19:59:20 +01:00
AdrianLxM
d9103b6823
wear wizard confirm reformat, connection stability, prime not in menu per default
2017-02-11 19:51:33 +01:00
AdrianLxM
6cb192b876
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into wear-bolus5
2017-02-11 18:09:22 +01:00
AdrianLxM
b57253af5e
wear add carbs to bolus-wizard confirmation
2017-02-11 17:54:47 +01:00
viktoria
06ee59b42c
Merge remote-tracking branch 'refs/remotes/MilosKozak/dev'
...
Conflicts:
app/build.gradle
2017-02-11 16:06:37 +01:00
Milos Kozak
e1341e79bf
Merge pull request #161 from warstar2187/master
...
Fix ExtendedBolusStep
2017-02-11 16:03:31 +01:00
viktoria
56f15a3cf7
Deprecation DataBaseHelper - use Long for .limit
2017-02-11 14:33:22 +01:00
Milos Kozak
c5081c378b
Merge pull request #169 from LadyViktoria/wip-deprecation-danarStats
...
Deprecation DanaR Stats
2017-02-11 14:23:45 +01:00
viktoria
0ffddcdefa
Deprecation TimeListEdit - add design support libraries
2017-02-11 14:01:37 +01:00
viktoria
a4591af392
Deprecation colors
2017-02-11 14:00:44 +01:00
viktoria
1217c22b43
Deprecation DanaR Stats
2017-02-11 13:44:43 +01:00
AdrianLxM
5ea7913a41
wear actionstringhandler use correct actualBG()
2017-02-11 02:58:22 +01:00
AdrianLxM
638b9c263c
Merge pull request #61 from MilosKozak/dev
...
Dev
2017-02-11 02:55:14 +01:00
viktoria
580a296177
use validation lib in cpp - small changes
2017-02-11 00:47:14 +01:00
AdrianLxM
9dae8b4e56
wear don't enact 0carbs/0bolus on wizard result
2017-02-11 00:32:45 +01:00
viktoria
7877235972
Merged branch dev into dev
2017-02-11 00:16:55 +01:00
viktoria
279c67bb70
use validation lib in cpp - add snackbar
2017-02-11 00:16:25 +01:00
Milos Kozak
1e4fa1b93e
fix not enacting extended
2017-02-10 21:45:46 +01:00
Milos Kozak
40d166cb7d
CS translations
2017-02-10 21:39:51 +01:00
Milos Kozak
2e40c7b605
sms calibrations
2017-02-10 21:20:55 +01:00
LadyViktoria
49e08f3357
use validation lib in cpp - add counter
2017-02-10 18:00:10 +01:00
LadyViktoria
e0627bd815
use validation lib in cpp - add a timer
2017-02-10 17:39:09 +01:00
LadyViktoria
48a158b036
use validation lib in cpp - better event handling
2017-02-10 17:29:59 +01:00
Milos Kozak
83667be8cc
extract sending intent to a function
2017-02-10 17:25:32 +01:00
Milos Kozak
8db3f258cd
xdrip calibration
2017-02-10 16:53:39 +01:00
LadyViktoria
11d0f1aebf
better keyboard handling in fragments
2017-02-10 14:24:56 +01:00
warstar2187
9458e0effa
Update DanaRKoreanPlugin.java
2017-02-10 20:59:44 +09:00
warstar2187
61f1acdcb0
Update DanaRPlugin.java
2017-02-10 20:59:06 +09:00
AdrianLxM
384e36a1f3
wear remove bolus enaction for testing
2017-02-10 12:52:54 +01:00
LadyViktoria
80de9c0cd8
use validation lib in cpp
2017-02-10 11:34:05 +01:00
LadyViktoria
4857259eda
ko translation
2017-02-10 07:59:26 +01:00
AdrianLxM
4220d7712a
wear wizard working
2017-02-10 06:07:31 +01:00
AdrianLxM
9785d507a8
wear temp targets working
2017-02-10 02:36:38 +01:00
AdrianLxM
8ece312b6a
Merge pull request #60 from MilosKozak/dev
...
Dev
2017-02-09 23:47:12 +01:00
AdrianLxM
aff82642af
wear multiple watch situation and disable fillbolus for wider testing
2017-02-09 23:39:23 +01:00
Milos Kozak
715d15b51f
CS translations
2017-02-09 22:44:42 +01:00
Milos Kozak
90061c6f25
Show log
2017-02-09 22:29:21 +01:00
AdrianLxM
3ff41af939
wear bolus activity and refactoring
2017-02-09 20:54:41 +01:00
Milos Kozak
ed7dd48612
remove TODOs
2017-02-09 20:18:22 +01:00
AdrianLxM
dc476a6600
wear menu restructuring and status
2017-02-09 17:40:26 +01:00
Milos Kozak
9d7ac0ce81
1.1e
2017-02-09 17:17:40 +01:00
Milos Kozak
8a2846c516
Merge branch 'dev' into dev
2017-02-09 17:01:05 +01:00
Milos Kozak
9e9637d70b
accept temp button visible only if loop selected
2017-02-09 16:51:14 +01:00
Milos Kozak
3aff89acdc
fix not attached to activity in bolus progress dialog
2017-02-09 16:45:54 +01:00
Milos Kozak
806cc4a3a7
fix nullpointerexception in reading temp basal status
2017-02-09 16:43:27 +01:00
Milos Kozak
a39416d876
fix nullpointerexception in reading temp basal status
2017-02-09 16:39:07 +01:00
Milos Kozak
caa109dbfd
use SafeParse in DanaRStartsActivity
2017-02-09 16:32:44 +01:00
Milos Kozak
b9b08c1528
fix crash when pump status not loaded yet
2017-02-09 16:29:02 +01:00
Milos Kozak
3d3e849d8a
fix null pointer exception in persistentnotification
2017-02-09 16:23:28 +01:00
AdrianLxM
b8c3fe2933
wear wizard including bg and iob toggles
2017-02-09 16:16:31 +01:00
Milos Kozak
7f123e4208
warn on wrong entered sms phone number
2017-02-09 16:14:09 +01:00
Milos Kozak
c015862239
fix crash: not attached to Activity
2017-02-09 16:04:57 +01:00
LadyViktoria
7fc6de17c1
Add prefernces.json changes 2
2017-02-09 10:41:02 +01:00
LadyViktoria
886c1ea359
Add prefernces.json changes
2017-02-09 09:36:51 +01:00
AdrianLxM
bf7a96b3e7
bolus progress dialog without activity context
2017-02-09 03:15:13 +01:00
AdrianLxM
74107f58fe
wear first fill bolus working
2017-02-09 01:53:28 +01:00
viktoria
0bf51710d1
Merged branch dev into dev
2017-02-08 21:23:47 +01:00
Milos Kozak
698ab31d71
show temp targets only if APS enabled in config
2017-02-08 21:04:26 +01:00
Milos Kozak
a43677e4b0
fix pumpcontrol build crash
2017-02-08 20:36:30 +01:00
AdrianLxM
d2d0d4b51a
wear confirm roundtrip working
2017-02-08 15:15:22 +01:00
AdrianLxM
8e9d73e3a3
wear sending confirmation requests
2017-02-08 11:53:26 +01:00
AdrianLxM
20d32d042f
wear bolusprogress cleanup
2017-02-07 12:08:13 +01:00
AdrianLxM
e261fa3ec8
wear re-disable fill bolus for virtual pump
2017-02-07 12:02:02 +01:00
AdrianLxM
650111d1b7
wear event for bolus requests to show card early on
2017-02-07 11:09:16 +01:00
AdrianLxM
f4b553fe52
Wear added bolusprogress and dismiss when finished
2017-02-07 09:17:19 +01:00
AdrianLxM
8c37809751
Wear cancel bolus via content intent to progress card
2017-02-06 19:35:27 +01:00
AdrianLxM
7ec3ff2a17
Wear bolus progress as card
2017-02-06 16:52:39 +01:00
AdrianLxM
379e3f8ab1
rounding minutesago instead of truncating it
2017-02-05 02:18:13 +01:00
viktoria
b0a9d74b49
Merge remote-tracking branch 'refs/remotes/MilosKozak/dev'
...
Conflicts:
app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/Autosens.java
app/src/main/res/values/strings.xml
2017-02-02 19:00:17 +01:00
AdrianLxM
bd75015a58
Correct error for tempbasals
2017-02-01 14:38:55 +01:00
LadyViktoria
1f3b425c44
Remove careportal_temptarget string
2017-01-31 20:28:32 +01:00
Milos Kozak
78fb6f934e
measure execution time of every part
2017-01-31 09:52:33 +01:00
Milos Kozak
1b2500dc6c
calculate only needed data in AMA
2017-01-31 09:40:05 +01:00
Milos Kozak
9722130299
move all treatments db actions to DatabaseHelper
2017-01-30 20:00:46 +01:00
Milos Kozak
8d0c1dcacf
do not calculate autosens for MA
2017-01-30 15:19:50 +01:00
Milos Kozak
90924e607f
1.1d
2017-01-30 14:36:04 +01:00
Milos Kozak
d98c6b125e
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-01-30 14:31:15 +01:00
Milos Kozak
607ac8b897
AMA execution time
2017-01-30 14:30:46 +01:00
AdrianLxM
dce0c378b9
round durations
2017-01-30 05:02:49 +01:00
AdrianLxM
9f74b0083b
Add minutesrunning in determine-basal Adapter
2017-01-30 04:25:03 +01:00
AdrianLxM
3d6be15306
update determine-basal.js to current Oref0 dev
2017-01-30 04:23:18 +01:00
Milos Kozak
179511a833
fix conflicts
2017-01-29 22:41:01 +01:00
Milos Kozak
907de4da7b
execution profiler
2017-01-29 22:37:25 +01:00
Milos Kozak
762b561abb
CS translations
2017-01-29 21:15:05 +01:00
Milos Kozak
d6a22be184
remove absorption rate from everywhere
2017-01-29 20:19:02 +01:00
Milos Kozak
4e14865054
remove unneeded carbs_hr from AMA
2017-01-29 19:29:26 +01:00
Milos Kozak
331598b7fa
display danar profile preferences only if selected
2017-01-29 19:22:49 +01:00
Milos Kozak
e608bf4095
fix profile test in keep alive & korean driver switching
2017-01-29 19:17:28 +01:00
Milos Kozak
3a17ed19c4
prevent null pointer exception
2017-01-29 18:48:42 +01:00
viktoria
75ff6867bc
Add prefernces.json make settings work with validator lib
2017-01-29 13:00:52 +01:00
viktoria
7d68b50a56
Add prefernces.json validator lib
2017-01-29 13:00:21 +01:00
Milos Kozak
ed29302547
status outdated first
2017-01-29 11:24:11 +01:00
Milos Kozak
c48e147a68
remove forgotten code
2017-01-29 11:21:15 +01:00
Milos Kozak
55f99ee28e
connect when outdated basal
2017-01-29 11:11:07 +01:00
Milos Kozak
3f90ad6a5c
sync profile to pump
2017-01-28 23:45:14 +01:00
viktoria
c64d45b758
Merged MilosKozak/dev into dev
...
Conflicts:
app/src/main/res/values/strings.xml
2017-01-28 22:35:54 +01:00
Milos Kozak
b9b9e21dcb
fix merge conflicts
2017-01-28 21:37:51 +01:00
Milos Kozak
926a26a724
the same for korean danar
2017-01-28 21:17:27 +01:00
Milos Kozak
538e8fd2fa
better detect & display old pump firmware
2017-01-28 20:48:32 +01:00
AdrianLxM
4ced11819c
fix autosens
...
bgi's most of the time where 0 or got truncated to full integers.
Example from tonight: autosens result factor from 1.0 before and 1.09 after this.
2017-01-28 01:20:36 +01:00
LadyViktoria
4d4630ca1a
Add prefernces.json rename some Strings to match OpenAPS docs
2017-01-27 09:56:32 +01:00
LadyViktoria
f510b0a8cc
Add prefernces.json errer message translations
...
attention the characters are limited.
maybe its caused by old libs
com.android.support:appcompat-v7:23.4.0
'com.android.support:support-v4:23.4.0
2017-01-27 09:52:16 +01:00
LadyViktoria
24e6f42ac2
Merged branch dev into dev
2017-01-27 09:11:45 +01:00
Milos Kozak
1e8defb884
Merge pull request #144 from AdrianLxM/deltasx
...
remove round-basal.js
2017-01-26 22:43:57 +01:00
viktoria
3fcf52aa02
Merged MilosKozak/dev into dev
2017-01-26 18:39:30 +01:00
Milos Kozak
08880b8032
Merge branch 'master' into dev
2017-01-26 18:31:31 +01:00
Milos Kozak
e78de8b622
fix static func
2017-01-26 18:27:09 +01:00
Milos Kozak
0c289bfb6e
Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS
2017-01-26 18:23:47 +01:00
Milos Kozak
87ba28136a
log new firmware pump
2017-01-26 18:23:30 +01:00
Milos Kozak
72fc4ec096
Merge branch 'master' into dev
2017-01-26 17:00:10 +01:00
Milos Kozak
750cea7bcf
Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS
2017-01-26 16:57:11 +01:00
Milos Kozak
5c5468b55b
use minimal basal rate from description
2017-01-26 16:56:29 +01:00
LadyViktoria
1d2f98abf4
Add prefernces.json remove openapsama_skip_neutral_temps
2017-01-26 15:32:44 +01:00
LadyViktoria
0ddc26ce89
Add prefernces.json small import fixes
2017-01-26 12:10:50 +01:00
LadyViktoria
4702a87d8e
Add prefernces.json add safety limits
2017-01-26 12:07:25 +01:00
viktoria
2f8b2a382d
Merged branch dev into dev
2017-01-26 00:39:28 +01:00
viktoria
74cfa08b81
Change some Prefernces names to match names in OpenAPS docs
2017-01-26 00:35:46 +01:00
Heiner1
5c43c66163
Update strings.xml
2017-01-25 23:35:31 +01:00
viktoria
88d6178a1b
Add prefernces.json small fix
2017-01-25 22:20:56 +01:00
viktoria
9d2b645d8c
Add prefernces.json default values
2017-01-25 22:11:17 +01:00
viktoria
fd6432f808
Add prefernces.json put hyperlink and warning there
2017-01-25 20:41:33 +01:00
viktoria
8e095fefaf
Add prefernces.json layout changes
2017-01-25 20:20:39 +01:00
viktoria
0838ede6a3
Add prefernces.json change secondary text color to white
2017-01-25 20:19:53 +01:00
viktoria
c01488e7a9
Add prefernces.json switch to SafeParse
2017-01-25 20:19:00 +01:00
LadyViktoria
2a0968eba9
Add prefences.Json show summary
2017-01-25 20:17:16 +01:00
AdrianLxM
b588211658
prevent nullpointer exception when BG <39
2017-01-25 15:37:05 +01:00
LadyViktoria
b898fc044e
Add prefernces.json to advanced settings
2017-01-25 15:18:01 +01:00
AdrianLxM
1328c32bb8
remove duplicate setTempBasal function declaration
2017-01-25 13:18:54 +01:00
AdrianLxM
9ef4f4d9ad
cleanup unused round-basal.js
2017-01-25 11:34:09 +01:00
AdrianLxM
805f23fe59
directly pass round-basal to V8
2017-01-25 10:02:35 +01:00
AdrianLxM
53c63f0f48
simplify round-basal.js
2017-01-25 09:43:54 +01:00
Milos Kozak
044547b594
Merge pull request #143 from AdrianLxM/deltasx
...
Settings for deltas
2017-01-24 10:59:10 +01:00
AdrianLxM
950b638e50
Advanced Settings
2017-01-24 10:28:42 +01:00
AdrianLxM
3a43858948
Settings for deltas
2017-01-24 02:21:25 +01:00
viktoria
bd588af1ba
DanaR Stats small Layout fixes
2017-01-23 21:52:24 +01:00
Milos Kozak
da2739f7b7
Merge pull request #140 from PitBeckh/patch-1
...
Update strings.xml
2017-01-23 20:23:30 +01:00
PitBeckh
dc12ef3fec
Update strings.xml
2017-01-23 16:26:59 +01:00
PitBeckh
2f72471915
Update strings.xml
2017-01-23 16:24:53 +01:00
Milos Kozak
5c216e5cec
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-01-23 15:56:55 +01:00
Milos Kozak
df0af4da94
fix uploading profile
2017-01-23 15:56:32 +01:00
Milos Kozak
750ac19b41
upload data for temp target only if needed
2017-01-23 14:47:14 +01:00
Milos Kozak
d62105b6c6
Merge pull request #139 from slavidex/patch-27
...
Update strings.xml
2017-01-23 12:03:47 +01:00
Radoslav Radev
fbceeec5b0
Update strings.xml
2017-01-23 11:01:42 +02:00
Milos Kozak
22f9817f8e
upload cpp setting to NS
2017-01-23 09:31:14 +01:00
Radoslav Radev
106bfe4f1c
Update strings.xml
2017-01-23 07:14:12 +02:00
Radoslav Radev
2d02449a87
Update strings.xml
2017-01-22 21:44:49 +02:00
PitBeckh
d995910384
Update strings.xml
2017-01-22 20:34:54 +01:00
Milos Kozak
ceaf4f7f78
Merge branch 'dev' into adjusttargetsse
2017-01-22 11:30:59 +01:00
ecorman
24b86a0b99
Update: Perfil->Objetivo
2017-01-22 00:07:10 +01:00
AdrianLxM
f418152059
sorten tab titles active
2017-01-21 23:48:05 +01:00
ecorman
3a2549d0b6
Update Spanish Translation
2017-01-21 23:08:23 +01:00
AdrianLxM
ea78dd5bc1
Shorten tabs first
2017-01-21 19:44:58 +01:00
Milos Kozak
404a4de916
Merge pull request #136 from AdrianLxM/adjusttargetsse
...
Preference Switches for Autosens
2017-01-21 11:22:34 +01:00
Milos Kozak
53f9b30b3e
temp target display update
2017-01-21 11:22:03 +01:00
AdrianLxM
50b7e619fc
Preference switches for Autosens
2017-01-21 01:35:15 +01:00
Milos Kozak
ea37d9eaa8
Merge pull request #131 from AdrianLxM/tempt-pill
...
Tempt pill
2017-01-21 00:11:07 +01:00
viktoria
5a09c3df70
DanaR Stats Korean react on touch elsewwhere
2017-01-20 22:43:02 +01:00
AdrianLxM
377a55c69f
DanaR Stats react on touch elsewhere
2017-01-20 20:47:31 +01:00
viktoria
33bb7d80a6
DanaR Stats small fixes and move Listeners
2017-01-20 16:45:01 +01:00
viktoria
722976f6b0
DanaR Stats beautify layout and add some listeners
2017-01-20 14:51:16 +01:00
viktoria
d2acad1942
Korean DanaR Stats some improvements
2017-01-20 03:19:17 +01:00
viktoria
2d966c9feb
DanaR Stats some improvements
2017-01-20 03:13:41 +01:00
viktoria
62853326ed
Merged branch dev into danarstats
2017-01-20 00:10:56 +01:00
AdrianLxM
3f3d519c84
Merge branch 'dev' into tempt-pill
2017-01-19 21:57:42 +01:00
AdrianLxM
992d95744d
remove duplicate code
2017-01-19 21:53:08 +01:00
AdrianLxM
88a1dcde51
remove empty language translation
2017-01-19 21:32:09 +01:00
AdrianLxM
0c11f78ed3
cleanup after merge
2017-01-19 21:15:08 +01:00
LadyViktoria
1597f74bd0
Merge branch 'dev' into danarstats
2017-01-19 20:52:01 +01:00
AdrianLxM
6c3a07cc62
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into MilosKozak-dev
2017-01-19 20:47:53 +01:00
viktoria
6120add315
Add very Hard Limits to constants
2017-01-19 20:36:19 +01:00
Milos Kozak
2754e23c08
CS translations
2017-01-19 19:52:14 +01:00
Milos Kozak
98a95fb16e
1.1c
2017-01-19 19:22:04 +01:00
Milos Kozak
c701b5d125
waiting for pump message
2017-01-19 19:21:25 +01:00
Milos Kozak
f8feaf565b
show how is value hard limited
2017-01-19 18:40:08 +01:00
Milos Kozak
649cab63fc
allow some diff on profile check
2017-01-19 18:07:16 +01:00
Milos Kozak
e808bcedee
remove logging
2017-01-19 15:17:43 +01:00
Milos Kozak
75b53cfc0d
iob calc fix
2017-01-19 14:35:16 +01:00
Milos Kozak
07c9a21ff9
autosens log
2017-01-19 13:54:56 +01:00
Milos Kozak
e8dcf73c83
remove carbsAbsorbed from debug
2017-01-18 21:45:27 +01:00
Milos Kozak
452edd5771
1.1b
2017-01-18 21:41:10 +01:00
Milos Kozak
8586ed5adb
show autosens result
2017-01-18 21:40:43 +01:00
AdrianLxM
480b832efe
temptarget zero-duration cleanup
2017-01-18 16:49:48 +01:00
AdrianLxM
b79743588d
temptarget sort and allow for zero-duration to cancel predated ones
2017-01-18 15:52:20 +01:00
Milos Kozak
ba370b3cf3
ver 1.1a
2017-01-18 08:05:46 +01:00
viktoria
b70e895b95
DanaR Stats fixes
2017-01-18 04:31:47 +01:00
viktoria
9ba24b4ffd
DanaR Stats Beautify
2017-01-18 03:08:19 +01:00
viktoria
678fbedcbf
Merge branch 'dev'
...
Conflicts:
app/src/main/res/values/strings.xml
2017-01-18 03:03:58 +01:00
Milos Kozak
9f4cc28c0f
allow removing temp target records with null _id
2017-01-17 23:43:50 +01:00
AdrianLxM
d36a515d45
temp target overview
2017-01-17 21:32:30 +01:00
Milos Kozak
f9ed2ed4b4
temp targets to AMA
2017-01-17 18:56:08 +01:00
Milos Kozak
0e21b67a42
fix merge conflicts
2017-01-17 18:00:44 +01:00
Milos Kozak
432c937a46
Merge branch 'dev' into AMA
2017-01-17 17:49:21 +01:00
Milos Kozak
08c078466a
Merge pull request #127 from MilosKozak/temptarget
...
Temptarget
2017-01-17 17:47:14 +01:00
Milos Kozak
b0392b997e
fix crash
2017-01-17 17:02:57 +01:00
Milos Kozak
1b385c10e3
fix iob calculation in the past
2017-01-17 16:19:34 +01:00
Milos Kozak
12eec7108a
detect oldest data available
2017-01-17 15:19:02 +01:00
Milos Kozak
7c90dfe03c
confirm dialog on removing temptarget
2017-01-16 23:54:46 +01:00
Milos Kozak
b6714ae254
use notification instead of toast
2017-01-16 23:37:58 +01:00
Milos Kozak
87c84da3d9
minimal NSClient version 1.21
2017-01-16 23:25:31 +01:00
Milos Kozak
218190e92f
support for removing temp targets from GUI
2017-01-16 23:23:20 +01:00
Milos Kozak
8c38090031
apply temp targets to MA
2017-01-16 21:03:31 +01:00
Milos Kozak
eaa16402a7
show running temp target on overview
2017-01-16 20:47:57 +01:00
Milos Kozak
61b1ee781f
temp target treatment dialog & sync fix
2017-01-16 16:59:12 +01:00
viktoria
61a1e5bc04
Korean DanaR Stats Activity
2017-01-16 13:23:41 +01:00
viktoria
e851d15aff
DanaR Stats Activity
2017-01-16 13:23:41 +01:00
Milos Kozak
262dae3ab3
Merge pull request #129 from slavidex/patch-26
...
Update pref_others.xml
2017-01-14 16:37:57 +01:00
Milos Kozak
61a8cad4e8
allow refrest temp targets from NS & fix bugs
2017-01-14 16:36:42 +01:00
Radoslav Radev
8f0a28419d
Update pref_others.xml
2017-01-14 15:25:06 +02:00
Radoslav Radev
cbd7aa74eb
Update strings.xml
2017-01-14 15:21:47 +02:00
Milos Kozak
a96bc52e01
handle temp targets data from NS
2017-01-14 00:37:35 +01:00
Milos Kozak
458bee4538
display temptargets
2017-01-13 23:43:17 +01:00
Milos Kozak
339e62c120
temptarget db support
2017-01-13 22:36:47 +01:00
Milos Kozak
1b53cde2bf
plain temptarget plugin
2017-01-13 21:14:04 +01:00
Milos Kozak
dcc6acdf31
Merge branch 'AMA' of https://github.com/MilosKozak/AndroidAPS into AMA
2017-01-13 20:31:20 +01:00
Milos Kozak
d9fffc5625
refactor IOB calculation & fix iob_array.time
2017-01-13 20:30:48 +01:00
Milos Kozak
6015930b41
Merge pull request #126 from AdrianLxM/patch-12
...
Extended restricted by MAXBOLUS DanaR-plugin
2017-01-13 19:41:49 +01:00
AdrianLxM
916ab35be1
Extended restricted by MAXBOLUS Dana
2017-01-13 19:33:37 +01:00
Milos Kozak
9d8d925f75
better check for null
2017-01-12 21:55:17 +01:00
Milos Kozak
ea15659050
Merge pull request #122 from AdrianLxM/patch-11
...
Typo German (Ereignis with one s)
2017-01-10 08:30:29 +01:00
AdrianLxM
dfc176d1bd
Typo German (Ereignis with one s)
2017-01-10 02:39:16 +01:00
AdrianLxM
856c025e2b
typo spanish
2017-01-10 02:37:20 +01:00
viktoria
f5f60bcd30
fix autosens adjust BG targets
...
regarding to that:
https://openaps.readthedocs.io/en/latest/docs/walkthrough/phase-3/beyond-low-glucose-suspend.html
the autosens_adjust_targets setting is only for allow autosens to adjust the BG target not for enabling or disabling the wohle autosens feature
2017-01-10 01:01:11 +01:00
Milos Kozak
97431e5b94
show base basal line
2017-01-09 23:19:25 +01:00
Milos Kozak
8a4678bb8f
make now-line more visible
2017-01-09 22:13:45 +01:00
Milos Kozak
bb76fa9d20
need of 14 days run to enable AMA
2017-01-09 19:54:23 +01:00
Milos Kozak
74afdb6874
Merge branch 'dev' into AMA
2017-01-09 17:34:49 +01:00
Milos Kozak
18a1927204
better optimize space of prediction in overview
2017-01-09 17:34:37 +01:00
Milos Kozak
26a76217bf
Greek language
2017-01-09 17:23:56 +01:00
Milos Kozak
e03de6cb63
use mgdl in autosens
2017-01-09 11:29:54 +01:00
Milos Kozak
c62e498aac
ensure we are loading 24h + dia data
2017-01-09 10:57:15 +01:00
Milos Kozak
5f146f90de
fix merge conflict
2017-01-09 10:17:27 +01:00
viktoria
4fe06e4ee1
refactor cpp
...
add safety values to constans class
2017-01-09 02:28:27 +01:00
Milos Kozak
e9b900d74a
show predictions in graph
2017-01-08 23:10:27 +01:00
Milos Kozak
93b80746c6
optimize determine basal
2017-01-08 17:02:33 +01:00
Milos Kozak
aa24a592fa
better detect meal bolus
2017-01-08 16:57:05 +01:00
Milos Kozak
68a127d804
make autosens configurable in settings, determinebasaladapter refactoring
2017-01-08 14:21:29 +01:00
Milos Kozak
e71b478941
show both deltas on overview
2017-01-08 12:04:42 +01:00
Milos Kozak
4303cd2982
Merge branch 'master' into AMA
2017-01-08 00:46:11 +01:00
Milos Kozak
7b5a289fc1
run aps only on interested treatments
2017-01-08 00:45:43 +01:00
Milos Kozak
66bd06076e
log invoke() source
2017-01-08 00:38:53 +01:00
Milos Kozak
6621c2f610
log script debug in fragment
2017-01-08 00:27:13 +01:00
Milos Kozak
28c329dc01
log script params separately
2017-01-08 00:19:48 +01:00
Milos Kozak
9c93d3ad7d
log autosens input data in fragment
2017-01-08 00:07:18 +01:00
Milos Kozak
f707029560
fix conflict
2017-01-07 23:45:41 +01:00
Milos Kozak
f704090eac
version bump 1.1
2017-01-07 23:39:29 +01:00
Milos Kozak
75192f0372
prevent logging exception
2017-01-07 23:38:59 +01:00
Milos Kozak
89db232375
Merge pull request #110 from MilosKozak/dateformat
...
use android.text.format.DateUtils
2017-01-07 23:27:47 +01:00
Milos Kozak
38f397cd59
revert formating date
2017-01-07 23:26:28 +01:00
Milos Kozak
e5fc19a785
better arrange code lines
2017-01-07 23:04:12 +01:00
Milos Kozak
8456f87de1
Merge remote-tracking branch 'origin/master' into AMA
2017-01-07 00:04:26 +01:00
Milos Kozak
25a3b678e9
most new AMA code added
2017-01-06 22:42:37 +01:00
Milos Kozak
6dc3d38a2f
fix passing carb ratio
2017-01-06 09:52:17 +01:00
Milos Kozak
26102848f5
refactor MealData
2017-01-04 23:03:13 +01:00
Milos Kozak
ebb3e90587
extract MealData
2017-01-04 22:47:21 +01:00
Milos Kozak
e585ab4030
Merge branch 'AMA' of https://github.com/MilosKozak/AndroidAPS into AMA
2017-01-04 22:37:10 +01:00
Milos Kozak
3eee917979
add sample data
2017-01-04 22:37:03 +01:00
Milos Kozak
724a041341
refactor classes
2017-01-04 22:33:17 +01:00
Milos Kozak
8aad003311
copy basic files oref0 dev 2017/01/04, make it running without crash
2017-01-04 22:21:46 +01:00
Milos Kozak
9d5c2e5dac
fix visibility of aps plugin at start
2017-01-03 22:13:25 +01:00
Milos Kozak
50f75e3404
upload AMA result to NS too
2017-01-03 21:42:32 +01:00
Milos Kozak
05911be4e0
remove parcelable code from determinebasaladapter
2017-01-03 21:37:23 +01:00
Milos Kozak
3dfac49b82
duplicate MA -> AMA
2017-01-03 21:15:40 +01:00
Milos Kozak
faf8e07248
renaming before adding AMA
2017-01-03 21:01:01 +01:00
Milos Kozak
f3f6a911ae
use android.text.format.DateUtils
2017-01-03 19:06:35 +01:00
Milos Kozak
fe75298263
safer display values in openapsma fragment
2017-01-03 10:24:08 +01:00
viktoria
f3551dda7f
german translation
2017-01-02 16:44:20 +01:00
Milos Kozak
952a2342a8
Merge pull request #104 from MilosKozak/mm640g
...
MM640g bg source
2017-01-02 13:58:56 +01:00
Milos Kozak
8637e99afe
Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS
2017-01-02 00:05:57 +01:00
AdrianLxM
9c40e4af34
Dismiss editing when fragment is paused
2017-01-01 21:46:25 +01:00
Milos Kozak
fded515ac1
fix TimeListEdit when fragment is restored
2017-01-01 20:22:23 +01:00
Milos Kozak
4408146f23
disable entering basals in profiles only if pump is not tempbasal capable
2017-01-01 14:34:57 +01:00
Milos Kozak
ef2e7b1a62
show basal line only if pump is tempbasal capable
2017-01-01 14:19:35 +01:00
Milos Kozak
9edb5c9a66
draw basals only if pump is tempbasal capable
2017-01-01 14:00:59 +01:00
Milos Kozak
86f5aec0bb
disable visible control when plugin is not enabled
2017-01-01 13:45:03 +01:00
Milos Kozak
38a9c94258
Local Profile
2016-12-31 20:10:36 +01:00
Milos Kozak
6b18336fa2
LocalProfile plugin
2016-12-31 15:06:45 +01:00
Milos Kozak
0458ad65ce
handle arrays separately
2016-12-31 14:52:23 +01:00
Milos Kozak
2e6c168adc
TimeListEdit most work done
2016-12-31 13:11:32 +01:00
Milos Kozak
e1c2e4c492
TimeListEdit initial work
2016-12-30 16:43:43 +01:00
Milos Kozak
2f52091b67
show upload profile button only when pump is capable to this
2016-12-29 23:10:39 +01:00
Milos Kozak
b2be49e631
simple profile layout
2016-12-29 22:40:30 +01:00
Milos Kozak
1e99c00626
allow sms string to be translated separately
2016-12-29 16:22:40 +01:00
Milos Kozak
8e46a55e48
allow better translation of min ago
2016-12-29 16:06:00 +01:00
Milos Kozak
0059266791
loop status font size
2016-12-29 14:23:05 +01:00
Milos Kozak
24c5bb9303
Merge branch 'master' into mm640g
2016-12-29 14:01:24 +01:00
Milos Kozak
83f4dbf9ca
Merge pull request #103 from AdrianLxM/patch-8
...
remove mm640g translation again
2016-12-29 13:51:24 +01:00
Milos Kozak
c06d25b235
more rearrangements
2016-12-29 00:12:52 +01:00
Milos Kozak
f127e7bec1
better allign bg arrows
2016-12-28 23:48:43 +01:00
AdrianLxM
834398b8f0
remove mm640g translation again
2016-12-28 23:31:02 +01:00
Milos Kozak
6b86818464
Merge pull request #102 from AdrianLxM/avgdelta
...
Avgdelta
2016-12-28 23:15:23 +01:00
Milos Kozak
c8a58808e0
more logging on setting extended bolus
2016-12-28 23:13:11 +01:00
AdrianLxM
d70c9673d5
average delta
2016-12-28 22:39:40 +01:00
Milos Kozak
9a47e521d2
show result in loop plugin when correct basal settoo
2016-12-28 22:30:38 +01:00
Milos Kozak
d6f4135d6e
travis
2016-12-28 15:58:44 +01:00
Milos Kozak
d2d3e024a2
Merge branch 'ongoingnotif' of https://github.com/AdrianLxM/AndroidAPS
2016-12-28 15:15:24 +01:00
Milos Kozak
e2c2f49f6f
MM640g bg source
2016-12-28 14:57:11 +01:00
Radoslav Radev
71461e38ca
Update strings.xml
2016-12-28 12:17:17 +02:00
warstar2187
804cdba7cf
Update strings.xml
2016-12-28 18:22:50 +09:00
AdrianLxM
6ac889cecd
ongoing notification integration
2016-12-28 00:03:08 +01:00
Milos Kozak
26b260a85a
use bolus step from pump description
2016-12-27 23:46:39 +01:00
AdrianLxM
4afd2295f8
Ongoing Notification 2
2016-12-27 23:39:47 +01:00
AdrianLxM
d597be71de
ongoing notification
2016-12-27 23:39:16 +01:00
Milos Kozak
405ae28e38
cz translations
2016-12-27 23:39:00 +01:00
Milos Kozak
29327aef01
MDI pump driver
2016-12-27 23:35:50 +01:00
Milos Kozak
fdb252b62d
show direction next to BG
2016-12-27 20:41:28 +01:00
Milos Kozak
13f2fce31e
product flavors dimensions update
2016-12-27 18:47:48 +01:00
Milos Kozak
34fce81563
fix build warning
2016-12-27 16:21:04 +01:00
Milos Kozak
ecd787bdb3
detect broken communication during bolusing
2016-12-27 16:06:49 +01:00
Milos Kozak
42b581ec29
log bolus start
2016-12-27 15:13:27 +01:00
Milos Kozak
cd41bff2bb
SMS command BG
2016-12-27 12:17:26 +01:00
Milos Kozak
a109bb9853
handle switching profiles in correct order
2016-12-25 23:18:46 +01:00
Milos Kozak
463a913cd1
add debug to profile comparation
2016-12-25 15:08:40 +01:00
Milos Kozak
46be73d187
send sms notification when profile received from NS
2016-12-25 14:26:41 +01:00
Milos Kozak
61720a74ec
do not return error if not initialized
2016-12-25 13:34:48 +01:00
Milos Kozak
94cb506d20
Merge branch 'koreandanar' into smsnotify
2016-12-25 11:51:52 +01:00
Milos Kozak
381de0a5f5
function to send notification
2016-12-25 11:51:46 +01:00
Milos Kozak
02b3da97e0
send important confirmations to all phone numbers
2016-12-25 11:29:13 +01:00
Milos Kozak
273993f995
Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS into smsnotify
2016-12-25 09:53:43 +01:00
Milos Kozak
3bd7568d34
dismiss button not hardcoded
2016-12-24 23:56:47 +01:00
Milos Kozak
052ac47595
Better profile handling
2016-12-24 23:53:17 +01:00
Milos Kozak
edcfebfd41
fix displaying missing carbs in wizard
2016-12-24 15:05:44 +01:00
Milos Kozak
5c506faa65
proper reaction to pump error
2016-12-24 14:53:37 +01:00
Milos Kozak
2b0c74c56f
CZ translations
2016-12-24 14:21:24 +01:00
Milos Kozak
79aee157e3
redundant code cleanup
2016-12-24 14:13:35 +01:00
Milos Kozak
7719e2ac63
use notifications for profile update
2016-12-22 12:17:38 +01:00
Milos Kozak
132f82b484
fix showing objectives
2016-12-22 12:04:17 +01:00
Milos Kozak
d72a3cbf36
Merge branch 'koreandanar' of https://github.com/MilosKozak/AndroidAPS into koreandanar
2016-12-21 14:50:22 +01:00
Milos Kozak
d8696412b1
temporary disable korean danar
2016-12-21 14:48:36 +01:00
AdrianLxM
5e2302ed68
start KeepAlive at app start 2
2016-12-16 02:00:53 +01:00
AdrianLxM
4f3c9baf0b
start KeepAlive at app start 1
2016-12-16 01:57:18 +01:00
Milos Kozak
37d539ce3e
remove duplicated function
2016-12-15 19:10:07 +01:00
Milos Kozak
368652670c
Merge branch 'master' into koreandanar
2016-12-15 18:58:16 +01:00
Milos Kozak
d34e4579fc
clear aps result before new calculation
2016-12-15 18:55:23 +01:00
Milos Kozak
889c75f3ee
Merge branch 'koreandanar' of https://github.com/MilosKozak/AndroidAPS into koreandanar
2016-12-14 11:17:15 +01:00
Milos Kozak
5626c621ff
fix loop
2016-12-14 11:16:28 +01:00
AdrianLxM
d461a4b2c4
Set fragmentVisible instead of fragmentEnabled
2016-12-14 08:23:22 +01:00
Milos Kozak
49453e10df
fix x axis on overview when no data displayed
2016-12-13 23:18:02 +01:00
Milos Kozak
738d4c1c2a
hide pump control buttons when pump is not initialized
2016-12-13 22:50:51 +01:00
Milos Kozak
cb4330ddcd
notify when pump settings is wrong
2016-12-13 22:10:13 +01:00
Milos Kozak
407ea423cb
detect if extended bolus is enabled, detect easy ui mode
2016-12-13 21:35:49 +01:00
Milos Kozak
9454e7e6e2
Merge branch 'koreandanar' of https://github.com/MilosKozak/AndroidAPS into koreandanar
2016-12-11 22:56:46 +01:00
Milos Kozak
4a2a15d394
smarter plugin selection and handling
2016-12-11 22:55:45 +01:00
AdrianLxM
d33629e5d4
Korean Dana history Activity in Manifest
2016-12-11 16:28:18 +01:00
Milos Kozak
8f6f6e326d
Disable profile control for pump profiles if pump is not enabled
2016-12-11 13:46:27 +01:00
Milos Kozak
0d6787a744
force enabled if only 1 plugin exists
2016-12-11 13:36:32 +01:00
Milos Kozak
be1ec7f3e3
fix processing plugins in configbuilder
2016-12-11 13:08:20 +01:00
Milos Kozak
7aaa15dd3b
Merge branch 'koreandanar' of https://github.com/MilosKozak/AndroidAPS into koreandanar
2016-12-11 11:15:34 +01:00
Milos Kozak
80a463a56d
parse allowed phone numbers
2016-12-11 10:52:50 +01:00
AdrianLxM
c8ac855219
also switch profiles
2016-12-10 23:51:57 +01:00
AdrianLxM
e1dc624a47
fully remove mm640g
2016-12-10 22:58:31 +01:00
Milos Kozak
5b6e85f5c9
Merge branch 'master' into koreandanar
2016-12-10 18:14:39 +01:00
Milos Kozak
82f4c8ffac
better handling of non existing profiles
2016-12-10 18:14:12 +01:00
Milos Kozak
617192dc3a
hide buttons based on pump description
2016-12-10 00:18:20 +01:00
Milos Kozak
cf4851250d
enable loop only when pump is temp basals capable
2016-12-09 21:47:58 +01:00
Milos Kozak
2a10d4789e
virtual pump description
2016-12-09 21:30:34 +01:00
Milos Kozak
b824cc28c9
korean danar description
2016-12-09 20:37:56 +01:00
Milos Kozak
bd6ee0f213
add duration to description
2016-12-09 20:20:21 +01:00
Milos Kozak
199c6b5e2c
fix curentBasal rouding
2016-12-09 19:32:59 +01:00
Milos Kozak
3acabd792c
basic danar description
2016-12-09 19:28:48 +01:00
Milos Kozak
6ba532d178
notify about setting basal profile
2016-12-09 16:04:07 +01:00
Milos Kozak
4103e4bf4a
allow set profile to pump from simpleprofile plugin
2016-12-09 12:40:15 +01:00
Milos Kozak
e9d639c979
fix read basal profile on korean pump
2016-12-09 12:00:44 +01:00
Milos Kozak
a01c15f8f7
miminum basal rate in description
2016-12-09 11:46:46 +01:00
Milos Kozak
56eb347b84
Merge remote-tracking branch 'origin/master' into koreandanar
2016-12-09 11:33:33 +01:00
Milos Kozak
8c00e08574
Merge pull request #87 from AdrianLxM/dbfix
...
lazy initialization of optional plugins
2016-12-09 11:32:22 +01:00
Milos Kozak
f75c2f8f91
check if plugin is enabled before accepting message
2016-12-09 11:31:45 +01:00
AdrianLxM
f4e82ec022
lazy loading on optional plugins
2016-12-09 09:56:16 +01:00
Milos Kozak
064de0f64e
synchronize pump time
2016-12-09 09:31:51 +01:00
Milos Kozak
ccda992161
remove unused MM640g plugin
2016-12-08 15:23:37 +01:00
Milos Kozak
073cc84368
added PumpDescription
2016-12-08 15:21:16 +01:00
Milos Kozak
0044b8b41a
Merge remote-tracking branch 'origin/master' into koreandanar
2016-12-08 14:29:38 +01:00
Milos Kozak
e0f0ee0cbb
Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS
2016-12-08 14:28:53 +01:00
Milos Kozak
fdd594358c
fix removeExpired in notifications
2016-12-08 14:28:21 +01:00
Milos Kozak
8f98ad1b15
do not process remote profile if not selected
2016-12-07 22:12:48 +01:00
AdrianLxM
fa4cf31cf4
Correct db query
2016-12-07 01:48:53 +01:00
Milos Kozak
1db9ce287c
fix basal rates decoding
2016-12-07 00:15:42 +01:00
Milos Kozak
2dea4615c0
basal rates set
2016-12-06 23:46:36 +01:00
Milos Kozak
f2928c3d39
fix IC and ISF in DanaR Korean profile
2016-12-06 23:19:48 +01:00
Milos Kozak
be8003da4b
Merge branch 'master' into koreandanar
2016-12-06 23:18:02 +01:00
Milos Kozak
64de2fd736
Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS
2016-12-06 23:15:23 +01:00
Milos Kozak
10d30571a9
fix IC and ISF in DanaR profile
2016-12-06 23:14:25 +01:00
Milos Kozak
d897b778a0
Merge pull request #84 from MilosKozak/notifications
...
basic notification functionality
2016-12-06 23:05:23 +01:00
Milos Kozak
3a3fc5d508
one more ICF with 1 decimal
2016-12-06 23:03:45 +01:00
Milos Kozak
86755599df
show IC and ICF with 1 decimal
2016-12-06 23:00:57 +01:00
Milos Kozak
0af894aa56
change info color to green
2016-12-06 22:57:49 +01:00
Milos Kozak
b61108eb2b
remove test data
2016-12-06 22:55:49 +01:00
AdrianLxM
1a20b637b6
limit readings to values above 38
2016-12-05 17:47:03 +01:00
Milos Kozak
abfb832a10
basic notification functionality
2016-12-05 15:20:44 +01:00
Milos Kozak
4b389c2cad
dana drivers switching working
2016-12-03 17:42:08 +01:00
AdrianLxM
1af28d007f
wear make sendData() private
2016-12-01 12:10:58 +01:00
AdrianLxM
7eb8702a9c
wear profile-null fix Toasts from strings.xml the second
2016-12-01 10:54:19 +01:00
AdrianLxM
68f4a2db50
wear profile-fix toast from strings.xml
2016-12-01 10:47:39 +01:00
AdrianLxM
0d8fd9df5c
wear profile may be null
2016-12-01 09:30:39 +01:00
Milos Kozak
db2fd55f7c
copy files for Korean DanaR
2016-11-29 20:52:40 +01:00
Milos Kozak
97a22344e3
CZ translations
2016-11-29 19:07:09 +01:00
Milos Kozak
36d5f1dc29
proper danar errors detection
2016-11-29 18:28:36 +01:00
AdrianLxM
896503918c
wear extract strings
2016-11-29 15:01:00 +01:00
AdrianLxM
1eacf35e47
Merge pull request #25 from AdrianLxM/wear-prepare-final
...
wear merge current master
2016-11-29 13:17:21 +01:00
Milos Kozak
ee408ada79
Merge pull request #80 from warstar2187/master
...
Fix Insulin Activity and Korean update
2016-11-29 07:44:58 +01:00
warstar2187
7f97b232da
Update Treatment.java
2016-11-29 12:08:45 +09:00
Milos Kozak
2912d1cce1
Merge pull request #79 from AdrianLxM/viktoria-permissions
...
Viktoria permissions
2016-11-28 19:02:28 +01:00
AdrianLxM
70338ac158
wear PoweRGbg fixes
2016-11-28 18:42:19 +01:00
AdrianLxM
87d49c03c8
wear product flavors
2016-11-26 07:10:22 +01:00
AdrianLxM
b2d2f462f6
first check if element exist, then access it
2016-11-25 13:35:53 +01:00
LadyViktoria
39be1bb4c7
Android 6+ Permissions #6
2016-11-25 13:35:34 +01:00
AdrianLxM
ff29a795db
SMS permission crashfix
2016-11-25 13:32:27 +01:00
LadyViktoria
33d783e9b0
Android 6+ Permissions #4
2016-11-25 13:32:17 +01:00
LadyViktoria
1967602c70
Android 6+ Permissions #3
2016-11-25 13:32:07 +01:00
viktoria
dd02fcaa85
Android 6+ Permissions #2
2016-11-25 13:31:52 +01:00
LadyViktoria
f25715d87c
Android 6+ Permissions
2016-11-25 13:31:43 +01:00
AdrianLxM
12e78656b7
wear settings
2016-11-24 16:23:31 +01:00
AdrianLxM
c633904e8c
wear fragment and reset button
2016-11-24 16:23:31 +01:00
AdrianLxM
b306de49dc
wear Emma
2016-11-24 16:23:31 +01:00
AdrianLxM
ef0e30b2b3
wear big chart avgDelta working
2016-11-24 16:23:31 +01:00
AdrianLxM
5e3fddcc05
wear arrows working
2016-11-24 16:23:31 +01:00
AdrianLxM
95432e35e0
wear yet again current situation tweaks
2016-11-24 16:23:31 +01:00
AdrianLxM
663a865595
wear intent to express current situation better
2016-11-24 16:23:31 +01:00
AdrianLxM
8af4ac0daf
wear bigchart fully functional
2016-11-24 16:23:31 +01:00
AdrianLxM
afa5faf834
wear basal live
2016-11-24 16:23:31 +01:00
AdrianLxM
2b17fc5155
wear painting temps
2016-11-24 16:23:31 +01:00
AdrianLxM
70c3969f85
wear something is painting
2016-11-24 16:23:31 +01:00
AdrianLxM
b93273d706
wear status working
2016-11-24 16:23:31 +01:00
AdrianLxM
e2c3069374
resend(), bigchart watchface layout overhaul, fix nullpointer exception, only send when enabled
2016-11-24 16:23:31 +01:00
AdrianLxM
2e0ac569eb
wear first bg and delta on watch
2016-11-24 16:23:31 +01:00
AdrianLxM
761077e8ae
wear fix overeager refactoring and plugin pluggable
2016-11-24 16:23:31 +01:00
AdrianLxM
2fd93a8e31
wear installing on watch
2016-11-24 16:23:31 +01:00
ecorman
da861a7108
Note basal start / end to see note in Xdrip+ with data
2016-11-23 23:59:11 +01:00
AdrianLxM
ef847a7cc2
Make bolus progress dialog not cancalable
2016-11-21 19:50:27 +01:00
AdrianLxM
b97920b3ef
Integer: comparison by value not by reference
...
Why is there no compiler warning for this?
2016-11-18 15:21:07 +01:00
Radoslav Radev
8b5ee91c95
Update strings.xml
2016-11-17 22:40:51 +02:00
Radoslav Radev
56c83aac2f
bg translation
...
1
2016-11-17 22:12:19 +02:00
Milos Kozak
41acb2d022
Merge pull request #70 from AdrianLxM/cpp_sum
...
Add sum to the overview of the basal profile.
2016-11-17 20:09:54 +01:00
AdrianLxM
505a135ac8
CPP add sum to basal rate representation
2016-11-17 13:35:38 +01:00
AdrianLxM
b74c29d202
zip logfiles on daily rollover
2016-11-17 00:23:20 +01:00
AdrianLxM
ade27a9460
CPP proper dialog handling
2016-11-15 18:59:38 +01:00
AdrianLxM
127c85effb
CPP delete images that are not used
2016-11-15 17:40:16 +01:00
AdrianLxM
3da9a8c45c
CPP limits 50 to 200 percent
2016-11-15 17:25:23 +01:00
AdrianLxM
b01fb6ee6e
CPP hard limits for percentage
2016-11-15 07:52:59 +01:00
AdrianLxM
513b2966c9
CPP cleanup and i18n
2016-11-14 18:19:17 +01:00
AdrianLxM
74ea6c4011
CPP working
2016-11-14 18:19:17 +01:00
AdrianLxM
85b052efda
CPP copyprev buttons working
2016-11-14 18:19:17 +01:00
AdrianLxM
c2d1fdb39e
CPP edit base basal gui - without function yet
2016-11-14 18:19:17 +01:00
AdrianLxM
dba81ede2a
calculation for isf and ic. Tooltips.
2016-11-14 18:19:17 +01:00
AdrianLxM
0e5d18ec86
keep basal in order as required when writing to dana
2016-11-14 18:19:17 +01:00
AdrianLxM
3fe7c7a0fa
CPP shiftfix and base profile view
2016-11-14 18:19:17 +01:00
AdrianLxM
2c5b20a721
CPP html-ify and send to pump button
2016-11-14 18:19:17 +01:00
AdrianLxM
a57a864c24
CPP icons
2016-11-14 18:19:17 +01:00
AdrianLxM
4dbb20b8c5
CPP small redesign
2016-11-14 18:19:17 +01:00
AdrianLxM
f815f7fce6
CPP ic and isf data
2016-11-14 18:19:17 +01:00
AdrianLxM
8c93925865
CPP simple representation string
2016-11-14 18:19:17 +01:00
AdrianLxM
364b3d6710
CPP percentage and shift working on hard coded basal rate
2016-11-14 18:19:17 +01:00
AdrianLxM
be556cf388
CPP copy simple profile
2016-11-14 18:19:17 +01:00
AdrianLxM
d94136bc95
overview dymanic height
2016-11-12 20:39:11 +01:00
warstar2187
2365dbac86
Update strings.xml
2016-11-13 01:54:28 +09:00
AdrianLxM
12fc454fe1
divisions with doubles to not do whole minute jumps
2016-11-12 13:16:11 +01:00
AdrianLxM
68acc3aca3
deltas per 5 minutes
2016-11-12 13:05:18 +01:00
Milos Kozak
0b56b7554c
Merge pull request #64 from AdrianLxM/fill-presets2
...
Fill presets
2016-11-12 10:41:54 +01:00
Milos Kozak
dce6acba54
Merge pull request #65 from AdrianLxM/german-update
...
German update
2016-11-12 10:28:01 +01:00
AdrianLxM
2fef497ce9
German updates 02
2016-11-11 17:59:23 +01:00
AdrianLxM
75889c24b3
German updates 01
2016-11-11 17:59:10 +01:00
Milos Kozak
b5bd6749ae
fix app crash when no profile set
2016-11-11 16:40:31 +01:00
AdrianLxM
401be6dd5b
add U to buttons
2016-11-11 16:29:28 +01:00
AdrianLxM
1568f77229
fill preset buttons
2016-11-11 16:24:00 +01:00
warstar2187
2d54a068ad
Update strings.xml
2016-11-11 23:07:32 +09:00
Milos Kozak
c034f77b71
fix merge conflict 2
2016-11-11 13:09:50 +01:00
Milos Kozak
a341fa4343
fix merge conflict
2016-11-11 13:09:11 +01:00
Milos Kozak
ad475ace90
Merge pull request #63 from AdrianLxM/profileLongpress
...
profile switch dialog on long press on profile pill
2016-11-11 12:57:00 +01:00
Milos Kozak
753fb4664d
Merge pull request #61 from AdrianLxM/fill-action
...
Fill action
2016-11-11 12:56:21 +01:00
AdrianLxM
4a23d4ce0d
profile switch dialog on long press on profile pill
2016-11-11 12:29:13 +01:00
AdrianLxM
41e68a03a2
SimpleProfile as profile name
2016-11-11 01:45:41 +01:00
AdrianLxM
4b27c9212a
DanaR as part of profile name
2016-11-11 01:45:28 +01:00
AdrianLxM
a6d5d68938
fill action
2016-11-11 00:56:15 +01:00
Milos Kozak
e8d169f078
allow automated actions only whem pump is initialized
2016-11-10 23:33:12 +01:00
Milos Kozak
86a3df1996
lower allowed diff to perform action from 0.1 to 0.05
2016-11-10 23:33:12 +01:00
AdrianLxM
7b4b4f7cfc
Overview profile redesign
2016-11-10 23:20:23 +01:00
AdrianLxM
4ee87d1cca
basal profile on overview
2016-11-10 21:03:26 +01:00
AdrianLxM
a6ae92bb2f
Receive profile updates on uploadOnly when NS-Profiles are used
2016-11-10 18:53:01 +01:00
AdrianLxM
c900d6611c
Warn on "refresh treatments from NS" button in upload only mode.
2016-11-10 18:52:42 +01:00
AdrianLxM
f85f04d33f
NS upload only
2016-11-10 18:33:50 +01:00
Milos Kozak
21f732b378
report app start/restart to NS
2016-11-10 16:42:59 +01:00
Milos Kozak
a5778b4916
Merge pull request #58 from AdrianLxM/loadmorehightemps
...
Load more "extended bolus" high temps
2016-11-10 13:54:11 +01:00
AdrianLxM
5088b84417
Receive profile updates on uploadOnly when NS-Profiles are used
2016-11-10 13:50:13 +01:00
Milos Kozak
156f42da5f
always report active profile
2016-11-10 13:15:23 +01:00
Milos Kozak
770f44118b
Merge pull request #56 from AdrianLxM/hapticFeedback
...
Haptic feedback
2016-11-10 10:02:26 +01:00
Milos Kozak
8d360f837d
Merge pull request #57 from warstar2187/master
...
kr translation update
2016-11-10 10:02:01 +01:00
AdrianLxM
3ee1cf5023
haptic feedback for loop pill on overview
2016-11-10 00:02:51 +01:00
Milos Kozak
8707b42526
Merge pull request #54 from AdrianLxM/confirm_reset_db
...
Confirm reset db
2016-11-08 23:02:03 +01:00
AdrianLxM
aaba503cd0
Fix crash due to not found theme
2016-11-08 22:57:56 +01:00
Milos Kozak
bad7e5d7c4
gradle fix
2016-11-08 22:55:08 +01:00
AdrianLxM
341d7222e5
Strings for reset DB
2016-11-08 22:36:47 +01:00
AdrianLxM
218ccc803b
Ask before resetting DB
2016-11-08 22:35:57 +01:00
Milos Kozak
a2d4f22bd7
added git HEAD and version to pump status and logs
2016-11-08 19:10:25 +01:00
Milos Kozak
94a7033e0c
always upload current basal rate
2016-11-08 17:55:39 +01:00
Milos Kozak
a4a9efd812
TAB_VIEW_PADDING_DIPS = 9
2016-11-08 14:24:02 +01:00
warstar2187
1f35018148
Update strings.xml
2016-11-08 20:04:19 +09:00
warstar2187
9ae3d88f9c
Update DanaRPlugin.java
2016-11-08 19:59:54 +09:00
Milos Kozak
4a4dc04865
fix iob reporting to NS
2016-11-08 10:29:24 +01:00
AdrianLxM
ff66edf064
Add TDD to DanaR daily view
...
... also don't show the time for the day. It is always 00:00 anyways.
2016-11-08 06:11:50 +01:00
AdrianLxM
ede982c8c5
Update danar_history_item.xml
2016-11-08 06:08:12 +01:00
AdrianLxM
93accc0d9f
Add in basalIOB.activity
2016-11-07 15:18:48 +01:00
AdrianLxM
8bdc86f359
Calculate activityContrib for TempBasal
2016-11-07 15:17:16 +01:00
AdrianLxM
2e6a37dcbd
Add base basal rate to Overview when temp is running
...
Now that there is more space with less buttons, it should fit ;)
2016-11-07 10:18:16 +01:00
Milos Kozak
d67ae5df78
version bump 1.0.20
2016-11-07 10:16:13 +01:00
Milos Kozak
925b5612fc
Merge pull request #49 from AdrianLxM/disableLoopLongpress
...
Disable loop on Longpress on Loop-Status in Overview
2016-11-07 10:14:14 +01:00
Milos Kozak
3533ec16ba
Merge pull request #50 from AdrianLxM/patch-7
...
fix for net IOB
2016-11-07 09:36:16 +01:00
Milos Kozak
6263b98683
Merge pull request #39 from warstar2187/master
...
Update strings.xml
2016-11-07 09:13:21 +01:00
AdrianLxM
e948a6f955
fix for net IOB
2016-11-07 07:55:41 +01:00
AdrianLxM
686593986c
Update PreferencesActivity.java
2016-11-07 01:02:08 +01:00
AdrianLxM
c851aefc8e
Update MainActivity.java
2016-11-07 01:01:33 +01:00
AdrianLxM
68be6179f8
Update EventRefreshGui.java
2016-11-07 01:00:50 +01:00
AdrianLxM
be39a35d68
Update ConfigBuilderFragment.java
2016-11-07 00:59:47 +01:00
AdrianLxM
c93322f2da
Overview Loopdisable on longclick 1
2016-11-07 00:58:44 +01:00
Milos Kozak
f84777bf00
Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS
2016-11-06 12:10:55 +01:00
Milos Kozak
95ffb03a26
fix resources crash
2016-11-06 12:10:24 +01:00
AdrianLxM
3f02c8fc8c
Show decimal place
...
The time since last bolus has one decimal place but it was shown as zero.
2016-11-06 02:01:22 +01:00
Milos Kozak
65b8ca00db
looper to profile switch
2016-11-05 20:32:47 +01:00
Milos Kozak
45ffc18d25
move set temp and set extended buttons to actions
2016-11-05 20:12:58 +01:00
Milos Kozak
3ac9811d9a
Actions page & offline profile switch
2016-11-05 15:46:11 +01:00
Radoslav Radev
b9d4a5fc0a
Update strings.xml
2016-11-03 07:47:24 +02:00
Milos Kozak
15ca64e218
Merge pull request #43 from ecorman/master
...
Basal % rate
2016-11-02 23:37:17 +01:00
Milos Kozak
57b032065f
Merge pull request #45 from AdrianLxM/disableLoopLabel
...
Disable loop label
2016-11-02 22:20:48 +01:00
AdrianLxM
b7f4dd3366
borders again on loopmode label
2016-11-02 18:27:46 +01:00
AdrianLxM
b1f3bb17bb
Show in Overview when loop is disabled
2016-11-02 18:04:14 +01:00
AdrianLxM
80e8ac465a
Update German translation
2016-11-02 14:33:41 +01:00
AdrianLxM
b265be3536
Some updates on German translation
2016-11-02 14:17:16 +01:00
AdrianLxM
2294093aab
Show current total
...
The total of the calculation in the wizard was showing the value from the previous calculation when you enable/disable to include Bolus-IOB or Basal-IOB into the calculation.
The button to send to the pump showed the current amount of units.
2016-10-31 13:01:50 +01:00
ecorman
f2baa32e40
Basal % rate
2016-10-31 13:01:38 +01:00
ecorman
cf3bb52c7b
Add percent to result to allow manual adjust
2016-10-31 02:29:19 +01:00
warstar2187
46fd0c87dd
Update strings.xml
2016-10-27 08:16:19 +09:00
warstar2187
e4e2ea3aac
Update strings.xml
2016-10-27 02:53:23 +09:00
warstar2187
5443bb4fba
Update SmsCommunicatorPlugin.java
2016-10-27 02:23:47 +09:00
warstar2187
79a6b65bb9
Update SmsCommunicatorPlugin.java
2016-10-26 19:38:36 +09:00
warstar2187
a49afea27c
Update strings.xml
2016-10-26 15:57:21 +09:00
warstar2187
58591514f7
Update strings.xml
2016-10-26 15:34:26 +09:00
warstar2187
02c231a236
Update strings.xml
2016-10-26 12:36:15 +09:00
warstar2187
f39b009ca3
Update strings.xml
2016-10-26 10:10:33 +09:00
warstar2187
70249c7e3e
Update strings.xml
2016-10-26 09:49:46 +09:00
Milos Kozak
8f17ecdd89
version bump 1.0.19
2016-10-25 23:40:03 +02:00
Milos Kozak
4c3d67535c
Korean language template
2016-10-25 23:38:44 +02:00
Milos Kozak
861c24fc45
distinguish between meal and correction bulus
2016-10-25 23:33:02 +02:00
Milos Kozak
8614469a35
test activity for null
2016-10-23 23:34:14 +02:00
Milos Kozak
1597ee77b5
typo
2016-10-22 18:04:26 +02:00
AdrianLxM
d2906e8fd4
overview_quickwizardentry translated but does not exist
2016-10-21 22:18:17 +02:00
AdrianLxM
e2956db141
don't complain on missing translations
2016-10-21 22:16:20 +02:00
Milos Kozak
05f8c2d1ba
default constructor only in WizardDialog
2016-10-21 22:00:14 +02:00
Milos Kozak
8d05845c4f
default constructor only in BolusProgressDialog
2016-10-21 21:50:21 +02:00
Milos Kozak
f167174151
version bump 1.0.18
2016-10-21 00:04:54 +02:00
Milos Kozak
38cf01eb62
more build types with maxbolus: full fullteenage fullchild
2016-10-21 00:03:52 +02:00
Milos Kozak
6f8d828ec2
QuickWizard
2016-10-20 23:50:31 +02:00
Milos Kozak
6bfaec375f
use sResources
2016-10-17 21:23:37 +02:00
Milos Kozak
7a3f7098b0
DanaR hardcoded bolus limit 10 -> 17
2016-10-17 09:31:06 +02:00
Milos Kozak
a829a506f2
check for null on getDialog()
2016-10-17 08:57:21 +02:00
Milos Kozak
2354e60f31
allow high temps in open loop mode
2016-10-17 08:44:01 +02:00
Milos Kozak
744a4143f4
retrieve device status with xdrip too
2016-10-16 21:11:16 +02:00
Milos Kozak
af31ca804f
correct width on more dialogs on Andriod 6
2016-10-15 11:31:15 +02:00
Milos Kozak
8ff675e8a4
Constant instead of string in profile
2016-10-11 23:55:53 +02:00
Milos Kozak
5ec339e987
fix BolusProgessDialog size on Android 6
2016-10-11 23:49:26 +02:00
Milos Kozak
9cd8602f83
normalize mg/dl mg/dL
2016-10-11 23:30:13 +02:00
Milos Kozak
9f1bbd35bd
wizard calculation to extra file
2016-10-11 22:47:48 +02:00
Milos Kozak
b7dfabbe11
version bump 1.0.17
2016-10-10 12:11:34 +02:00
Milos Kozak
777b6cdb0d
catch errors on load profile
2016-10-10 12:11:12 +02:00
Milos Kozak
cf65b3f865
version bump 1.0.16
2016-10-09 11:18:24 +02:00
Milos Kozak
2e02521eae
Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS
2016-10-09 11:17:56 +02:00
Milos Kozak
174d6019ff
fix carbs limit in wizard
2016-10-09 11:17:41 +02:00
Milos Kozak
cbb316b599
check for null in NS treatment dialog
2016-10-07 22:35:17 +02:00
Milos Kozak
960cde06cf
version bump 1.0.15
2016-10-06 20:57:57 +02:00
Milos Kozak
34c6329b6f
fix context in newextendedbolusdialog
2016-10-06 20:57:12 +02:00
Milos Kozak
331d94c78e
version bump 1.0.14
2016-10-02 16:13:37 +02:00
Milos Kozak
4f07fea8b2
SafeParse in SimpleProfile
2016-10-02 16:12:44 +02:00
Milos Kozak
b5ecbc11e8
check if pump info is loaded before invoking loop
2016-10-01 19:47:18 +02:00
Milos Kozak
163ccf2d0a
hard limits on base basal rate
2016-09-19 15:09:35 +02:00
Milos Kozak
a3721f8932
do set bg on init in careportal dialog
2016-09-18 03:09:53 +02:00
Milos Kozak
4378c9af14
more SMS commands
2016-09-16 14:08:26 +02:00
Milos Kozak
84efccb392
version 1.0.13 bump
2016-09-14 22:03:37 +02:00
Milos Kozak
514fb569e9
show base basal rate and profile in ns pump plugin
2016-09-14 22:02:49 +02:00
Milos Kozak
57db26443e
Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS
2016-09-13 22:40:55 +02:00
Milos Kozak
5ac2cd5cca
try to fix random crash
2016-09-13 22:34:40 +02:00
Milos Kozak
ecb685f7f6
hard limits on openaps params
2016-09-13 22:15:17 +02:00
ecorman
83c4214710
Reduce width, + sign was not visible
2016-09-12 00:34:31 +02:00
ecorman
52525b69f4
Updated Translation
2016-09-12 00:33:14 +02:00
ecorman
0221a14f7c
Updated translation
2016-09-12 00:07:50 +02:00
Milos Kozak
e23be121a5
workaround for missing unit in nsprofile
2016-09-11 15:17:33 +02:00
Milos Kozak
841141cd20
recheck pump status if older than 30 min before aplly basal
2016-09-11 13:32:21 +02:00
Milos Kozak
81e82143fc
fix treatment dialog in careportal
2016-09-10 21:20:01 +02:00
Milos Kozak
f1564519d3
show icon in toolbar
2016-09-10 16:08:29 +02:00
Milos Kozak
23e8220b12
initialize current profile in careportal
2016-09-10 15:51:07 +02:00
Milos Kozak
87055bef0b
show danar prefs only if pump is enabled
2016-09-10 15:37:37 +02:00
Milos Kozak
05831c75a6
SMS LOOP commands
2016-09-10 15:33:00 +02:00
Milos Kozak
61134a550f
Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS
2016-09-10 12:20:58 +02:00
Milos Kozak
b15fe7541e
objectives fix
2016-09-10 12:20:32 +02:00
Radoslav Radev
9c82350c1e
Update strings.xml
2016-09-10 10:37:33 +03:00
Milos Kozak
bdeb7d6061
Merge pull request #30 from slavidex/patch-11
...
too long
2016-09-09 13:08:37 +02:00
Milos Kozak
26c09093d1
version bump 1.0.12
2016-09-09 13:07:32 +02:00
Milos Kozak
a3ea0b5316
Merge branch 'master' of https://github.com/ecorman/AndroidAPS into ecorman-master
2016-09-09 11:08:04 +02:00
Milos Kozak
f48faccdd8
Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS
2016-09-09 11:05:07 +02:00
Milos Kozak
77916ec4ae
fix double carbs when carbtime != 0
2016-09-09 11:04:50 +02:00
Radoslav Radev
829beb5c8f
too long
2016-09-09 07:54:16 +03:00
ecorman
5878cbbb75
Change plugins order to have fast access to careportal
2016-09-08 23:37:44 +02:00
ecorman
b7402aa9ea
Correction Input negative improvement
2016-09-08 23:29:14 +02:00
ecorman
e5c1c1df4d
Improve Spanish Translation
2016-09-08 23:19:07 +02:00
ecorman
fcdd07a182
Reduce size to better fit screen
2016-09-08 23:18:15 +02:00
Milos Kozak
e8467ec75f
check for null
2016-09-08 16:53:48 +02:00
Milos Kozak
2c10ade944
try catch on load settings
2016-09-08 13:15:07 +02:00
Milos Kozak
ae9b03f1ae
fix newtempbasaldialogcontext
2016-09-08 12:53:06 +02:00
Milos Kozak
933e081fc5
Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS
2016-09-08 10:08:24 +02:00
Milos Kozak
7fd59246af
use locale string in extended status of DanaR pump
2016-09-08 10:07:55 +02:00
ecorman
96a0d25183
Merge pull request #1 from MilosKozak/master
...
Update from original repo
2016-09-08 00:04:02 +02:00
ecorman
b4f9fca50d
Modificaciones en gradle
2016-09-07 23:47:33 +02:00
ecorman
dd032b19e0
Spanish translation update strings.xml
2016-09-07 23:40:37 +02:00
ecorman
b3857f7794
Spanish translation
2016-09-07 23:39:06 +02:00
ecorman
581f053e53
Allow negative correction in bolus
2016-09-07 23:38:29 +02:00
Milos Kozak
47bff5ad5e
limit requests on openloop mode
2016-09-05 15:27:53 +02:00
Milos Kozak
34d2178878
fix newextendedbolusdialog context
2016-09-05 09:14:39 +02:00
Milos Kozak
b5d2d8d931
danarcontrol build variant
2016-09-05 09:11:30 +02:00
Milos Kozak
b56d3223ab
fix passing date in careportal
2016-09-02 14:12:05 +02:00
Milos Kozak
3d238e3adb
reset flag when pump is changed
2016-09-02 13:35:10 +02:00
Milos Kozak
ff32764375
remove accents in SMS
2016-09-02 09:43:38 +02:00
Milos Kozak
9f9d348c11
check for null context in wizarddialog
2016-08-27 12:32:18 +02:00
Milos Kozak
65ea11d9a8
v 1.0.11
2016-08-21 22:20:17 +02:00
Milos Kozak
7b82b60324
vars optimalization
2016-08-21 22:14:33 +02:00
Milos Kozak
e46aab8948
updateguiifvisible on resume
2016-08-21 22:06:36 +02:00
Milos Kozak
08d940b2fb
temp fix of bolus progress crash
2016-08-18 09:10:32 +02:00
Milos Kozak
38ee1402a4
simple profile fix
2016-08-16 08:32:31 +02:00
Milos Kozak
ced974e96d
Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS
2016-08-15 10:05:00 +02:00
Milos Kozak
d78d0be270
danar history context fix
2016-08-15 10:04:52 +02:00
Milos Kozak
451a455d3d
longer wait in comm after bolus
2016-08-14 20:35:00 +02:00
Milos Kozak
8864886702
more dialogs tweaking
2016-08-14 20:33:29 +02:00
Milos Kozak
bb041b1c06
more progress dialog tweaking
2016-08-14 20:19:47 +02:00
Milos Kozak
e95650d54d
Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS
2016-08-14 10:14:16 +02:00
Milos Kozak
be8c1c2a83
change to screen lock, better context handling
2016-08-14 10:13:26 +02:00
Milos Kozak
6a6ed7b87a
Merge pull request #24 from jotomo/case-sensitive-filesystem
...
Align class name with file name to fix error on case-sensitive filesy…
2016-08-14 09:44:21 +02:00
Milos Kozak
9c3b8dc2b9
typo
2016-08-13 23:00:10 +02:00
Milos Kozak
b77bbd5bc6
static options in careportal dialog
2016-08-13 22:16:36 +02:00
