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

3588 commits

Author SHA1 Message Date
Johannes Mockenhaupt
6a6359f1ee
Combo: Show count of boluses delivered and TBRs set on pump. 2018-03-17 13:51:13 +01:00
Johannes Mockenhaupt
a7ca483565
Rename isActiveBgSource -> isFromActiveBgSource. 2018-03-17 13:36:52 +01:00
Johannes Mockenhaupt
8849df639f
Invoke loop only for new BGs from active BG source. 2018-03-17 13:31:33 +01:00
Johannes Mockenhaupt
ad3bf19e4c
Handle received EventNewBg depending on args. 
(cherry picked from commit 79b7a7b)
 2018-03-17 13:28:49 +01:00
Johannes Mockenhaupt
7f45316a24
Add isActiveBg to EventNewBg. 
(cherry picked from commit a8291ff)
 2018-03-17 13:28:47 +01:00
Johannes Mockenhaupt
063505fdb3
Only invoke the loop for new BGs. 2018-03-17 13:27:56 +01:00
Milos Kozak
1e359184a9 check for null profile 2018-03-17 08:12:07 +01:00
AdrianLxM
a2ecfa89a0 history browser chart selection 2018-03-16 23:32:17 +01:00
Johannes Mockenhaupt
7c9824e37d
Insulin button: allow negative presets, fix adding TT insulin. 2018-03-16 22:54:38 +01:00
Johannes Mockenhaupt
194c7a2dbc
Overview: symetric spacing. 2018-03-16 22:54:31 +01:00
Johannes Mockenhaupt
8564cf172e
Carbs button: send carbs to pump if pump supports carbs. 2018-03-16 22:11:15 +01:00
Johannes Mockenhaupt
32108a7c2f
Carbs button: fix visibility pref, input type, allow negative increments. 2018-03-16 22:11:15 +01:00
AdrianLxM
90f9bf373c
Smallscreen fix 2018-03-16 21:52:02 +01:00
AdrianLxM
47c6c2d9a8 chart menu 4 2018-03-16 19:26:18 +01:00
AdrianLxM
067b264ae8 chart menu 3 2018-03-16 19:16:47 +01:00
AdrianLxM
21c3853461 chart menu 2 2018-03-16 18:10:13 +01:00
AdrianLxM
32894a092e chart menu 1 2018-03-16 17:23:02 +01:00
Milos Kozak
b6ce7c03c6 remove profile dependency from pump drivers, TRB optimalization 2018-03-16 16:53:38 +01:00
Johannes Mockenhaupt
0205dc40b3
Combo: set SMB flag on bolus progress update for wear. 2018-03-16 15:56:31 +01:00
Johannes Mockenhaupt
6bebb30da0
Combo: use PrivacyFabric to align with dev. 2018-03-16 15:52:21 +01:00
Johannes Mockenhaupt
30d522e1a8
Combo: update PumpDescription to align with dev. 2018-03-16 15:49:12 +01:00
Johannes Mockenhaupt
db00404e43
Merge commit 'origin/dev^' into combo-dev-merge 
* commit 'origin/dev^': (313 commits)
  cleanup
  draw profile in dana profile viewer
  optimize imports
  draw basal in profile viewer
  BG autobackfill configurable
  travis 2nd try
  Save new profile when updating it
  Add environment variable to handle testCoverage
  do not pass DIA to SMB determine_basal
  show Dana model properly after communication error
  fix deviation slope calculations
  Read maximum basal and bolus amount from pump
  update maxIOB hard limits
  Allow bolus record only in new treatment dialog
  use safeGetString
  JsonHelper test
  food code cleanup
  Show bolus progress
  Missing import statement
  Insight: add treatment to progress event
  ...
 2018-03-16 15:44:54 +01:00
Markus M. May
2c3f28670c Disallow profile store on pump if on dev branch but not in engineering mode 2018-03-15 23:00:08 +01:00
Markus M. May
39aae28101 Disable profile switch if not in Engineering mode and on dev branch 2018-03-15 21:51:43 +01:00
Markus M. May
e38f10dba0 Merge jamoto/engineering-mode 2018-03-15 21:10:18 +01:00
Milos Kozak
db7671cd23 split enacting TRB and SMB 2018-03-15 18:30:18 +01:00
AdrianLxM
5fd05158ac cleanup 2018-03-15 17:00:57 +01:00
AdrianLxM
b481e77008 draw profile in dana profile viewer 2018-03-15 16:56:59 +01:00
AdrianLxM
d31c9a6ed6 optimize imports 2018-03-15 14:13:21 +01:00
AdrianLxM
212a9dcc94 draw basal in profile viewer 2018-03-15 14:08:00 +01:00
Milos Kozak
e9313c5b28 BG autobackfill configurable 2018-03-14 20:21:48 +01:00
Milos Kozak
d25855295d travis 2nd try 2018-03-13 23:48:14 +01:00
Milos Kozak
52d558388d
Merge pull request #758 from triplem/travis_coverage 
Add environment variable to handle testCoverage on travis
 2018-03-13 20:55:32 +01:00
Milos Kozak
e92e05cfbd
Merge pull request #759 from TebbeUbben/dev 
Save new profile when updating it to fix "endless loop"
 2018-03-13 20:31:38 +01:00
TebbeUbben
11295b1e96 Save new profile when updating it 2018-03-13 20:15:58 +01:00
Markus M. May
b10f8f2fe1 Add environment variable to handle testCoverage 2018-03-13 19:24:08 +01:00
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.

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