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 |
|
AdrianLxM
|
6c3a07cc62
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into MilosKozak-dev
|
2017-01-19 20:47:53 +01:00 |
|
viktoria
|
6120add315
|
Add very Hard Limits to constants
|
2017-01-19 20:36:19 +01:00 |
|
Milos Kozak
|
2754e23c08
|
CS translations
|
2017-01-19 19:52:14 +01:00 |
|
Milos Kozak
|
c701b5d125
|
waiting for pump message
|
2017-01-19 19:21:25 +01:00 |
|
Milos Kozak
|
f8feaf565b
|
show how is value hard limited
|
2017-01-19 18:40:08 +01:00 |
|
Milos Kozak
|
649cab63fc
|
allow some diff on profile check
|
2017-01-19 18:07:16 +01:00 |
|
Milos Kozak
|
e808bcedee
|
remove logging
|
2017-01-19 15:17:43 +01:00 |
|
Milos Kozak
|
75b53cfc0d
|
iob calc fix
|
2017-01-19 14:35:16 +01:00 |
|
Milos Kozak
|
07c9a21ff9
|
autosens log
|
2017-01-19 13:54:56 +01:00 |
|
Milos Kozak
|
e8dcf73c83
|
remove carbsAbsorbed from debug
|
2017-01-18 21:45:27 +01:00 |
|
Milos Kozak
|
8586ed5adb
|
show autosens result
|
2017-01-18 21:40:43 +01:00 |
|
AdrianLxM
|
480b832efe
|
temptarget zero-duration cleanup
|
2017-01-18 16:49:48 +01:00 |
|
AdrianLxM
|
b79743588d
|
temptarget sort and allow for zero-duration to cancel predated ones
|
2017-01-18 15:52:20 +01:00 |
|
viktoria
|
b70e895b95
|
DanaR Stats fixes
|
2017-01-18 04:31:47 +01:00 |
|
viktoria
|
9ba24b4ffd
|
DanaR Stats Beautify
|
2017-01-18 03:08:19 +01:00 |
|
viktoria
|
678fbedcbf
|
Merge branch 'dev'
Conflicts:
app/src/main/res/values/strings.xml
|
2017-01-18 03:03:58 +01:00 |
|
Milos Kozak
|
9f4cc28c0f
|
allow removing temp target records with null _id
|
2017-01-17 23:43:50 +01:00 |
|
AdrianLxM
|
d36a515d45
|
temp target overview
|
2017-01-17 21:32:30 +01:00 |
|
Milos Kozak
|
f9ed2ed4b4
|
temp targets to AMA
|
2017-01-17 18:56:08 +01:00 |
|
Milos Kozak
|
0e21b67a42
|
fix merge conflicts
|
2017-01-17 18:00:44 +01:00 |
|
Milos Kozak
|
432c937a46
|
Merge branch 'dev' into AMA
|
2017-01-17 17:49:21 +01:00 |
|
Milos Kozak
|
08c078466a
|
Merge pull request #127 from MilosKozak/temptarget
Temptarget
|
2017-01-17 17:47:14 +01:00 |
|
Milos Kozak
|
b0392b997e
|
fix crash
|
2017-01-17 17:02:57 +01:00 |
|
Milos Kozak
|
1b385c10e3
|
fix iob calculation in the past
|
2017-01-17 16:19:34 +01:00 |
|
Milos Kozak
|
12eec7108a
|
detect oldest data available
|
2017-01-17 15:19:02 +01:00 |
|
Milos Kozak
|
7c90dfe03c
|
confirm dialog on removing temptarget
|
2017-01-16 23:54:46 +01:00 |
|
Milos Kozak
|
b6714ae254
|
use notification instead of toast
|
2017-01-16 23:37:58 +01:00 |
|
Milos Kozak
|
87c84da3d9
|
minimal NSClient version 1.21
|
2017-01-16 23:25:31 +01:00 |
|
Milos Kozak
|
218190e92f
|
support for removing temp targets from GUI
|
2017-01-16 23:23:20 +01:00 |
|
Milos Kozak
|
8c38090031
|
apply temp targets to MA
|
2017-01-16 21:03:31 +01:00 |
|
Milos Kozak
|
eaa16402a7
|
show running temp target on overview
|
2017-01-16 20:47:57 +01:00 |
|
Milos Kozak
|
61b1ee781f
|
temp target treatment dialog & sync fix
|
2017-01-16 16:59:12 +01:00 |
|
viktoria
|
61a1e5bc04
|
Korean DanaR Stats Activity
|
2017-01-16 13:23:41 +01:00 |
|
viktoria
|
e851d15aff
|
DanaR Stats Activity
|
2017-01-16 13:23:41 +01:00 |
|
Milos Kozak
|
262dae3ab3
|
Merge pull request #129 from slavidex/patch-26
Update pref_others.xml
|
2017-01-14 16:37:57 +01:00 |
|
Milos Kozak
|
61a8cad4e8
|
allow refrest temp targets from NS & fix bugs
|
2017-01-14 16:36:42 +01:00 |
|
Radoslav Radev
|
8f0a28419d
|
Update pref_others.xml
|
2017-01-14 15:25:06 +02:00 |
|
Radoslav Radev
|
cbd7aa74eb
|
Update strings.xml
|
2017-01-14 15:21:47 +02:00 |
|
Milos Kozak
|
a96bc52e01
|
handle temp targets data from NS
|
2017-01-14 00:37:35 +01:00 |
|
Milos Kozak
|
458bee4538
|
display temptargets
|
2017-01-13 23:43:17 +01:00 |
|
Milos Kozak
|
339e62c120
|
temptarget db support
|
2017-01-13 22:36:47 +01:00 |
|
Milos Kozak
|
1b53cde2bf
|
plain temptarget plugin
|
2017-01-13 21:14:04 +01:00 |
|
Milos Kozak
|
dcc6acdf31
|
Merge branch 'AMA' of https://github.com/MilosKozak/AndroidAPS into AMA
|
2017-01-13 20:31:20 +01:00 |
|
Milos Kozak
|
d9fffc5625
|
refactor IOB calculation & fix iob_array.time
|
2017-01-13 20:30:48 +01:00 |
|
Milos Kozak
|
6015930b41
|
Merge pull request #126 from AdrianLxM/patch-12
Extended restricted by MAXBOLUS DanaR-plugin
|
2017-01-13 19:41:49 +01:00 |
|
AdrianLxM
|
916ab35be1
|
Extended restricted by MAXBOLUS Dana
|
2017-01-13 19:33:37 +01:00 |
|
Milos Kozak
|
9d8d925f75
|
better check for null
|
2017-01-12 21:55:17 +01:00 |
|
Milos Kozak
|
ea15659050
|
Merge pull request #122 from AdrianLxM/patch-11
Typo German (Ereignis with one s)
|
2017-01-10 08:30:29 +01:00 |
|
AdrianLxM
|
dfc176d1bd
|
Typo German (Ereignis with one s)
|
2017-01-10 02:39:16 +01:00 |
|
AdrianLxM
|
856c025e2b
|
typo spanish
|
2017-01-10 02:37:20 +01:00 |
|
viktoria
|
f5f60bcd30
|
fix autosens adjust BG targets
regarding to that:
https://openaps.readthedocs.io/en/latest/docs/walkthrough/phase-3/beyond-low-glucose-suspend.html
the autosens_adjust_targets setting is only for allow autosens to adjust the BG target not for enabling or disabling the wohle autosens feature
|
2017-01-10 01:01:11 +01:00 |
|
Milos Kozak
|
97431e5b94
|
show base basal line
|
2017-01-09 23:19:25 +01:00 |
|
Milos Kozak
|
8a4678bb8f
|
make now-line more visible
|
2017-01-09 22:13:45 +01:00 |
|
Milos Kozak
|
bb76fa9d20
|
need of 14 days run to enable AMA
|
2017-01-09 19:54:23 +01:00 |
|
Milos Kozak
|
74afdb6874
|
Merge branch 'dev' into AMA
|
2017-01-09 17:34:49 +01:00 |
|
Milos Kozak
|
18a1927204
|
better optimize space of prediction in overview
|
2017-01-09 17:34:37 +01:00 |
|
Milos Kozak
|
26a76217bf
|
Greek language
|
2017-01-09 17:23:56 +01:00 |
|
Milos Kozak
|
e03de6cb63
|
use mgdl in autosens
|
2017-01-09 11:29:54 +01:00 |
|
Milos Kozak
|
c62e498aac
|
ensure we are loading 24h + dia data
|
2017-01-09 10:57:15 +01:00 |
|
Milos Kozak
|
5f146f90de
|
fix merge conflict
|
2017-01-09 10:17:27 +01:00 |
|
viktoria
|
4fe06e4ee1
|
refactor cpp
add safety values to constans class
|
2017-01-09 02:28:27 +01:00 |
|
Milos Kozak
|
e9b900d74a
|
show predictions in graph
|
2017-01-08 23:10:27 +01:00 |
|
Milos Kozak
|
93b80746c6
|
optimize determine basal
|
2017-01-08 17:02:33 +01:00 |
|
Milos Kozak
|
aa24a592fa
|
better detect meal bolus
|
2017-01-08 16:57:05 +01:00 |
|
Milos Kozak
|
68a127d804
|
make autosens configurable in settings, determinebasaladapter refactoring
|
2017-01-08 14:21:29 +01:00 |
|
Milos Kozak
|
e71b478941
|
show both deltas on overview
|
2017-01-08 12:04:42 +01:00 |
|
Milos Kozak
|
4303cd2982
|
Merge branch 'master' into AMA
|
2017-01-08 00:46:11 +01:00 |
|
Milos Kozak
|
7b5a289fc1
|
run aps only on interested treatments
|
2017-01-08 00:45:43 +01:00 |
|
Milos Kozak
|
66bd06076e
|
log invoke() source
|
2017-01-08 00:38:53 +01:00 |
|
Milos Kozak
|
6621c2f610
|
log script debug in fragment
|
2017-01-08 00:27:13 +01:00 |
|
Milos Kozak
|
28c329dc01
|
log script params separately
|
2017-01-08 00:19:48 +01:00 |
|
Milos Kozak
|
9c93d3ad7d
|
log autosens input data in fragment
|
2017-01-08 00:07:18 +01:00 |
|
Milos Kozak
|
f707029560
|
fix conflict
|
2017-01-07 23:45:41 +01:00 |
|
Milos Kozak
|
75192f0372
|
prevent logging exception
|
2017-01-07 23:38:59 +01:00 |
|
Milos Kozak
|
89db232375
|
Merge pull request #110 from MilosKozak/dateformat
use android.text.format.DateUtils
|
2017-01-07 23:27:47 +01:00 |
|
Milos Kozak
|
38f397cd59
|
revert formating date
|
2017-01-07 23:26:28 +01:00 |
|
Milos Kozak
|
e5fc19a785
|
better arrange code lines
|
2017-01-07 23:04:12 +01:00 |
|
Milos Kozak
|
8456f87de1
|
Merge remote-tracking branch 'origin/master' into AMA
|
2017-01-07 00:04:26 +01:00 |
|
Milos Kozak
|
25a3b678e9
|
most new AMA code added
|
2017-01-06 22:42:37 +01:00 |
|
Milos Kozak
|
6dc3d38a2f
|
fix passing carb ratio
|
2017-01-06 09:52:17 +01:00 |
|
Milos Kozak
|
26102848f5
|
refactor MealData
|
2017-01-04 23:03:13 +01:00 |
|
Milos Kozak
|
ebb3e90587
|
extract MealData
|
2017-01-04 22:47:21 +01:00 |
|
Milos Kozak
|
e585ab4030
|
Merge branch 'AMA' of https://github.com/MilosKozak/AndroidAPS into AMA
|
2017-01-04 22:37:10 +01:00 |
|
Milos Kozak
|
3eee917979
|
add sample data
|
2017-01-04 22:37:03 +01:00 |
|
Milos Kozak
|
724a041341
|
refactor classes
|
2017-01-04 22:33:17 +01:00 |
|
Milos Kozak
|
8aad003311
|
copy basic files oref0 dev 2017/01/04, make it running without crash
|
2017-01-04 22:21:46 +01:00 |
|
Milos Kozak
|
9d5c2e5dac
|
fix visibility of aps plugin at start
|
2017-01-03 22:13:25 +01:00 |
|
Milos Kozak
|
50f75e3404
|
upload AMA result to NS too
|
2017-01-03 21:42:32 +01:00 |
|
Milos Kozak
|
05911be4e0
|
remove parcelable code from determinebasaladapter
|
2017-01-03 21:37:23 +01:00 |
|
Milos Kozak
|
3dfac49b82
|
duplicate MA -> AMA
|
2017-01-03 21:15:40 +01:00 |
|
Milos Kozak
|
faf8e07248
|
renaming before adding AMA
|
2017-01-03 21:01:01 +01:00 |
|
Milos Kozak
|
f3f6a911ae
|
use android.text.format.DateUtils
|
2017-01-03 19:06:35 +01:00 |
|
Milos Kozak
|
fe75298263
|
safer display values in openapsma fragment
|
2017-01-03 10:24:08 +01:00 |
|
viktoria
|
f3551dda7f
|
german translation
|
2017-01-02 16:44:20 +01:00 |
|
Milos Kozak
|
952a2342a8
|
Merge pull request #104 from MilosKozak/mm640g
MM640g bg source
|
2017-01-02 13:58:56 +01:00 |
|
Milos Kozak
|
8637e99afe
|
Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS
|
2017-01-02 00:05:57 +01:00 |
|
AdrianLxM
|
9c40e4af34
|
Dismiss editing when fragment is paused
|
2017-01-01 21:46:25 +01:00 |
|
Milos Kozak
|
fded515ac1
|
fix TimeListEdit when fragment is restored
|
2017-01-01 20:22:23 +01:00 |
|
Milos Kozak
|
4408146f23
|
disable entering basals in profiles only if pump is not tempbasal capable
|
2017-01-01 14:34:57 +01:00 |
|
Milos Kozak
|
ef2e7b1a62
|
show basal line only if pump is tempbasal capable
|
2017-01-01 14:19:35 +01:00 |
|
Milos Kozak
|
9edb5c9a66
|
draw basals only if pump is tempbasal capable
|
2017-01-01 14:00:59 +01:00 |
|
Milos Kozak
|
86f5aec0bb
|
disable visible control when plugin is not enabled
|
2017-01-01 13:45:03 +01:00 |
|
Milos Kozak
|
38a9c94258
|
Local Profile
|
2016-12-31 20:10:36 +01:00 |
|
Milos Kozak
|
6b18336fa2
|
LocalProfile plugin
|
2016-12-31 15:06:45 +01:00 |
|
Milos Kozak
|
0458ad65ce
|
handle arrays separately
|
2016-12-31 14:52:23 +01:00 |
|
Milos Kozak
|
2e6c168adc
|
TimeListEdit most work done
|
2016-12-31 13:11:32 +01:00 |
|
Milos Kozak
|
e1c2e4c492
|
TimeListEdit initial work
|
2016-12-30 16:43:43 +01:00 |
|
Milos Kozak
|
2f52091b67
|
show upload profile button only when pump is capable to this
|
2016-12-29 23:10:39 +01:00 |
|
Milos Kozak
|
b2be49e631
|
simple profile layout
|
2016-12-29 22:40:30 +01:00 |
|
Milos Kozak
|
1e99c00626
|
allow sms string to be translated separately
|
2016-12-29 16:22:40 +01:00 |
|
Milos Kozak
|
8e46a55e48
|
allow better translation of min ago
|
2016-12-29 16:06:00 +01:00 |
|
Milos Kozak
|
0059266791
|
loop status font size
|
2016-12-29 14:23:05 +01:00 |
|
Milos Kozak
|
24c5bb9303
|
Merge branch 'master' into mm640g
|
2016-12-29 14:01:24 +01:00 |
|
Milos Kozak
|
83f4dbf9ca
|
Merge pull request #103 from AdrianLxM/patch-8
remove mm640g translation again
|
2016-12-29 13:51:24 +01:00 |
|
Milos Kozak
|
c06d25b235
|
more rearrangements
|
2016-12-29 00:12:52 +01:00 |
|
Milos Kozak
|
f127e7bec1
|
better allign bg arrows
|
2016-12-28 23:48:43 +01:00 |
|
AdrianLxM
|
834398b8f0
|
remove mm640g translation again
|
2016-12-28 23:31:02 +01:00 |
|
Milos Kozak
|
6b86818464
|
Merge pull request #102 from AdrianLxM/avgdelta
Avgdelta
|
2016-12-28 23:15:23 +01:00 |
|
Milos Kozak
|
c8a58808e0
|
more logging on setting extended bolus
|
2016-12-28 23:13:11 +01:00 |
|