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

3682 commits

Author SHA1 Message Date
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.

reverting changess to app/src/main/java/info/nightscout/androidaps/MainApp.java
 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