Commit graph

1699 commits

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