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

3541 commits

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

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