Commit graph

936 commits

Author SHA1 Message Date
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
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
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
Milos Kozak
1e8defb884 Merge pull request #144 from AdrianLxM/deltasx
remove round-basal.js
2017-01-26 22:43:57 +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
Milos Kozak
837c4573be Merge pull request #146 from Heiner1/dev
Update strings.xml
2017-01-26 00:34:52 +01:00
Heiner1
5c43c66163 Update strings.xml 2017-01-25 23:35:31 +01:00
AdrianLxM
b588211658 prevent nullpointer exception when BG <39 2017-01-25 15:37:05 +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
Milos Kozak
1ac071c655 Merge pull request #142 from AdrianLxM/patch-13
Remove diff meta info from unresolved merge conflict
2017-01-24 08:49:30 +01:00
Milos Kozak
107f71722c Merge pull request #141 from LadyViktoria/dev
DanaR Stats small Layout fixes
2017-01-24 08:48:57 +01:00
AdrianLxM
3a43858948 Settings for deltas 2017-01-24 02:21:25 +01:00
AdrianLxM
0b31062480 Remove diff meta info from unresolved merge conflict
Should remove the "unsupported module" error in Android Studio
2017-01-24 01:24:05 +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