Winfried Kuiper
5b43f11a3f
Update strings.xml
...
Confirmation=Bestätigung statt Konfiguration (configuration)
2017-08-09 22:12:09 +02:00
Winfried Kuiper
99a0edfa06
Update strings.xml
...
Missing units in german translation
2017-08-09 22:03:59 +02:00
Milos Kozak
57f5e5a92d
add bolus metadata when reading pump history
2017-08-08 23:14:56 +02:00
Milos Kozak
bbc68b2266
synchronized getAutosensData
2017-08-08 15:55:31 +02:00
Milos Kozak
2f8ca8bb04
fix setting zero temp
2017-08-08 15:06:31 +02:00
RoumenGeorgiev
122efb1b8e
Fix for getting double of alarmTimeagoWarnMins
2017-08-07 20:06:15 +03:00
RoumenGeorgiev
1dd9086924
added snoozing if bgReadingAgo is smaller than threshold
2017-08-07 18:53:56 +03:00
Milos Kozak
3bfecd6da8
check for existing
2017-08-07 16:13:09 +02:00
Milos Kozak
2ae0028495
Swedish
2017-08-07 14:06:11 +02:00
RoumenGeorgiev
4f054907cb
Merge pull request #1 from MilosKozak/dev
...
Dev
2017-08-07 09:17:07 +03:00
Milos Kozak
a40afd0948
1.5g
2017-08-06 14:28:01 +02:00
Milos Kozak
848863aca5
calculateFromTreatmentsAndTempsSynchronized
2017-08-06 14:25:25 +02:00
Milos Kozak
f1f7a6ca6c
check for null
2017-08-06 14:14:03 +02:00
Milos Kozak
066283a4b0
add SMB flag to treatments
2017-08-06 12:19:25 +02:00
Milos Kozak
6ab6f82b10
more debug on setting temp basal
2017-08-06 11:42:20 +02:00
Milos Kozak
4e4088f164
remove unneeded strings
2017-08-05 18:47:01 +02:00
Milos Kozak
4fda4fd547
convert target values to mdgl before passing to openaps
2017-08-05 18:14:10 +02:00
Milos Kozak
e295c8a2dc
target range change confirm dialog
2017-08-05 18:09:19 +02:00
Milos Kozak
f834b3b7e0
remove unneeded texts
2017-08-05 17:43:31 +02:00
Milos Kozak
1604b85d34
Merge branch 'dev' into move-to-range-in-profile
2017-08-05 14:48:41 +02:00
RoumenGeorgiev
222c357456
Added check for enabled openAPS stale data alarm in NS
2017-08-05 11:58:49 +03:00
RoumenGeorgiev
ad122153a9
added openAPSEnabledAlerts()
...
check for OpenAPS alerts enabled
2017-08-05 11:26:12 +03:00
RoumenGeorgiev
3d9df4e18e
Using equals() instead of == on line 1811
2017-08-05 11:20:09 +03:00
RoumenGeorgiev
cdee9bf703
Get staleData setting from NS first
2017-08-04 17:04:57 +03:00
RoumenGeorgiev
aff62d86b1
Changed name of button to snooze if it's staleDataAlarm
2017-08-04 16:43:46 +03:00
RoumenGeorgiev
714a292d78
fixed wrong pasting
2017-08-04 15:05:09 +03:00
RoumenGeorgiev
837dcdb23b
If alarm is staledata dismis snoozes it
2017-08-04 14:51:25 +03:00
RoumenGeorgiev
82541a50e4
Added functions for snoozing and unsnoozing
2017-08-04 14:49:46 +03:00
RoumenGeorgiev
a8b17a1f22
adding staleDataThreshold as snooze time
2017-08-04 14:48:44 +03:00
RoumenGeorgiev
529d267b9d
Added check for staleData and notification
...
with every loop
2017-08-04 12:29:48 +03:00
RoumenGeorgiev
232590e707
Added staleData
2017-08-03 18:48:45 +03:00
RoumenGeorgiev
74bb05a654
added staledataalarm
2017-08-03 17:14:14 +03:00
AdrianLxM
36e6cb8497
remove canceltemp button from all layouts and click handling from overview fragment
2017-08-03 08:22:59 +02:00
AdrianLxM
053004bbbd
correct logging
2017-08-03 08:20:11 +02:00
AdrianLxM
7a7f75db01
fix cancel real temp basals from actions
2017-08-03 03:22:30 +02:00
AdrianLxM
0ac7357ee9
color for active temp
2017-08-03 03:12:47 +02:00
AdrianLxM
1ac1b77fd4
remove translated string not in default strings and add flag to cancel method
2017-08-03 02:01:52 +02:00
AdrianLxM
23abc0e4e5
Some more German
2017-08-02 00:08:56 +02:00
AdrianLxM
5d51b8f0f9
Some more German
2017-08-01 23:56:16 +02:00
AdrianLxM
e30e62e9ab
Some German translations, remove unused strings, App name for all
2017-08-01 23:46:58 +02:00
Radoslav Radev
39891bbad9
Update strings.xml
2017-08-01 23:29:23 +03:00
Milos Kozak
e933650330
CS translations
2017-08-01 22:17:39 +02:00
Milos Kozak
9cf5c6b6c3
hide all overview buttons by default
2017-08-01 20:52:23 +02:00
Milos Kozak
34d4bec556
move cancel temp to actions
2017-08-01 20:45:57 +02:00
Milos Kozak
9596987b35
new temp basal dialog refactor
2017-08-01 20:02:17 +02:00
Milos Kozak
d2a5939ce3
fix virtual pump crash
2017-08-01 17:53:28 +02:00
Milos Kozak
a24cbfda50
Disconnect pump: cancel temp before setting new to make sure it will last as expected
2017-08-01 17:37:32 +02:00
Milos Kozak
6828e11dd9
remove notes strings as well
2017-08-01 17:25:43 +02:00
Milos Kozak
6f9f72d849
remove notes from temp basal upload
2017-08-01 17:21:32 +02:00
Milos Kozak
668008e1c1
cancel current temp before activating superbolus
2017-07-31 19:53:09 +02:00
AdrianLxM
5569b42ac3
wear wizard percentage
2017-07-26 09:58:51 +02:00
Milos Kozak
7a572d2341
1.5f
2017-07-25 22:53:55 +02:00
Milos Kozak
4bb3b7c11d
Merge pull request #323 from MilosKozak/nsclient-local-second
...
Nsclient local broadcasts
2017-07-25 19:51:57 +02:00
Milos Kozak
0914e67c11
typo
2017-07-25 19:25:58 +02:00
Milos Kozak
f1e21053b5
use key instead of string
2017-07-25 19:24:51 +02:00
Milos Kozak
d6cb8ef6bc
check for existing value
2017-07-25 19:18:51 +02:00
Milos Kozak
252b24cefe
Merge pull request #313 from MilosKozak/synchronize-nsclientlog
...
synchronize NSClient log
2017-07-25 12:50:48 +02:00
AdrianLxM
3500e92a41
nsclient ackAlarm local
2017-07-24 02:33:29 +02:00
AdrianLxM
d60321b4d1
nsclient alarms local
2017-07-24 02:27:16 +02:00
AdrianLxM
a4864c3d06
nsclient cal local
2017-07-24 02:09:26 +02:00
AdrianLxM
194a817332
nsclient devicestatus local
2017-07-24 02:06:05 +02:00
AdrianLxM
fe57d4a61d
nsclient mbg local
2017-07-24 02:02:54 +02:00
AdrianLxM
82b99e1708
nsclient status local
2017-07-24 02:00:46 +02:00
AdrianLxM
759154e578
nsclient profile local
2017-07-24 01:58:23 +02:00
AdrianLxM
7a171bd949
nsclient sgv local
2017-07-24 01:55:01 +02:00
AdrianLxM
38100e758e
nsclient treatments local
2017-07-24 01:50:27 +02:00
AdrianLxM
796b7ecdf2
rename package lowercase
2017-07-24 00:12:53 +02:00
AdrianLxM
1c0e97c175
recategorize cp icons
2017-07-22 20:57:30 +02:00
AdrianLxM
2e32d12bc0
removed unnecessary text colour and fixed indentation
2017-07-22 14:34:59 +02:00
AdrianLxM
c187bf1575
layout indentation
2017-07-22 14:30:55 +02:00
Roumen Georgiev
54697df358
Moving some buttons to the right categories
2017-07-22 14:27:51 +02:00
AdrianLxM
3d4fa0cebf
remove duplicate IDs and indentation fix
2017-07-22 02:15:55 +02:00
AdrianLxM
0b6c9845fa
synchronize NSClient log
2017-07-22 01:43:33 +02:00
AdrianLxM
10d27f0b6a
Picture renaming ( #311 )
...
* adding icons
2017-07-21 22:24:06 +02:00
AdrianLxM
e381d197cb
1.5e
2017-07-21 16:49:43 +02:00
AdrianLxM
3d82bdb347
Merge pull request #295 from jotomo/on-resume-update-gui
...
On resume update gui
2017-07-21 16:47:28 +02:00
AdrianLxM
06497a862d
Merge pull request #303 from AdrianLxM/synchronize-intervals
...
synchronize interval access from other classes
2017-07-21 16:47:00 +02:00
AdrianLxM
6d1c0feeab
Merge pull request #302 from AdrianLxM/cleanups
...
Cleanups
2017-07-21 16:46:48 +02:00
AdrianLxM
0297f2b75d
Merge pull request #301 from MilosKozak/insulin-colourlables
...
Add color of chart to corresponding lables/scale
2017-07-21 16:46:39 +02:00
Johannes Mockenhaupt
fdc0aea24b
Let CircadianPercentageProfileFragment inherit from SubscriberFragment.
2017-07-21 14:56:14 +02:00
AdrianLxM
31fcf34a2d
Fix after merge-conflict cleanup
2017-07-21 11:59:36 +02:00
PoweRGbg
059e58c640
Files renamed
2017-07-21 11:55:12 +02:00
Milos Kozak
c68eccc328
Merge pull request #306 from boikonur/dev
2017-07-20 20:49:35 +02:00
Boyko Kazakov
3b1407b8dd
Added icons for home, actions and care portal screens
2017-07-20 20:57:45 +03:00
Radoslav Radev
3098f0bdfa
update bg translation
2017-07-20 09:24:35 +03:00
AdrianLxM
42263e979e
synchronize interval access from other classes
2017-07-20 02:43:01 +02:00
AdrianLxM
b72482601e
remove unnecessary semicolons
2017-07-20 01:06:41 +02:00
AdrianLxM
1ba11ed006
spanish emptiy string
2017-07-20 01:06:21 +02:00
AdrianLxM
b5cb68be73
remove extra strings
2017-07-20 01:06:00 +02:00
AdrianLxM
6daff6fae9
self asignment -> comment
2017-07-20 01:05:25 +02:00
AdrianLxM
c35b7bb9d6
string comparison
2017-07-20 01:05:05 +02:00
AdrianLxM
03ad898562
Merge branch 'dev' into on-resume-update-gui
2017-07-20 00:17:32 +02:00
AdrianLxM
98bb792264
Add color of chart to corresponding lables/scale
2017-07-19 23:46:32 +02:00
AdrianLxM
732e225c7d
bulgarian removed non-translatable
2017-07-19 19:50:40 +02:00
AdrianLxM
f220bb034e
Merge pull request #286 from AdrianLxM/temp-target-logic
...
Temp target logic
2017-07-19 19:33:17 +02:00
AdrianLxM
e51954cec3
Merge pull request #292 from AdrianLxM/wear-tdd
...
Wear tdd
2017-07-19 19:05:41 +02:00
Milos Kozak
3475b64e1b
Merge pull request #299 from MilosKozak/dev-nsclient-quickfix
...
NSClient quickfix
2017-07-19 18:53:38 +02:00
AdrianLxM
76990b7983
synchronize interval access
2017-07-19 17:39:55 +02:00
Milos Kozak
62ff62a31f
Merge pull request #290 from PoweRGbg/patch-1
2017-07-19 17:21:15 +02:00
AdrianLxM
e6ce35485a
nsclient remove debug data that puts stress on the broadcast system 3
2017-07-19 16:09:34 +02:00
AdrianLxM
621c32d832
nsclient remove debug data that puts stress on the broadcast system 2
2017-07-19 16:06:36 +02:00
AdrianLxM
c1e030d789
nsclient remove debug data that puts stress on the broadcast system
2017-07-19 16:05:13 +02:00
Johannes Mockenhaupt
c95879e6ad
Align OpenAS(A)MA fragments with layout of other fragments.
...
Removes a margin that makes the top elements jump up and
down when flipping through tabs.
2017-07-19 12:32:18 +02:00
AdrianLxM
cfe8e0a23a
local broadcasts better setting title
2017-07-18 22:18:10 +02:00
AdrianLxM
c753873769
setting to disable local broadcasts in NSClient
2017-07-18 22:15:17 +02:00
PoweRGbg
c3f85faede
removed some "unneeded" translations
2017-07-18 18:10:24 +03:00
AdrianLxM
c79a5725fd
Update InsulinFastactingProlongedFragment.java
...
... in case DIA has changed.
2017-07-18 13:19:43 +02:00
AdrianLxM
741f6bd866
Update InsulinFastactingFragment.java
...
... in case DIA has changed
2017-07-18 13:18:41 +02:00
Johannes Mockenhaupt
7eacd5021c
Use target ranges from profile, rather than fixed values from prefs.
2017-07-18 13:04:15 +02:00
Johannes Mockenhaupt
435ec55580
Extract SubscriberFragment base class.
2017-07-18 12:59:25 +02:00
Johannes Mockenhaupt
7c6bdc0b31
Have most fragments update their content in onResume.
2017-07-18 12:38:42 +02:00
AdrianLxM
e0c1f65b8b
wear tdd weighted
2017-07-17 22:40:05 +02:00
AdrianLxM
50c26f28fd
wear TDD status
2017-07-17 22:39:48 +02:00
AdrianLxM
387cfcccaf
wear menu simplification
2017-07-17 22:39:00 +02:00
PoweRGbg
7216418f44
Translated latest additions strings.xml
2017-07-17 11:37:00 +03:00
AdrianLxM
0d1ff3d721
ns client quickfix now catch all
2017-07-16 16:49:26 +02:00
AdrianLxM
c64c5f5401
NS client quickfix - catch even more
2017-07-16 16:38:01 +02:00
AdrianLxM
d5599f1f00
catch TransactionTooLargeException
2017-07-16 16:00:04 +02:00
Milos Kozak
26ebceb4d9
Merge pull request #288 from AdrianLxM/wear-overviewnotification
2017-07-15 16:31:45 +02:00
Boyko Kazakov
7a2db43347
Added Images for different resolutions
2017-07-15 17:03:38 +03:00
AdrianLxM
b79beda971
wear pass through overview notifications
2017-07-15 16:03:04 +02:00
AdrianLxM
cb08d1d76b
TT new "old" logic for temp targets
2017-07-15 13:37:48 +02:00
AdrianLxM
9eaba98dfa
TT refactor OverlappingIntervals to two classes with an abstract superclass Intervals
2017-07-15 13:37:48 +02:00
Johannes Mockenhaupt
80124e6d7b
Bolus wizard: use PumpDescription to round final bolus to a value compatible with the pump.
2017-07-14 23:52:16 +02:00
Milos Kozak
0e6a93df90
Merge pull request #279 from AdrianLxM/cpp-wear2
...
Cpp wear
2017-07-12 08:18:57 +02:00
Milos Kozak
3e9734188b
check for array size
2017-07-11 11:27:14 +02:00
Milos Kozak
e33d757975
Merge pull request #277 from AdrianLxM/refactor-profileswitch
...
extract method for new ProfileSwitch
2017-07-10 08:13:07 +02:00
AdrianLxM
b53c40c4ad
cpp-watch update while in backtround
2017-07-10 05:26:24 +02:00
AdrianLxM
7fa8ea7224
cpp-watch working2
2017-07-10 04:46:29 +02:00
AdrianLxM
7f0e611783
cpp watch working1
2017-07-10 04:46:13 +02:00
AdrianLxM
0bff8e2778
extract method for new ProfileSwitch
2017-07-10 04:45:43 +02:00
AdrianLxM
26f3362ffc
cpp-watch first roundtrip
2017-07-10 04:45:22 +02:00
AdrianLxM
85d028abff
cpp watch openactivity
2017-07-10 04:45:08 +02:00
AdrianLxM
39ee68e62a
cpp-watch external-function
2017-07-10 04:44:46 +02:00
AdrianLxM
5ea8cff751
extract method for new ProfileSwitch
2017-07-10 01:25:48 +02:00
Milos Kozak
059ac4040e
fix 640g plugin
2017-07-09 23:12:57 +02:00
Milos Kozak
551ff70bc8
forgotten file
2017-07-07 19:35:45 +02:00
Milos Kozak
2724e10c2f
1.5d
2017-07-07 18:39:31 +02:00
Milos Kozak
d61d35fa82
move class to correct place
2017-07-07 18:37:15 +02:00
Milos Kozak
0b5abae44f
fix conflict
2017-07-07 15:10:29 +02:00
Milos Kozak
8de7e05dd5
weightedaverage sensitivity
2017-07-07 15:08:21 +02:00
drnoname82
e12e4ec55e
Update strings.xml
2017-07-07 01:03:20 +02:00
Milos Kozak
31e9f3f55c
Merge pull request #274 from AdrianLxM/wear-oaps-reason-result
...
wear show oaps result/reason
2017-07-04 12:01:47 +02:00
Milos Kozak
24259470ad
Merge pull request #275 from AdrianLxM/fakeextended-fix
...
Fake extended fix
2017-07-04 12:01:12 +02:00
AdrianLxM
a45fd1619e
fake extended fix 3
2017-07-04 01:43:56 +02:00
AdrianLxM
1922a1b121
fake extended fix 2
2017-07-04 00:17:26 +02:00
Milos Kozak
7b9e5fec1e
autosens warning
2017-07-04 00:16:35 +02:00
AdrianLxM
1574d94aa6
fake extended fix
2017-07-04 00:03:50 +02:00
Milos Kozak
c75bb0e453
fix sensitivy
2017-07-03 21:21:20 +02:00
Milos Kozak
ebf56d0032
double check units are in profile
2017-07-03 11:14:30 +02:00
AdrianLxM
e81b217c94
wear show oaps result/reason
2017-07-03 01:47:58 +02:00
Milos Kozak
5a27f9afa1
allow lock screen in nsclient mode
2017-07-03 00:02:54 +02:00
Milos Kozak
e0e0a75519
allow ISO format with miliseconds
2017-07-02 12:49:25 +02:00
Milos Kozak
771ff0d781
1.5c
2017-07-02 11:47:16 +02:00
Milos Kozak
e9dba7136d
nsclient layout for phones
2017-07-02 11:28:03 +02:00
Milos Kozak
d4537a001f
check for null profile in watchupdaterservice
2017-06-30 23:59:12 +02:00
Milos Kozak
b4ab1d4109
fix types in configbuilder
2017-06-30 21:35:07 +02:00
Milos Kozak
4d16b04acd
buttons on overview GONE before profile is loaded
2017-06-30 17:50:30 +02:00
Milos Kozak
37055cd917
allow decimal number in NumberPicker
2017-06-30 17:43:10 +02:00
Milos Kozak
09e5fdc61b
sensitivity prefs cleanup
2017-06-30 11:56:36 +02:00
Milos Kozak
96e4a25f9e
typo
2017-06-30 11:40:12 +02:00
Milos Kozak
448cf7ea85
use default dia when no profile available
2017-06-30 11:18:51 +02:00
Milos Kozak
51b01a0993
split device statuses too before broadcast
2017-06-30 10:57:29 +02:00
Milos Kozak
f0c9ce5a00
fix crash when no profile loaded from pump yet
2017-06-30 10:47:30 +02:00
Milos Kozak
38002be73d
check for units null
2017-06-30 10:35:05 +02:00
Milos Kozak
a8a4ffcab1
ver 1.5b
2017-06-30 10:24:45 +02:00
Milos Kozak
63ad0704fa
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-06-30 10:23:31 +02:00
Milos Kozak
1e5f96f841
split treatments to smaller chunks before broadcast
2017-06-30 10:23:24 +02:00
Milos Kozak
9e8c91319e
move ns version to about dialog
2017-06-30 09:55:47 +02:00
Milos Kozak
514d6d4dd5
fix crash in instantiating fragment
2017-06-30 09:46:56 +02:00
Milos Kozak
39c6ae5eae
fix merge conflict
2017-06-30 09:35:20 +02:00
Milos Kozak
fec4e60359
Merge pull request #269 from AdrianLxM/percentagevisualization
...
visualize absolute rate emulation as percentage
2017-06-30 00:00:47 +02:00
AdrianLxM
6bbec3411a
absolute as percentage update
2017-06-29 23:36:45 +02:00
Milos Kozak
68f90f0da8
Merge pull request #270 from AdrianLxM/danarstats-historyadaption
...
DanaRStats adapt to history and work around gaps
2017-06-29 22:15:06 +02:00
Milos Kozak
b4ea205103
Merge pull request #271 from AdrianLxM/diadivisor
...
adapt diadivisor
2017-06-29 22:14:28 +02:00
AdrianLxM
72fbb73c65
bolusprogress without context
2017-06-29 20:24:19 +02:00
AdrianLxM
fcab1a267b
adapt diadivisor
2017-06-29 19:39:58 +02:00
Milos Kozak
d81bb9bf23
fix bolusprogress dialog size
2017-06-29 19:21:34 +02:00
AdrianLxM
1f9ed574b7
DanaRStats adapt to history and work around gaps
2017-06-29 16:24:17 +02:00
AdrianLxM
16e360f200
visualize absolute rate emulation as percentage
2017-06-29 14:14:40 +02:00
Milos Kozak
a8338b2dd1
careportal dialog number picker
2017-06-29 01:37:58 +02:00
Milos Kozak
f58f70bdca
wizard tweaking
2017-06-28 23:11:17 +02:00
Milos Kozak
39e83f0cfe
clean context after fragment is destroyed
2017-06-28 10:24:42 +02:00
Milos Kozak
e4d55473a1
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-06-28 09:09:29 +02:00
Milos Kozak
5c5c4243bc
check for missing bg direction
2017-06-28 09:09:19 +02:00
Milos Kozak
ea06a90453
1.5a
2017-06-27 23:24:30 +02:00
Milos Kozak
491f0837c8
allow manual input in NumberPicker
2017-06-27 23:23:44 +02:00
Milos Kozak
c3876c730b
numberpicker in wizard dialog
2017-06-27 23:16:23 +02:00
Milos Kozak
4fc935f0bd
bolus dialog numberpickers
2017-06-27 19:14:32 +02:00
Milos Kozak
ef4a1feda2
numberpicker in calibration dialog
2017-06-27 17:06:23 +02:00
Milos Kozak
341b0660a8
calibration dialog cancel button
2017-06-27 15:25:11 +02:00
Milos Kozak
311a14e457
typo
2017-06-27 13:59:37 +02:00
Milos Kozak
9fb428c128
fix conflict
2017-06-27 13:52:47 +02:00
Milos Kozak
103836717a
fix conflict
2017-06-27 13:51:45 +02:00
Milos Kozak
70374ee341
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-06-27 13:42:45 +02:00
Milos Kozak
50ba9720e1
use container for inflate
2017-06-27 13:42:39 +02:00
Milos Kozak
42b42a90eb
another check for null
2017-06-27 11:01:38 +02:00
Milos Kozak
ab63c2fb48
better check for app initialization
2017-06-27 10:00:22 +02:00
Milos Kozak
7b1b9c9881
dialog widths
2017-06-27 00:11:23 +02:00
Milos Kozak
dbd721319e
ns uploader status
2017-06-26 22:39:01 +02:00
Milos Kozak
87fb969d9f
ns openaps status
2017-06-26 17:21:39 +02:00
Milos Kozak
36b83e4c8a
typo
2017-06-26 13:08:45 +02:00
Milos Kozak
47a9d4b9c8
ns pump status
2017-06-26 12:44:03 +02:00
Milos Kozak
3f641f9c30
carbs absorption settings
2017-06-25 11:16:19 +02:00
Milos Kozak
ac98852f79
cut off carbs after 4h
2017-06-24 19:55:49 +02:00
Milos Kozak
129f813de2
reset cache on ConfigBuilderChange event
2017-06-24 15:11:30 +02:00
Milos Kozak
70aaafa616
copy old oref0 sensitivity code
2017-06-24 15:04:22 +02:00
Milos Kozak
b39f59f59e
remove unneeded fragments
2017-06-24 13:22:50 +02:00
Milos Kozak
5360129e5f
sensitivity plugins
2017-06-24 11:04:09 +02:00
Milos Kozak
240f9618f5
Merge branch 'dev' into newautosens
2017-06-21 09:04:38 +02:00
Milos Kozak
3e7c4b1350
NS high & low alarms with sound
2017-06-21 07:28:04 +02:00
Milos Kozak
7f92f42923
cob on overview
2017-06-20 20:30:50 +02:00
Milos Kozak
33de4e8f2a
schedule overview update 500ms
2017-06-20 20:13:01 +02:00
Milos Kozak
e9898a58c7
show target range as number if equal
2017-06-20 20:10:14 +02:00
Milos Kozak
134efb04bf
fix merge conflict
2017-06-20 20:01:09 +02:00
Milos Kozak
befdbefa49
fix zero parsing error
2017-06-20 19:58:43 +02:00
Milos Kozak
a3757877a3
fix landscape mode
2017-06-20 19:56:25 +02:00
Milos Kozak
80962e33d7
allow to ignore profileswitch events
2017-06-20 19:52:46 +02:00
Milos Kozak
c728174858
Merge branch 'dev' into newautosens
2017-06-19 23:13:29 +02:00
Milos Kozak
745f9270ee
one more null check
2017-06-19 23:08:56 +02:00
Milos Kozak
b185733859
more checks for null
2017-06-19 22:55:56 +02:00
Milos Kozak
df3dff1940
revert magic constant
2017-06-19 22:32:54 +02:00
Milos Kozak
4b1263e2e0
small simplify
2017-06-19 16:28:36 +02:00
Milos Kozak
150ef1a8bc
Merge branch 'dev' into newautosens
2017-06-19 15:03:35 +02:00
Milos Kozak
6eed701310
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-06-19 14:52:54 +02:00
Milos Kozak
7e1c435374
fix loading danar history
2017-06-19 14:52:46 +02:00
PoweRGbg
dcc7112fd8
Update Profile.java
2017-06-19 14:39:49 +03:00
PoweRGbg
6293e89be2
fixed getICList() returning bg units/U to g/hr
2017-06-19 13:10:32 +03:00
Milos Kozak
e90812634b
work from old autosens branch
2017-06-16 14:37:43 +02:00
Milos Kozak
b67d8be1ef
dia as primitive
2017-06-16 09:14:57 +02:00
Milos Kozak
c78399ded0
cache created objects in profilestore
2017-06-16 09:06:35 +02:00
Milos Kozak
49ef46936b
optimize refreshing gui
2017-06-16 08:37:07 +02:00
Milos Kozak
43231cc362
use System.currentTimeMillis()
2017-06-15 23:12:12 +02:00
Milos Kozak
26daffa692
use primitives in inner loops
2017-06-15 22:55:07 +02:00
Milos Kozak
fb7af2f317
ns alarm setting in xml
2017-06-15 21:33:45 +02:00
Milos Kozak
5408562d84
use phone name in devicestatus
2017-06-15 09:45:10 +02:00
Milos Kozak
a2aa8d8bc6
bucketed data for non 5min interval
2017-06-15 00:34:42 +02:00
Milos Kozak
2642a12829
schedule correct scheduleExtendedBolusChange
2017-06-14 22:18:01 +02:00
Milos Kozak
9ce78881fb
log initiator in loop
2017-06-14 22:12:36 +02:00
Milos Kozak
b14cf480cf
add duration to profile switch dialogs
2017-06-14 20:41:55 +02:00
Milos Kozak
ae2bbf76e5
fix duplicating carb entries
2017-06-14 19:49:01 +02:00
Milos Kozak
0b322e53fc
nsclient plugin tweaking
2017-06-13 21:25:50 +02:00
Milos Kozak
43b70f9efc
loop, MA, AMA new design
2017-06-13 20:48:53 +02:00
Milos Kozak
745a3cf874
reuse profile object
2017-06-13 19:37:31 +02:00
Milos Kozak
2c2b6c21a1
cancel temp basal in the same connection
2017-06-13 18:47:54 +02:00
Milos Kozak
3a95325039
fix sms reply text
2017-06-13 16:51:59 +02:00
Milos Kozak
d3de51cc88
optimize dia
2017-06-13 15:06:41 +02:00
Milos Kozak
2a1fe205ee
optimize nsclient logging
2017-06-13 12:17:54 +02:00
Milos Kozak
afca896f23
optimize getUnits() & detecting faked extended
2017-06-13 12:08:30 +02:00
Milos Kozak
1de64f06c2
simplify danar activities, fix profiles
2017-06-12 23:31:50 +02:00
Milos Kozak
6fca923275
fix profileswitch reloads
2017-06-12 13:11:16 +02:00
Milos Kozak
0f40670c24
create singleton from NSstatus
2017-06-12 11:15:03 +02:00
Milos Kozak
b41a942d11
update supported NS & NSclient versions
2017-06-12 09:30:04 +02:00
Milos Kozak
148f4d43f9
detect faking by extended boluses in nsclient mode
2017-06-12 09:15:51 +02:00
Milos Kozak
77659e20e7
ns alarms & getBasal fix
2017-06-11 17:22:54 +02:00
Milos Kozak
bf953f1240
fix maxdailybasal calculation
2017-06-11 14:29:02 +02:00
Milos Kozak
39224f421a
fix extended bolus step
2017-06-11 13:37:38 +02:00
Milos Kozak
b603fce8c7
do not add empty iob series
2017-06-11 12:44:42 +02:00
Milos Kozak
f6650e33e4
remove test buttons
2017-06-10 22:04:59 +02:00
Milos Kozak
723c90c32d
optimize rendering
2017-06-10 21:51:58 +02:00
Milos Kozak
e6f173f305
fix merge conflict
2017-06-10 13:43:02 +02:00
Milos Kozak
6ce35bc36a
Merge branch 'history' of https://github.com/MilosKozak/AndroidAPS into history
2017-06-10 13:41:36 +02:00
Milos Kozak
f65d75e553
specify source at detailedbolusinfo
2017-06-10 13:39:51 +02:00
Milos Kozak
dfaf3a07c2
typo
2017-06-08 23:22:43 +02:00
Milos Kozak
4231557c9f
fix axis
2017-06-08 23:18:38 +02:00
Milos Kozak
96d760ba62
fix adding basals to database in danar driver
2017-06-08 22:26:32 +02:00
Milos Kozak
74268675af
optimize overview graph drawing
2017-06-08 22:14:55 +02:00
Milos Kozak
a39f61284a
profileswitch sync & v2 bolus fix
2017-06-08 20:52:33 +02:00
Milos Kozak
e09fba93cb
update graph properly
2017-06-08 20:08:02 +02:00
Milos Kozak
e8be720138
temptarget sync
2017-06-08 19:34:46 +02:00
Milos Kozak
1153c33200
tempbasal & extendedbolus 3way sync
2017-06-08 18:15:17 +02:00
Milos Kozak
4d30ba9cdb
treatments PumpHistory and NS mark
2017-06-07 19:43:19 +02:00
Johannes Mockenhaupt
d00e7f8b00
Clear notification when accepting temp basal.
...
This clears the notification about a new suggested basal when the
temp basal is accepted from within AndroidAPS.
2017-06-07 18:10:08 +02:00
Milos Kozak
e5a326c377
nsclient always use virtual pump, more sync fixes
2017-06-07 18:10:07 +02:00
Milos Kozak
fec56e7c23
fix bug in sync
2017-06-07 08:09:15 +02:00
Milos Kozak
8fab76ee9b
treatments synchronization improvement
2017-06-07 00:11:33 +02:00
Milos Kozak
5931abc860
BgReading optimization
2017-06-06 17:14:17 +02:00
Milos Kozak
a180e182eb
optimize rendering graph
2017-06-06 15:49:41 +02:00
Milos Kozak
8b8a8fcb45
remote time update extra task
2017-06-06 15:06:00 +02:00
Milos Kozak
b8b00dbc81
revert asynctask
2017-06-06 14:49:17 +02:00
Milos Kozak
f93090b012
allow only 1 updategui running
2017-06-06 10:56:26 +02:00
Milos Kozak
17f59df597
gui tweaking, pump battery event
2017-06-06 08:21:11 +02:00
Milos Kozak
7c7638a7a1
extract color resources
2017-06-05 15:34:22 +02:00
Milos Kozak
e0a6db22a2
run rendering calculations on background
2017-06-05 15:16:07 +02:00
Milos Kozak
88b9caa357
absolute basal line
2017-06-05 01:12:36 +02:00
Milos Kozak
dd7e777a24
simplify graph series
2017-06-05 00:50:31 +02:00
Milos Kozak
8934d2d6b9
Merge branch 'history' of https://github.com/MilosKozak/AndroidAPS into history
2017-06-04 22:38:42 +02:00
Milos Kozak
a3db05ec39
v 1.50 & fix conflict
2017-06-04 22:37:58 +02:00
Milos Kozak
ac038a9252
bigger bg dots on tablet
2017-06-04 22:27:36 +02:00
Milos Kozak
013025b750
fix crashing at start
2017-06-04 01:15:11 +02:00
Milos Kozak
1702ce7702
adjusting nsclient mode
2017-06-04 00:46:44 +02:00
Milos Kozak
b40cf99201
gui tweaking
2017-06-03 22:43:35 +02:00
Milos Kozak
1a4e60d3a8
process duration correctly
2017-06-02 23:59:34 +02:00
Milos Kozak
d365fcd6a4
fix bugs & design tweaking
2017-06-02 23:25:11 +02:00
Milos Kozak
6ca4811e8e
profiles visualisation
2017-06-02 12:27:21 +02:00
Milos Kozak
f267c85377
it compiles now with profiles
2017-06-02 10:25:49 +02:00
Milos Kozak
a19a5a442b
some v2 driver tweaking
2017-06-01 20:52:38 +02:00
Milos Kozak
622097aabc
fix wrong merge
2017-06-01 19:33:56 +02:00
Milos Kozak
32084094fd
v 1.46
2017-06-01 18:59:39 +02:00
Milos Kozak
0a2cdff5e5
fix conflict
2017-05-31 09:29:39 +02:00
Milos Kozak
fb4ea156d6
disable loop as a fist action on superbolus
2017-05-31 09:26:08 +02:00
Milos Kozak
496872a58e
resend after 10sec allowed
2017-05-31 09:14:31 +02:00
Milos Kozak
15f44e6085
basic sync for v2
2017-05-30 22:44:26 +02:00
Milos Kozak
b3d18b2537
disable bolus when pump is suspended
2017-05-30 18:23:07 +02:00
Milos Kozak
f5f7d28cc1
temp basal dialog design
2017-05-30 18:10:05 +02:00
Milos Kozak
3861bece54
extended bolus dialog
2017-05-30 15:07:44 +02:00
Milos Kozak
5f6a77983b
Merge branch 'dev' into history
2017-05-29 22:42:17 +02:00
Milos Kozak
9e3edbb530
typo in checkbox handling
2017-05-29 22:36:04 +02:00
Milos Kozak
358de54322
redesign uploading treatments to NS
2017-05-29 21:45:59 +02:00
Milos Kozak
ec76908eca
redesign uploading tb&eb to NS
2017-05-29 19:43:19 +02:00
Milos Kozak
dec627946d
0xE004 DanaRv2 message
2017-05-29 16:45:09 +02:00
Milos Kozak
9032deaaf3
better cache invalidate handling
2017-05-29 15:26:25 +02:00
Milos Kozak
c90de88ec1
better logging & double treatment plugin fix
2017-05-29 13:07:58 +02:00
Milos Kozak
442ff12aa1
initialize treatment data first by another message
2017-05-29 11:39:12 +02:00
Milos Kozak
fa695b9399
Merge branch 'dev' into history
2017-05-29 10:04:09 +02:00
Milos Kozak
e91acf3fed
eliminate multiple resends in nsclient
2017-05-29 10:03:55 +02:00
Milos Kozak
4dff0e3a56
rename treatment interfaace functions to be more clear
2017-05-26 15:33:42 +02:00
Milos Kozak
0371e97391
Merge branch 'dev' into history
2017-05-26 15:06:04 +02:00
Milos Kozak
60a41b7dce
switch order of commands when setting superbolus
2017-05-26 15:02:59 +02:00
Milos Kozak
0973ef97ac
synchronize danar and danarv2 plugins
2017-05-26 14:41:05 +02:00
Milos Kozak
b8b9827b61
synchronize danar and danarkorean plugins
2017-05-26 13:28:27 +02:00
Milos Kozak
4b39578d9c
fix adding contribution from faked extended
2017-05-26 12:07:56 +02:00
Milos Kozak
a9b251ce12
Merge branch 'history' of https://github.com/MilosKozak/AndroidAPS into history
2017-05-26 10:31:46 +02:00
Milos Kozak
559e07904c
remove unneeded call
2017-05-26 10:31:05 +02:00
Milos Kozak
bb4302c02f
Merge branch 'dev' into history
2017-05-26 10:24:48 +02:00
Milos Kozak
0b8499cb7f
Merge pull request #251 from AdrianLxM/historytest1
...
lint disable 'ExtraTranslation'
2017-05-26 10:23:51 +02:00
AdrianLxM
7bf8a31e02
check for unused translations again
2017-05-26 10:11:38 +02:00
AdrianLxM
8b81960ceb
remove unused strings from russion translation
2017-05-26 10:10:57 +02:00
Milos Kozak
650b792099
mark selected tab in treatments
2017-05-26 10:05:42 +02:00
AdrianLxM
cc4419f57a
lint ExtraTranslation
2017-05-26 10:00:41 +02:00
AdrianLxM
99b8e48031
lint ExtraTranslation
2017-05-26 09:58:38 +02:00
Milos Kozak
a066580896
handle faked tempbasals synchronization
2017-05-26 08:54:48 +02:00
Milos Kozak
5fb72181ee
careportal cage, sage, iage
2017-05-25 20:18:29 +02:00
Milos Kozak
87993c6163
return functionality of faking by extended boluses
2017-05-25 17:26:05 +02:00
fedor apanasenko
4406bb3f06
Update strings.xml
2017-05-25 09:51:08 +03:00
Milos Kozak
86af9eab3d
stop extended bolus in actions
2017-05-24 20:37:58 +02:00
Milos Kozak
2ae30fe9b4
temptarget design
2017-05-24 19:42:23 +02:00
Milos Kozak
bb9c68fd4d
Merge remote-tracking branch 'origin/dev' into history
2017-05-24 19:18:30 +02:00
Milos Kozak
45df7ddd26
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-05-24 18:50:10 +02:00
Milos Kozak
f936580734
Russsian language
2017-05-24 18:46:19 +02:00
Milos Kozak
5208f23661
Temptargets under treatments
2017-05-23 23:56:53 +02:00
Milos Kozak
771fbdc303
sync of treatments, tempbasals, extended tested and working
2017-05-23 22:59:06 +02:00
Milos Kozak
8db1bd5ae5
tempbasal ns sync
2017-05-23 20:15:14 +02:00
Milos Kozak
7bed883368
Merge branch 'dev' into history
2017-05-22 22:13:42 +02:00
Milos Kozak
6394421017
boluses working
2017-05-22 22:10:56 +02:00
Milos Kozak
6cd046459a
original treatmens plugin removed, temp basals working
2017-05-22 20:58:05 +02:00
AdrianLxM
6d90f79521
also cancel temp on disable loop plugin
2017-05-22 19:14:57 +02:00
AdrianLxM
448a420fad
cancel temp on suspend loop
2017-05-22 17:39:25 +02:00
Milos Kozak
85e6375026
make all getDao private
2017-05-22 12:52:19 +02:00
Milos Kozak
6004a17594
change database structures
2017-05-21 22:05:03 +02:00
Milos Kozak
3330c6a3fd
Merge branch 'dev' into history
2017-05-21 16:46:13 +02:00
Milos Kozak
462849af12
russian language entry
2017-05-21 10:06:34 +02:00
Milos Kozak
012b6a2c26
v 1.45
2017-05-20 20:42:10 +02:00
Milos Kozak
56d54a6988
italian language
2017-05-20 20:41:23 +02:00
Milos Kozak
6ee6eff759
fix objective 1
2017-05-19 14:15:21 +02:00
Milos Kozak
0a182fb022
v 1.44
2017-05-17 18:54:48 +02:00
Milos Kozak
3ec08ab10f
fix app crash
2017-05-16 20:02:09 +02:00
Milos Kozak
91fa355d8c
remove unneeded code
2017-05-16 18:51:31 +02:00
Milos Kozak
d0ae965054
fix basal rounding for v2
2017-05-16 18:02:58 +02:00
Milos Kozak
8452c42746
fix merge
2017-05-16 18:02:01 +02:00
Milos Kozak
8d2e7a34ae
same workaround for korean danar
2017-05-16 17:58:18 +02:00
Milos Kozak
a362c77afe
fix temp basal netRatio display
2017-05-16 17:57:18 +02:00
Milos Kozak
8c5ce7290d
more work on treatments fragment
2017-05-16 17:48:58 +02:00
AdrianLxM
44c3303e0e
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into xdripstatusline
2017-05-16 16:30:26 +02:00
AdrianLxM
3869b143c4
Workaround for DanaR truncation
2017-05-16 16:29:30 +02:00
Milos Kozak
3ee9bf5ff7
Merge branch 'dev' into history
2017-05-16 15:15:32 +02:00
Milos Kozak
1ad424a178
use Activity instead of FramgmentActivity
2017-05-16 15:15:28 +02:00
Milos Kozak
86c975e9d6
Add Italian language
2017-05-16 13:39:24 +02:00
Milos Kozak
45477f96ee
Merge pull request #243 from AdrianLxM/xdripstatusline
...
basal and bolus step in DanaR Fragment
2017-05-16 13:28:39 +02:00
AdrianLxM
572e726678
basal and bolus step in DanaR Fragment
2017-05-16 13:10:02 +02:00
Milos Kozak
6fff6f63a4
bolus dialog redesign
2017-05-16 12:09:32 +02:00
Milos Kozak
4201709e2a
finish careportal dialog redesign
2017-05-16 11:47:33 +02:00
Milos Kozak
54758d08d8
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-05-16 09:47:23 +02:00
Milos Kozak
894923664e
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into history
2017-05-16 09:46:59 +02:00
Milos Kozak
fd62c572af
more treatments plugin tweaking
2017-05-16 09:46:09 +02:00
Milos Kozak
704ad383e9
careportal layout part1
2017-05-15 21:10:43 +02:00
Milos Kozak
25110cfea4
move database actions from pump to treatments plugin
2017-05-15 18:44:40 +02:00
Milos Kozak
85744548d8
typo in log
2017-05-14 11:48:59 +02:00
Milos Kozak
b1d9e647c6
Merge branch 'dev' into history
2017-05-12 23:14:07 +02:00
Milos Kozak
b19bf628b8
Merge pull request #241 from AdrianLxM/xdripstatusline
...
Get correct calibration value if entered with (onboard) keyboard
2017-05-12 23:12:49 +02:00
Milos Kozak
6a6a02f212
Merge branch 'dev' into history
2017-05-12 23:04:39 +02:00
Milos Kozak
3f4cf57bbc
make all Spiners centered
2017-05-12 23:04:14 +02:00
Milos Kozak
7bbd2cff2d
consolidate DanaR code
2017-05-12 22:40:22 +02:00
Milos Kozak
d641b0edd9
move rest of PumpInterface to TreatmentInterface
2017-05-12 21:21:31 +02:00
Milos Kozak
52177cead1
move part of PumpInterface to TreatmentInterface
2017-05-12 21:07:29 +02:00
AdrianLxM
bb35f58eab
Get correct calibration value if entered with (onboard) keyboard
2017-05-12 18:31:52 +02:00
Milos Kozak
22bb49aa60
hide DanaRv2 constraints
2017-05-12 18:05:22 +02:00
Milos Kozak
863e6454eb
calculate iob based on insulin stored with treatment
2017-05-12 17:57:57 +02:00
Milos Kozak
9fc1d59bd0
allow to enforce Treatment plugin
2017-05-12 17:30:52 +02:00
Milos Kozak
c6830baf8f
Merge branch 'dev' into history
2017-05-12 16:35:07 +02:00
Milos Kozak
abdc1022bf
merge bolus & basal into one plugin
2017-05-12 16:27:33 +02:00
AdrianLxM
a60afbceb9
typo
2017-05-12 16:08:48 +02:00
AdrianLxM
a9e093ad0d
some German translations
2017-05-12 16:06:14 +02:00
AdrianLxM
c88b8eaa9a
make buttons scrollable for small heights
2017-05-12 15:26:16 +02:00
Milos Kozak
eddd8ac56d
Merge branch 'DanaRv2' into history
2017-05-12 13:06:05 +02:00
Milos Kozak
e005d6bd69
Merge branch 'dev' into history
2017-05-12 13:05:57 +02:00
Milos Kozak
831b45fac5
DanaRv2 mod7
2017-05-12 13:05:29 +02:00
Milos Kozak
df424ea5ff
overview buttons
2017-05-12 11:06:33 +02:00
Milos Kozak
19c23a3c02
Merge pull request #238 from AdrianLxM/xdripstatusline
...
No permission to read statusline
2017-05-12 09:22:09 +02:00
AdrianLxM
7517ee4930
No permission to read statusline
2017-05-12 03:54:24 +02:00
Milos Kozak
b782a5b8dc
Merge branch 'dev' into history
2017-05-12 00:39:20 +02:00
Milos Kozak
be4aa1131e
Merge branch 'DanaRv2' into history
2017-05-12 00:39:08 +02:00
Milos Kozak
2610edae55
DanaRv2 Modify 6
2017-05-12 00:38:26 +02:00
Milos Kozak
a0d31b2118
rename identical functions
2017-05-11 18:54:50 +02:00
Radoslav Radev
d58ddf48c6
Update strings.xml
2017-05-11 17:01:49 +03:00
Milos Kozak
7e99ce416a
move buttons back to bottom
2017-05-11 10:59:05 +02:00
Milos Kozak
6b9048cd61
Merge pull request #234 from warstar2187/korean
...
Korean translation update
2017-05-11 09:27:58 +02:00
Milos Kozak
72f3efc39a
disable danarv2 temporary
2017-05-10 21:58:46 +02:00
Milos Kozak
51d52f6b3d
Merge branch 'DanaRv2' into history
2017-05-10 21:53:31 +02:00
Milos Kozak
15127dc4c6
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-05-10 21:37:42 +02:00
Milos Kozak
878e3e0921
use SP
2017-05-10 21:37:34 +02:00
AdrianLxM
201d2df16b
cleanup imports
2017-05-10 16:37:11 +02:00
AdrianLxM
b247b81428
use helper class to query settings
2017-05-10 16:33:41 +02:00
Milos Kozak
5b25d28f42
Merge branch 'dev' into DanaRv2
2017-05-10 14:05:43 +02:00
Milos Kozak
23fd6a6c44
overlappingintervals
2017-05-10 14:00:46 +02:00
AdrianLxM
fc85deb62d
move evaluation of always_use_shortavg setting to the OAPS plugins
...
For the overview and the watch we still may use the standard delta, even if this setting is enabled. (Also good to check that it is the same as in xDrip e.g.)
2017-05-10 01:18:27 +02:00
AdrianLxM
298d7a7d9c
Merge branch 'dev' into xdripstatusline
2017-05-09 23:26:31 +02:00
AdrianLxM
1fa3a2a697
bgi on watch status (optional)
2017-05-09 23:23:37 +02:00
Milos Kozak
a03b5be189
v 1.43
2017-05-09 21:34:00 +02:00
Milos Kozak
77181f6f7f
Handle exceptions in StatusLinePlugin
2017-05-09 21:32:24 +02:00
Milos Kozak
cd16b71759
upload OpenAPS Offline
2017-05-09 21:29:08 +02:00
Milos Kozak
d313df0d19
removing treatments
2017-05-09 20:47:02 +02:00
Milos Kozak
554fb51a75
profile layout
2017-05-09 19:06:59 +02:00
Milos Kozak
84a6554e07
smaller font size on careportal buttons
2017-05-09 18:36:13 +02:00
Milos Kozak
d781c69b94
invalidate autosens on new profile
2017-05-09 16:51:08 +02:00
Milos Kozak
09fea02ed2
Allow to disable NS upload while client is connected
2017-05-09 16:24:53 +02:00
Milos Kozak
ee16fabdfc
DanaRv2 modify 3
2017-05-09 15:53:11 +02:00
Milos Kozak
b30d79c4cb
fix conflicts
2017-05-09 10:46:04 +02:00
Milos Kozak
0048366dcf
fix conflict
2017-05-09 10:14:21 +02:00
Milos Kozak
8d3be5e958
colors on danar fragment
2017-05-08 23:19:11 +02:00
Milos Kozak
6e5d3635c8
using bolus amount from history if comm is interrupted
2017-05-08 23:13:43 +02:00
AdrianLxM
63b9a06431
Send empty status to xDrip when disabled. Send status immediately when enabling plugin.
2017-05-08 16:34:45 +02:00
AdrianLxM
da0334eb19
xdrip statusline reformat
2017-05-08 16:23:59 +02:00
AdrianLxM
67f21537ea
send status to xDrip
2017-05-06 15:18:19 +02:00
Milos Kozak
14a56842ee
allow to change x axis scale
2017-05-04 23:51:04 +02:00
Milos Kozak
05d9f16031
hide label too
2017-05-04 23:22:16 +02:00
Milos Kozak
bd0ff991dd
remember graph settings fix
2017-05-04 21:33:26 +02:00
Milos Kozak
344144d88a
pump status equal size
2017-05-04 21:11:51 +02:00
Milos Kozak
645bcdbb8a
deviations < 2 as equal
2017-05-04 21:09:17 +02:00
Milos Kozak
db5dcc0064
different color for carbs deviations
2017-05-04 20:40:43 +02:00
Milos Kozak
aabcee8ea7
fix conflicts
2017-05-04 19:53:45 +02:00
Milos Kozak
352a2a7475
deviations graph
2017-05-04 19:51:58 +02:00
Milos Kozak
070867af28
menu on top
2017-05-04 19:13:56 +02:00
Milos Kozak
a83ff12ca8
remove unneeded code
2017-05-04 16:30:01 +02:00
Milos Kozak
d145ef907f
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-05-04 15:25:48 +02:00
Milos Kozak
194fd7f0a6
check for null
2017-05-04 15:25:41 +02:00
Milos Kozak
289ad394ce
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-05-03 22:30:12 +02:00
Milos Kozak
6d5f2514d0
remove duplicated string
2017-05-03 18:45:29 +02:00
Milos Kozak
10d5b914f3
check for finished activity
2017-05-03 18:37:00 +02:00
Milos Kozak
573256d7d4
catch missing sms permission
2017-05-03 18:30:18 +02:00
Milos Kozak
37edc19509
check for null
2017-05-03 18:23:33 +02:00
Milos Kozak
037bb09d23
check for null
2017-05-03 18:15:10 +02:00
Milos Kozak
c30977bfd8
Merge pull request #230 from AdrianLxM/adridev3
...
typo insuin->insulin
2017-05-03 08:31:04 +02:00
Milos Kozak
b80c382512
fix exception in sms comm
2017-05-02 22:49:17 +02:00
Milos Kozak
602310b70a
DanaRv2 1st rev
2017-05-02 17:02:30 +02:00
AdrianLxM
9cef4c5a01
typo insuin->insulin
2017-05-01 18:09:53 +02:00
Milos Kozak
1b69771893
report autosens to NS
2017-05-01 14:28:45 +02:00
Milos Kozak
34f83e6b09
fix null pointer exception
2017-05-01 09:18:10 +02:00
Milos Kozak
2fabee85b4
Merge pull request #229 from AdrianLxM/adridev3
...
adaptions to small screen
2017-04-30 22:20:21 +02:00
AdrianLxM
0069f320f8
config builder smallscreen
2017-04-30 21:57:55 +02:00
Milos Kozak
c44ea83165
1.42 bump
2017-04-30 21:36:47 +02:00
AdrianLxM
5dc07012d2
overview smallscreen
2017-04-30 21:34:30 +02:00
Milos Kozak
9ff714ea2d
try to fix cob graph
2017-04-30 21:27:40 +02:00
Milos Kozak
0f1c2bb193
DanaRv2 1st rev
2017-04-30 21:08:00 +02:00
AdrianLxM
01fe3cacc1
Making dialogs scrollable
2017-04-30 20:57:07 +02:00
AdrianLxM
d8fb53de69
Making dialogs scrollable
2017-04-30 20:54:35 +02:00
Milos Kozak
3279c297dc
equal weight
2017-04-30 13:22:16 +02:00
Milos Kozak
2cb6e275c0
allign design of status pills
2017-04-30 13:17:59 +02:00
Milos Kozak
1abdadceca
ver 1.41
2017-04-30 10:24:09 +02:00
Milos Kozak
76993e17e5
handle calculation properly when historical data changed
2017-04-30 10:23:26 +02:00
Milos Kozak
4dd9281276
remove actionbar
2017-04-29 20:16:50 +02:00
Milos Kozak
974e5e0098
pump fragment redesign
2017-04-29 18:11:15 +02:00
Milos Kozak
f641d40722
virtual pump layout
2017-04-29 17:48:45 +02:00
Milos Kozak
66d011665d
configbuilder UI improvement
2017-04-29 16:59:44 +02:00
Milos Kozak
686d6635d3
remove unused code
2017-04-29 15:27:24 +02:00
Milos Kozak
3add216584
more work on autosens
2017-04-29 09:04:25 +02:00
Milos Kozak
5fe3c50171
copy paste bug
2017-04-28 08:27:05 +02:00
Milos Kozak
3552d6aa40
bg value colored
2017-04-27 21:26:53 +02:00
Milos Kozak
0aad00808c
fix temp basal iob calculation
2017-04-27 20:22:04 +02:00
Milos Kozak
5ef034b4fc
cob display
2017-04-26 23:45:40 +02:00
Milos Kozak
638f6bc291
IobCobCalculationPlugin
2017-04-25 16:37:27 +02:00
Milos Kozak
0232229020
fix history iob calculation
2017-04-25 10:48:30 +02:00
warstar2187
dac969b381
Update strings.xml
2017-04-25 10:14:06 +09:00
Milos Kozak
5a3eb0cc25
refresh on context menu
2017-04-24 22:17:45 +02:00
Milos Kozak
7d328f0676
do not trigger refresh too many times
2017-04-24 21:15:27 +02:00
Milos Kozak
7534f54f19
trend in wizard off by default
2017-04-24 19:24:53 +02:00
Milos Kozak
935a9366d9
fix cob in wizard
2017-04-24 17:46:20 +02:00
Milos Kozak
a20e49669a
fix graph library bug
2017-04-24 16:04:31 +02:00
Milos Kozak
0942ffe0fa
fix iob rendering 2
2017-04-24 14:18:54 +02:00
Milos Kozak
80305aae3a
fix iob rendering
2017-04-24 13:24:16 +02:00
Milos Kozak
a07a8755b1
IOB graph
2017-04-24 13:17:14 +02:00
Milos Kozak
1a474f7983
grid gray
2017-04-23 21:14:42 +02:00
Milos Kozak
b8a8bed6c5
remove butterknife at all, remove unused code, overview graph optimalization
2017-04-23 13:45:49 +02:00
Milos Kozak
66c05d8a08
remove butterknife from overview
2017-04-23 10:55:07 +02:00
Milos Kozak
2ce08260bf
do not calculate autosens when no bg data available
2017-04-23 09:47:27 +02:00
Milos Kozak
1a76809f33
more checking for null
2017-04-22 11:27:56 +02:00
Milos Kozak
1f2967e866
superbolus must be explicitly enabled
2017-04-22 11:08:57 +02:00
Milos Kozak
3b34e55fda
CS translations
2017-04-22 10:21:24 +02:00
Milos Kozak
c18fcfda62
revert sdk to 23
2017-04-22 10:18:31 +02:00
Milos Kozak
20f99dffe2
basals rendering redesign
2017-04-22 10:09:54 +02:00
Milos Kozak
a8146da8a8
target range with background color
2017-04-21 23:06:54 +02:00
Milos Kozak
2077b5e081
android support library bug workaround
2017-04-21 18:56:48 +02:00
Milos Kozak
55a2df470e
insulin activity graph
2017-04-21 18:34:40 +02:00
Milos Kozak
7f122f7497
show dia in insulin plugin
2017-04-21 16:13:53 +02:00
Milos Kozak
90a55966b1
Fast Acting Insulin Prolonged
2017-04-21 15:36:49 +02:00
Milos Kozak
17771434aa
upgrade travis & plugin packages
2017-04-21 12:15:08 +02:00
Milos Kozak
51439bbf33
upgrade libraries
2017-04-21 12:03:54 +02:00
Milos Kozak
25491fbac6
Insulin interface
2017-04-21 11:45:25 +02:00
Milos Kozak
04ae55ac63
exit app after import settings
2017-04-16 13:27:01 +02:00
Milos Kozak
781aa6e657
check for null
2017-04-14 16:10:20 +02:00
Milos Kozak
7aa2aa4d24
give some time to service to start in UploadQueue
2017-04-14 16:00:21 +02:00
Milos Kozak
a5d10708e6
check for null in calibration dialog
2017-04-14 15:54:07 +02:00
Milos Kozak
402768cb87
1.33 app start logging optional
2017-04-14 15:33:39 +02:00
Milos Kozak
2413fae0a9
1.32 superbolus & trend contribution in wizard
2017-04-14 14:50:18 +02:00
Milos Kozak
6e90b425f7
ver 1.31 bump
2017-04-09 21:50:53 +02:00
Milos Kozak
3b5ba29489
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-04-09 21:50:11 +02:00
Milos Kozak
387defbfc7
fix sms pref key
2017-04-09 21:50:05 +02:00
Milos Kozak
a203591d44
ver 1.3 bump
2017-04-09 11:47:20 +02:00
Milos Kozak
d41d5f9e6b
loop context menu fix
2017-04-08 20:13:30 +02:00
Radoslav Radev
5fe22eac65
Update strings.xml
2017-04-07 13:53:47 +03:00
Milos Kozak
c5245ae5fd
SMS suspend/resume loop
2017-04-06 21:22:27 +02:00
Milos Kozak
a02da220c9
CS translations
2017-04-05 22:04:55 +02:00
Milos Kozak
f596050239
loop suspend menu
2017-04-05 21:39:39 +02:00
Milos Kozak
42883a81a0
allow return GlucoseStatus with only 1 actual value
2017-04-04 10:29:46 +02:00
Milos Kozak
e5012d8633
Answers for SMS commands
2017-04-04 10:03:15 +02:00
Milos Kozak
5f0de38dfe
1.3rc2
2017-04-01 12:47:18 +02:00
Milos Kozak
d6f31820d9
request battery optimalization whitelisting
2017-03-31 09:21:40 +02:00
Milos Kozak
0cb4ace052
glimp broadcast to manifest
2017-03-28 22:49:56 +02:00
Milos Kozak
fe6ff686b1
fix pump suspended message
2017-03-27 18:37:43 +02:00
Milos Kozak
dc45d01120
changle loading initial status
2017-03-24 23:03:55 +01:00
Milos Kozak
b6016dc084
objective 0 zero days duration
2017-03-24 12:31:28 +01:00
Milos Kozak
c78adb6256
suspended status for korean pump
2017-03-24 12:22:36 +01:00
Milos Kozak
a4f302ee4a
show if pump is suspended
2017-03-24 12:05:12 +01:00
Milos Kozak
32fda0f0df
fix upload virtual pump status
2017-03-23 10:48:49 +01:00
Milos Kozak
8b357ac49e
fix null pointer exception
2017-03-23 10:12:36 +01:00
Milos Kozak
a5b59d5092
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-03-23 10:09:55 +01:00
Milos Kozak
e8edf9eb54
Glimp support
2017-03-21 19:11:39 +01:00
Milos Kozak
f528f1cd83
fix reading glimp bg data
2017-03-18 23:35:43 +01:00
Milos Kozak
7f4db28c41
add sound
2017-03-10 10:42:12 +01:00
Milos Kozak
48d30f2da3
toast out of memory
2017-03-09 22:24:57 +01:00
Milos Kozak
86a7699d8f
copy/paste mistake
2017-03-09 16:34:08 +01:00
Milos Kozak
aa46479cdb
unneeded else
2017-03-09 11:00:29 +01:00
Milos Kozak
96427cf3dc
use onAttach for context in CalibrationDialog
2017-03-09 10:59:11 +01:00
Milos Kozak
7c6d708d06
use onAttach for context in WizardDialog
2017-03-09 10:57:20 +01:00
Milos Kozak
aa8fa729ad
update fabric
2017-03-09 10:25:13 +01:00
Milos Kozak
2c2d837079
fix null pointer exception
2017-03-09 10:20:38 +01:00
Milos Kozak
79ef93a839
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-03-09 09:57:32 +01:00
Milos Kozak
52aa7c1bf8
fix null pointer exception
2017-03-09 09:57:24 +01:00
warstar2187
242428e2cb
Update strings.xml
2017-03-09 04:20:40 +09:00
Milos Kozak
151baa2fb5
enable nsclient internal by default
2017-03-07 11:07:56 +01:00
Milos Kozak
02b90fa6c7
update gradle to 2.3
2017-03-07 10:52:25 +01:00
Milos Kozak
be26db356d
another fix
2017-03-06 18:53:43 +01:00
Milos Kozak
af8e485250
log SafeParse
2017-03-05 20:12:30 +01:00
Milos Kozak
ccca820a95
Merge pull request #205 from slavidex/patch-32
...
Update strings.xml
2017-03-05 15:22:32 +01:00
Milos Kozak
9843f139ad
fixed bugs in autosens
2017-03-05 15:22:35 +01:00
Radoslav Radev
3b129dc7f6
Update strings.xml
2017-03-05 15:58:37 +02:00
Radoslav Radev
a0f2e4f663
Update strings.xml
2017-03-05 15:42:01 +02:00
Radoslav Radev
54f376330a
Update strings.xml
2017-03-05 15:28:20 +02:00
Milos Kozak
9e05c86284
Log hours in sensitivity
2017-03-05 12:12:28 +01:00
Milos Kozak
de9dbf9243
CS translations
2017-03-04 20:55:13 +01:00
Milos Kozak
2af1ab6ac4
more Answers to user actions
2017-03-03 21:12:59 +01:00
Milos Kozak
ebf4697150
log app start
2017-03-02 23:25:55 +01:00
Milos Kozak
79d282d215
add answers
2017-03-02 23:08:40 +01:00
Milos Kozak
c79ccf7ccb
update crashlytics
2017-03-02 23:02:07 +01:00
Milos Kozak
5a45bd3751
remove sample data
2017-03-02 21:17:24 +01:00
Milos Kozak
8c8af1755b
1.3rc1
2017-03-02 21:14:08 +01:00
Milos Kozak
3d521eb75c
nsclient: try to send data immediately
2017-03-02 20:59:18 +01:00
Milos Kozak
d841ff5098
prevent null pointer exception
2017-03-02 20:40:09 +01:00
Milos Kozak
73fbac1bae
fix crash
2017-03-02 20:33:46 +01:00
Milos Kozak
6ecaad7d69
make sure service is running
2017-03-02 20:19:35 +01:00
Milos Kozak
d4070cf99a
check for null
2017-03-01 19:14:42 +01:00
Milos Kozak
9e03087a77
nsclient tweaking
2017-02-28 14:36:44 +01:00
Milos Kozak
2fceb0b891
1.1h
2017-02-25 20:59:46 +01:00
Milos Kozak
a9d8f3f806
queue in db
2017-02-24 13:02:44 +01:00
Milos Kozak
e25fb9845d
hide unneeded labels in nsclient mode
2017-02-23 23:32:26 +01:00
Milos Kozak
ade45d5b4c
hide unlock button if not needed
2017-02-23 23:13:38 +01:00
Milos Kozak
b0c828c93e
nsclient build variant
2017-02-23 20:00:33 +01:00
Milos Kozak
15d6de4701
age from product flavor to prefs
2017-02-22 20:29:41 +01:00
Milos Kozak
d9225ccc8a
fix null object reference
2017-02-22 15:23:16 +01:00
Milos Kozak
87ad140eb5
SMS logging and resource refactor
2017-02-22 14:11:05 +01:00
Milos Kozak
666874c6c4
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-02-22 13:54:50 +01:00
Milos Kozak
efc1988374
uploader battery fix
2017-02-21 14:12:28 +01:00
Milos Kozak
4b6276c0b1
uploader battery always in json
2017-02-21 13:45:33 +01:00
Milos Kozak
2e0f6e8914
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2017-02-21 13:33:59 +01:00
Milos Kozak
a508b0bbc5
do not postpone status upload
2017-02-21 13:33:52 +01:00
Milos Kozak
615af399f8
remove ping me
2017-02-21 11:17:46 +01:00
Milos Kozak
99b66ab393
connect counter
2017-02-21 10:36:29 +01:00
Milos Kozak
3f84a63213
add delta sign
2017-02-21 10:00:44 +01:00
Milos Kozak
34ed92f8aa
fix displaying delta when not available
2017-02-21 10:00:08 +01:00
AdrianLxM
98edfc57e0
dismiss bolus progress via events
2017-02-20 14:49:38 +01:00
AdrianLxM
686e16de8d
scrollview match parent in width
2017-02-20 13:31:47 +01:00
AdrianLxM
1f464bdae0
Merge remote-tracking branch 'milosremote/dev' into adridev
2017-02-20 13:11:35 +01:00
AdrianLxM
18e2dcffcf
make things scrollable
2017-02-20 13:10:07 +01:00
Milos Kozak
6200584268
hours to fetch fixed
2017-02-20 09:46:55 +01:00
Milos Kozak
352902438c
Merge branch 'nsclient' of https://github.com/MilosKozak/AndroidAPS into nsclient
2017-02-20 08:32:25 +01:00
Milos Kozak
d84632a8a4
uploader battery in device status
2017-02-20 08:32:10 +01:00
Milos Kozak
9ea19fff9b
detect last received date
2017-02-19 23:41:42 +01:00
Milos Kozak
3b1b732d8f
nclient log collection
2017-02-19 20:56:12 +01:00
Milos Kozak
c9a6a44e4b
adjust upload timing
2017-02-19 20:48:10 +01:00
Milos Kozak
d030427b0f
adjust devicestatus upload
2017-02-19 20:41:20 +01:00
Milos Kozak
5f4eb1e4c4
pump status tweaking
2017-02-19 19:15:14 +01:00
Milos Kozak
de124b8e3e
Merge branch 'nsclient' of https://github.com/MilosKozak/AndroidAPS into nsclient
2017-02-19 09:42:28 +01:00
Milos Kozak
9303bd61fd
Merge branch 'dev' into nsclient
2017-02-19 09:41:16 +01:00
Milos Kozak
a2eb76a8b8
handle if bolus progress is not sent
2017-02-19 00:06:29 +01:00
Milos Kozak
e0a9a7ae81
fix carbs logging in driver
2017-02-18 23:12:45 +01:00
AdrianLxM
abaafb87eb
wear show on status when loop is disabled
2017-02-18 18:52:09 +01:00
AdrianLxM
d113d39916
wear setting to show detailed IOB
2017-02-18 18:13:13 +01:00
Milos Kozak
2e15c8b138
add permissions to manifest
2017-02-18 10:41:42 +01:00
Milos Kozak
5d795fbe33
Merge branch 'dev' into nsclient
2017-02-17 22:26:02 +01:00
Milos Kozak
29b4f0063b
better handling readonly permission
2017-02-17 22:12:35 +01:00
Milos Kozak
f33ccf278b
dbupdate/remove, saving queue
2017-02-17 21:24:30 +01:00
Milos Kozak
14e37246c2
nsclient gui and pausing tweaking
2017-02-17 18:14:33 +01:00
Milos Kozak
31364ff07b
ignore dbaccess if nsclient not enabled
2017-02-17 16:41:28 +01:00
Milos Kozak
8a374f1b35
Shared preferences cleanup
2017-02-17 16:16:20 +01:00
Milos Kozak
3216ff636a
preference keys to strings
2017-02-17 13:43:17 +01:00
Milos Kozak
71112a90e2
internal nsclient
2017-02-17 13:18:36 +01:00
Radoslav Radev
09880f029a
Update strings.xml
2017-02-16 16:46:47 +02:00
LadyViktoria
92cd31a0b6
fix key for openapsama_current_basal_safety_multiplier
2017-02-15 14:42:59 +01:00
LadyViktoria
16555347e8
fix key for openapsama_current_basal_safety_multiplier
2017-02-15 13:21:38 +01:00
Milos Kozak
1a3d3eb97c
1.1g
2017-02-14 21:41:39 +01:00
Milos Kozak
dda95dc275
allow to remove treatments from GUI
2017-02-14 21:13:13 +01:00
Milos Kozak
a75c62be35
show notification when aproaching daily limit
2017-02-14 19:47:45 +01:00
Milos Kozak
2e4aec9916
settings password protected
2017-02-14 19:16:34 +01:00
Milos Kozak
5992413cf9
disable quickwizard with if bg is old
2017-02-14 15:50:24 +01:00
Milos Kozak
8001796f4b
virtual pump status upload optional
2017-02-14 15:41:30 +01:00
Milos Kozak
e00045155e
prefill bg value in careportal dialog
2017-02-14 15:09:22 +01:00
Milos Kozak
ac82e2b044
1.1f
2017-02-13 21:06:20 +01:00
Milos Kozak
f9ee3c547a
translations
2017-02-13 21:05:57 +01:00
Milos Kozak
e3edf5cce5
calculate cob 1.5 * DIA to the past
2017-02-13 19:35:01 +01:00
Milos Kozak
c6b3fe9883
Merge pull request #178 from AdrianLxM/wear-bolus5
...
Wear Bolus
2017-02-13 18:13:36 +01:00
Milos Kozak
c31795d2e6
adjust devicestatus upload timings
2017-02-13 17:47:58 +01:00
AdrianLxM
05d40e4af0
wear better toasts
2017-02-13 14:18:23 +01:00
AdrianLxM
665f662f3a
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into pumpstatus2
2017-02-13 02:18:32 +01:00
AdrianLxM
5ce9d257e8
pump shortStatus String in interface
2017-02-13 02:18:25 +01:00
AdrianLxM
e85e651c56
wear full status support and product flavour with/without controls on wear
2017-02-13 01:55:35 +01:00
AdrianLxM
6fcee9ea3f
pump shortStatus String in interface
2017-02-13 00:15:02 +01:00
Milos Kozak
e003ef8368
Merge pull request #175 from LadyViktoria/dev
...
use validation lib in cpp - layout fixes & longer snackbar duration
2017-02-12 22:29:20 +01:00
Milos Kozak
f6ae267bb5
CS translations
2017-02-12 22:28:42 +01:00
Milos Kozak
1f3aee091e
manual invoke of loop in separate thread
2017-02-12 22:02:42 +01:00
viktoria
ba254f8829
Merged branch dev into dev
2017-02-12 20:01:25 +01:00
viktoria
0d02f42714
use validation lib in cpp - layout fixes & longer snackbar duration
2017-02-12 19:51:56 +01:00
Milos Kozak
4e3cc65d5d
handling pump suspend, show pump actions on overview
2017-02-12 19:51:13 +01:00
AdrianLxM
c0b287ba00
wear target statusO
2017-02-12 17:32:53 +01:00
Milos Kozak
351a624b83
small string change
2017-02-12 13:48:03 +01:00
Milos Kozak
dc85bc26fc
typo
2017-02-12 13:45:08 +01:00
AdrianLxM
5e96124a2d
mmol/l fix
2017-02-11 22:27:04 +01:00
AdrianLxM
2e6d754c86
mmol/l fix
2017-02-11 22:26:16 +01:00
AdrianLxM
1f5dd4750a
CPP dismiss info when focus is lost
2017-02-11 22:20:29 +01:00
AdrianLxM
6c5028b4be
CPP dismiss info when focus is lost
2017-02-11 22:18:28 +01:00
AdrianLxM
104c146b2f
Merge pull request #63 from AdrianLxM/patch-16
...
LadyViktoria validation lib plus safety
2017-02-11 21:12:22 +01:00
AdrianLxM
e4c529fa1f
reenable safety function
2017-02-11 19:59:20 +01:00
AdrianLxM
d9103b6823
wear wizard confirm reformat, connection stability, prime not in menu per default
2017-02-11 19:51:33 +01:00
AdrianLxM
6cb192b876
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into wear-bolus5
2017-02-11 18:09:22 +01:00
AdrianLxM
b57253af5e
wear add carbs to bolus-wizard confirmation
2017-02-11 17:54:47 +01:00
viktoria
06ee59b42c
Merge remote-tracking branch 'refs/remotes/MilosKozak/dev'
...
Conflicts:
app/build.gradle
2017-02-11 16:06:37 +01:00
Milos Kozak
e1341e79bf
Merge pull request #161 from warstar2187/master
...
Fix ExtendedBolusStep
2017-02-11 16:03:31 +01:00
viktoria
56f15a3cf7
Deprecation DataBaseHelper - use Long for .limit
2017-02-11 14:33:22 +01:00
Milos Kozak
c5081c378b
Merge pull request #169 from LadyViktoria/wip-deprecation-danarStats
...
Deprecation DanaR Stats
2017-02-11 14:23:45 +01:00
viktoria
0ffddcdefa
Deprecation TimeListEdit - add design support libraries
2017-02-11 14:01:37 +01:00
viktoria
a4591af392
Deprecation colors
2017-02-11 14:00:44 +01:00
viktoria
1217c22b43
Deprecation DanaR Stats
2017-02-11 13:44:43 +01:00
AdrianLxM
5ea7913a41
wear actionstringhandler use correct actualBG()
2017-02-11 02:58:22 +01:00
AdrianLxM
638b9c263c
Merge pull request #61 from MilosKozak/dev
...
Dev
2017-02-11 02:55:14 +01:00
viktoria
580a296177
use validation lib in cpp - small changes
2017-02-11 00:47:14 +01:00
AdrianLxM
9dae8b4e56
wear don't enact 0carbs/0bolus on wizard result
2017-02-11 00:32:45 +01:00
viktoria
7877235972
Merged branch dev into dev
2017-02-11 00:16:55 +01:00
viktoria
279c67bb70
use validation lib in cpp - add snackbar
2017-02-11 00:16:25 +01:00
Milos Kozak
1e4fa1b93e
fix not enacting extended
2017-02-10 21:45:46 +01:00
Milos Kozak
40d166cb7d
CS translations
2017-02-10 21:39:51 +01:00
Milos Kozak
2e40c7b605
sms calibrations
2017-02-10 21:20:55 +01:00
LadyViktoria
49e08f3357
use validation lib in cpp - add counter
2017-02-10 18:00:10 +01:00
LadyViktoria
e0627bd815
use validation lib in cpp - add a timer
2017-02-10 17:39:09 +01:00
LadyViktoria
48a158b036
use validation lib in cpp - better event handling
2017-02-10 17:29:59 +01:00
Milos Kozak
83667be8cc
extract sending intent to a function
2017-02-10 17:25:32 +01:00
Milos Kozak
8db3f258cd
xdrip calibration
2017-02-10 16:53:39 +01:00
LadyViktoria
11d0f1aebf
better keyboard handling in fragments
2017-02-10 14:24:56 +01:00
warstar2187
9458e0effa
Update DanaRKoreanPlugin.java
2017-02-10 20:59:44 +09:00
warstar2187
61f1acdcb0
Update DanaRPlugin.java
2017-02-10 20:59:06 +09:00
AdrianLxM
384e36a1f3
wear remove bolus enaction for testing
2017-02-10 12:52:54 +01:00
LadyViktoria
80de9c0cd8
use validation lib in cpp
2017-02-10 11:34:05 +01:00
LadyViktoria
4857259eda
ko translation
2017-02-10 07:59:26 +01:00
AdrianLxM
4220d7712a
wear wizard working
2017-02-10 06:07:31 +01:00
AdrianLxM
9785d507a8
wear temp targets working
2017-02-10 02:36:38 +01:00
AdrianLxM
8ece312b6a
Merge pull request #60 from MilosKozak/dev
...
Dev
2017-02-09 23:47:12 +01:00
AdrianLxM
aff82642af
wear multiple watch situation and disable fillbolus for wider testing
2017-02-09 23:39:23 +01:00
Milos Kozak
715d15b51f
CS translations
2017-02-09 22:44:42 +01:00
Milos Kozak
90061c6f25
Show log
2017-02-09 22:29:21 +01:00
AdrianLxM
3ff41af939
wear bolus activity and refactoring
2017-02-09 20:54:41 +01:00
Milos Kozak
ed7dd48612
remove TODOs
2017-02-09 20:18:22 +01:00
AdrianLxM
dc476a6600
wear menu restructuring and status
2017-02-09 17:40:26 +01:00
Milos Kozak
9d7ac0ce81
1.1e
2017-02-09 17:17:40 +01:00
Milos Kozak
8a2846c516
Merge branch 'dev' into dev
2017-02-09 17:01:05 +01:00
Milos Kozak
9e9637d70b
accept temp button visible only if loop selected
2017-02-09 16:51:14 +01:00
Milos Kozak
3aff89acdc
fix not attached to activity in bolus progress dialog
2017-02-09 16:45:54 +01:00
Milos Kozak
806cc4a3a7
fix nullpointerexception in reading temp basal status
2017-02-09 16:43:27 +01:00
Milos Kozak
a39416d876
fix nullpointerexception in reading temp basal status
2017-02-09 16:39:07 +01:00
Milos Kozak
caa109dbfd
use SafeParse in DanaRStartsActivity
2017-02-09 16:32:44 +01:00
Milos Kozak
b9b08c1528
fix crash when pump status not loaded yet
2017-02-09 16:29:02 +01:00
Milos Kozak
3d3e849d8a
fix null pointer exception in persistentnotification
2017-02-09 16:23:28 +01:00
AdrianLxM
b8c3fe2933
wear wizard including bg and iob toggles
2017-02-09 16:16:31 +01:00
Milos Kozak
7f123e4208
warn on wrong entered sms phone number
2017-02-09 16:14:09 +01:00
Milos Kozak
c015862239
fix crash: not attached to Activity
2017-02-09 16:04:57 +01:00
LadyViktoria
7fc6de17c1
Add prefernces.json changes 2
2017-02-09 10:41:02 +01:00
LadyViktoria
886c1ea359
Add prefernces.json changes
2017-02-09 09:36:51 +01:00
AdrianLxM
bf7a96b3e7
bolus progress dialog without activity context
2017-02-09 03:15:13 +01:00
AdrianLxM
74107f58fe
wear first fill bolus working
2017-02-09 01:53:28 +01:00
viktoria
0bf51710d1
Merged branch dev into dev
2017-02-08 21:23:47 +01:00
Milos Kozak
698ab31d71
show temp targets only if APS enabled in config
2017-02-08 21:04:26 +01:00
Milos Kozak
a43677e4b0
fix pumpcontrol build crash
2017-02-08 20:36:30 +01:00
AdrianLxM
d2d0d4b51a
wear confirm roundtrip working
2017-02-08 15:15:22 +01:00
AdrianLxM
8e9d73e3a3
wear sending confirmation requests
2017-02-08 11:53:26 +01:00
AdrianLxM
20d32d042f
wear bolusprogress cleanup
2017-02-07 12:08:13 +01:00
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
f4b553fe52
Wear added bolusprogress and dismiss when finished
2017-02-07 09:17:19 +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
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
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
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
98a95fb16e
1.1c
2017-01-19 19:22:04 +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
452edd5771
1.1b
2017-01-18 21:41:10 +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
Milos Kozak
ba370b3cf3
ver 1.1a
2017-01-18 08:05:46 +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
f704090eac
version bump 1.1
2017-01-07 23:39:29 +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
AdrianLxM
d70c9673d5
average delta
2016-12-28 22:39:40 +01:00
Milos Kozak
9a47e521d2
show result in loop plugin when correct basal settoo
2016-12-28 22:30:38 +01:00
Milos Kozak
d6f4135d6e
travis
2016-12-28 15:58:44 +01:00
Milos Kozak
d2d3e024a2
Merge branch 'ongoingnotif' of https://github.com/AdrianLxM/AndroidAPS
2016-12-28 15:15:24 +01:00
Milos Kozak
e2c2f49f6f
MM640g bg source
2016-12-28 14:57:11 +01:00
Radoslav Radev
71461e38ca
Update strings.xml
2016-12-28 12:17:17 +02:00
warstar2187
804cdba7cf
Update strings.xml
2016-12-28 18:22:50 +09:00
AdrianLxM
6ac889cecd
ongoing notification integration
2016-12-28 00:03:08 +01:00
Milos Kozak
26b260a85a
use bolus step from pump description
2016-12-27 23:46:39 +01:00
AdrianLxM
4afd2295f8
Ongoing Notification 2
2016-12-27 23:39:47 +01:00
AdrianLxM
d597be71de
ongoing notification
2016-12-27 23:39:16 +01:00
Milos Kozak
405ae28e38
cz translations
2016-12-27 23:39:00 +01:00
Milos Kozak
29327aef01
MDI pump driver
2016-12-27 23:35:50 +01:00
Milos Kozak
fdb252b62d
show direction next to BG
2016-12-27 20:41:28 +01:00
Milos Kozak
13f2fce31e
product flavors dimensions update
2016-12-27 18:47:48 +01:00
Milos Kozak
34fce81563
fix build warning
2016-12-27 16:21:04 +01:00
Milos Kozak
ecd787bdb3
detect broken communication during bolusing
2016-12-27 16:06:49 +01:00
Milos Kozak
42b581ec29
log bolus start
2016-12-27 15:13:27 +01:00
Milos Kozak
cd41bff2bb
SMS command BG
2016-12-27 12:17:26 +01:00
Milos Kozak
a109bb9853
handle switching profiles in correct order
2016-12-25 23:18:46 +01:00
Milos Kozak
463a913cd1
add debug to profile comparation
2016-12-25 15:08:40 +01:00
Milos Kozak
46be73d187
send sms notification when profile received from NS
2016-12-25 14:26:41 +01:00
Milos Kozak
61720a74ec
do not return error if not initialized
2016-12-25 13:34:48 +01:00
Milos Kozak
94cb506d20
Merge branch 'koreandanar' into smsnotify
2016-12-25 11:51:52 +01:00
Milos Kozak
381de0a5f5
function to send notification
2016-12-25 11:51:46 +01:00
Milos Kozak
02b3da97e0
send important confirmations to all phone numbers
2016-12-25 11:29:13 +01:00
Milos Kozak
273993f995
Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS into smsnotify
2016-12-25 09:53:43 +01:00
Milos Kozak
3bd7568d34
dismiss button not hardcoded
2016-12-24 23:56:47 +01:00
Milos Kozak
052ac47595
Better profile handling
2016-12-24 23:53:17 +01:00
Milos Kozak
edcfebfd41
fix displaying missing carbs in wizard
2016-12-24 15:05:44 +01:00
Milos Kozak
5c506faa65
proper reaction to pump error
2016-12-24 14:53:37 +01:00
Milos Kozak
2b0c74c56f
CZ translations
2016-12-24 14:21:24 +01:00
Milos Kozak
79aee157e3
redundant code cleanup
2016-12-24 14:13:35 +01:00
Milos Kozak
7719e2ac63
use notifications for profile update
2016-12-22 12:17:38 +01:00
Milos Kozak
132f82b484
fix showing objectives
2016-12-22 12:04:17 +01:00
Milos Kozak
d72a3cbf36
Merge branch 'koreandanar' of https://github.com/MilosKozak/AndroidAPS into koreandanar
2016-12-21 14:50:22 +01:00
Milos Kozak
d8696412b1
temporary disable korean danar
2016-12-21 14:48:36 +01:00
AdrianLxM
5e2302ed68
start KeepAlive at app start 2
2016-12-16 02:00:53 +01:00
AdrianLxM
4f3c9baf0b
start KeepAlive at app start 1
2016-12-16 01:57:18 +01:00
Milos Kozak
37d539ce3e
remove duplicated function
2016-12-15 19:10:07 +01:00
Milos Kozak
368652670c
Merge branch 'master' into koreandanar
2016-12-15 18:58:16 +01:00
Milos Kozak
d34e4579fc
clear aps result before new calculation
2016-12-15 18:55:23 +01:00
Milos Kozak
889c75f3ee
Merge branch 'koreandanar' of https://github.com/MilosKozak/AndroidAPS into koreandanar
2016-12-14 11:17:15 +01:00
Milos Kozak
5626c621ff
fix loop
2016-12-14 11:16:28 +01:00
AdrianLxM
d461a4b2c4
Set fragmentVisible instead of fragmentEnabled
2016-12-14 08:23:22 +01:00
Milos Kozak
49453e10df
fix x axis on overview when no data displayed
2016-12-13 23:18:02 +01:00
Milos Kozak
738d4c1c2a
hide pump control buttons when pump is not initialized
2016-12-13 22:50:51 +01:00
Milos Kozak
cb4330ddcd
notify when pump settings is wrong
2016-12-13 22:10:13 +01:00
Milos Kozak
407ea423cb
detect if extended bolus is enabled, detect easy ui mode
2016-12-13 21:35:49 +01:00
Milos Kozak
9454e7e6e2
Merge branch 'koreandanar' of https://github.com/MilosKozak/AndroidAPS into koreandanar
2016-12-11 22:56:46 +01:00
Milos Kozak
4a2a15d394
smarter plugin selection and handling
2016-12-11 22:55:45 +01:00
AdrianLxM
d33629e5d4
Korean Dana history Activity in Manifest
2016-12-11 16:28:18 +01:00
Milos Kozak
8f6f6e326d
Disable profile control for pump profiles if pump is not enabled
2016-12-11 13:46:27 +01:00
Milos Kozak
0d6787a744
force enabled if only 1 plugin exists
2016-12-11 13:36:32 +01:00
Milos Kozak
be1ec7f3e3
fix processing plugins in configbuilder
2016-12-11 13:08:20 +01:00
Milos Kozak
7aaa15dd3b
Merge branch 'koreandanar' of https://github.com/MilosKozak/AndroidAPS into koreandanar
2016-12-11 11:15:34 +01:00
Milos Kozak
80a463a56d
parse allowed phone numbers
2016-12-11 10:52:50 +01:00
AdrianLxM
c8ac855219
also switch profiles
2016-12-10 23:51:57 +01:00
AdrianLxM
e1dc624a47
fully remove mm640g
2016-12-10 22:58:31 +01:00
Milos Kozak
5b6e85f5c9
Merge branch 'master' into koreandanar
2016-12-10 18:14:39 +01:00
Milos Kozak
82f4c8ffac
better handling of non existing profiles
2016-12-10 18:14:12 +01:00
Milos Kozak
617192dc3a
hide buttons based on pump description
2016-12-10 00:18:20 +01:00
Milos Kozak
cf4851250d
enable loop only when pump is temp basals capable
2016-12-09 21:47:58 +01:00
Milos Kozak
2a10d4789e
virtual pump description
2016-12-09 21:30:34 +01:00
Milos Kozak
b824cc28c9
korean danar description
2016-12-09 20:37:56 +01:00
Milos Kozak
bd6ee0f213
add duration to description
2016-12-09 20:20:21 +01:00
Milos Kozak
199c6b5e2c
fix curentBasal rouding
2016-12-09 19:32:59 +01:00
Milos Kozak
3acabd792c
basic danar description
2016-12-09 19:28:48 +01:00
Milos Kozak
6ba532d178
notify about setting basal profile
2016-12-09 16:04:07 +01:00
Milos Kozak
4103e4bf4a
allow set profile to pump from simpleprofile plugin
2016-12-09 12:40:15 +01:00
Milos Kozak
e9d639c979
fix read basal profile on korean pump
2016-12-09 12:00:44 +01:00
Milos Kozak
a01c15f8f7
miminum basal rate in description
2016-12-09 11:46:46 +01:00
Milos Kozak
56eb347b84
Merge remote-tracking branch 'origin/master' into koreandanar
2016-12-09 11:33:33 +01:00
Milos Kozak
8c00e08574
Merge pull request #87 from AdrianLxM/dbfix
...
lazy initialization of optional plugins
2016-12-09 11:32:22 +01:00
Milos Kozak
f75c2f8f91
check if plugin is enabled before accepting message
2016-12-09 11:31:45 +01:00
AdrianLxM
f4e82ec022
lazy loading on optional plugins
2016-12-09 09:56:16 +01:00
Milos Kozak
064de0f64e
synchronize pump time
2016-12-09 09:31:51 +01:00
Milos Kozak
ccda992161
remove unused MM640g plugin
2016-12-08 15:23:37 +01:00
Milos Kozak
073cc84368
added PumpDescription
2016-12-08 15:21:16 +01:00
Milos Kozak
0044b8b41a
Merge remote-tracking branch 'origin/master' into koreandanar
2016-12-08 14:29:38 +01:00
Milos Kozak
e0f0ee0cbb
Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS
2016-12-08 14:28:53 +01:00
Milos Kozak
fdd594358c
fix removeExpired in notifications
2016-12-08 14:28:21 +01:00
Milos Kozak
8f98ad1b15
do not process remote profile if not selected
2016-12-07 22:12:48 +01:00
AdrianLxM
fa4cf31cf4
Correct db query
2016-12-07 01:48:53 +01:00
Milos Kozak
1db9ce287c
fix basal rates decoding
2016-12-07 00:15:42 +01:00
Milos Kozak
2dea4615c0
basal rates set
2016-12-06 23:46:36 +01:00
Milos Kozak
f2928c3d39
fix IC and ISF in DanaR Korean profile
2016-12-06 23:19:48 +01:00
Milos Kozak
be8003da4b
Merge branch 'master' into koreandanar
2016-12-06 23:18:02 +01:00
Milos Kozak
64de2fd736
Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS
2016-12-06 23:15:23 +01:00
Milos Kozak
10d30571a9
fix IC and ISF in DanaR profile
2016-12-06 23:14:25 +01:00
Milos Kozak
d897b778a0
Merge pull request #84 from MilosKozak/notifications
...
basic notification functionality
2016-12-06 23:05:23 +01:00
Milos Kozak
3a3fc5d508
one more ICF with 1 decimal
2016-12-06 23:03:45 +01:00
Milos Kozak
86755599df
show IC and ICF with 1 decimal
2016-12-06 23:00:57 +01:00
Milos Kozak
0af894aa56
change info color to green
2016-12-06 22:57:49 +01:00
Milos Kozak
b61108eb2b
remove test data
2016-12-06 22:55:49 +01:00
AdrianLxM
1a20b637b6
limit readings to values above 38
2016-12-05 17:47:03 +01:00
Milos Kozak
abfb832a10
basic notification functionality
2016-12-05 15:20:44 +01:00
Milos Kozak
4b389c2cad
dana drivers switching working
2016-12-03 17:42:08 +01:00
AdrianLxM
1af28d007f
wear make sendData() private
2016-12-01 12:10:58 +01:00
AdrianLxM
7eb8702a9c
wear profile-null fix Toasts from strings.xml the second
2016-12-01 10:54:19 +01:00
AdrianLxM
68f4a2db50
wear profile-fix toast from strings.xml
2016-12-01 10:47:39 +01:00
AdrianLxM
0d8fd9df5c
wear profile may be null
2016-12-01 09:30:39 +01:00
Milos Kozak
db2fd55f7c
copy files for Korean DanaR
2016-11-29 20:52:40 +01:00
Milos Kozak
97a22344e3
CZ translations
2016-11-29 19:07:09 +01:00
Milos Kozak
36d5f1dc29
proper danar errors detection
2016-11-29 18:28:36 +01:00
AdrianLxM
896503918c
wear extract strings
2016-11-29 15:01:00 +01:00
AdrianLxM
1eacf35e47
Merge pull request #25 from AdrianLxM/wear-prepare-final
...
wear merge current master
2016-11-29 13:17:21 +01:00
Milos Kozak
ee408ada79
Merge pull request #80 from warstar2187/master
...
Fix Insulin Activity and Korean update
2016-11-29 07:44:58 +01:00
warstar2187
7f97b232da
Update Treatment.java
2016-11-29 12:08:45 +09:00
