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 |
|