Commit graph

1230 commits

Author SHA1 Message Date
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
5cff42cd92 wear toggle setting to enable watch vibration on bolus 2017-02-07 09:29:59 +01:00
AdrianLxM
f4b553fe52 Wear added bolusprogress and dismiss when finished 2017-02-07 09:17:19 +01:00
AdrianLxM
10d71325dd Wear separate cancel action extra with bolus progress card 2017-02-06 21:10:55 +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
Milos Kozak
adaa20e5e4 Merge pull request #151 from AdrianLxM/patch-15
rounding minutesago instead of truncating it
2017-02-06 12:03:14 +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
Milos Kozak
29dff77325 Merge pull request #150 from AdrianLxM/tempbasal-errorstring
Correct error for tempbasals
2017-02-02 17:20:41 +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
Milos Kozak
a82c579014 Merge pull request #148 from AdrianLxM/minutesrunning
Update determine-basal.js with minutesrunning
2017-01-30 09:53:33 +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
Milos Kozak
635c64210f Merge pull request #147 from AdrianLxM/patch-14
fix bgi in autosens
2017-01-28 10:32:07 +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