Milos Kozak
0552a3f1ed
2.0g-dev
2018-09-09 12:24:03 +02:00
Milos Kozak
3c8b7f10be
fix NPE
2018-09-09 12:22:23 +02:00
Milos Kozak
e577e8555d
openloop mode min change threshold configurable
2018-09-09 12:15:44 +02:00
Milos Kozak
a83ffb60dd
Merge pull request #1402 from MilosKozak/l10n_dev
...
New Crowdin translations
2018-09-09 10:00:45 +02:00
Milos Kozak
0edc79e589
New translations strings.xml (Russian)
2018-09-09 09:51:01 +02:00
Milos Kozak
4181488d8d
Merge pull request #1400 from MilosKozak/l10n_dev
...
New Crowdin translations
2018-09-07 12:56:06 +02:00
Milos Kozak
55d1dd0847
Merge pull request #1392 from MilosKozak/openloop
...
Openloop
2018-09-07 12:55:25 +02:00
Milos Kozak
4165a178d4
New translations strings.xml (Bulgarian)
2018-09-07 08:26:12 +02:00
Mark Carrington
be7693a73d
Assume md/dl units for temp targets created through Nightscout
2018-09-06 22:50:35 +01:00
Milos Kozak
ecae6af151
reset autosens on profileswitch with zero duration
2018-09-06 16:30:57 +02:00
Milos Kozak
f5873f9f87
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-09-06 11:18:27 +02:00
Milos Kozak
e4f95c7a4e
more logging for bucketed data
2018-09-06 11:18:15 +02:00
Milos Kozak
abea2f30bb
typo
2018-09-06 07:45:52 +02:00
Milos Kozak
65f7f9cbfb
New Crowdin translations ( #1389 )
...
* New translations strings.xml (Slovak)
* New translations strings.xml (Swedish)
2018-09-06 07:41:29 +02:00
Milos Kozak
a8bed0096d
fix NPE
2018-09-04 22:34:36 +02:00
Milos Kozak
5499396661
fix NPE
2018-09-04 22:26:59 +02:00
Milos Kozak
e36499f9d4
more tests
2018-09-04 22:08:35 +02:00
Milos Kozak
f3a4f883a4
fix tests
2018-09-04 21:51:13 +02:00
Milos Kozak
1ede3df627
fix tests
2018-09-04 20:50:42 +02:00
Milos Kozak
6f5332af0a
Omnipod max tbr 30U
2018-09-04 20:42:33 +02:00
Milos Kozak
4ca9d22062
Virtual pump descriptions used for APS requests in open loop mode
2018-09-04 19:55:31 +02:00
Milos Kozak
42714afeb1
fix false constraint warning
2018-09-04 15:38:04 +02:00
Milos Kozak
cc934d3e89
New Crowdin translations ( #1378 )
2018-09-03 15:16:25 +02:00
Milos Kozak
f5e7d28aa6
fix WizardInfoDialog 2nd
2018-09-01 23:34:35 +02:00
Milos Kozak
91695614f4
Merge branch 'andyrozman-virtual_pump_bug_1372' into dev
2018-09-01 22:46:16 +02:00
Milos Kozak
315c83069d
apply bolus description settings in constraints
2018-09-01 22:45:15 +02:00
Milos Kozak
62b111eb64
fix test
2018-09-01 12:40:07 +02:00
Milos Kozak
316f001cbc
PumpUtil cleanup
2018-09-01 11:45:29 +02:00
triplem
b9fda827bd
Add version information to emails
2018-08-31 11:25:57 +02:00
Milos Kozak
7fd0d2fe56
Merge branch 'dev' into insightfix
2018-08-31 08:26:59 +02:00
Andy Rozman
e2182528fd
- changed calls of PumpUtil.setPumpDescription to use enums directly
2018-08-30 22:03:09 +01:00
Andy Rozman
d205492a7b
reverting changed name
2018-08-30 21:26:29 +01:00
Andy Rozman
bbffa703df
reverting some formater changes
2018-08-30 20:54:15 +01:00
Andy Rozman
679b4b2668
- added methods to return correct Extended bolus size
...
- using exetended bolus size
2018-08-30 16:22:25 +01:00
Milos Kozak
39358ac804
Merge pull request #1377 from PoweRGbg/patch-2
...
also don't show UserOptions for pumps with code 3
2018-08-30 12:49:55 +02:00
Milos Kozak
7869ee987e
New Crowdin translations ( #1376 )
2018-08-30 12:49:15 +02:00
Roumen Georgiev
c3e1dff345
also don't show UserOptions for pumps with code 3
...
until debugged
2018-08-30 12:08:45 +03:00
Milos Kozak
063ead4c17
RS text bolus error codes
2018-08-29 20:14:36 +02:00
Milos Kozak
178c2b90fe
min_5m_carbimpact to AMA settings
2018-08-29 18:17:11 +02:00
Milos Kozak
236c05e8d4
New Crowdin translations ( #1373 )
...
* New translations strings.xml (Romanian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Korean)
* New translations strings.xml (Korean)
* New translations strings.xml (Korean)
* New translations strings.xml (Korean)
* New translations strings.xml (Korean)
* New translations strings.xml (Korean)
* New translations strings.xml (Korean)
* New translations strings.xml (Korean)
* New translations strings.xml (Korean)
* New translations strings.xml (Korean)
2018-08-29 17:42:08 +02:00
Milos Kozak
a172458e76
catch bus errors, enable only for dev
2018-08-29 08:10:06 +02:00
Milos Kozak
105485c9b6
do not use FEATURE_CUSTOM_TITLE
2018-08-29 08:00:15 +02:00
Andy Rozman
c167728935
- changed build name
2018-08-28 22:56:12 +01:00
Andy Rozman
124f3d8ac1
- small bug in determineCorrectBasalSize
2018-08-28 22:41:31 +01:00
Milos Kozak
8c2ad32ad8
fix NPE
2018-08-28 23:33:09 +02:00
Andy Rozman
07495ccfdd
- added bolus and basal amount rounding (rounding to pump specification)
2018-08-28 16:57:14 +01:00
Milos Kozak
abc374193a
Merge branch 'dev' into insightfix
2018-08-28 14:11:34 +02:00
Milos Kozak
4082f52dd9
Merge pull request #1369 from MilosKozak/l10n_dev
...
New Crowdin translations
2018-08-28 12:59:14 +02:00
Milos Kozak
980e4998e2
send HEAD to fabric
2018-08-27 20:19:30 +02:00
Milos Kozak
bb18fad654
Merge pull request #1370 from jotomo/upstream-combo-fabric-removal
...
Upstream combo fabric removal
2018-08-27 20:09:13 +02:00
Johannes Mockenhaupt
3fd3d0f059
Combo: remove dead code.
2018-08-27 19:56:07 +02:00
Milos Kozak
0c43966391
New translations strings.xml (Czech)
2018-08-27 19:41:27 +02:00
Johannes Mockenhaupt
0eb08c2eaf
Combo: remove fabric logging.
2018-08-27 19:10:08 +02:00
Milos Kozak
4e07e37535
Merge pull request #1366 from MilosKozak/l10n_dev
...
New Crowdin translations
2018-08-27 16:39:50 +02:00
Milos Kozak
4fd4d71187
fix min percent value in careportal
2018-08-27 16:05:30 +02:00
Milos Kozak
ceb6453f09
New translations strings.xml (Bulgarian)
2018-08-27 08:11:39 +02:00
Milos Kozak
f4ac44e9da
New translations strings.xml (Bulgarian)
2018-08-27 08:01:09 +02:00
Milos Kozak
e5d96e5c17
fix bucketed data
2018-08-25 20:03:48 +02:00
Milos Kozak
a9262d8374
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-08-25 19:35:47 +02:00
Milos Kozak
e1a0aad0b1
update strings
2018-08-25 19:34:48 +02:00
Milos Kozak
72f7b244c5
Merge pull request #1361 from MilosKozak/g6-xdrip-filtered
...
Also count "G6 Native" in xDrip as filtered
2018-08-25 19:27:56 +02:00
Milos Kozak
2e03c3a298
2.0f-dev
2018-08-25 19:23:17 +02:00
Milos Kozak
ead57748aa
more autosens logging
2018-08-25 19:22:45 +02:00
Milos Kozak
8c4c5a291e
is5minData detection improvement
2018-08-25 18:13:32 +02:00
Milos Kozak
324ba072bb
fix Dana password handling
2018-08-25 14:08:04 +02:00
AdrianLxM
972eeeda29
Also count "G6 Native" in xDrip as filtered
2018-08-24 20:57:52 +02:00
Milos Kozak
d330764d9f
Merge branch 'dev' into insightfix
2018-08-24 10:40:31 +02:00
Milos Kozak
7da4e4fd70
log (SITECHANGE)
2018-08-24 10:36:01 +02:00
Milos Kozak
bed901fe15
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-08-24 10:35:52 +02:00
Milos Kozak
2e9da51daf
register VP plugin on start
2018-08-24 10:24:04 +02:00
Milos Kozak
da0e560690
New Crowdin translations ( #1359 )
2018-08-24 09:13:48 +02:00
Milos Kozak
9419b8c4d1
reuse predefined descriptions in real drivers
2018-08-23 19:36:56 +02:00
Milos Kozak
b7950322c8
virtual pump lifecycle
2018-08-23 18:59:46 +02:00
Milos Kozak
b0f8ab9922
extract key_virtualpump_type
2018-08-23 18:46:06 +02:00
Milos Kozak
243755d1b1
virtualpump: fix string, fix formatter
2018-08-23 18:41:55 +02:00
Milos Kozak
2c5837a235
Merge branch 'virtual_pump_Bug863' of https://github.com/andyrozman/AndroidAPS into andyrozman-virtual_pump_Bug863
2018-08-23 17:53:28 +02:00
Milos Kozak
67b4fb2584
New Crowdin translations ( #1336 )
2018-08-23 17:51:48 +02:00
Milos Kozak
fa4934ba0e
Merge pull request #1357 from PoweRGbg/patch-3
...
don't show User oprtions if firmware is OLD
2018-08-23 17:33:44 +02:00
Milos Kozak
8a4e1d8efd
fix ISE
2018-08-23 07:37:31 +02:00
Milos Kozak
8f9d0269c1
better TREATMENT logging
2018-08-22 22:04:47 +02:00
Sebastian Lenz
1935d5b011
send notification about tbr to watch if wearcontrol is false. Fixes #1318
2018-08-22 19:22:30 +02:00
Milos Kozak
15741b2a02
more logging on extended bolus
2018-08-22 15:49:22 +02:00
Milos Kozak
45321f889a
Merge branch 'dev' into insihgtfix
2018-08-22 15:47:32 +02:00
Roumen Georgiev
ca96791059
don't show User oprtions if firmware is OLD
2018-08-22 14:04:57 +03:00
Milos Kozak
653a98fd5b
better layout for nsclient mode
2018-08-21 23:19:04 +02:00
Milos Kozak
5114335005
more logs
2018-08-21 19:53:59 +02:00
Milos Kozak
0817809417
logback format update
2018-08-21 18:32:46 +02:00
Milos Kozak
73bb574944
add Slovak language to menu
2018-08-21 17:32:31 +02:00
Milos Kozak
32d9a8b4d6
Fix connection handshake for DanaR pumps
2018-08-21 17:25:20 +02:00
Milos Kozak
cd90bab877
fix NPE
2018-08-21 11:39:32 +02:00
Milos Kozak
8ec3649cea
key_nsclient_localbroadcasts default to false
2018-08-20 23:01:11 +02:00
Milos Kozak
8fec60ea35
fix NPE
2018-08-20 22:13:01 +02:00
Milos Kozak
004a9193bb
AUTOSENS logging on by default
2018-08-20 19:39:39 +02:00
Milos Kozak
414c3416dd
WizardInfoDialog
2018-08-20 19:32:18 +02:00
Milos Kozak
9610ef54da
2.0e-dev
2018-08-20 15:14:04 +02:00
Milos Kozak
e9d7a917d2
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-08-20 14:46:20 +02:00
Milos Kozak
98b9a52a9a
remove catch to get more data from people
2018-08-20 14:46:08 +02:00
Milos Kozak
28ff01978f
fix NPE
2018-08-20 08:04:35 +02:00
Milos Kozak
200c75d421
fix NPE
2018-08-20 08:02:57 +02:00
Nico Schmitz
5386c7db4a
Update to upstream/dev and resolve conflicts
2018-08-19 14:37:42 +02:00
Milos Kozak
a6e25df543
log version check
2018-08-17 21:58:00 +02:00
Milos Kozak
1b6e54f8a8
iobplugin tests
2018-08-17 19:49:39 +02:00
Milos Kozak
c98ffb2df1
iobplugin tests
2018-08-17 19:34:53 +02:00
Milos Kozak
4133bc9ad1
iobplugin tests
2018-08-17 19:00:35 +02:00
Milos Kozak
d198de94c0
fix sending logs
2018-08-17 17:01:48 +02:00
Milos Kozak
94b1fa3552
fix bucketed data, add some tests, fix failing tests
2018-08-17 16:41:12 +02:00
Milos Kozak
74f2866fb5
2.0d-dev
2018-08-17 15:22:30 +02:00
Milos Kozak
1d67f124fc
get rid of Date.class
2018-08-17 15:11:43 +02:00
Milos Kozak
15e69a478e
RS,Rv2: thread safe history
2018-08-17 13:58:06 +02:00
Milos Kozak
9c1e52bd17
RS,Rv2: more logging on storing boluses
2018-08-17 13:28:37 +02:00
Milos Kozak
91cbe1dd63
update PluginStats
2018-08-17 10:27:46 +02:00
Milos Kozak
00dd539310
remove unneeded file
2018-08-16 22:46:52 +02:00
Milos Kozak
b42d604606
false pump unreachable alert workaround
2018-08-16 22:46:20 +02:00
Milos Kozak
c927b8f061
storing extended bolus fix for insight
2018-08-16 15:02:45 +02:00
Milos Kozak
b46ebf34c4
fix typo
2018-08-16 12:46:56 +02:00
Milos Kozak
54930fee02
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-08-15 22:44:31 +02:00
Milos Kozak
9642ff7cac
use local broadcast for dbaccess
2018-08-15 22:09:13 +02:00
Milos Kozak
e2896cbc5d
SW: less aggressivity on nsclient connections
2018-08-14 18:33:29 +02:00
Milos Kozak
03f8a7c629
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-08-14 18:32:37 +02:00
Milos Kozak
31e050be4a
loop mode in setup wizard
2018-08-14 17:06:09 +02:00
Milos Kozak
04af3eb806
source selection in nsclient after dropping g5 uploader
2018-08-14 16:06:02 +02:00
Milos Kozak
2d8ffcab9b
New Crowdin translations ( #1326 )
2018-08-14 15:39:29 +02:00
Milos Kozak
17b9a4b951
add logging
2018-08-13 23:58:07 +02:00
Milos Kozak
7f17110d98
fix NPE
2018-08-13 23:57:16 +02:00
Milos Kozak
d925011380
WATCHDOG_RECONNECT_IN = 15
2018-08-12 21:27:45 +02:00
Andy Rozman
6a73937b2a
- merges of bug fixes from RileyLinkAAPS
2018-08-12 16:30:32 +01:00
Milos Kozak
1abeb51b4f
fix NPE
2018-08-12 09:29:41 +02:00
Milos Kozak
26a24d384e
fix NPE
2018-08-12 08:53:57 +02:00
Milos Kozak
ce66118344
New Crowdin translations ( #1324 )
...
* New translations strings.xml (Dutch)
* New translations strings.xml (Czech)
* New translations strings.xml (German)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Romanian)
* New translations strings.xml (Russian)
* New translations strings.xml (Spanish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Slovak)
2018-08-10 23:19:58 +02:00
Milos Kozak
7d5f61d677
restore removed tests
2018-08-10 22:34:08 +02:00
Milos Kozak
0ab5981665
Roumen's Unit tests ( #1325 )
...
* initializer
* aading some tests
* ading some tests
* removed try-catch
but added testingMode boolean for the test to run
* update to latest dev
* formatting
* cleanup tests
* More test classes
* some more
* upd
* more coverage in comm
* 50% class coverage in comm
* Delete crashlytics-build.properties
* remove of crashlytics
* removed unneeded checks
* removet mocking of treatmentsService
* removed treatmentsService mock from newNSTreatmentTest
* more testing classes
* tests of _History_ packets
* tests of _Notify_ packets
* 64 / 65 classes covered
* 100% class coverage in comm
2018-08-10 22:17:44 +02:00
Andy Rozman
c9d35696cf
- various changes
...
- reformatting everything
2018-08-10 16:13:40 +01:00
Milos Kozak
e4e6399543
New Crowdin translations ( #1320 )
...
* New translations strings.xml (Spanish)
* New translations strings.xml (Dutch)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
2018-08-10 11:44:59 +02:00
Andy Rozman
e62fbfb189
Merge branch 'virtual_pump_Bug863' of github.com:andyrozman/AndroidAPS into virtual_pump_Bug863
2018-08-09 15:16:13 +01:00
Andy Rozman
fa1a08367f
- Changed one string
...
- Removed one pump that was just wrongly named (553 doesn't exists, 523 is actually Revel one)
2018-08-09 15:11:34 +01:00
Milos Kozak
27bfab5e15
fix NPE
2018-08-08 00:41:31 +02:00
Milos Kozak
60d5567c91
verify plugins after import
2018-08-08 00:39:40 +02:00
Milos Kozak
d793135339
fixed stack overflow
2018-08-07 23:50:43 +02:00
Milos Kozak
671a8030b5
Merge pull request #1313 from jotomo/revert-behavioral-change
...
[Regression] Only log about records with duplicate pump id.
2018-08-07 23:33:26 +02:00
Milos Kozak
ae677fec98
New Crowdin translations ( #1312 )
...
* New translations strings.xml (Romanian)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (Dutch)
* New translations strings.xml (German)
2018-08-07 23:32:58 +02:00
Milos Kozak
8e83ff2390
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-08-07 21:45:56 +02:00
Milos Kozak
fff2e84608
remove g5uploader flavor
2018-08-07 21:45:35 +02:00
Milos Kozak
fcf47ecc03
NSClient2 flavor
2018-08-07 21:07:43 +02:00
Milos Kozak
9dde50f93f
Merge pull request #1316 from jotomo/fixingthefix
...
TT context menu fixes
2018-08-07 19:46:46 +02:00
Johannes Mockenhaupt
27cf03f39a
Context TT menu fixes.
...
Default values where previously correctly converted for mmol/l,
but user-defined settings in the prefs (in mmol/l) where not.
This works for default settings and user-defined preference
for both mg/dl as well as mmol/l.
2018-08-07 18:50:09 +02:00
Johannes Mockenhaupt
1c7777e5eb
Revert "Fix #1254 double mmol/l conversion."
...
This reverts commit 0b280ce
2018-08-07 18:35:31 +02:00
Johannes Mockenhaupt
ca003fbdd7
Only log about records with duplicate pump id.
2018-08-07 14:17:47 +02:00
Milos Kozak
d3b6337749
New Crowdin translations ( #1311 )
...
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
2018-08-07 11:01:23 +02:00
Milos Kozak
a6b16d154d
New Crowdin translations ( #1300 )
...
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Slovak)
* New translations strings.xml (Spanish)
* New translations strings.xml (Czech)
* New translations strings.xml (Czech)
* New translations strings.xml (German)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Russian)
* New translations strings.xml (Spanish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Slovak)
* New translations strings.xml (Russian)
* New translations strings.xml (Swedish)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (German)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Czech)
* New translations strings.xml (German)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Spanish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Slovak)
* New translations strings.xml (Czech)
* New translations strings.xml (Czech)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (German)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (Russian)
* New translations strings.xml (German)
2018-08-07 08:49:17 +02:00
Johannes Mockenhaupt
9af0bc2976
Fix target line performance regression.
2018-08-06 17:34:09 +02:00
Milos Kozak
409acd0721
Merge pull request #1305 from triplem/fix_stackoverflow
...
Fix stackoverflow
2018-08-05 23:08:29 +02:00
Milos Kozak
cd71597baa
fix tests
2018-08-05 22:55:08 +02:00
Milos Kozak
2bc07e3277
fix notification string
2018-08-05 22:43:30 +02:00
triplem
b7ffb2c847
Should fix stackoverflow
2018-08-05 22:11:30 +02:00
Milos Kozak
aa97583daa
fix NPE
2018-08-05 20:50:20 +02:00
Milos Kozak
2677f3cca7
fix NPE in NsClientService
2018-08-05 20:46:52 +02:00
Milos Kozak
ff30d9af80
fix typo
2018-08-05 10:00:14 +02:00
Milos Kozak
7ad74146c4
New Crowdin translations ( #1299 )
...
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
2018-08-04 20:57:19 +02:00
Milos Kozak
ab4ca5fa13
log wrong bundles
2018-08-04 12:08:43 +02:00
Milos Kozak
a16fa7ee0f
normalize bucketed data, fix doubled cob
2018-08-04 11:56:29 +02:00
Milos Kozak
4bfd851bf6
Merge pull request #1297 from MilosKozak/overview-flexbox
...
overview flexbox
2018-08-04 09:02:19 +02:00
Milos Kozak
9f86e5b96c
New Crowdin translations ( #1296 )
...
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Slovak)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Romanian)
2018-08-04 09:01:43 +02:00
Milos Kozak
9a2df7b04c
fix #1145 non-consistent singleton-pattern in DanaRPump
2018-08-03 23:35:24 +02:00
Milos Kozak
294253797c
fix NPE
2018-08-03 21:13:19 +02:00
AdrianLxM
77a3972f6a
overview flexbox
2018-08-03 16:07:15 +02:00
Milos Kozak
d2f8cfa6c2
fix logging, bolus delivered must not be only smb
2018-08-03 13:15:29 +02:00
Milos Kozak
cbed615f90
fix typo in logging
2018-08-03 13:10:33 +02:00
Milos Kozak
70e2b64adf
rename Time -> Time offset in eCarbs dialog
2018-08-03 13:04:58 +02:00
Milos Kozak
8cc7fb03d1
UI log category, BolusProgressDialog detailed log
2018-08-03 12:32:10 +02:00
Milos Kozak
580e05e8eb
close progress dialog when stop was pressed prior connection
2018-08-03 11:02:46 +02:00
Milos Kozak
a2ed5561e5
New Crowdin translations ( #1292 )
...
* New translations strings.xml (Czech)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Swedish)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Czech)
* New translations strings.xml (Czech)
* New translations strings.xml (German)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Swedish)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (German)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Romanian)
* New translations strings.xml (Slovak)
* New translations strings.xml (Romanian)
* New translations strings.xml (Slovak)
* New translations strings.xml (Swedish)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Romanian)
* New translations strings.xml (Slovak)
* New translations strings.xml (Romanian)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Slovak)
* New translations strings.xml (Czech)
* New translations strings.xml (German)
* New translations strings.xml (Romanian)
* New translations strings.xml (Swedish)
* New translations strings.xml (Romanian)
2018-08-03 10:23:04 +02:00
AdrianLxM
0e2b9c384f
eCarbs delay->start
...
To avoid the confusion between the period of time the carbs are spread and the delay when it starts.
2018-08-02 21:43:19 +02:00
Milos Kozak
1ae885cb17
DanaRS_Packet_APS_Basal_Set_Temporary_BasalTest update
2018-08-02 16:22:22 +02:00
Milos Kozak
5d7bebbbdc
L.class mock
2018-08-02 16:11:30 +02:00
Milos Kozak
12883a407e
fix test coverage
2018-08-02 15:53:36 +02:00
Milos Kozak
a01d9924eb
Merge branch 'dev' into sens
2018-08-02 15:22:45 +02:00
Milos Kozak
3bcd656c14
Maintenance plugin cleanup
2018-08-02 15:19:13 +02:00
Milos Kozak
ddff05da75
Merge pull request #1262 from triplem/logshipper
...
Logshipper
2018-08-02 14:40:54 +02:00
Milos Kozak
76625e2a70
Merge pull request #1290 from MarkMpn/temp-basal-rate
...
Autotune compatibility change
2018-08-02 13:50:00 +02:00
Mark Carrington
7be49571ae
Get profile for specific time for percentage -> absolute conversion
2018-08-02 12:27:56 +01:00
Milos Kozak
1a6dcf46e5
New Crowdin translations ( #1285 )
...
* New translations strings.xml (Czech)
* New translations strings.xml (German)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Swedish)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (German)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Romanian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* Backlight h->s
* New translations strings.xml (Czech)
2018-08-02 12:38:07 +02:00
Mark Carrington
f9fb4c1bc5
Include rate property in temp basal records
2018-08-01 22:32:04 +01:00
Milos Kozak
6544191c78
fix state plugin change handling
2018-08-01 23:26:01 +02:00
Milos Kozak
c0a3eb67ba
check for new version on github
2018-08-01 23:03:01 +02:00
Markus M. May
8f5869d806
Add sens data to small height overview as well
2018-08-01 20:48:36 +02:00
Markus M. May
47fa33c1a9
Use lambdas
2018-08-01 20:45:58 +02:00
Markus M. May
2bc462aa13
use correct methods for context handling
2018-08-01 20:44:16 +02:00
Markus M. May
3306e14ca1
Merge branch 'dev' into logshipper
2018-08-01 20:42:05 +02:00
Markus M. May
38ac294a3c
Add sens data to overview for normal overview
2018-08-01 20:40:34 +02:00
Milos Kozak
eee187a71f
NSClient watchdog
2018-08-01 19:16:31 +02:00
Andy Rozman
5d4dc7ea61
Changes requested after review.
...
- added additional parameter for extended_note
- changed how extended_note is set
- created positional formatting
2018-08-01 16:19:57 +01:00
Andy Rozman
bf34a3b41f
Merge branch 'dev' into virtual_pump_Bug863
2018-08-01 15:16:43 +01:00
Milos Kozak
2859860d0d
use EventConfigBuilderChange in xdrip status line
2018-08-01 14:54:35 +02:00
Milos Kozak
e6fae87abf
use EventAppInitialized in xdrip status line
2018-08-01 14:46:19 +02:00
Milos Kozak
796c1becc2
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-08-01 14:31:04 +02:00
Milos Kozak
22881e17a2
fix NPE on temp target sync
2018-08-01 14:30:32 +02:00
Milos Kozak
c6bc15e311
Merge branch 'dev' into virtual_pump_Bug863
2018-08-01 11:57:48 +02:00
Milos Kozak
3fc3b80466
Merge pull request #1282 from swissalpine/patch-1
...
Shorten eCarb note
2018-08-01 11:56:35 +02:00
Milos Kozak
e26f33081a
fix wrong merge
2018-08-01 11:41:36 +02:00
swissalpine
e246917cdc
Shorten eCarb note
...
... the original is unreadable on my smartphone display
2018-08-01 11:39:30 +02:00
Milos Kozak
3ccf2e51f7
Merge branch 'tbr_wear_accept' of https://github.com/quizzmaster/AndroidAPS into quizzmaster-tbr_wear_accept
2018-08-01 11:28:58 +02:00
Milos Kozak
44c50804a8
resolve NPE on app start in xdrip status line
2018-08-01 11:16:46 +02:00
Milos Kozak
7c9b81fbbf
Merge branch 'dev' into tbr_wear_accept
2018-08-01 08:18:29 +02:00
Milos Kozak
2ecb6d3a97
New Crowdin translations ( #1278 )
...
* New translations strings.xml (German)
* New translations strings.xml (Swedish)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
2018-08-01 08:11:40 +02:00
Milos Kozak
5fc2535bcd
2.0c-dev
2018-07-31 22:08:35 +02:00
Milos Kozak
9d686adf7e
finish apllication after clicking Exit
2018-07-31 19:11:32 +02:00
Milos Kozak
ce16dd747b
remove ALARM logging
2018-07-31 18:00:31 +02:00
Markus M. May
5d1fc92e44
code cleanup - use lambdas
2018-07-30 23:10:58 +02:00
Markus M. May
aca9b3ff65
reflect code revieww
2018-07-30 23:05:46 +02:00
Markus M. May
883bbf46e1
use fragment insteaad of activity, move pref im/export to maintenance plugin
2018-07-30 22:56:00 +02:00
Milos Kozak
976a624b66
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-07-30 20:24:09 +02:00
Milos Kozak
a590b1590a
fix tests, add crashlitycs to .ignore
2018-07-30 20:23:48 +02:00
Markus M. May
61dba0633a
Merge again
2018-07-30 19:42:18 +02:00
Markus M. May
9f90d31f35
Merge latest dev changes
2018-07-30 19:39:38 +02:00
Markus M. May
93e0c72b17
Refactor logshipper to maintenance
2018-07-30 19:33:57 +02:00
Milos Kozak
35ab3d05aa
New Crowdin translations ( #1259 )
...
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (Czech)
* New translations strings.xml (Czech)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Czech)
* New translations strings.xml (German)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Dutch)
* New translations strings.xml (French)
* New translations strings.xml (Greek)
* New translations strings.xml (Italian)
* New translations strings.xml (Polish)
* New translations strings.xml (Romanian)
* New translations strings.xml (Russian)
* New translations strings.xml (Spanish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Irish)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Czech)
* New translations strings.xml (Czech)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Czech)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Czech)
* New translations strings.xml (German)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Dutch)
* New translations strings.xml (French)
* New translations strings.xml (Greek)
* New translations strings.xml (Italian)
* New translations strings.xml (Polish)
* New translations strings.xml (Romanian)
* New translations strings.xml (Russian)
* New translations strings.xml (Spanish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Irish)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Czech)
* New translations strings.xml (Czech)
* New translations strings.xml (Czech)
* New translations strings.xml (Czech)
* New translations strings.xml (Czech)
* New translations strings.xml (Czech)
* New translations strings.xml (Czech)
* New translations strings.xml (Czech)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (Czech)
* New translations strings.xml (German)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Czech)
* New translations strings.xml (Dutch)
* New translations strings.xml (Greek)
* New translations strings.xml (Italian)
* New translations strings.xml (Polish)
* New translations strings.xml (Romanian)
* New translations strings.xml (Russian)
* New translations strings.xml (Spanish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Irish)
* New translations strings.xml (Czech)
* New translations strings.xml (German)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Dutch)
* New translations strings.xml (French)
* New translations strings.xml (Greek)
* New translations strings.xml (Italian)
* New translations strings.xml (Polish)
* New translations strings.xml (Romanian)
* New translations strings.xml (Russian)
* New translations strings.xml (Spanish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Irish)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (Portuguese)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Czech)
* New translations strings.xml (German)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Swedish)
* New translations strings.xml (Slovak)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Swedish)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Swedish)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (German)
* New translations strings.xml (Swedish)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (German)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (German)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (German)
* New translations strings.xml (German)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Czech)
* New translations strings.xml (Chinese Simplified)
2018-07-30 19:08:13 +02:00
Milos Kozak
073b522b93
user defined level of logging
2018-07-30 17:04:43 +02:00
Milos Kozak
35b51af09c
logging cleanup
2018-07-30 15:46:20 +02:00
Milos Kozak
6a9bf04a98
move APS function from ConfigBuilder to Loop
2018-07-30 14:46:15 +02:00
Milos Kozak
96745b6866
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-07-30 14:21:38 +02:00
Milos Kozak
4ec0ebfa74
move profile function from ConfigBuilder to extra class
2018-07-30 14:21:11 +02:00
Milos Kozak
61ea87dd39
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-07-30 08:42:08 +02:00
Milos Kozak
0de5888bc5
languages not translatable
2018-07-30 08:41:37 +02:00
Milos Kozak
188a9b6313
PROFILE logging
2018-07-29 15:37:28 +02:00
Milos Kozak
54c83dc374
L.class
2018-07-29 14:39:56 +02:00
Milos Kozak
ce9e5b9165
APS logging
2018-07-29 11:10:06 +02:00
Milos Kozak
5ef9bc7948
cleanup
2018-07-29 00:20:41 +02:00
Milos Kozak
75bb38ba1f
move activities to new package
2018-07-29 00:08:28 +02:00
Milos Kozak
a4935b5d38
Services refactor
2018-07-29 00:00:48 +02:00
Milos Kozak
5efad35721
NSUpload refactor
2018-07-28 23:57:25 +02:00
Milos Kozak
6e902cb9ca
PUMP logging
2018-07-28 23:38:39 +02:00
Markus M. May
f70909d6c6
Refactore logshipper to maintenance, move funcs from menu to plugin
2018-07-28 22:45:40 +02:00
Milos Kozak
8a66b4db2e
OBJECTIVES logging
2018-07-28 18:07:06 +02:00
Milos Kozak
cfff357e6b
NSCLIENT logging
2018-07-28 17:58:52 +02:00
Milos Kozak
a7efa317be
DATA logging & refactor
2018-07-28 16:26:36 +02:00
Milos Kozak
b8a41e5f5b
ALARM logging
2018-07-28 13:55:16 +02:00
Milos Kozak
8e60e07b7c
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-07-28 11:39:37 +02:00
Milos Kozak
15694a3b8b
fix NPE
2018-07-28 11:31:37 +02:00
Milos Kozak
c7e6474b50
Merge branch 'dev' into logshipper
2018-07-27 17:49:58 +02:00
Milos Kozak
71a7599902
remove comment
2018-07-27 15:14:46 +02:00
Milos Kozak
8fbdc9b07c
translations cleanup pass 1
2018-07-27 14:41:23 +02:00
Milos Kozak
9712557d6c
Merge pull request #1246 from pedroll/dev
...
Spanish translation RC5
2018-07-27 14:04:25 +02:00
Milos Kozak
9141e0f66d
OVERVIEW & NOTIFICATION logging cleanup
2018-07-27 14:01:56 +02:00
Milos Kozak
6a058f5036
BGSOURCE refactor & logging
2018-07-27 13:41:25 +02:00
Milos Kozak
bfccda21cb
QUEUE logging cleanup
2018-07-27 12:17:29 +02:00
Milos Kozak
3d57d52271
EVENTS logging cleanup
2018-07-27 11:40:27 +02:00
Milos Kozak
1e68165c82
AUTOSENS logging cleanup
2018-07-27 11:35:32 +02:00
Andy Rozman
fcdb2f9708
- change to tunning
2018-07-26 23:34:28 +01:00
Andy Rozman
8e99482723
Some fixes in merge
2018-07-26 17:31:38 +01:00
Andy Rozman
1b8ceb83cf
Merge branch 'dev' into medtronic_andy
2018-07-26 16:48:52 +01:00
Andy Rozman
318436f417
- some changes from RileyLinkAAPS project:
...
- refactored RfSpy and underlaying classes so that we can read Version (which is not encoded and has no CRC)
- added functionality to be able to recover RL if BT is disabled and re-enabled
- some minor refactorings here and there
- TBR enabled
- Bolus delivery
- Medtronic Pump Plugin is working (able to deliver TBRs and Bolus), there are still a lot of things to work on but we have base implementation here...
2018-07-26 16:31:23 +01:00
Sebastian Lenz
ee06d1119d
clear Notification if tbr is accepted from wearable
2018-07-26 13:07:08 +02:00
Sebastian Lenz
79abcdb0d7
moved tbr accepting to a new method of the LoopPlugin
2018-07-26 11:47:39 +02:00
Milos Kozak
8639a8ec59
Merge pull request #1260 from schmitzn/refactor-strings-zh
...
Use positional format strings in Chinese translation
2018-07-26 08:36:04 +02:00
Sebastian Lenz
971e258265
cancel TBR request notification on wearable if accepted or no longer valid
2018-07-25 23:48:54 +02:00
Sebastian Lenz
8c49119b15
processing the acceptance of the TBR request from the wearable
2018-07-25 23:47:59 +02:00
Sebastian Lenz
e2ef8f2d74
send notification about TBR request to the wearable
2018-07-25 23:46:06 +02:00
Sebastian Lenz
5bb6635cab
dismiss notification for TBR request if it's no longer requested
2018-07-25 23:32:23 +02:00
Sebastian Lenz
2db63d4be4
dismiss notification when accepting a TBR request
2018-07-25 23:28:15 +02:00
Tanja Schmidt
0a29e8a055
delete now value even if empty/deleted
2018-07-25 22:04:44 +02:00
Markus M. May
c34104b906
move log shipment to own plugin
2018-07-25 22:00:58 +02:00
Nico Schmitz
4fa78ecee5
Fix strings.xml
2018-07-25 12:28:28 +02:00
Nico Schmitz
325142cedd
Use positional format strings in Chinese translation
2018-07-25 12:16:47 +02:00
Milos Kozak
088c423208
Merge pull request #1253 from jotomo/hypo-tt-correction
...
NewCarbsDialog: correct situation where Hypo TT can't be unchecked.
2018-07-25 10:30:19 +02:00
Milos Kozak
87de4bce5b
Merge pull request #1257 from jotomo/1254
...
Fix #1242 double mmol/l conversion.
2018-07-25 10:29:13 +02:00
Milos Kozak
ee1c620907
Chinese language
2018-07-25 09:18:03 +02:00
Markus M. May
60721c8395
First working version
2018-07-24 22:34:10 +02:00
Johannes Mockenhaupt
0b280ce4d4
Fix #1254 double mmol/l conversion.
2018-07-24 19:19:01 +02:00
Milos Kozak
96e101aa80
logging
2018-07-24 14:38:12 +02:00
Johannes Mockenhaupt
39dc914c2c
NewCarbsDialog: correct situation where Hypo TT can't be unchecked.
2018-07-24 12:48:50 +02:00
Milos Kozak
026c9f4788
fix ratio scale #2
2018-07-24 12:00:16 +02:00
Milos Kozak
9fc54f4e0c
fix ratio scale
2018-07-24 11:01:33 +02:00
Milos Kozak
503d61e1be
Merge pull request #1227 from PoweRGbg/rotation
...
fix for carbs and wizard dialogs on screen rotation
2018-07-24 10:34:27 +02:00
Roumen Georgiev
166d58fa3e
fix for timeDisplayFormat in Dana RS
2018-07-24 10:39:46 +03:00
Milos Kozak
4052725096
Merge pull request #1249 from MilosKozak/hypoTT-checkable
...
react to HypoTT on first click
2018-07-24 09:26:10 +02:00
Milos Kozak
6f29bd6a9a
bump 2.0b-dev
2018-07-24 00:46:42 +02:00
Milos Kozak
7e2d3fd8be
historybrowser, rendering optimizations
2018-07-24 00:46:08 +02:00
Markus M. May
2090b3c7e1
First draft
2018-07-23 20:58:20 +02:00
AdrianLxM
fa67aa69d5
react to HypoTT on first click
...
onClickListener, not OnCheckedListener was set for HypoTT
2018-07-23 18:43:26 +02:00
Milos Kozak
130fca4c2a
RS onConnectionStateChangeSynchronized
2018-07-23 16:33:51 +02:00
Milos Kozak
d7b29db626
fix NPE
2018-07-23 16:19:11 +02:00
Milos Kozak
90729cffe6
RS disconnect synchronized
2018-07-23 16:17:17 +02:00
Milos Kozak
49e8a0b7c4
some logging conditional
2018-07-22 21:19:59 +02:00
Milos Kozak
cede7dd4b9
log JSON data with exception
2018-07-22 21:14:42 +02:00
pedroll
0b9fdac9fc
Spanish translation RC5
2018-07-22 19:37:03 +02:00
Milos Kozak
0616c16e9f
Merge pull request #1243 from jotomo/patchpatchpatch
...
Abort APS run if AS requested but not yet available.
2018-07-22 18:09:02 +02:00
Johannes Mockenhaupt
a2e17c05c6
So here's the thing ...
2018-07-22 18:06:11 +02:00
Milos Kozak
a0f261ba0c
fix NPE
2018-07-22 18:02:00 +02:00
Johannes Mockenhaupt
777542dbb8
Abort APS run if AS requested but not yet available.
...
Should only occur during startup or when something else is broken
already, so just return.
2018-07-22 17:57:17 +02:00
Andy Rozman
0b180d3d65
- tbr start is succesful, but tbr is not displayed
2018-07-22 16:45:26 +01:00
AdrianLxM
b435c09771
preserve carbs
2018-07-22 14:26:56 +02:00
Milos Kozak
2e1d473243
bump 2.0a-dev
2018-07-22 10:01:59 +02:00
AdrianLxM
9824b45640
NSClient -> owl
2018-07-22 01:32:09 +02:00
AdrianLxM
7b87dfa7f8
remove remaining parts of old launcher icon
2018-07-21 23:19:55 +02:00
Milos Kozak
213a45c1e5
unique autosens debug tag
2018-07-21 22:56:08 +02:00
AdrianLxM
0601cba2d9
Merge pull request #1237 from MilosKozak/logo
...
Logo
2018-07-21 22:27:16 +02:00
AdrianLxM
e3c4de8f7b
Merge pull request #1236 from MilosKozak/RShistory
...
Rshistory
2018-07-21 22:22:11 +02:00
AdrianLxM
77d2326331
remove debug toasts
2018-07-21 22:21:12 +02:00
AdrianLxM
cfcd98aef6
assets and new notification icon
2018-07-21 21:44:02 +02:00
AdrianLxM
6e9e9702e0
icons & wear
2018-07-21 21:21:29 +02:00
AdrianLxM
983e9c3658
allow updated Treatments for insight 2
2018-07-21 19:21:40 +02:00
AdrianLxM
bcbf432236
allow update for insight -> don't alarm
2018-07-21 18:34:48 +02:00
Milos Kozak
8402dfb9c7
more compact log with function name
2018-07-21 15:24:56 +02:00
Milos Kozak
b52c1f3aa6
postpone EventAutosensCalculationFinished
2018-07-20 22:40:44 +02:00
Milos Kozak
ab70d5b67d
use Thread.isAlive()
2018-07-20 17:52:31 +02:00
Milos Kozak
cfee405914
use thread.join
2018-07-20 10:52:58 +02:00
Milos Kozak
d17ffc334d
autosens call refactor
2018-07-20 00:19:13 +02:00
Milos Kozak
8f8e91f2de
report TreamtentClash to Fabric
2018-07-18 17:10:21 +02:00
Milos Kozak
dd687fbb40
RS,Rv2: load only recent history
2018-07-18 17:02:28 +02:00
PoweRGbg
bf22b88123
some work for all the CP dialogs
2018-07-18 13:52:15 +03:00
Milos Kozak
b15da5a5cf
Merge pull request #1213 from MilosKozak/insight-constraints
...
insight constraints
2018-07-18 11:21:55 +03:00
Milos Kozak
048c1c6cfc
Merge pull request #1226 from jotomo/hb-is-wip
...
Disable history browser unless on dev-branch.
2018-07-18 11:20:55 +03:00
Milos Kozak
e6baf3ff47
Merge branch 'dev' into last-2.0-something-stuff-update1
2018-07-17 23:05:08 +02:00
Milos Kozak
782e7939bc
history browser: remove seek bar until gets implemented
2018-07-17 23:00:45 +02:00
Milos Kozak
ebb97be8c5
Dana pumps: better detect wrong profile in pump
2018-07-17 22:56:25 +02:00
Johannes Mockenhaupt
54be28388b
Disable history browser unless on dev-branch.
2018-07-17 21:57:06 +02:00
Milos Kozak
5f4db31e80
fix multiple code
2018-07-17 19:42:18 +02:00
Milos Kozak
7d6674267b
Merge branch 'dev' into last-2.0-something-stuff-update1
2018-07-17 19:53:43 +03:00
PoweRGbg
141bfda099
wizard is ready also
2018-07-17 15:04:07 +03:00
PoweRGbg
edbeddf8b0
carbsDialog done also
2018-07-17 14:43:34 +03:00
PoweRGbg
15b9cb5b3c
removed dummy message
2018-07-17 12:19:36 +03:00
Roumen Georgiev
cd4e7c2d4f
Save & restore dialog state on screen rotate
2018-07-17 12:01:21 +03:00
AdrianLxM
b689aff02d
Merge pull request #1205 from swissalpine/patch-3
...
Überarbeitung/Vereinheitlichung der deutschen Übersetzung
2018-07-16 15:39:32 +02:00
swissalpine
7774830ea2
Bye bye "-"
...
Careportal buttons without "-"
2018-07-16 15:25:48 +02:00
swissalpine
b0e96d93a9
Thanks to Adrian
2018-07-16 13:36:36 +02:00
AdrianLxM
6054501b5f
Merge pull request #1219 from jotomo/auto-hypo-tt
...
fix #1173,newcarbsdialog: activate hypo tt if bg < 72mgdl/4mmol/l.
2018-07-16 13:27:06 +02:00
Johannes Mockenhaupt
f5ecb9811e
fix #1173,newcarbsdialog: activate hypo tt if bg < 72mgdl/4mmol/l.
2018-07-15 22:33:42 +02:00
Milos Kozak
97d9f7866c
Rv2: prevent carbs x insulin
2018-07-15 19:48:33 +02:00
Milos Kozak
357b947c1d
RS: prevent carbs x insulin
2018-07-15 19:45:51 +02:00
swissalpine
c0a5e3d1c6
Das endet nie ...
2018-07-14 18:43:43 +02:00
swissalpine
d5a8723577
Und "Vordefinierte Ziele" ...
2018-07-14 18:40:55 +02:00
swissalpine
2bcbd6f2f1
Übersehenes ...
2018-07-14 17:28:04 +02:00
swissalpine
55cf0aa8e5
"Feste temporäre Ziele" + Zeichensetzung + min
...
- "Feste temporäre Ziele" (besser?)
- Interpunktion (die Punkte habe ich teilweise wieder entfernt, immer dann, wenn es keine Erklärungen waren)
- Abkürzung "min" statt "Min." (die "offizielle" halt)
2018-07-14 11:36:22 +02:00
Milos Kozak
8f641f994f
RSv3 firmware error reporting
2018-07-13 18:03:04 +03:00
Milos Kozak
695997ebb9
RS: delay before reading history
2018-07-13 09:50:04 +03:00
Milos Kozak
8a3d3d580f
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-07-12 22:03:28 +03:00
AdrianLxM
5f5a2b6a0d
insight constraints
2018-07-12 20:30:19 +02:00
Milos Kozak
efefe8ed18
Merge pull request #1211 from jotomo/pluginstats
...
PluginStats: used simple class named instead of translated name.
2018-07-12 21:30:12 +03:00
Milos Kozak
35e93ffafd
more debug to autosens
2018-07-12 21:28:35 +03:00
AdrianLxM
cb826da403
Revert "Fixed problem with Corr numberpicker when using Insightpump"
2018-07-12 19:37:21 +02:00
swissalpine
dcfcd14e96
Update strings.xml
2018-07-12 19:21:47 +02:00
swissalpine
6b24eea5ae
Update strings.xml
2018-07-12 18:57:47 +02:00
Johannes Mockenhaupt
5b9ede15ea
PluginStats: used simple class named instead of translated name.
2018-07-12 15:47:45 +02:00
Milos Kozak
e8c1dd5e3b
Merge pull request #1209 from harispoljo/CorrInsight
...
Fixed problem with Corr numberpicker when using Insightpump
2018-07-12 16:10:10 +03:00
Milos Kozak
ba945f334b
Merge pull request #1204 from jotomo/pluginstats
...
Fabric-log enabled plugins once a day.
2018-07-12 16:06:10 +03:00
Johannes Mockenhaupt
6302769652
Log app usage type daily.
2018-07-11 20:51:09 +02:00
harispoljo
8b200ba9de
Fixed bug
2018-07-11 19:53:19 +02:00
harisp
395f2313fd
Implemented feedback
2018-07-11 18:17:09 +02:00
Milos Kozak
d97e195ad1
revert wrong autosens fix
2018-07-11 18:23:58 +03:00
Milos Kozak
e4e0e64eef
another fix of displaying ext bolus
2018-07-11 18:02:20 +03:00
Milos Kozak
798199852b
CS translation
2018-07-11 17:34:41 +03:00
Milos Kozak
613802b12c
Merge pull request #1183 from triplem/autosens_fix
...
Autosens fix
2018-07-11 17:30:29 +03:00
harisp
b42ce70daa
Fixed problem with corr numberpicker when using insight pump
2018-07-11 14:14:01 +02:00
swissalpine
20b6709ae4
Update strings.xml
2018-07-10 22:54:39 +02:00
swissalpine
dbee8e6224
Update strings.xml
2018-07-10 22:50:58 +02:00
swissalpine
9d899a140e
Überarbeitung/Vereinheitlichung der deutschen Übersetzung
2018-07-10 19:08:50 +02:00
Johannes Mockenhaupt
09a1d23bc8
Move logging of app start to Fabric class.
2018-07-10 17:55:50 +02:00
Johannes Mockenhaupt
ccaf68d043
Fabric-log enabled plugins once a day.
2018-07-10 13:00:20 +02:00
Johannes Mockenhaupt
afe9a845d3
(Hopefully) fix iob(AMA|SMB)shouldBeLimited tests.
...
By making sure there is exactly one APS plugin enabled.
2018-07-09 22:59:30 +02:00
marie
d7cea7883e
Adding ')' to the German translation
2018-07-09 20:48:41 +02:00
marie
351bda0240
Adding english text about temp target to objective 2 to in all languages
2018-07-09 19:23:36 +02:00
marie
8b7c552dcb
Adding text about temp target to objective 2
2018-07-09 18:51:42 +02:00
Milos Kozak
5a6b7f9dad
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-07-09 18:16:55 +03:00
Johannes Mockenhaupt
2cd3ec82de
Create note for eCarbs, so it's easier to see what amount/time was used.
...
Otherwise iterating on parameters is tedious with only the generated carbs.
2018-07-07 12:02:44 +02:00
Milos Kozak
506971292e
cleanup
2018-07-05 15:36:13 +02:00
Markus M. May
afaf729df1
Try to rework the ugly fix
2018-07-04 20:42:31 +02:00
Markus M. May
c78117e356
recall getAutosensData, if it is null
2018-07-03 22:35:06 +02:00
Markus M. May
a978225428
Cleanup Imports
2018-07-03 22:11:01 +02:00
Markus M. May
5422a8bc20
Cleanup Imports, added a TODO
2018-07-03 22:10:33 +02:00
AdrianLxM
e5d8eb163b
Update Treatment.java
2018-07-03 19:25:23 +02:00
AdrianLxM
006528ae4c
Update TreatmentService.java
2018-07-03 19:24:44 +02:00
Milos Kozak
2c06a9cdf9
fixed typo
2018-07-02 19:45:38 +02:00
Milos Kozak
3a0fb59aee
Merge branch 'dev' into last-2.0-something-stuff
2018-07-02 18:54:32 +02:00
Milos Kozak
375025f7f0
remove unused string
2018-07-02 15:55:52 +02:00
Milos Kozak
60e9ea05a8
fix objectives typo
2018-07-02 15:52:20 +02:00
Milos Kozak
917ddf0cbe
CS translations
2018-07-02 15:04:09 +02:00
Milos Kozak
4919986dc0
setup wizard for pumpcontrol
2018-07-02 12:18:49 +02:00
Milos Kozak
bb30171777
fix typo in poctech driver
2018-07-02 10:53:09 +02:00
AdrianLxM
297fe487f7
update with data from pump
2018-07-02 06:54:02 +02:00
AdrianLxM
b39fa514c2
alarm on clashes, not on identical treatments
2018-07-02 02:11:25 +02:00
Nico Schmitz
2ce38702e2
Merge branch 'dev' into dev-wip
2018-07-01 22:44:11 +02:00
Milos Kozak
98dedf117f
Merge pull request #1167 from triplem/date_util
...
Do calculations in a central place
2018-07-01 22:43:49 +02:00
Johannes Mockenhaupt
bf3b4502bf
log origin of offending call
2018-07-01 19:15:27 +02:00
Johannes Mockenhaupt
21313bd418
obligatory format specifier fixes
2018-07-01 19:10:58 +02:00
Johannes Mockenhaupt
290effcd7c
simplyify defaulting to hypo tt.
2018-07-01 18:53:45 +02:00
Johannes Mockenhaupt
5df054a999
more fixes
2018-07-01 18:32:52 +02:00
Johannes Mockenhaupt
9b7d36ffed
bugfix
2018-07-01 18:25:32 +02:00
Johannes Mockenhaupt
6ebb13d28d
alarm on failure to add treatment to db.
2018-07-01 17:31:54 +02:00
Johannes Mockenhaupt
658af4bcfd
combo: don't attempt to add a bolus record if it already exists in db.
2018-07-01 17:31:54 +02:00
Johannes Mockenhaupt
f12db81f96
treatmentservice: add method to check if record with pump id exists.
2018-07-01 17:31:54 +02:00
Johannes Mockenhaupt
780a4dda36
fix #1173,newcarbsdialog: activate hypo tt if bg < 72mgdl/4mmol/l.
2018-07-01 17:21:40 +02:00
AdrianLxM
86ef6a155c
Merge pull request #1171 from jotomo/revert-901
...
Revert "Merge pull request #1131 from jotomo/901"
2018-07-01 17:02:26 +02:00
Markus M. May
6bc60cd8a8
Rework to use already existing method
2018-07-01 13:50:37 +02:00
Johannes Mockenhaupt
33b66e2ce7
Revert "Merge pull request #1131 from jotomo/901"
...
This reverts commit 268dec0059ab41541c69
2018-06-29 22:43:54 +02:00
Milos Kozak
a3862aca2a
Merge pull request #1161 from schmitzn/refactor-strings
...
Use positional format strings in translations
2018-06-29 22:22:44 +02:00
Milos Kozak
2291472b01
Merge pull request #1168 from MilosKozak/milosremote/dev
...
ask user if he switches to a HW pump for the first time
2018-06-29 15:43:48 +02:00
AdrianLxM
dccb675198
anrdoid -> android
2018-06-29 14:15:30 +02:00
AdrianLxM
4af7e6c1e6
update warning text
2018-06-29 14:13:33 +02:00
AdrianLxM
5a1d696ab1
ask user if he switches to a HW pump for the first time
2018-06-29 03:52:58 +02:00
Milos Kozak
268dec0059
Merge pull request #1131 from jotomo/901
...
Don't loop for values from non-active BG sources
2018-06-28 22:51:56 +02:00
Markus M. May
468b645486
Do calculations in a central place
2018-06-28 22:36:08 +02:00
Milos Kozak
ab41541c69
fix NPE
2018-06-28 22:31:42 +02:00
Milos Kozak
720e938ebf
allow longer lowtemp on RS an Rv2
2018-06-28 10:30:45 +02:00
Milos Kozak
a99b478eea
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-06-27 20:13:37 +02:00
Milos Kozak
29032e658f
show predictions in nsclient mode
2018-06-27 20:13:25 +02:00
Nico Schmitz
49e10dcaa9
Fix wrong argument in values-cs/strings.xml
2018-06-27 18:46:49 +02:00
Nico Schmitz
44eaa2d2f2
Use positional format strings in translations
2018-06-26 22:52:25 +02:00
Milos Kozak
2b799d9f71
SW: ask for import after storage permission
2018-06-26 13:15:50 +02:00
Milos Kozak
4df3561b4b
setup wizard cleanup
2018-06-26 12:53:43 +02:00
Milos Kozak
520f2e1518
plugin descritpions to setup wizard
2018-06-26 12:28:53 +02:00
Milos Kozak
77245c027e
prevent NPE
2018-06-26 10:45:56 +02:00
Milos Kozak
f7f4385d5d
cleanup
2018-06-26 00:20:43 +02:00
Milos Kozak
d55612b290
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-06-26 00:16:31 +02:00
Milos Kozak
44cf82abde
fix iob graph axis labels
2018-06-26 00:16:26 +02:00
Johannes Mockenhaupt
b6a621528a
Autosens: show 'u's for UAM in output.
2018-06-26 00:01:31 +02:00
Johannes Mockenhaupt
50ffebc679
BgReading.copyFrom: don't update local data.
...
Like the 'valid' flag, which is not copied and is not synced with
NS, don't sync sourcePlugin or isFiltered.
Otherwise there might be a race condition if the NS-roundtrip of a
locally received BG updates the sourcePlugin field to null,
thus leaving no values for the loop to loop with.
2018-06-25 23:02:58 +02:00
Johannes Mockenhaupt
069f0fb7b1
Fix method name.
2018-06-25 22:51:59 +02:00
Milos Kozak
81ad4c54f3
fix bug when uncomplete autosens was stored to the cache
2018-06-25 22:20:00 +02:00
Milos Kozak
6d1fa2ffda
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-06-25 20:04:03 +02:00
Milos Kozak
4b777f8dcc
fix extendedBolusView
2018-06-25 20:03:54 +02:00
Milos Kozak
cac6297aae
Merge pull request #1155 from MilosKozak/AdrianLxM-patch-2
...
swedish - removed unused string
2018-06-25 16:01:54 +02:00
Johannes Mockenhaupt
e4a72c8175
Fix name of incoming profile from NS with timeshift/percentage.
2018-06-25 12:07:12 +02:00
AdrianLxM
e9834acf81
swedish - removed unused string
2018-06-25 00:12:29 +02:00
AdrianLxM
619ba32840
configbuilder fix
2018-06-25 00:07:43 +02:00
Milos Kozak
385f0c7bfe
Merge pull request #1148 from triplem/1133
...
1133
2018-06-24 19:32:18 +02:00
Milos Kozak
ee2d6b71d1
add delay to sms bolus command
2018-06-24 18:28:38 +02:00
Markus M. May
07f7c00d85
Move Algo to abstract class
2018-06-24 18:20:28 +02:00
Milos Kozak
15607dc9be
follow autosens min/max for clearing cache
2018-06-24 17:54:23 +02:00
Milos Kozak
cf8bf419e2
Merge pull request #1147 from TebbeUbben/cb-fix
...
Config builder cleanup
2018-06-24 17:29:29 +02:00
Milos Kozak
eb9f489411
Merge pull request #1149 from jotomo/treatment-prefs
...
Treatments don't have settings.
2018-06-24 17:20:59 +02:00
Johannes Mockenhaupt
dcdbe7791f
Treatments don't have settings.
...
Before this, treatments preferences opened preferencs of the
oref0 sensitivity plugin.
2018-06-24 16:39:56 +02:00
AdrianLxM
87d24b6e6e
re-initialize on time sync Rv2
2018-06-24 15:46:31 +02:00
AdrianLxM
54e647bbe1
re-initialize after time-sync
2018-06-24 15:43:42 +02:00
Markus M. May
faca79d13e
Add unit test to PR
2018-06-24 15:43:25 +02:00
TebbeUbben
2b5631e1e7
Config builder cleanup
2018-06-24 15:13:06 +02:00
AdrianLxM
02eceef134
De-initialize Rv2 if time is off by more than 1.5h
2018-06-24 15:03:46 +02:00
AdrianLxM
78949a34ab
De-initialize RS if time is off by more than 1.5h
2018-06-24 15:03:03 +02:00
Milos Kozak
c5841063a2
Merge branch 'dev' into rs-sync-warn
2018-06-24 14:03:12 +02:00
Milos Kozak
8c695255d6
Merge pull request #1143 from jotomo/strings
...
Rename "Lock screen" -> "Keep screen on".
2018-06-24 13:58:35 +02:00
AdrianLxM
6a96b546ec
Merge pull request #1127 from MilosKozak/AdrianLxM-patch-5
...
Please Review: update determine-basal
2018-06-24 13:40:46 +02:00
AdrianLxM
5f2f0fff40
time sync in Rv2 as in RS
2018-06-24 13:32:19 +02:00
AdrianLxM
3e53c66365
don't set time on large diff, just warn
2018-06-24 13:27:55 +02:00
AdrianLxM
d72cb96d2b
Oref0 sensitivity 24 hours
2018-06-24 13:12:15 +02:00
Johannes Mockenhaupt
a8d783874c
Rename "Lock screen" -> "Keep screen on".
2018-06-24 12:50:11 +02:00
Milos Kozak
f7609317ba
Merge branch 'dev' into rs-sync-warn
2018-06-24 11:45:33 +02:00
Milos Kozak
2963f0a698
Merge pull request #1140 from triplem/issue_1130_backwards
...
Issue 1130 backwards
2018-06-24 11:44:41 +02:00
Johannes Mockenhaupt
784c071f53
Small oref1 sens corrections.
2018-06-24 01:03:38 +02:00
Markus M. May
7f9c459a4a
Merge branch 'issue_1130' into issue_1130_backwards
2018-06-23 22:42:34 +02:00
Markus M. May
8bdaddb389
Allow backwards compatibility to previous solution to add quotes
2018-06-23 22:41:01 +02:00
Milos Kozak
cbdd0699ec
Merge pull request #1139 from triplem/issue_1130
...
fixes #1130
2018-06-23 22:20:13 +02:00
Milos Kozak
a3fafa521b
nsclient for phones layout
2018-06-23 22:17:54 +02:00
Markus M. May
e32f33a8d3
fixes #1130
2018-06-23 21:36:18 +02:00
Milos Kozak
de2273836e
OpenAPS Offline visualization fix
2018-06-23 21:16:08 +02:00
Milos Kozak
a4b3b7b2e9
Clean AndroidAPS started button
2018-06-23 20:28:20 +02:00
AdrianLxM
11b8587768
Warn on long time diffs on Rv2
2018-06-23 20:05:59 +02:00
AdrianLxM
1b047bba69
Warn on large time offsets RS
2018-06-23 20:05:05 +02:00
AdrianLxM
9c0665124d
Update strings.xml
2018-06-23 20:04:09 +02:00
Milos Kozak
0d48cc8770
fix parsing SSID
2018-06-23 19:59:11 +02:00
Milos Kozak
fb94c93ba6
Merge pull request #1110 from TebbeUbben/foreground-service
...
Use a foreground service for the ongoing notification and enforce using it on Oreo and up
2018-06-23 19:37:33 +02:00
Milos Kozak
a3c3c52249
Merge branch 'dev' into sens-cutoff
2018-06-23 18:59:33 +02:00
Milos Kozak
bbfe1d2f83
fix NPE in #1136
2018-06-23 18:52:58 +02:00
Milos Kozak
f7309c9ff1
Merge branch 'dev' into sens-cutoff
2018-06-23 18:34:46 +02:00
Milos Kozak
d59c3c567b
Merge pull request #1132 from jotomo/1129
...
Combo: update error message. Fixes #1129 .
2018-06-23 18:32:59 +02:00
Milos Kozak
470487375d
Merge pull request #1136 from TebbeUbben/profile-invalid-fix
...
Mark profile as invalid if high target < low target
2018-06-23 18:24:40 +02:00
Milos Kozak
586665e19f
nsclient table mode improvements
2018-06-23 18:24:04 +02:00
TebbeUbben
8adc333ade
Mark profile as invalid if high target < low target
2018-06-23 16:02:10 +02:00
AdrianLxM
064a8915a0
downweight Autosens if not enough data
2018-06-23 14:05:12 +02:00
Johannes Mockenhaupt
5c95b785bb
Combo: update error message. Fixes #1129 .
2018-06-23 13:33:17 +02:00
Johannes Mockenhaupt
eac1d5ffdb
(Hopefully) fix iob(AMA|SMB)shouldBeLimited tests.
...
By making sure there is exactly one APS plugin enabled.
2018-06-23 13:12:29 +02:00
Johannes Mockenhaupt
b2a60e2fac
Disable unfinished noise tests.
2018-06-23 12:52:07 +02:00
Milos Kozak
53ba6d46d5
fix adding zero deviations
2018-06-23 12:27:18 +02:00
Milos Kozak
9c5e389afb
move sensitivity plugins to one package
2018-06-23 12:19:55 +02:00
Johannes Mockenhaupt
6cb09d4fcb
Remove BgReading.noise for now, clashes with existing NS data.
...
I believe NS uses 'noise' to store the noise level (1 through 3?).
2018-06-23 11:41:03 +02:00
Johannes Mockenhaupt
73e8a0c876
Rename BgReading.filtered to BgReading.isFiltered and add to NS.
...
Avoids collision with 'filtered' value in NS data.
2018-06-23 11:36:23 +02:00
Johannes Mockenhaupt
6d437b4afa
Test stubs.
2018-06-23 11:35:01 +02:00
Johannes Mockenhaupt
c18effd893
Fix detecting BG source from NS entry.
2018-06-23 11:27:56 +02:00
Johannes Mockenhaupt
b4db98fa1d
Process xDrip noise data if provided (engineering mode only).
2018-06-23 11:21:05 +02:00
Johannes Mockenhaupt
34ee125666
Add message to constraints if BG is not filtered.
2018-06-23 11:07:16 +02:00
Johannes Mockenhaupt
79dec2e871
Fixes.
2018-06-23 02:59:11 +02:00
Johannes Mockenhaupt
986d9fb01c
Detect source from NSClient BG.
2018-06-23 01:33:13 +02:00
Johannes Mockenhaupt
906cc8a76a
Clean up assigning sourcePlugin, filtered properties.
2018-06-23 01:27:37 +02:00
Johannes Mockenhaupt
940d58fc79
Tests.
2018-06-23 01:27:37 +02:00
Johannes Mockenhaupt
53b9d5cae3
Fix column type.
2018-06-23 01:27:37 +02:00
Johannes Mockenhaupt
aab171932c
Have Bgsource.processNewData return added BGs.
2018-06-23 01:27:37 +02:00
Johannes Mockenhaupt
922f9ff83d
Refactor DataService to delegate BG processing to BgSources.
2018-06-23 01:26:36 +02:00
Johannes Mockenhaupt
7a331e0c94
Don't loop with readings coming from non-active BG source.
2018-06-23 01:26:36 +02:00
Johannes Mockenhaupt
6abad56b1f
Replace BgSourceInterface.advancedFilteringSupported.
...
Replaced by 'filtered' property on BgReading.
2018-06-23 01:26:36 +02:00
Johannes Mockenhaupt
98c933af57
BgReading: add sourcePlugin and filtered fields.
2018-06-23 01:24:26 +02:00
Milos Kozak
4efb115209
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-06-22 22:52:23 +02:00
Milos Kozak
8e08a293c1
detect bg source in nsclient
2018-06-22 22:30:03 +02:00
Milos Kozak
8a74646b67
set positive deviations to zero if bg < 80
2018-06-22 21:18:59 +02:00
AdrianLxM
5f6a6dbbbc
update determine-basal
2018-06-22 21:00:59 +02:00
Milos Kozak
c139942981
reset autosens on site change (AAPS,WA)
2018-06-22 20:11:45 +02:00
Milos Kozak
8237456030
reset autosens on site change
2018-06-22 20:05:49 +02:00
Milos Kozak
9360151100
Merge branch 'dev' into oref1
2018-06-22 17:55:38 +02:00
Milos Kozak
7bed827f4b
Merge pull request #1119 from jotomo/delete-future-treatments
...
Treatments tab: add button (if applicable) to delete future treatments.
2018-06-22 17:47:37 +02:00
Milos Kozak
9dc667817b
Merge pull request #1120 from schmitzn/sync-butterknife-eventbus
...
Synchronize Butterknife / Eventbus (#1090 )
2018-06-22 17:45:55 +02:00
Milos Kozak
a3cf7622b6
Merge pull request #1121 from jotomo/tt-context-menu
...
TT context menu
2018-06-22 17:28:20 +02:00
Johannes Mockenhaupt
9b4f3f6e0e
Don't apply loop result if a bolus is in progress.
...
While an SMB is rejected by the queue in this scenario, a temp basal
would still be applied, so don't apply loop results if a bolus is
progress or queued at this point.
2018-06-21 22:58:15 +02:00
Johannes Mockenhaupt
3eed0afe61
Move 'eating soon' TT to top (ordering of dialog).
2018-06-21 22:29:16 +02:00
Johannes Mockenhaupt
58d79892ed
Overview: TT context menu.
2018-06-21 22:06:39 +02:00
Nico Schmitz
4d853c1435
Check for unbound variables
2018-06-21 21:58:12 +02:00
Johannes Mockenhaupt
41ce9677df
Remove duplicate string.
2018-06-21 09:57:35 +02:00
Milos Kozak
bd846e7526
Merge pull request #1117 from jotomo/1068-bolus-after-smb
...
WIP: Reject SMB if bolus is queued/running or outdated. Fixes 1068.
2018-06-21 09:30:56 +02:00
AdrianLxM
809ad97cb9
Merge pull request #1118 from jotomo/1096
...
Disable slope deviation unless on dev branch, fixes #1096 .
2018-06-21 06:00:17 +02:00
Johannes Mockenhaupt
6002c747e6
Treatments tab: add button (if applicable) to delete future treatments.
2018-06-21 00:38:22 +02:00
Johannes Mockenhaupt
49b84fb550
Reject SMB if bolus is queued/running or outdated. Fixes 1068.
2018-06-21 00:32:23 +02:00
Johannes Mockenhaupt
8036f8bcde
Disable slope deviation unless on dev branch, fixes #1096 .
2018-06-21 00:31:35 +02:00
Milos Kozak
5292e09535
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-06-20 23:56:50 +02:00
Milos Kozak
a02961da61
check for NPE
2018-06-20 23:56:38 +02:00
Nico Schmitz
c3050740a8
Synchronize Butterknife / Eventbus
2018-06-20 22:57:31 +02:00
Milos Kozak
3ed11f9002
oref1 autosens: count with extra deviations
2018-06-20 20:49:16 +02:00
Milos Kozak
6eef71c4c0
Merge pull request #1116 from TebbeUbben/cb-fix
...
Fix for #1115
2018-06-20 20:43:29 +02:00
TebbeUbben
ed10c8cadc
Fix for #1115
2018-06-20 20:12:22 +02:00
Milos Kozak
370008f41e
oref 0.6.0 sens
2018-06-20 18:39:47 +02:00
Milos Kozak
e913cfe454
prepare oref1 plugin
2018-06-19 20:41:40 +02:00
Milos Kozak
df021a2dd2
Merge pull request #1111 from jotomo/combo-setup-notification
...
Combo setup notification
2018-06-19 18:41:43 +02:00
Johannes Mockenhaupt
3ed4aa468d
Combo: fix ReadQuickInfoCommand to handle empty bolus history.
2018-06-18 20:19:47 +02:00
Johannes Mockenhaupt
ef650b80a1
Combo: show notification on broken setup.
2018-06-18 20:19:30 +02:00
TebbeUbben
ef237ed378
DummyService javadoc
2018-06-18 19:43:40 +02:00
Milos Kozak
af8e1fb32f
Merge pull request #1078 from MilosKozak/AdrianLxM-patch-1
...
restrict local profile DIA to min of 5 on the GUI
2018-06-18 18:58:29 +02:00
TebbeUbben
a590a8be42
Foreground service
2018-06-17 23:33:32 +02:00
Nico Schmitz
d88b4da5a9
Don't show statuslight preferences in NSCLIENT build
2018-06-17 22:41:34 +02:00
Nico Schmitz
f46a81a7be
Add overview_statuslights to overview_fragment_smallheight.xml
2018-06-17 21:02:42 +02:00
Andy Rozman
47427ec68e
- integration started
...
- states visible
- command framework added
- we get currect profile and compare it with AAPS profile
- setProfile command is disabled, if pumps profile is different we get warning
- bolus is enabled and working
- get remaining reservoir level
2018-06-16 18:13:29 +01:00
Nico Schmitz
87d7fed75b
Remove margin of status light layout
2018-06-16 14:03:45 +02:00
Milos Kozak
f14ba554f0
RS ble cleanup
2018-06-16 13:18:00 +02:00
Nico Schmitz
aa4f506961
Update to current upstream/dev branch
2018-06-16 02:51:33 +02:00
Nico Schmitz
db36d6e3f5
Change colors and refactor code
2018-06-16 02:18:03 +02:00
Tebbe Ubben
1e4c7178f4
Merge branch 'dev' into dev
2018-06-15 21:10:33 +02:00
Nico Schmitz
14a17efecc
Update colors
2018-06-15 19:36:49 +02:00
Milos Kozak
21b598edfa
Merge pull request #1100 from MilosKozak/rsoption
...
Rsoption
2018-06-15 00:19:08 +02:00
Milos Kozak
bcabeac228
Merge pull request #1104 from schmitzn/fix-careportalevent
...
Fix bug in CareportalEvent.getHoursFromStart()
2018-06-15 00:04:47 +02:00
Nico Schmitz
bf3ce735bc
Set colors of profile view
2018-06-14 23:22:15 +02:00
Milos Kozak
5acb689eeb
Merge pull request #1102 from TebbeUbben/new-icon
...
New launcher icon
2018-06-14 23:10:43 +02:00
Nico Schmitz
1604b53327
Fix bugs, refactor code and add preferences
2018-06-14 20:49:58 +02:00
TebbeUbben
da9d586326
Also set round icon if available
2018-06-14 19:43:16 +02:00
TebbeUbben
f77e903721
Revert "Use icon for all build configurations"
...
This reverts commit e194e0d
2018-06-14 19:39:00 +02:00
Nico Schmitz
d7db19bf2d
Merge branch 'fix-careportalevent' into dev-wip
2018-06-14 13:01:14 +02:00
Nico Schmitz
43d787ff88
Simplify isOlderThan()
2018-06-14 12:38:15 +02:00
Nico Schmitz
f82240a724
Fix bug in getHoursFromStart()
2018-06-14 12:34:42 +02:00
Nico Schmitz
18c6bdd4ef
Improve layout xml
2018-06-13 21:35:21 +02:00
TebbeUbben
e194e0dc48
Use icon for all build configurations
2018-06-13 20:26:46 +02:00
TebbeUbben
9e0dc9bfe5
New launcher icon
2018-06-13 20:23:40 +02:00
Nico Schmitz
217583d601
Use getBatteryLevel() for BAT status. Refactor code and layout.
2018-06-13 19:58:52 +02:00
Roumen Georgiev
904957d0d2
removing unneeded methods
2018-06-13 18:24:50 +03:00
PoweRGbg
a64364de4e
removed excessive debugging and unneeded source
2018-06-13 16:17:10 +03:00
PoweRGbg
5a197676fb
IT WORKS!!!
2018-06-13 15:57:42 +03:00
PoweRGbg
faab8fbc67
setting full userOptions
2018-06-13 11:43:44 +03:00
Milos Kozak
4d2e166620
try to fix crash
2018-06-13 10:41:15 +02:00
PoweRGbg
eaffa66946
latest
2018-06-13 11:11:03 +03:00
PoweRGbg
56651691a5
more more
2018-06-13 11:08:47 +03:00
PoweRGbg
64b5783e4a
more
2018-06-13 11:07:03 +03:00
PoweRGbg
71c474ef5f
danaR changes
2018-06-13 11:04:32 +03:00
PoweRGbg
5634aabd9f
more
2018-06-13 11:02:52 +03:00
PoweRGbg
2cb3c15d61
more update
2018-06-13 11:01:43 +03:00
PoweRGbg
cd337ecdc8
update to latest changes from Milos
2018-06-13 10:51:06 +03:00
PoweRGbg
434db333b1
reverting changes
2018-06-13 09:56:30 +03:00
PoweRGbg
87bc6ed798
Revert "more debugging output"
...
This reverts commit 1adf8718ae
2018-06-13 09:49:58 +03:00
PoweRGbg
0f067ef3a7
Revert "more debugging output"
...
This reverts commit f1f8bae2d1
2018-06-13 09:49:45 +03:00
PoweRGbg
90a3a66c30
Revert "Merge remote-tracking branch 'upstream/rsoption' into dev"
...
This reverts commit 233fb33659f1f8bae2d1
2018-06-13 09:49:37 +03:00
PoweRGbg
0e40d1e7ef
Revert "Revert "more debugging output""
...
This reverts commit 209fb79396
2018-06-13 09:49:35 +03:00
PoweRGbg
209fb79396
Revert "more debugging output"
...
This reverts commit f1f8bae2d1
2018-06-13 09:34:57 +03:00
PoweRGbg
233fb33659
Merge remote-tracking branch 'upstream/rsoption' into dev
2018-06-13 09:14:46 +03:00
Roumen Georgiev
f1f8bae2d1
more debugging output
2018-06-13 09:00:04 +03:00
Milos Kozak
082918c776
remove unneded code
2018-06-13 07:44:26 +02:00
Milos Kozak
6fa759a395
remove unneded code
2018-06-13 07:42:57 +02:00
Nico Schmitz
a7aa4c2b5a
Implement getBatteryLevel() in PumpInterface and for all pump plugins
2018-06-13 00:28:17 +02:00
Nico Schmitz
f28fca668f
Integrate info fields from swissalpine/dev-work
2018-06-13 00:07:13 +02:00
Milos Kozak
ecdbe2ac37
setUserOptions cleanup
2018-06-12 23:43:04 +02:00
Nico Schmitz
5ba6f02b93
Remove reservoir TextView
2018-06-12 23:31:46 +02:00
Nico Schmitz
4ebc149783
Add changes of schmitzn/reservoir-view
2018-06-12 23:28:11 +02:00
Milos Kozak
d051e081e2
Merge branch 'dev' into rsoption
2018-06-12 21:59:20 +02:00
Milos Kozak
d4ed6539d8
poctech units mmol/L
2018-06-12 21:57:33 +02:00
Roumen Georgiev
1adf8718ae
more debugging output
2018-06-12 13:30:07 +03:00
Roumen Georgiev
06507bab2c
update method names
2018-06-12 12:41:40 +03:00
Roumen Georgiev
978d94499f
update method names
2018-06-12 11:03:23 +03:00
Roumen Georgiev
f044ab15c0
setting swithces in activity
2018-06-12 10:39:47 +03:00
Roumen Georgiev
01012d817c
getting userOptions from v2
2018-06-12 10:29:47 +03:00
Milos Kozak
e7eec8fe69
Poctech BG source
2018-06-11 17:26:31 +02:00
TebbeUbben
41a7f57b75
Update Objective views every minute
2018-06-11 16:35:47 +02:00
TebbeUbben
3ac10f4f7a
Improved MinimumDurationTask visualization
2018-06-11 16:24:46 +02:00
TebbeUbben
31cb68240b
Automatically scroll to currently active objective
2018-06-11 15:45:28 +02:00
Roumen Georgiev
2441214bb8
added SetUserOptions for DanaR
2018-06-11 11:36:32 +03:00
Andy Rozman
9bae53e53a
- update on initial checkin (code is now same as in RileyLinkAAPS on 10.June - most command working)
...
- it will take some time until code is actually integrated into AAPS, but at least now all files are available
2018-06-10 21:50:50 +01:00
TebbeUbben
97984f8ef3
Improved leftover time display
2018-06-09 23:15:46 +02:00
TebbeUbben
6bc13d9cc0
Don't return false in isStarted if objective has been accomplished
2018-06-09 23:10:54 +02:00
TebbeUbben
0d21a0ab62
Fixed tests
2018-06-09 23:03:31 +02:00
TebbeUbben
005039effc
Objectives styling
2018-06-09 22:07:41 +02:00
AdrianLxM
8106907a55
unify padding pills and pumpstatus
2018-06-09 13:53:11 +02:00
AdrianLxM
3a9017ae10
Merge pull request #1092 from TebbeUbben/sw-same-color-scheme
...
Same color scheme for SW
2018-06-09 13:37:31 +02:00
TebbeUbben
934a7e6797
Same color scheme for SW
2018-06-09 13:27:27 +02:00
TebbeUbben
531a926d00
Close navigation drawer on click
2018-06-09 13:17:26 +02:00
Milos Kozak
30dbbb12a8
Merge pull request #1081 from MilosKozak/AdrianLxM-patch-3
...
Wizard: fully undo "ok" on constraints violation
2018-06-09 11:46:41 +02:00
Milos Kozak
6344e88550
Merge pull request #1084 from TebbeUbben/dev
...
Config builder styling
2018-06-09 11:39:16 +02:00
TebbeUbben
09b93078a8
Fixed typos
2018-06-08 23:45:32 +02:00
TebbeUbben
67b6d94fe5
Android Wear was renamed to WearOS
2018-06-08 23:35:18 +02:00
TebbeUbben
5d60f34e26
Better description for MDI plugin
2018-06-08 23:31:57 +02:00
TebbeUbben
f7597c93d7
Merge remote-tracking branch 'milos/AdrianLxM-patch-4' into dev
...
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalPlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java
2018-06-08 23:30:39 +02:00
TebbeUbben
37d543c865
Improvements to descriptions from Adrian
2018-06-08 23:27:52 +02:00
TebbeUbben
506482082d
Fixed descriptions
2018-06-08 21:26:12 +02:00
TebbeUbben
029057f1fc
Fix typo
2018-06-08 21:25:19 +02:00
TebbeUbben
2d94133175
Plugin descriptions
2018-06-08 21:19:46 +02:00
TebbeUbben
f9582d042f
Don't restore CheckBoxes and RadioButtons automatically
2018-06-08 20:05:33 +02:00
swissalpine
5bf6057838
Update danar_fragment.xml
2018-06-08 19:22:36 +02:00
swissalpine
87ea018181
Update wear_fragment.xml
2018-06-08 19:22:03 +02:00
swissalpine
3c58b94a28
Update objectives_fragment.xml
2018-06-08 19:19:21 +02:00
swissalpine
5df03e4ea7
Update openapsama_fragment.xml
2018-06-08 19:07:04 +02:00
swissalpine
ab599a452b
Update loop_fragment.xml
2018-06-08 19:06:16 +02:00
swissalpine
a926c4db86
Update combopump_fragment.xml
2018-06-08 19:05:34 +02:00
swissalpine
76505e0229
Update careportal_fragment.xml
2018-06-08 19:04:31 +02:00
swissalpine
7bd2f629bf
Update bgsource_fragment.xml
2018-06-08 19:02:20 +02:00
AdrianLxM
bbf09a62f1
synchronize onDestroyView
2018-06-08 06:20:35 +02:00
AdrianLxM
97bbc00dcf
Don't set text onunbound gui elements
2018-06-08 06:19:02 +02:00
TebbeUbben
38526d64c6
These should not be changed
2018-06-07 23:24:10 +02:00
TebbeUbben
e25ebbdafa
Protection against callback looping
2018-06-07 23:23:10 +02:00
TebbeUbben
aa86a49339
Use real plugin descriptions
2018-06-07 22:55:13 +02:00
TebbeUbben
13cb4c28ed
ConfigBuilder styling
2018-06-07 22:54:27 +02:00
AdrianLxM
d6184cc151
Wizard: fully undo "ok" on constraints violation
...
Fixes https://github.com/MilosKozak/AndroidAPS/issues/1056
2018-06-07 22:44:09 +02:00
Roumen Georgiev
17a0aba2e5
remove button if pump is DanaR Korean
2018-06-07 09:34:12 +03:00
Roumen Georgiev
6559f57cd9
remove button if pump is DanaR Korean
2018-06-07 09:33:29 +03:00
Roumen Georgiev
4b7f8615bf
Merge pull request #26 from MilosKozak/rsoption
...
update
2018-06-07 09:30:22 +03:00
Roumen Georgiev
9e2074433e
remove button if pump is DanaR Korean
2018-06-07 09:26:33 +03:00
Milos Kozak
9e099ec741
Merge pull request #1079 from MilosKozak/AdrianLxM-patch-2
...
Ro update by @bogdangorescu
2018-06-06 23:33:26 +02:00
AdrianLxM
c96f860585
Update strings.xml
2018-06-06 23:19:54 +02:00
AdrianLxM
712549e562
Update strings.xml
2018-06-06 23:04:15 +02:00
Milos Kozak
1d13712aec
nsclient setup wizard tweaking
2018-06-06 22:58:50 +02:00
AdrianLxM
4c2babb905
Ro formatted false 3rd
2018-06-06 22:44:06 +02:00
AdrianLxM
964efee162
Ro formatted false 2nd
2018-06-06 22:42:36 +02:00
AdrianLxM
f343cfe0fa
Ro formatted false
2018-06-06 22:39:51 +02:00
AdrianLxM
0996b0f182
Ro update
2018-06-06 22:09:40 +02:00
Milos Kozak
f94d1e85e1
cleanup
2018-06-06 18:32:19 +02:00
Milos Kozak
04fffae811
addd setUserOption to Queue (Dana pumps)
2018-06-06 18:29:40 +02:00
Milos Kozak
6a4bb8a719
layout cleanup
2018-06-06 17:58:59 +02:00
Milos Kozak
d2830d1938
DanaRUserOptionActivity update on pump load
2018-06-06 17:13:58 +02:00
Milos Kozak
bbeca6b83e
cleanup
2018-06-06 16:57:00 +02:00
AdrianLxM
5ec828e16f
restrict local profile DIA to min of 5 on the GUI
2018-06-06 15:18:03 +02:00
Milos Kozak
4adcb88d12
Merge pull request #1067 from jotomo/fill-one-shot-guard
...
One-short guards for Fill/Prime dialog.
2018-06-06 08:47:08 +02:00
Roumen Georgiev
7ef97a5334
files renamed and added icon
2018-06-06 09:28:51 +03:00
Roumen Georgiev
f528b708c3
Merge remote-tracking branch 'origin/dev' into dev
2018-06-06 09:22:28 +03:00
Roumen Georgiev
fd4662df32
files renamed and added icon
2018-06-06 09:13:21 +03:00
AdrianLxM
1acefd618b
Merge pull request #1076 from MilosKozak/AdrianLxM-cancel-color
...
higher contrast ok and cancel buttons
2018-06-05 22:29:21 +02:00
AdrianLxM
e21f99a63d
Merge pull request #1077 from MilosKozak/padding-top
...
Slightly more padding on top buttons/fields
2018-06-05 22:29:11 +02:00
AdrianLxM
5c6d098601
Merge pull request #1073 from jotomo/french-translation-format-specifier-fix
...
Fix format specifier in French translation.
2018-06-05 22:28:55 +02:00
Milos Kozak
65c8cb22ef
check for null context
2018-06-05 14:38:00 +02:00
Milos Kozak
7e7e921853
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-06-05 14:37:47 +02:00
Milos Kozak
5df51e8a6e
check for NPE
2018-06-05 14:35:18 +02:00
AdrianLxM
32f4a08fa6
slightly more padding on top buttons/fields
2018-06-05 13:26:43 +02:00
Roumen Georgiev
4a481bf294
Merge branch 'dev' into dev
2018-06-05 12:45:00 +03:00
Roumen Georgiev
54cc768a47
files renamed and added icon
2018-06-05 12:39:55 +03:00
Roumen Georgiev
c1b69404d0
files renamed and added icon
2018-06-05 12:19:47 +03:00
Roumen Georgiev
37e6e0268c
Merge pull request #25 from alesinka/master
...
adding icons from Alessya
2018-06-05 10:55:41 +03:00
AdrianLxM
536fe3e5d2
higher contrast ok and cancel buttons
2018-06-05 00:15:41 +02:00
AdrianLxM
171209503e
remove unneeded log statement
2018-06-05 00:04:03 +02:00
AdrianLxM
9d07e3e83f
Merge pull request #1072 from jotomo/silly-idea
...
Revert "Update prediction colors to match NS."
2018-06-04 23:54:22 +02:00
AdrianLxM
4998ebae89
Merge pull request #1071 from TebbeUbben/new-design
...
TabLayout + NavigationDrawer
2018-06-04 23:53:42 +02:00
TebbeUbben
5fa79b1db9
Changed accent color to #009688
2018-06-04 23:34:56 +02:00
TebbeUbben
f7b19e37a1
Button for plugin preferences
2018-06-04 21:56:31 +02:00
TebbeUbben
80e9d769e4
Compact version of toolbar
2018-06-04 21:34:21 +02:00
Alessya
fbe44b7190
new icon added to danaR tab - user options
2018-06-04 17:48:02 +03:00
Johannes Mockenhaupt
d31b90cd3e
Fix format specifier in French translation.
2018-06-04 15:38:06 +02:00
Roumen Georgiev
19e7d507b2
shutdown value can be 0
2018-06-04 10:24:20 +03:00
Roumen Georgiev
1147c28f04
use numberPicker instead of editText
2018-06-04 10:23:01 +03:00
Johannes Mockenhaupt
358108be49
Revert "Update prediction colors to match NS."
...
This reverts commit dd41afa
2018-06-04 03:00:50 +02:00
TebbeUbben
6c1ccebb4a
Moved padding to Toolbar
2018-06-03 23:42:10 +02:00
TebbeUbben
9cf9da0d22
MINIMUM_BASAL_VALUE_REPLACED -> MAXIMUM_BASAL_VALUE_REPLACED
2018-06-03 23:33:49 +02:00
TebbeUbben
263275659a
TabLayout + NavigationDrawer
2018-06-03 23:28:04 +02:00
TebbeUbben
f8c621dc6a
Fixed tests
2018-06-03 11:04:33 +02:00
TebbeUbben
a86c654f8d
Use real TBR cancels and dismiss their alerts
2018-06-03 10:56:29 +02:00
Johannes Mockenhaupt
ef6ee43c32
One-short guards for Fill/Prime dialog.
2018-06-02 18:06:04 +02:00
TebbeUbben
f151cbb0bf
TBR emulation
2018-06-02 16:37:53 +02:00
Roumen Georgiev
054003460c
push new settings to pump
2018-06-01 16:42:56 +03:00
Milos Kozak
96fb4323f8
Merge pull request #1064 from jotomo/purple-pony
...
Update prediction colors to match NS.
2018-06-01 13:57:20 +02:00
Johannes Mockenhaupt
ef8f4f1448
Fix unit test.
2018-06-01 12:24:09 +02:00
Roumen Georgiev
75dbf71a70
Merge remote-tracking branch 'origin/dev' into dev
2018-06-01 12:11:29 +03:00
Roumen Georgiev
861f9bdd8d
Timeformat reverse
2018-06-01 12:10:08 +03:00
Roumen Georgiev
9569fbf183
Merge branch 'dev' into dev
2018-06-01 12:02:41 +03:00
Roumen Georgiev
908fd9f77e
strings update
2018-06-01 11:55:59 +03:00
Roumen Georgiev
85bef0036b
back to original
2018-06-01 11:45:31 +03:00
Roumen Georgiev
4581733cd7
some debugging output and forced getting user options
2018-06-01 11:41:37 +03:00
Roumen Georgiev
319e786988
display 666 in backlightontime if no settings read
2018-06-01 10:08:13 +03:00
Roumen Georgiev
f3d19aa6f4
convert int values to strings
2018-06-01 09:38:18 +03:00
Johannes Mockenhaupt
dd41afa55a
Update prediction colors to match NS.
2018-06-01 02:53:23 +02:00
swissalpine
dd60cadd5a
Fix broken cage age
2018-05-31 22:22:22 +02:00
Roumen Georgiev
bbb9c681e6
filling in some data
2018-05-31 17:16:30 +03:00
Roumen Georgiev
41af503104
filling in some data
2018-05-31 17:10:09 +03:00
Roumen Georgiev
da89ea1643
some formatting
2018-05-31 16:47:58 +03:00
Roumen Georgiev
39e704645b
create userOptionsActivity class
2018-05-31 14:45:26 +03:00
Roumen Georgiev
e4e4829c73
update of strings
2018-05-31 14:18:43 +03:00
Roumen Georgiev
f71372444b
strings for danaR options fragment
2018-05-31 13:54:37 +03:00
Markus M. May
a587f72de2
Fix wrong usage of event in refactored source
2018-05-30 18:09:41 +02:00
Milos Kozak
418f68153e
Merge pull request #1058 from MilosKozak/NSC-no-advancedfiltering
...
NSClient as source without advanced filtering
2018-05-30 08:08:04 +02:00
Markus M. May
0fe744c3e6
Remove unnecessary assignment
2018-05-29 21:44:33 +02:00
Markus M. May
41503800e8
Remove some duplicate code lines
2018-05-29 20:57:55 +02:00
AdrianLxM
de1196f34b
NSClient as source without advanced filtering
2018-05-29 12:57:07 +02:00
Milos Kozak
7e57c30ecf
SW Exit label
2018-05-25 13:00:08 +02:00
Milos Kozak
35c07d1e60
SW scroll to the top on activity create
2018-05-24 00:13:59 +02:00
Milos Kozak
d642418e02
resolve NPE
2018-05-23 23:43:41 +02:00
Milos Kozak
683caf78f8
SW configure insulin button
2018-05-23 13:47:16 +02:00
Milos Kozak
a7cfcd56e3
SW fix return to 1st page
2018-05-23 13:20:24 +02:00
Milos Kozak
fa2c0ab003
Merge pull request #994 from MilosKozak/startupwizard
...
Startupwizard
2018-05-22 23:07:04 +02:00
Milos Kozak
53bdb0bf09
asking permissions to notifications
2018-05-22 23:06:17 +02:00
Milos Kozak
5d27a28dc9
SW eula
2018-05-22 20:02:38 +02:00
Milos Kozak
250f9f74a0
move askForStoragePermission
2018-05-22 18:59:34 +02:00
Milos Kozak
2626e5bb63
SW android permissions
2018-05-22 17:34:09 +02:00
Milos Kozak
4fa24fb009
SW add more texts
2018-05-20 23:44:09 +02:00
Milos Kozak
c723deaf02
SW patient age screen finalization
2018-05-20 22:01:32 +02:00
Milos Kozak
b57683eaf5
SW rename package
2018-05-20 21:55:53 +02:00
Andy Rozman
e8f860be8b
- copied RL code
...
- copied Medtronic code
- added BLE Scan
- added RL Stats activity
- added RL configuration display
2018-05-20 20:53:55 +01:00
Milos Kozak
f24d296836
SW nsclient screen finalizing
2018-05-20 21:36:17 +02:00
AdrianLxM
953128ffe5
UAM without advanced filtering
2018-05-20 19:17:46 +02:00
Milos Kozak
52a4f9af14
SW loop screen update
2018-05-20 16:29:15 +02:00
Milos Kozak
d079052944
Merge branch 'startupwizard' of https://github.com/MilosKozak/AndroidAPS into startupwizard
2018-05-20 16:18:10 +02:00
Milos Kozak
de8557a115
SW sensitivity plugin
2018-05-20 16:17:53 +02:00
Milos Kozak
5b9594bdbb
SW create elements package
2018-05-20 15:09:32 +02:00
Milos Kozak
d0ed4bd717
SWString fix
2018-05-20 15:01:03 +02:00
Milos Kozak
bac1be1944
Merge pull request #1050 from boysim/dev
...
Added and improved dutch translations
2018-05-20 14:46:41 +02:00
Milos Kozak
7714aa9138
Merge branch 'dev' into startupwizard
2018-05-20 14:18:58 +02:00
boysim
5c346f5b79
addedd formattng="false"
2018-05-20 14:18:37 +02:00
Milos Kozak
53cbe05436
Merge pull request #1019 from McHoffi/obj.7-add-info
...
Obj.7 add info about using SMB/maxIOB
2018-05-20 14:14:11 +02:00
boysim
e2bfb224f2
dutch typo fixes
2018-05-20 13:36:28 +02:00
boysim
da8acd4a1e
dutch typo fixes
2018-05-20 12:55:52 +02:00
Simon Pauwels
25b20f13f1
Merge pull request #50 from MilosKozak/dev
...
20 mei
2018-05-20 12:20:49 +02:00
Milos Kozak
948e925d12
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-05-20 10:56:37 +02:00
Milos Kozak
06e52bb6ae
remove duplicated key
2018-05-20 10:56:32 +02:00
Andy Rozman
4aefea0b28
Add constants file and modified status.
2018-05-17 14:21:35 +01:00
Roumen Georgiev
764e035666
remove wizard from backstack and fix the Exit -> returning to SW
2018-05-16 15:35:17 +03:00
Milos Kozak
e91d7e0d11
Merge pull request #1045 from MilosKozak/AdrianLxM-patch-2
...
Swedish update
2018-05-15 14:27:39 +02:00
AdrianLxM
bf23a8f935
polish update
2018-05-15 14:20:35 +02:00
AdrianLxM
bae05b26bb
Update strings.xml
...
Thanks Marcus
2018-05-15 14:03:14 +02:00
Milos Kozak
66e50f5b62
Merge pull request #1038 from jotomo/upstreaming
...
[Polish] Dialog/color consistency, translations and other small stuff
2018-05-15 13:09:50 +02:00
Milos Kozak
e58149379a
Merge pull request #1043 from jotomo/issue-646
...
[Bugfix] On bolus cancel request, cancel all boluses. Partially addresses #646 .
2018-05-15 10:55:04 +02:00
Johannes Mockenhaupt
561c7fb470
Add test.
2018-05-14 00:38:47 +02:00
Johannes Mockenhaupt
25aa6f859f
On bolus cancel request, cancel all boluses. Partially addresses #646 .
2018-05-13 23:57:40 +02:00
Johannes Mockenhaupt
29efe11ece
Combo: always send out progress updates (SMB or not).
...
Without this, showing SMB progress on wear is broken.
(cherry picked from commit 5ebff72)
2018-05-13 23:20:29 +02:00
Andy Rozman
2600a7009b
Added UTests for PumpUtil and VirualPlugin (new methods)
2018-05-13 18:40:53 +01:00
TebbeUbben
3103a0f276
Some styling for SW
2018-05-13 13:40:34 +02:00
Johannes Mockenhaupt
52da1feaf0
i18n: add German translation, layout issues with longer translations.
...
Dialog headers (insulin, carbs, prime/fill) now lock proper at least
in English and German.
2018-05-13 13:35:24 +02:00
Johannes Mockenhaupt
24e672a7f8
Add icon header to calibration dialog.
2018-05-13 12:48:30 +02:00
Johannes Mockenhaupt
d80fecc390
Add T.now, plus, minus methods.
2018-05-13 12:44:47 +02:00
Johannes Mockenhaupt
d0492462a4
Add time to build version.
2018-05-13 12:32:45 +02:00
Johannes Mockenhaupt
1883ac06dd
Use TT color for TT confirmations in dialogs.
2018-05-13 12:14:49 +02:00
Andy Rozman
7a388a5715
Little bit of refactoring.
2018-05-12 14:29:02 +01:00
Andy Rozman
2cc4fe4450
Added options Max Bolus and Max Basal
...
Little bit of refactoring in Medtronic code
2018-05-12 00:41:44 +01:00
boysim
aab85fe298
added dutch translations
2018-05-11 23:23:55 +02:00
boysim
bf5e8e7142
added dutch translations
2018-05-11 21:26:42 +02:00
Simon Pauwels
f788f5981d
Merge pull request #49 from MilosKozak/dev
...
11/05
2018-05-11 21:05:31 +02:00
Milos Kozak
4fae6c703c
SW autostart SetupWizard
2018-05-11 13:14:59 +02:00
Milos Kozak
ff2cc04408
SW warn if exported configuration is missing
2018-05-11 13:04:17 +02:00
Milos Kozak
7be418fdf2
Merge pull request #980 from triplem/de
...
DE translation
2018-05-11 09:24:24 +02:00
Markus M. May
cdd264686b
fix duplicate %
2018-05-11 08:43:24 +02:00
Milos Kozak
337a3d9776
SW show ObjectivesFragment
2018-05-11 08:30:21 +02:00
Milos Kozak
0a51c86afb
SW Configure APS button
2018-05-11 00:09:35 +02:00
Milos Kozak
376fffa6ec
SW Import settings, Skip wizard
2018-05-10 23:59:20 +02:00
Milos Kozak
8d7df64050
Merge pull request #1016 from MilosKozak/pump-notifications
...
Pump notifications
2018-05-10 23:24:45 +02:00
Milos Kozak
e105e5149e
Merge pull request #1032 from jotomo/wear-wizard-tt
...
Wear wizard: add TT config option.
2018-05-10 16:53:34 +02:00
Markus M. May
6d04d4b6e5
use positional indices in formatted strings to allow the usage of the translation editor
2018-05-10 16:53:01 +02:00
Andy Rozman
347d210d06
Merge branch 'virtual_pump_Bug863' of https://github.com/andyrozman/AndroidAPS into virtual_pump_Bug863
2018-05-10 12:42:06 +01:00
Andy Rozman
6f19ad1407
Wrong handling of specialBasalDurations (Duration15 and Duartion30 flags), and added some logging.
2018-05-10 12:40:31 +01:00
Roumen Georgiev
91c0b1a2ec
make Objectives visible
2018-05-10 14:36:05 +03:00
Milos Kozak
d5137a061b
Merge branch 'dev' into virtual_pump_Bug863
2018-05-10 13:19:44 +02:00
Roumen Georgiev
61afdd6e4c
cleanup
2018-05-10 14:05:33 +03:00
Roumen Georgiev
9ac081dd1d
arrays.xml clean
2018-05-10 14:01:17 +03:00
Roumen Georgiev
016aa1c069
Added insulin descriptions to SW screen
2018-05-10 13:56:50 +03:00
Roumen Georgiev
2fa77d2a8c
Added insulin descriptions to SW screen
2018-05-10 13:49:13 +03:00
Roumen Georgiev
33a6135e75
Added insulin descriptions to SW screen
2018-05-10 13:48:18 +03:00
boysim
0227fc0089
added dutch translations
2018-05-10 11:53:38 +02:00
Roumen Georgiev
06180e3bbd
Merge branch 'startupwizard' of https://github.com/MilosKozak/AndroidAPS into dev
2018-05-10 12:51:12 +03:00
Simon Pauwels
a5babe7934
Merge pull request #48 from MilosKozak/dev
...
10/05
2018-05-10 10:59:51 +02:00
Milos Kozak
71b44edea6
SW enable loop
2018-05-09 19:34:15 +02:00
Milos Kozak
fb7067b207
SW profile switch
2018-05-09 19:24:20 +02:00
Milos Kozak
1ba828d20a
SWFragment
2018-05-09 18:49:42 +02:00
Johannes Mockenhaupt
a2a165d510
Wear wizard: make TT option depend on BG being enabled.
2018-05-09 16:46:22 +02:00
Roumen Georgiev
e3153230e0
added NSClient followup
2018-05-09 17:11:07 +03:00
Milos Kozak
0060a2ba7f
SW show pump status
2018-05-09 15:10:47 +02:00
Roumen Georgiev
50f8bf2d18
fix for screens adding up
2018-05-09 15:55:02 +03:00
Roumen Georgiev
bfd61a65a0
fix for screens adding up
2018-05-09 15:44:40 +03:00
Roumen Georgiev
41d736e176
updated to latest from Milos
2018-05-09 15:06:34 +03:00
Roumen Georgiev
a7bbf93599
Merge pull request #19 from MilosKozak/startupwizard
...
Startupwizard
2018-05-09 14:49:17 +03:00
Roumen Georgiev
0e8f0669c5
Update SWDefinition.java
2018-05-09 14:48:35 +03:00
Milos Kozak
bacb3fb337
SW pump screen
2018-05-09 13:38:17 +02:00
Roumen Georgiev
1f2f2f54fc
added SWCheckbox item
2018-05-09 14:15:53 +03:00
Milos Kozak
ed43eddc83
SWInfotext
2018-05-09 11:55:21 +02:00
Milos Kozak
61a7d69a65
Merge branch 'dev' into startupwizard
2018-05-09 11:41:05 +02:00
Milos Kozak
dbc5e3689a
Merge pull request #1028 from andyrozman/translation_irish
...
Translation - Irish (Gaeilge)
2018-05-09 11:20:52 +02:00
Andy Rozman
bacc79970a
Added formated=false to some translations.
2018-05-09 10:19:27 +01:00
Milos Kozak
8c2d0d80ee
Merge pull request #1017 from MilosKozak/notification-height
...
Tests required: Notification height
2018-05-09 10:16:29 +02:00
Roumen Georgiev
d5a3177c35
trying pump followup screen -NOT WORKING
2018-05-09 11:06:52 +03:00
McHoffi
77522d0770
Update strings.xml
2018-05-09 09:45:53 +02:00
Milos Kozak
0c848b25f6
Merge branch 'dev' into translation_irish
2018-05-09 09:25:11 +02:00
Milos Kozak
e29a590cad
Merge pull request #1020 from MilosKozak/dia-refactor
...
default DIA
2018-05-08 23:43:54 +02:00
Milos Kozak
62a83bc197
Merge pull request #1010 from MilosKozak/sv-update
...
swedish update
2018-05-08 23:32:10 +02:00
Milos Kozak
3f568c2724
Merge pull request #1030 from triplem/wifi_connection
...
Add isConnected, enable NSClient only, if really connected to internet
2018-05-08 23:30:51 +02:00
Milos Kozak
faba0d9ff6
Merge pull request #1023 from MilosKozak/polish-translation
...
Polish translation
2018-05-08 23:27:14 +02:00
Milos Kozak
8c042b4bc8
Merge pull request #1029 from RadoslavR/patch-58
...
bg translation again
2018-05-08 23:18:52 +02:00
Johannes Mockenhaupt
39905f8e60
Darker UAM, ZT prediction colors.
...
They now have the same level of 'brightness'.
2018-05-08 21:26:52 +02:00
Markus M. May
86a91baad7
Fix translation
2018-05-08 20:56:02 +02:00
Roumen Georgiev
85d4ef4419
trying pump followup screen
2018-05-08 17:09:37 +03:00
Roumen Georgiev
e357c7fd1b
adding pump selection
2018-05-08 15:14:36 +03:00
Johannes Mockenhaupt
ce6e53e9c6
Wear wizard: add TT config option.
2018-05-08 13:28:01 +02:00
Markus M. May
b0d8d547d8
Add isConnected, enable NSClient only, if really connected to internet
2018-05-07 20:43:13 +02:00
Radoslav Radev
0164da23a4
Update strings.xml
2018-05-07 21:34:55 +03:00
Markus M. May
5314c24099
Additional translations
2018-05-07 20:25:30 +02:00
Andy Rozman
3baf907267
Initial irish translation
2018-05-07 16:45:38 +01:00
Andy Rozman
c03b4f6780
Minor change in plugin util.
2018-05-07 13:52:21 +01:00
Andy Rozman
41205d4ba7
Merge branch 'dev' into riley_link_medtronic
2018-05-07 12:11:38 +01:00
Andy Rozman
fb45bad8d9
Removed .orig
2018-05-07 12:06:47 +01:00
Andy Rozman
af56304669
Initial commit after dev was merged into here
2018-05-07 12:05:53 +01:00
AdrianLxM
c6dac2789c
one more polish update
2018-05-07 10:30:07 +02:00
AdrianLxM
af2c27236b
polish update
2018-05-07 10:24:06 +02:00
Johannes Mockenhaupt
785c402848
LP: Don't notify about invalid values during editing.
2018-05-07 02:11:59 +02:00
boysim
2ae6369362
added dutch translations
2018-05-06 22:52:04 +02:00
AdrianLxM
3385a23bdb
Merge pull request #1004 from pedroll/aaps20_rc3
...
Spanish translation
2018-05-06 20:25:17 +02:00
pedroll
0d2a0798f7
Spanish translation 2
2018-05-06 20:04:12 +02:00
pedroll
7b73c59ee5
Spanish translation 2
2018-05-06 20:04:12 +02:00
AdrianLxM
cdc8e45f32
Merge pull request #1015 from jotomo/lemming-treatment
...
Fix finding BG in graph for treatments before the first displayed BG.
2018-05-06 19:51:01 +02:00
AdrianLxM
f3967e07d2
polish in gerenal strings.xml
2018-05-06 19:44:58 +02:00
AdrianLxM
858c75095b
polish arrays.xml
2018-05-06 19:32:43 +02:00
AdrianLxM
b89ac3049c
polish fix strings
2018-05-06 19:30:35 +02:00
AdrianLxM
7b0acd1c4a
polish remove translatable=false
2018-05-06 19:29:00 +02:00
AdrianLxM
270f60ac1c
polish first - thanks Tomasz K.
2018-05-06 19:25:10 +02:00
McHoffi
9d367c1fa1
Update ObjectivesFragment.java
2018-05-06 18:18:34 +02:00
McHoffi
06948ca0f4
Update strings.xml
2018-05-06 18:16:42 +02:00
Radoslav Radev
b08332e340
bg translation
2018-05-06 14:49:10 +03:00
AdrianLxM
f0351834ff
default DIA
2018-05-06 12:49:03 +02:00
McHoffi
36d6edf0db
Update strings.xml
2018-05-06 12:16:51 +02:00
Johannes Mockenhaupt
56cbac3b4d
Leftover MainApp.gs rewrite.
2018-05-06 11:49:16 +02:00
Johannes Mockenhaupt
ef70c1f244
MainApp.sResources.getColor -> MainApp.gc.
2018-05-06 11:47:15 +02:00
Johannes Mockenhaupt
b9c649bd68
Uso blue/orange for carbs/insulin in confirmation dialogs.
...
Aligns with the graph's use of using blueish colors insulin and
orange for carbs stuff.
2018-05-06 11:46:09 +02:00
AdrianLxM
1ac41323e6
fix notification last line cutoff
2018-05-05 21:55:49 +02:00
AdrianLxM
116222858e
update lastApproachingDailyLimit
2018-05-05 21:12:09 +02:00
AdrianLxM
d99fafe375
restrict aproaching daily limit to once every 30 minutes RS
2018-05-05 21:10:15 +02:00
AdrianLxM
5458df0907
restrict aproaching daily limit to once every 30 minutes Rv2
2018-05-05 21:08:17 +02:00
AdrianLxM
c2315b7bea
restrict aproaching daily limit to once every 30 minutes R-Korean
2018-05-05 21:03:35 +02:00
AdrianLxM
b43eff8e55
restrict aproaching daily limit to once every 30 minutes R
2018-05-05 21:02:31 +02:00
AdrianLxM
70b2b1502f
restrict wrong password notification to once every 30 seconds
2018-05-05 20:59:11 +02:00
AdrianLxM
c8c7e12056
Wrong password notification
2018-05-05 20:54:10 +02:00
AdrianLxM
246c8922df
Korean wrong password notification
2018-05-05 20:51:46 +02:00
Johannes Mockenhaupt
1e0b7d331a
Fix finding BG in graph for treatments before the first displayed BG.
...
(cherry picked from commit 8bdafe3)
2018-05-05 19:13:38 +02:00
AdrianLxM
260e259fb0
Update strings.xml
2018-05-05 15:17:03 +02:00
AdrianLxM
d574c70471
Merge pull request #1011 from Heiner1/dev-strings
...
Dev strings
2018-05-05 10:12:20 +02:00
swissalpine
fb04250c90
Elliminat syntax error
2018-05-05 10:00:30 +02:00
Heiner1
3a0c34e7b6
Update strings.xml
2018-05-05 09:45:10 +02:00
AdrianLxM
499edd7c05
swedish update
2018-05-05 09:20:29 +02:00
Radoslav Radev
9aeb2b6ede
Update strings.xml
2018-05-04 23:51:08 +03:00
Markus M. May
e07aecd62d
Further translations
2018-05-04 22:02:32 +02:00
Johannes Mockenhaupt
d15ada5cd9
Combo: Fix visual glitch in fragment.
2018-05-04 21:27:54 +02:00
AdrianLxM
1646420c47
base basal -> Basal Base (was Base Temporal)
2018-05-04 20:17:55 +02:00
AdrianLxM
714eca483e
revert gradle to dev
2018-05-04 20:16:12 +02:00
pedroll
5ff86e9c34
Spanish translation
2018-05-04 19:54:21 +02:00
AdrianLxM
7190bccf20
release candidate 3
2018-05-04 19:24:05 +02:00
AdrianLxM
93c3a3d624
Merge branch 'dev' into aaps20_rc3
2018-05-04 19:21:39 +02:00
Milos Kozak
f5a23b2921
Merge branch 'dev' into virtual_pump_Bug863
2018-05-04 19:18:52 +02:00
AdrianLxM
f511b9ed39
Merge pull request #1000 from MilosKozak/bolusprogress-dismiss
...
IDEA: dismiss bolus progress dialog when Queue is empty
2018-05-04 19:03:11 +02:00
Andy Rozman
4fb8e899c2
Feature Request/Bug #863
...
- merged with dev
- extended PumpType with new setting in PumpDescription
- added Insight pump settings for VirtualPump
2018-05-04 15:48:46 +01:00
Milos Kozak
57973d4d3a
Merge pull request #1001 from jotomo/carbs-gen-refactor
...
Extract and deduplicate eCarbs generation
2018-05-04 16:10:23 +02:00
Milos Kozak
61e6404bbe
Merge pull request #995 from MilosKozak/wear-wizard
...
Wear eCarbs
2018-05-04 14:33:55 +02:00
Johannes Mockenhaupt
35a6bbb6a7
Set CareportalEvent.MEALBOLUS for eCarbs.
2018-05-04 14:22:43 +02:00
Johannes Mockenhaupt
43cc3c4908
Extract CarbsGenerator class.
2018-05-04 14:18:55 +02:00
Milos Kozak
963f1e1abf
Merge branch 'dev' into startupwizard
2018-05-04 13:26:40 +02:00
swissalpine
10b67a0c11
Update GraphData.java
2018-05-04 12:31:11 +02:00
swissalpine
7312bf061a
Update colors.xml
2018-05-04 12:30:28 +02:00
AdrianLxM
5c8e99b191
dismiss bolus progress dialog when Queue is empty
2018-05-04 12:24:37 +02:00
Andy Rozman
f2df13dbfb
Merge branch 'dev' into virtual_pump_Bug863
2018-05-04 10:06:18 +01:00
Milos Kozak
91f3db782d
SWButton rename option to text
2018-05-04 10:20:22 +02:00
Milos Kozak
55661ca7a0
SWButton
2018-05-04 10:17:50 +02:00
swissalpine
010a2f3fd8
Make deviation bars transparent
2018-05-04 10:04:45 +02:00
Milos Kozak
88d964f135
SW reuse save, cleanup
2018-05-04 09:35:57 +02:00
AdrianLxM
c34cc73b1e
fix wear wizard
2018-05-03 23:08:16 +02:00
Radoslav Radev
52411f7afe
half of the Bulgarian translation
2018-05-03 23:34:50 +03:00
AdrianLxM
8d6997f519
ecarb ignore 0 carbs
2018-05-03 22:08:54 +02:00
AdrianLxM
fb75346bcd
ecarb make settings consistent
2018-05-03 22:08:50 +02:00
AdrianLxM
61f07da1a2
ecarb doECarb
2018-05-03 22:08:43 +02:00
AdrianLxM
c69a541b75
ecarb ash first response
2018-05-03 22:08:27 +02:00
Milos Kozak
4539756455
Merge branch 'startupwizard' of https://github.com/MilosKozak/AndroidAPS into startupwizard
2018-05-03 22:02:12 +02:00
Milos Kozak
dea5ff0080
styles cleanup
2018-05-03 22:01:59 +02:00
Milos Kozak
d1958a3e2d
Merge branch 'dev' into startupwizard
2018-05-03 21:31:55 +02:00
Milos Kozak
02590ddd72
SW remove unneeded code
2018-05-03 21:29:34 +02:00
McHoffi
39e9448c67
Typo fix
2018-05-03 21:20:54 +02:00
Milos Kozak
cc532b9107
SWRadioButton cleanup
2018-05-03 20:13:27 +02:00
Milos Kozak
94db444acb
SW validator, language, cleanup
2018-05-03 20:06:13 +02:00
Milos Kozak
36265ab1c6
SWPlugin
2018-05-03 18:41:47 +02:00
Andy Rozman
421946269a
Merge branch 'dev' into riley_link_medtronic
2018-05-03 17:23:23 +01:00
Andy Rozman
f6110bd096
Merge branch 'virtual_pump_Bug863' into riley_link_medtronic
2018-05-03 16:54:03 +01:00
AdrianLxM
43dc7d1846
wear cathegorize preferences
2018-05-03 17:49:31 +02:00
AdrianLxM
62a38ed537
wearwizard fix NPE when CobInfo not available - missing part
2018-05-03 17:49:22 +02:00
AdrianLxM
b37b892eea
wearwizard fix NPE when CobInfo not available
2018-05-03 17:49:17 +02:00
AdrianLxM
fe0f2e3ce6
wearwizard settings on phone
2018-05-03 17:49:13 +02:00
AdrianLxM
c394c045c9
wearwizard reduced watch settings
2018-05-03 17:49:09 +02:00
AdrianLxM
bdfce784c0
wearwizard ensure watch apk is up to date
2018-05-03 17:49:05 +02:00
AdrianLxM
ec106726a7
wearwizard trend
2018-05-03 17:49:01 +02:00
AdrianLxM
24dd4e1710
wearwizard cob
2018-05-03 17:48:54 +02:00
Andy Rozman
f4648e44b2
- minor changes
2018-05-03 16:31:23 +01:00
Andy Rozman
5b8779f8a7
Feature Request/Bug #863
...
- added PumpCapability (to set boolean values)
- added Dana Pumps to PumpType and to VirtulaPumps array
2018-05-03 15:10:34 +01:00
Roumen Georgiev
515590cdf6
other screens
2018-05-03 17:04:56 +03:00
Roumen Georgiev
425ba77200
other screens
2018-05-03 16:59:23 +03:00
AdrianLxM
012593a480
Update NotificationStore.java
2018-05-03 12:18:48 +02:00
Roumen Georgiev
083730f476
WIP: BGSOURCE screen
2018-05-03 09:02:16 +03:00
Andy Rozman
416bd2ff41
Feature Request/Bug #863
...
- added package PumpCommon for common pump files
- added DoseSettings, DoseStepSize, PumpTempBasalType which are needed for PumpType
- added PumpType which contains all definitions for pumps
- extended fragement to display Pump Type and Pump Type definitions
- extended plugin to read configuration and set pumpDescription object
- extended pref_virtualpump to add pump type selection
2018-05-02 23:59:33 +01:00
Milos Kozak
e5ed63a46f
fix name on future profile switches
2018-05-03 00:13:49 +02:00
Milos Kozak
a35c925930
Merge pull request #983 from jotomo/issue-939
...
WIP: Fix bolus progress dialog not closing with onPause/onResume cycle
2018-05-02 23:20:29 +02:00
Johannes Mockenhaupt
396268d9c8
Send invalid boluses (prime boluses) to watch.
2018-05-02 22:49:31 +02:00
Johannes Mockenhaupt
599c87f794
Combo: better error message when initialization fails.
2018-05-02 22:48:57 +02:00
Milos Kozak
a64bfe7a39
Merge pull request #977 from MilosKozak/persistent-text
...
show bg missing not no profile
2018-05-02 22:38:07 +02:00
Milos Kozak
f9bbb72831
Merge pull request #979 from MilosKozak/lp-ps-always
...
LP: Allow ProfileSwitch before pump is connected.
2018-05-02 22:37:23 +02:00
Johannes Mockenhaupt
79458a1c73
Ignore harmless errors (un)subscribing to the message bus.
2018-05-02 22:36:52 +02:00
Milos Kozak
28430cc757
fix cob calculation
2018-05-02 22:35:51 +02:00
Milos Kozak
e2f28e0ae4
fix rounding on bolus delivery
2018-05-02 22:20:27 +02:00
Markus M. May
07c47a4ba7
Start de translation
2018-05-02 21:45:16 +02:00
AdrianLxM
a3421316ac
Allow ProfileSwitch before pump is connected.
...
https://github.com/MilosKozak/AndroidAPS/issues/969
2018-05-02 21:38:45 +02:00
Johannes Mockenhaupt
3b19db14fd
Clean up.
2018-05-02 21:25:04 +02:00
Johannes Mockenhaupt
22e90743aa
Fix #939 .
2018-05-02 21:24:06 +02:00
AdrianLxM
eb594c1867
show bg missing not no profile
2018-05-02 21:09:04 +02:00
AdrianLxM
f1736f048e
Update strings.xml
2018-05-02 20:20:13 +02:00
Milos Kozak
8419f8d0e9
update socket.io to 1.0.0
2018-05-02 18:49:40 +02:00
Milos Kozak
a36b1b2a10
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-05-02 18:39:47 +02:00
Milos Kozak
4cc952900d
show progress reason from iobcobthread
2018-05-02 18:39:37 +02:00
Milos Kozak
5671b99f30
Merge pull request #974 from MilosKozak/swedish-update
...
Swedis Update strings.xml
2018-05-02 18:02:51 +02:00
CaroGo
a768c03462
Update strings.xml
2018-05-02 17:43:17 +02:00
Milos Kozak
a4ff9d29e2
Merge branch 'dev' into swedish-update
2018-05-02 17:10:01 +02:00
Milos Kozak
e42d5f1204
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-05-02 17:05:32 +02:00
Milos Kozak
42164489c8
cs translations
2018-05-02 17:05:20 +02:00
AdrianLxM
f52451085c
remove translation of language names
2018-05-02 16:41:56 +02:00
AdrianLxM
fb61f3cde2
Update strings.xml
2018-05-02 16:39:28 +02:00
Johannes Mockenhaupt
c51635dba4
Watch: colored preds.
2018-05-02 16:01:40 +02:00
Milos Kozak
efff5d4e10
Merge pull request #966 from jotomo/greener-grass
...
Brighter green for "treatment active" for better readability.
2018-05-02 15:05:27 +02:00
Milos Kozak
e562d0f437
Merge pull request #957 from triplem/charging_merged
...
Charging merged
2018-05-02 15:04:00 +02:00
Johannes Mockenhaupt
32323d673b
Brighter green for "treatment active" for better readability.
2018-05-02 15:01:49 +02:00
AdrianLxM
926ee535d5
use MainApp.gs instead of context 2
2018-05-02 14:28:16 +02:00
AdrianLxM
d289c5c7d7
use MainApp.gs instead of context
2018-05-02 14:27:23 +02:00
AdrianLxM
3f3959f785
use MainApp.gs instead of getString from Activity/Dialog 2
2018-05-02 14:21:53 +02:00
AdrianLxM
611d761a41
use MainApp.gs instead of getString from Activity/Dialog
2018-05-02 14:16:40 +02:00
AdrianLxM
4a22fd355d
Merge remote-tracking branch 'milosremote/dev' into use-gs
2018-05-02 14:11:45 +02:00
AdrianLxM
5aa3a88c7f
remove direct access to sResources 9
2018-05-02 13:59:27 +02:00
AdrianLxM
166f2843df
remove direct access to sResources 8
2018-05-02 13:58:52 +02:00
AdrianLxM
de4643d16f
remove direct access to sResources 8
2018-05-02 13:57:28 +02:00
AdrianLxM
74d0c71712
remove direct access to sResources 7
2018-05-02 13:51:24 +02:00
AdrianLxM
545d1d1586
remove direct access to sResources 6
2018-05-02 13:50:31 +02:00
AdrianLxM
0e4e36f2b1
remove direct access to sResources 5
2018-05-02 13:49:24 +02:00
AdrianLxM
3979913a6d
remove direct access to sResources 4
2018-05-02 13:46:38 +02:00
AdrianLxM
2af62d8e4e
remove direct access to sResources 3
2018-05-02 13:42:50 +02:00
AdrianLxM
a8382daefd
remove direct access to sResources 2
2018-05-02 13:36:56 +02:00
AdrianLxM
81ad2779bc
remove direct access to sResources 1
2018-05-02 13:32:41 +02:00
AdrianLxM
cfaa26d337
remove one more gs helper
2018-05-02 13:28:58 +02:00
AdrianLxM
20263c9fe4
remove other gs helper methods
2018-05-02 13:17:57 +02:00
AdrianLxM
73b41a7162
some more gs
2018-05-02 13:12:08 +02:00
AdrianLxM
7b6402de09
use gs function in MainApp to get strings
2018-05-02 13:05:22 +02:00
AdrianLxM
2749c1c853
refactor cob string
2018-05-02 11:19:03 +02:00
AdrianLxM
24bd509ec6
COB in ongoing notification
2018-05-02 08:30:37 +02:00
AdrianLxM
c445c078e1
add g to default COB as well
2018-05-02 08:30:34 +02:00
AdrianLxM
915dac8ef3
COB in external status
2018-05-02 08:30:28 +02:00
AdrianLxM
f75329f5dc
move COB string representation to CobInfo
2018-05-02 08:30:23 +02:00
Roumen Georgiev
15f4f64c4f
using View.generateId() instead of fixed value
2018-05-02 09:22:26 +03:00
Andy Rozman
4b121ae892
- copied roundtrip2 project into here (for easier use), some of it might be reused
...
- added PumpCommon
- added PumpMedtronic
2018-05-01 22:44:53 +01:00
Markus M. May
2d3d39d1dc
Use common helper method for day calculation
2018-05-01 23:43:18 +02:00
Markus M. May
a46b038381
use correct number format
2018-05-01 23:34:40 +02:00
Markus M. May
de92125967
Fixes wrong algo
2018-05-01 22:49:44 +02:00
Markus M. May
8a627603ea
Revert lib change
2018-05-01 22:23:24 +02:00
Markus M. May
306d45bb3e
Fix Boolean thingy
2018-05-01 22:15:22 +02:00
Markus M. May
02e9ce105c
Add boolean thingie from Adrian ;-)
2018-05-01 22:01:08 +02:00
Markus M. May
12d80e96ef
Merge latest dev version
2018-05-01 21:56:33 +02:00
Markus M. May
e91fd00836
Add Unit-Test, as well as fixtures for SSID handling
2018-05-01 21:46:37 +02:00
soko78
183f2cd6b3
Update strings.xml
...
line 177 & 178 changed "temoräres ziel" into "temporäres ziel"
2018-05-01 20:30:53 +02:00
Milos Kozak
dbca668afd
Merge pull request #952 from jotomo/rainbow
...
Fix missing predictions in graph, color them.
2018-05-01 20:10:59 +02:00
Milos Kozak
537be09493
Merge pull request #950 from jotomo/oreo-persistent-notification-annoyance
...
Make persistent notification not peak on every update on Oreo.
2018-05-01 20:08:17 +02:00
Milos Kozak
eb7b67781c
Merge pull request #947 from jotomo/issue-940
...
Don't create empty future carbs records. Fixes #940 .
2018-05-01 20:07:46 +02:00
Milos Kozak
c991673de1
Merge pull request #948 from MilosKozak/zerotempiob
...
fix zeroTempIOB
2018-05-01 20:06:32 +02:00
Johannes Mockenhaupt
a362eeb31b
Fix unit tests for added Combo plugin w/o engineering mode.
2018-05-01 19:33:27 +02:00
Johannes Mockenhaupt
af563474d5
Skip predictions below 40.
2018-05-01 19:33:27 +02:00
Johannes Mockenhaupt
1e80ca22c6
Don't draw invalidated SMBs.
2018-05-01 19:33:27 +02:00
Johannes Mockenhaupt
ee61a71181
Sort predictions so they're properly displayed in the graph.
...
GraphView library requires a series to be ordered by the x-value.
2018-05-01 19:33:27 +02:00
Johannes Mockenhaupt
5ef7506e5f
Clean up prediction colors.
2018-05-01 19:16:28 +02:00
AdrianLxM
e70791dc2f
gradle rc2
2018-05-01 18:07:08 +02:00
TebbeUbben
60d3cde0d3
Compat for SR 1.6.0
2018-05-01 17:29:21 +02:00
Johannes Mockenhaupt
4d1515769f
Make persistent notification not peak on every update on Oreo.
2018-05-01 14:59:40 +02:00
AdrianLxM
3d5fb96d7d
fix zeroTempIOB
2018-05-01 13:47:26 +02:00
AdrianLxM
55077d3ad8
Merge remote-tracking branch 'milosremote/dev' into aaps20_rc2
2018-05-01 13:29:23 +02:00
AdrianLxM
4789ac0616
fix zeroTempIOB
2018-05-01 13:29:15 +02:00
Johannes Mockenhaupt
7fbab357e8
Fix unit tests for added Combo plugin w/o engineering mode.
2018-05-01 13:25:12 +02:00
Johannes Mockenhaupt
8c3df40fdf
Don't create empty future carbs records. Fixes #940 .
...
When very few carbs are stretched out (e.g. 10g over 4h), there are
gaps, so that 1g is generated only every 30m. Don't create empty
records in between.
2018-05-01 12:22:01 +02:00
Winfried Kuiper
d68f74bb68
Update strings.xml
2018-04-30 23:09:35 +02:00
Roumen Georgiev
3f0c2958c7
WIP: change of language works
2018-04-30 16:41:40 +03:00
Markus M. May
099cb6c4e4
add battery charging state
2018-04-29 22:49:43 +02:00
AdrianLxM
faa09f8505
2.0 rc1
2018-04-28 19:49:55 +02:00
AdrianLxM
81037cde5c
Merge pull request #935 from jotomo/calculator-carb-only
...
Calculator: carb-only handling.
2018-04-28 19:29:13 +02:00
Johannes Mockenhaupt
4813c9c163
Combo: minor cleanup.
2018-04-27 19:51:12 +02:00
Johannes Mockenhaupt
5746e37553
Enable Combo & extended carbs without engineering mode as well.
2018-04-27 19:50:59 +02:00
Johannes Mockenhaupt
21f231e2b3
Calculator: carb-only handling.
...
If only carbs where entered/calculated, send them to the pump only
if the pump supports it, otherwise just add it to the DB.
2018-04-27 19:49:50 +02:00
Roumen Georgiev
a0463742fa
WIP: language set and validation
2018-04-27 17:04:08 +03:00
Roumen Georgiev
bb38d7644b
move onClick in SWRadioButton
2018-04-27 13:30:45 +03:00
Milos Kozak
8577a94571
Merge pull request #925 from MilosKozak/safety-loop
...
Safety loop
2018-04-27 11:00:18 +02:00
Milos Kozak
e951a924c4
Merge pull request #931 from MilosKozak/cobchart
...
align failoverToMinAbsorbtionRate to cobtime
2018-04-27 10:54:39 +02:00
AdrianLxM
3631f685e2
cleanup
2018-04-27 00:03:08 +02:00
AdrianLxM
9889d34512
Treat future IOB as if the current TBR was cancelled
2018-04-26 23:59:04 +02:00
AdrianLxM
5df59d8fe3
Merge pull request #927 from MilosKozak/lastBolusTime
...
lastBolusTime - only treatments with insulin
2018-04-26 23:57:54 +02:00
AdrianLxM
ee0c811e0d
Merge pull request #912 from jotomo/display-cob
...
Add IobCobCalculatorPlugin.getCobInfo().
2018-04-26 23:52:52 +02:00
Roumen Georgiev
11dc20faca
code cleanup
2018-04-26 16:59:56 +03:00
Roumen Georgiev
ef171dbccd
get SP value and check if it is already set
2018-04-26 16:13:08 +03:00
Roumen Georgiev
67ed699ca5
save() before showing next
2018-04-26 15:59:08 +03:00
Roumen Georgiev
59f654f918
show "NEXT" only when isValid() == true
2018-04-26 15:28:23 +03:00
Roumen Georgiev
d75de2f645
show "NEXT" only when isValid() == true
2018-04-26 15:18:01 +03:00
AdrianLxM
3356004065
don't hide IOB behind COB
2018-04-26 03:43:43 +02:00
AdrianLxM
c045a0a41e
align failoverToMinAbsorbtionRate to cobtime
2018-04-26 03:17:57 +02:00
Johannes Mockenhaupt
f3bc59003e
Space-optimize COB on watch.
2018-04-26 01:33:09 +02:00
Johannes Mockenhaupt
8d4e9f0043
Add future carbs on watch.
2018-04-26 01:16:31 +02:00
Johannes Mockenhaupt
2f846bc417
WatchUpdaterService: use IobCob.getCobInfo().
2018-04-26 01:10:27 +02:00
AdrianLxM
1eb2e59043
lastBolusTime - only treatments with insulin
2018-04-26 00:16:15 +02:00
AdrianLxM
3ec5eaea63
don't trigger loop on treatment
2018-04-26 00:14:51 +02:00
AdrianLxM
b6cd56b90a
cleanup logs
2018-04-25 23:31:15 +02:00
Markus M. May
55ea10e88f
Catch NetworkState changes correctly
2018-04-25 22:22:37 +02:00
Markus M. May
3fb17e6869
First step to use network activity receiver
2018-04-25 20:49:03 +02:00
osodebailar
5a74087632
Change iob and cob color for a better uniform look.
...
Insulin , iob etc. always in different blue colors,
Cob in orange (ocher) like color
2018-04-25 16:51:49 +02:00
AdrianLxM
e79ef7f018
always call callback on TBR-Request
2018-04-25 16:28:54 +02:00
AdrianLxM
a14345bb1a
synchronized loop invoke
2018-04-25 16:14:21 +02:00
Roumen Georgiev
dc91e3a544
currentScreen not updating - fixed & center fields
2018-04-25 17:02:10 +03:00
Roumen Georgiev
8333fe8975
get radiobutton values from arrays.xml & no header
2018-04-25 16:45:15 +03:00
Roumen Georgiev
ddf3c44928
rename show() to generateDialog()
2018-04-25 15:34:07 +03:00
Roumen Georgiev
7fb1b32188
moved show() method to SWItem classes
2018-04-25 15:29:20 +03:00
AdrianLxM
18fc03ec78
Merge remote-tracking branch 'milosremote/safety-loop' into safety-loop
2018-04-25 12:54:35 +02:00
AdrianLxM
85bb085188
rename safety to tempBasalFallback
2018-04-25 12:51:27 +02:00
AdrianLxM
b5a6ef2ecc
make now part of the past
2018-04-25 12:15:29 +02:00
AdrianLxM
ac23750942
lastBolusTime - only treatments with insulin
2018-04-25 11:52:01 +02:00
Roumen Georgiev
dda7ca3f95
radio group is generated dynamically
2018-04-25 11:03:33 +03:00
AdrianLxM
2a50248ba5
travis re-invoke commit with cleanup
2018-04-25 01:37:48 +02:00
AdrianLxM
a6a4a8837d
safety run if SMB fails
2018-04-25 01:18:40 +02:00
Johannes Mockenhaupt
da96b2d87c
Round up to be sure.
2018-04-24 23:09:07 +02:00
Johannes Mockenhaupt
60fbb1eeba
Fix another NPE.
2018-04-24 23:09:07 +02:00
Johannes Mockenhaupt
f4bafc6260
Add IobCobCalculatorPlugin.getCobInfo().
2018-04-24 23:09:07 +02:00
Milos Kozak
4217e82e0a
Merge pull request #884 from swissalpine/patch-1
...
More generous values for colored iage warnings (careportal)
2018-04-24 09:13:34 +02:00
Milos Kozak
c490499d03
preferences cleanup
2018-04-24 00:11:52 +02:00
Andy Rozman
99544e1f2b
Pre start for Medtronic plugin
2018-04-23 19:47:51 +01:00
Roumen Georgiev
eef4423109
basic navigation works
2018-04-23 17:03:22 +03:00
Milos Kozak
c15a4b5efe
fix wrong error dialog when only carbs are delivered (R,KoreanR)
2018-04-23 15:24:32 +02:00
Roumen Georgiev
76685c3cff
WIP: initial work
2018-04-23 15:58:27 +03:00
Andreas Eggen
511b9c6819
Merge branch 'dev' of git://github.com/MilosKozak/AndroidAps into dev
2018-04-23 08:26:48 +02:00
Milos Kozak
545b4a51ee
Merge pull request #914 from jotomo/overview-extended-bolus-display
...
Overview: hide ext. bolus line if none running; spacings, alignments.
2018-04-22 23:13:10 +02:00
Milos Kozak
a0036bfb79
Merge pull request #906 from jotomo/loop-invocations
...
Don't loop with old BG value, don't loop twice for the same value.
2018-04-22 22:43:37 +02:00
Johannes Mockenhaupt
896f919f37
Disable roaming (pref) when wifi-only is enabled.
2018-04-22 21:43:31 +02:00
Johannes Mockenhaupt
47770e9c6c
Overview: hide ext. bolus line if none running; spacings, alignments.
2018-04-22 21:31:53 +02:00
osodebailar
e97b35a030
Change headertext label size from large to medium
2018-04-22 19:48:56 +02:00
Milos Kozak
6851adbfd3
NSClient connection settings
2018-04-22 18:24:06 +02:00
Milos Kozak
b81d2ec6da
Merge pull request #909 from TebbeUbben/dev
...
Don't create TBR record when pump has been paused
2018-04-22 15:42:30 +02:00
TebbeUbben
2844be85b5
Don't create TBR record when pump has been paused
2018-04-22 13:44:12 +02:00
Milos Kozak
be5a989c5e
Merge pull request #908 from jotomo/fresh-cob
...
Fix delay in COB calculation.
2018-04-22 09:13:13 +02:00
Johannes Mockenhaupt
89a29d150f
Fix delay in COB calculation.
2018-04-22 00:08:41 +02:00
TebbeUbben
7c971197c7
Swapped pump started and paused strings inadvertently
2018-04-21 23:29:23 +02:00
Tebbe Ubben
f4e02a4862
Merge branch 'dev' into dev
2018-04-21 23:22:02 +02:00
TebbeUbben
fd776a2a0e
Add 0%-TBR to history when pump has been started or stopped
2018-04-21 23:20:33 +02:00
TebbeUbben
d82a24873f
Use SightRemote's history broadcast permission
2018-04-21 22:47:38 +02:00
Milos Kozak
c4db1c5e2d
move quickwizard preferences under overview
2018-04-21 21:58:07 +02:00
Milos Kozak
1f55078aa3
extract strings from overview preferences
2018-04-21 21:37:50 +02:00
Milos Kozak
cab592efb5
overview preferences cleanup
2018-04-21 21:31:42 +02:00
Milos Kozak
fe762248a5
nsclient preferences cleanup
2018-04-21 21:14:09 +02:00
Milos Kozak
6ad0c1f1d3
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-04-21 20:47:15 +02:00
Milos Kozak
ea59458383
nsclient preferences cleanup
2018-04-21 20:46:55 +02:00
Milos Kozak
3d7cdd3819
fix ns backfill bug
2018-04-21 19:51:52 +02:00
Milos Kozak
209623f9ea
Merge pull request #905 from jotomo/no-future-for-you
...
Don't send future carbs to pumps.
2018-04-21 18:13:33 +02:00
Johannes Mockenhaupt
e4a4e07d21
Add javadoc.
2018-04-21 15:28:37 +02:00
Johannes Mockenhaupt
d0405014b2
Don't loop with old BG value, don't loop twice for the same value.
...
Loop is potentially triggered twice when BG reading sent to NS comes back.
This should also deal with backfilled data coming in, since any previous
reading will be older than 9m, for which DatabaseHelper.actualBg()
returns null.
The previous approach to solve multiple invocations for the same value
added a isNew flag to EventNewBG, but since
DatabaseHelper.scheduleBgChange() drops excessive updates the event
carrying that flag is not guarantued to be delivered, resulting in
missed loop invocations. The approach taken now lets the receiver
of the event fully decide how to deal with it.
Should fix, or at least improve, #901 , #671 .
2018-04-21 14:28:47 +02:00
Johannes Mockenhaupt
9c6ee32586
Don't send future carbs to pumps.
2018-04-21 14:08:42 +02:00
Milos Kozak
c40aaed52f
allow to show dev slope in dev
2018-04-21 12:09:09 +02:00
Milos Kozak
c0250dd62c
show calculation cob progress on graph
2018-04-21 10:50:55 +02:00
Milos Kozak
cb65bed0a7
alling code to xdrip changes
2018-04-21 10:20:49 +02:00
Milos Kozak
c27ceb0a72
better bolus error handling for Dana pumps
2018-04-21 00:02:15 +02:00
Milos Kozak
883da922e5
1.60e-dev
2018-04-20 22:14:54 +02:00
Milos Kozak
870d23c08c
fix bolus step for Dana pumps
2018-04-20 22:13:20 +02:00
Milos Kozak
2f299bc670
Merge pull request #898 from MilosKozak/cob-rework
...
Please review: Cob rework
2018-04-20 20:53:50 +02:00
AdrianLxM
69c8eea53b
Enforce TBRs on enforceNew
2018-04-20 18:05:37 +02:00
Milos Kozak
b554d641a7
setupwizard template
2018-04-20 17:27:31 +02:00
Milos Kozak
41b5636c13
clear autosens cache on new preferences change
2018-04-20 12:44:19 +02:00
Milos Kozak
fb71b64922
Merge branch 'cob-rework' of https://github.com/MilosKozak/AndroidAPS into cob-rework
2018-04-20 12:28:18 +02:00
Milos Kozak
0ab04c4d95
fix cob scaling
2018-04-20 12:28:07 +02:00
AdrianLxM
d8180cc52b
Merge remote-tracking branch 'milosremote/dev' into cob-rework
2018-04-19 23:54:36 +02:00
Milos Kozak
645e83b6e6
dismiss notification if pump is reachable
2018-04-19 23:42:37 +02:00
Milos Kozak
51530fbcf8
fix temptarget NS sync
2018-04-19 23:18:19 +02:00
Milos Kozak
e1dc69cd4d
visualize min carbs absorption
2018-04-19 22:31:07 +02:00
Milos Kozak
4f4f92ff76
Merge pull request #895 from triplem/mgdl_mmol_handling
...
Cleanup mmol/mgdl TT handling in Dialogs
2018-04-19 21:00:47 +02:00
AdrianLxM
11b88c7947
Merge remote-tracking branch 'milosremote/dev' into cob-rework
2018-04-19 20:22:14 +02:00
AdrianLxM
dfa05711d3
Merge pull request #892 from MilosKozak/carbs-gen-pr
...
Carbs gen pr
2018-04-19 20:19:10 +02:00
AdrianLxM
9e9270bff7
cleanups
2018-04-19 19:34:38 +02:00
AdrianLxM
ed24a129ae
unify Default in settings xml and constants
2018-04-19 19:32:50 +02:00
AdrianLxM
6df614e7c6
Merge remote-tracking branch 'milosremote/dev' into cob-rework
2018-04-19 19:29:27 +02:00
AdrianLxM
eac6f15881
XDrip source description extra
2018-04-19 17:49:18 +02:00
AdrianLxM
572b308f6c
cleanup
2018-04-19 17:47:34 +02:00
AdrianLxM
a227a8b601
Push source to xDrip plugin
2018-04-19 17:45:52 +02:00
AdrianLxM
938040ae6b
xDrip plugin depend filtering on source
2018-04-19 17:44:52 +02:00
AdrianLxM
d810be9b6a
consider absorption time for carbs - not DIA
2018-04-19 14:03:30 +02:00
AdrianLxM
8d94acb051
more cleanups
2018-04-19 13:44:06 +02:00
AdrianLxM
d7bf3c563a
cleanup
2018-04-19 13:35:52 +02:00
AdrianLxM
09cc8c01b6
use min5min impact actually used for SMB
2018-04-19 13:31:34 +02:00
AdrianLxM
f4dea97f36
cutoff at max absorption time
2018-04-19 13:04:21 +02:00
AdrianLxM
00c05c0e23
totalMinCarbsImpact depending on sensitivty plugin
2018-04-19 12:57:13 +02:00
AdrianLxM
e8406320e0
COB settings
2018-04-19 11:48:00 +02:00
AdrianLxM
542cc9ac7f
Update Overview on Profile Switch
2018-04-19 01:38:27 +02:00
Markus M. May
83da3447ac
Cleanup mmol/mgdl handling in Dialogs
2018-04-18 22:11:32 +02:00
AdrianLxM
38a0dc5c05
Merge branch 'carbs-gen-pr' into carbsgen0418
2018-04-18 16:55:19 +02:00
Milos Kozak
2fb199ae6c
fix insulin dialog TT & TT sync from NS
2018-04-18 16:34:46 +02:00
AdrianLxM
dd8d907f4f
fix TT units
2018-04-18 16:23:40 +02:00
AdrianLxM
2561c3f8b6
Carbs only treatments in Queue
2018-04-18 16:13:02 +02:00
Johannes Mockenhaupt
49a836eda9
NewNSTreatmentDialog: add Hypo TT preset.
2018-04-18 16:03:23 +02:00
AdrianLxM
2cf438a064
Merge remote-tracking branch 'jotomoremote/carbs-gen-pr' into carbsgen0418
2018-04-18 16:00:00 +02:00
Johannes Mockenhaupt
5d1c6cd118
Move "show notes ..." pref into Buttons submenu.
2018-04-17 21:03:16 +02:00
AdrianLxM
00a0bf2f1a
local profile icons
2018-04-17 20:41:43 +02:00
AdrianLxM
eb2f628f1f
unify names of same icon with different resolution
2018-04-17 20:41:33 +02:00
Alessya
05a1b35ccb
Rename Icon files
2018-04-17 20:41:21 +02:00
Alessya
8dd589c5fe
New icons added for local profile screen
2018-04-17 20:41:07 +02:00
Alessya
91b58446ca
Rename Icon files
2018-04-17 15:59:00 +03:00
Alessya
b2fb14e57a
New icons added for local profile screen
2018-04-17 15:57:54 +03:00
swissalpine
ca5001e3a4
Update CareportalFragment.java
2018-04-17 14:42:41 +02:00
Milos Kozak
7063f4de8b
Merge pull request #879 from MilosKozak/temptargetfix
...
NewNSTreatment dialog cleanup
2018-04-17 07:45:08 +02:00
Milos Kozak
abadcd4eaa
fix test
2018-04-16 23:29:53 +02:00
swissalpine
7ef5b4fb28
More realistic colored IAGE warnings
...
Normaly Insulin should be stable at least 4-5 days. So I think a warning after two days and a red alarm after three is two early. I changed the default values to 72 hours for the yellow and 86 hours for the red warning.
2018-04-16 20:31:37 +02:00
Johannes Mockenhaupt
c7c90ea919
Proper fix.
2018-04-16 10:11:48 +02:00
Johannes Mockenhaupt
0ef8af262f
NewInsulinDialog: fix botched notes field reference.
2018-04-16 01:40:52 +02:00
Johannes Mockenhaupt
58aa4f1323
Unbreak wizard xml, small fixes.
2018-04-15 19:29:23 +02:00
Johannes Mockenhaupt
447bd9b6a3
Alignments.
...
(cherry picked from commit a63c388)
2018-04-15 00:28:08 +02:00
Johannes Mockenhaupt
9b80221752
Set inputType for notes fields.
...
(cherry picked from commit af0807d)
2018-04-14 10:43:48 +02:00
Johannes Mockenhaupt
5d66ecc767
NewCarbsDialog: use correct 'constraint applied' messages.
...
(cherry picked from commit a9e290e)
2018-04-14 10:43:39 +02:00
Johannes Mockenhaupt
10604299e7
Cleanups.
2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt
f420491611
NewCarbsDialog: cleanups.
2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt
bf7e9e4bf3
NewInsulinDialog: add notes field, use relative time, align style.
2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt
719d3d459b
NumberPicker: apply signed, decimal constraints for keyboard usage.
2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt
efcc02775b
FillDialog: add missed validation, notes field, align style.
2018-04-13 21:35:25 +02:00
AdrianLxM
10b9171afe
Distribute carbs strictly within timeframe
2018-04-13 00:48:57 +02:00
Milos Kozak
d9ac199559
Merge pull request #878 from triplem/fix_objectives
...
Fix Objectives Issue #842
2018-04-12 22:26:51 +02:00
Milos Kozak
54048b29c4
NewNSTreatment dialog cleanup
2018-04-12 21:45:59 +02:00
Johannes Mockenhaupt
bf02edd871
Make visibility of notes field a preference.
2018-04-12 21:43:55 +02:00
Johannes Mockenhaupt
05e07cf943
Align style of labels, i18n.
2018-04-12 21:32:47 +02:00
Johannes Mockenhaupt
4acf0c713a
Merge remote-tracking branch 'origin/dev' into carbs-gen-pr
...
* origin/dev:
Adding notes to carbs and to wizard on overview
2018-04-12 21:23:30 +02:00
Johannes Mockenhaupt
7e19aff121
Merge remote-tracking branch 'origin/dev' into carbs-gen-pr
...
* origin/dev:
Overview: fix rendering zero-temp covering entire displayed range.
cleanup
remove duplicate upload
upload temptargets to NS properly
fix NPE
log profile conditional
adding device name to AndroidAPS started note
show tests in travis
gradle 3.1.1
Remove CB.getActiveLoop(), use LoopPlugin.getPlugin().
added phone Manufacturer and model note to NS
dummy-edit to re-trigger travis
Fix for black number and labels on black background (aaps wear)
Fix re-enabling the loop plugin from overview. Fixes #861 .
int to double in the isOlderThan()
Get thresholds from NS
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java
2018-04-12 21:18:04 +02:00
Milos Kozak
7fafd59a5e
Merge pull request #872 from triplem/notes_wizard
...
Notes wizard
2018-04-12 21:17:33 +02:00
Milos Kozak
c573bcc277
Merge pull request #876 from MilosKozak/temptargetfix
...
upload temptargets to NS properly
2018-04-12 21:17:11 +02:00
Markus M. May
42e36ab818
Fix #842
2018-04-12 21:08:06 +02:00
Johannes Mockenhaupt
b04eee0b52
Overview: fix rendering zero-temp covering entire displayed range.
...
(cherry picked from commit 525eaef)
2018-04-12 21:00:08 +02:00
Johannes Mockenhaupt
a075d87da1
Remove help dialog.
...
(cherry picked from commit b1ef8e1)
2018-04-12 20:59:24 +02:00
Milos Kozak
0a377eb98e
cleanup
2018-04-12 10:32:52 +02:00
Milos Kozak
5eee8054c4
remove duplicate upload
2018-04-12 10:21:38 +02:00
Milos Kozak
dfc869ba2b
upload temptargets to NS properly
2018-04-12 10:17:59 +02:00
Milos Kozak
80e81b1c25
fix NPE
2018-04-12 09:53:14 +02:00
Milos Kozak
613b8a2f30
log profile conditional
2018-04-12 09:40:12 +02:00
Johannes Mockenhaupt
5ef2502b4f
Saner types.
2018-04-12 00:50:28 +02:00
Johannes Mockenhaupt
b1f66d086a
Fix overshoot on last carb record.
2018-04-12 00:42:12 +02:00
Markus M. May
ca53b94498
Merge branch 'dev' into notes_wizard
2018-04-11 20:05:47 +02:00
Milos Kozak
263263daf1
Merge pull request #869 from PoweRGbg/phoneModel
...
Phone model note added to Ns #841
2018-04-11 17:57:30 +02:00
Roumen Georgiev
1acefaea3c
adding device name to AndroidAPS started note
2018-04-11 18:09:08 +03:00
Milos Kozak
83421c7266
show tests in travis
2018-04-11 16:23:35 +02:00
Johannes Mockenhaupt
d0edd89b5b
Remove CB.getActiveLoop(), use LoopPlugin.getPlugin().
2018-04-11 15:42:51 +02:00
Johannes Mockenhaupt
61cce65947
Revert "NewCarbsDialog: prefill with carbsReq."
...
This reverts commit f8d022ba87
2018-04-11 15:22:38 +02:00
Roumen Georgiev
564e87d782
added phone Manufacturer and model note to NS
2018-04-11 15:44:53 +03:00
Johannes Mockenhaupt
f8d022ba87
NewCarbsDialog: prefill with carbsReq.
2018-04-11 13:05:54 +02:00
Johannes Mockenhaupt
9b3b228aad
Color active/scheduled bolus/carbs and TT entries in treatment tab.
2018-04-11 13:05:54 +02:00
Johannes Mockenhaupt
d2491ca429
NewCarbsDialog: add duration, help.
2018-04-11 13:05:54 +02:00
Johannes Mockenhaupt
80be7fb586
Fix re-enabling the loop plugin from overview. Fixes #861 .
...
Note that enabling a loop plugin is hardcoded against the only
impl currently available LoopPlugin. Support for multiple loop
plugins is incomplete (and not needed at this point), since
there's no LoopInterface, but immediately LoopPlugin (as compared
to APSInterface with OpenAPS* impls).
When adding support, the last activated loop plugin must be remembered
so the correct one is re-enabled.
2018-04-10 12:10:19 +02:00
Markus M. May
99c8bbc6c2
Adding notes to carbs and to wizard on overview
2018-04-09 22:10:08 +02:00
Milos Kozak
e9ac979a1b
fix NPE in TempBasal treatments tab
2018-04-09 19:52:01 +02:00
AdrianLxM
d1d46849ee
Merge pull request #832 from MilosKozak/lp-edit
...
LocalProfile reset/save button
2018-04-09 14:08:22 +02:00
Milos Kozak
b2129fa48e
Merge pull request #857 from TebbeUbben/disable-tdd-load-button
...
Hide TDD buttons
2018-04-09 00:36:48 +02:00
Milos Kozak
0f0d68e46a
Merge pull request #855 from TebbeUbben/automatic-careportal-events
...
Automatic careportal events
2018-04-09 00:35:23 +02:00
Milos Kozak
82bb65560b
QuickWizardTest part1
2018-04-09 00:37:23 +02:00
Milos Kozak
9b91b4ab93
Merge branch 'dev' into automatic-careportal-events
2018-04-08 23:53:04 +02:00
Milos Kozak
05591cd762
missing conditional logging
2018-04-08 22:28:05 +02:00
Milos Kozak
44e923dd09
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-04-08 22:24:51 +02:00
Milos Kozak
4663bb3cf6
extended boluses NS sync fix
2018-04-08 22:24:04 +02:00
Milos Kozak
a609d806d1
fix tests
2018-04-08 20:37:05 +02:00
TebbeUbben
df7d93ab2a
Check for TDD support in updateGUI
2018-04-08 20:33:07 +02:00
TebbeUbben
851cec7240
Renamed alerts.xml to insight_alerts.xml
2018-04-08 20:27:23 +02:00
Milos Kozak
d9279eed2a
split MaxIOB for SMB
2018-04-08 20:17:15 +02:00
TebbeUbben
42541fc7e3
Switched back to custom careportal code
2018-04-08 18:57:29 +02:00
TebbeUbben
b488e30459
Use uploadError for pump alarms
2018-04-08 18:46:29 +02:00
TebbeUbben
56b2799785
Added insight_real_tbr_cancel option again
2018-04-08 18:32:11 +02:00
TebbeUbben
50458d1fbc
log.error("Unhandled exception", e);
2018-04-08 18:15:27 +02:00
TebbeUbben
b3c1bf6e7d
Hide TDD button if pump doesn't support them
...
Hide reload button if pump doesn't need it
2018-04-08 17:54:16 +02:00
TebbeUbben
d3342d13f5
Added ACTION_OCCURENCE_OF_ALERT to IntentFilter
2018-04-08 17:28:48 +02:00
TebbeUbben
f8d4dbf6a1
Add pump alerts as notes
2018-04-08 17:22:53 +02:00
AdrianLxM
5c6e598cd6
Merge branch 'dev' into lp-edit
2018-04-08 16:14:43 +02:00
TebbeUbben
5022a77711
Automatic careportal events
2018-04-08 14:31:24 +02:00
TebbeUbben
ba83f7f499
Correct lastDataTime handling
2018-04-08 13:43:37 +02:00
Milos Kozak
7a74364af6
remove unused catch
2018-04-07 16:43:20 +02:00
Milos Kozak
2fee7f3186
fix NPE in Simulator
2018-04-07 16:33:37 +02:00
Milos Kozak
ca01fcc270
1.60d-dev
2018-04-07 09:35:21 +02:00
Milos Kozak
485bbd5d68
Merge pull request #850 from TebbeUbben/dev
...
Insight - Support for TDDs
2018-04-06 21:50:01 +02:00
TebbeUbben
1d2cd4b9cf
Support for TDDs
2018-04-06 21:39:42 +02:00
Milos Kozak
78ffae6e47
Merge pull request #849 from jotomo/combo-cleanup
...
Combo cleanup
2018-04-06 21:14:50 +02:00
Milos Kozak
35decd0e53
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-04-06 21:12:14 +02:00
Milos Kozak
74edadd1e5
fix detailedbolusinfo for DanaRS
2018-04-06 21:07:29 +02:00
Milos Kozak
7cf2505276
Better time synchronization for DanaRS
2018-04-06 19:07:47 +02:00
Milos Kozak
fc56af7add
Fix detailedbolusinfo for DanaRv2
2018-04-06 18:58:13 +02:00
Milos Kozak
c94d01f22b
better time synchronization for danarv2
2018-04-06 18:30:36 +02:00
Johannes Mockenhaupt
623a5e3da1
Combo: remove unused strings, minor code cleanups.
2018-04-06 11:42:33 +02:00
Johannes Mockenhaupt
344d9c1f49
Combo: remove 'read history' button.
...
History and basal rate profile are permanently checked and updated. This
functionality would only be needed if driver was fundamentally broken.
2018-04-06 11:35:35 +02:00
Johannes Mockenhaupt
db4439f1cc
Combo: remove half-backed alerts dialog.
2018-04-06 11:35:34 +02:00
Johannes Mockenhaupt
e937a777ba
Combo: remove superseeded TDD button and dialog.
2018-04-06 11:35:34 +02:00
Milos Kozak
828b20e358
optimize notifications & overview, fix reporting profile update
2018-04-05 23:42:27 +02:00
Milos Kozak
a3811b503f
catch the thread
2018-04-05 23:28:17 +02:00
Milos Kozak
f2a7876466
Merge pull request #846 from swissalpine/patch-1
...
Overview fragment: Show "Disconnected" when disconnected not "Suspended"
2018-04-05 23:22:44 +02:00
Milos Kozak
e5bf36bfe3
code cleanup
2018-04-05 23:21:08 +02:00
Milos Kozak
36d94ecdef
Merge branch 'dev' into PoweRGbg/patch-15
2018-04-05 22:14:26 +02:00
Milos Kozak
b520a077f8
Merge branch 'dev' into PoweRGbg/patch-15
2018-04-05 22:05:47 +02:00
swissalpine
afebf30bc0
Add string loopdisconnectedfor
2018-04-05 21:55:07 +02:00
swissalpine
4ec959b0c4
Show "Disconnected (2d m)" on overview fragment
2018-04-05 21:53:09 +02:00
Markus M. May
a5a0a27db6
Xchange activity and eating soon temp target mgdl
2018-04-05 20:38:49 +02:00
Milos Kozak
ee133f87ae
fix test
2018-04-05 10:56:55 +02:00
Milos Kozak
ba7d0aebaa
show message ragarding closed loop mode only if closed mode is enabled in preferences
2018-04-05 10:46:23 +02:00
Milos Kozak
a615553047
check for profile already set before notification
2018-04-05 10:02:57 +02:00
Milos Kozak
aebaa76864
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-04-05 09:39:34 +02:00
Milos Kozak
f6cd1201e3
Treatments refactor
2018-04-05 09:39:18 +02:00
Roumen Georgiev
934fedaa73
added determineTextColor() to shorten source
2018-04-05 10:01:16 +03:00
Roumen Georgiev
6ace7080b2
changed isOlderThan() parameter to hours not days
2018-04-05 09:58:55 +03:00
Roumen Georgiev
269382f5ff
Default values of CAGE, SAGE .. like in NS
2018-04-05 09:37:20 +03:00
Milos Kozak
d235fc0bfb
show build flavor in about dialog
2018-04-05 00:08:59 +02:00
Markus M. May
79094a92f9
Provide newer support libraries, compile with 27 and target 25
2018-04-04 22:46:44 +02:00
Markus M. May
3e792ebfe3
Downgrade supportLibVersion
2018-04-04 21:53:37 +02:00
Markus M. May
b7840fb5b5
Revert compileSdkVersion as well
2018-04-04 21:44:23 +02:00
Markus M. May
c3bec7e7a6
Revert targetSdkVersion
2018-04-04 21:38:47 +02:00
Milos Kozak
16319aeb52
logging options
2018-04-04 17:51:39 +02:00
AdrianLxM
8c303fd447
notifications for oreo quickfix
2018-04-04 14:55:25 +02:00
Roumen Georgiev
5e418c5916
adding color for warn levels of cage,sage...
2018-04-04 14:55:29 +03:00
Roumen Georgiev
29bbc9dfec
added method to get iage,cage,sage
2018-04-04 14:52:52 +03:00
Roumen Georgiev
2c42bad48d
change name of threshold to days to clarify
2018-04-04 12:22:54 +03:00
Roumen Georgiev
5e56e2afa0
Get thresholds from NS
...
thresholds in NS are in hours
2018-04-04 12:16:01 +03:00
Roumen Georgiev
5e045264d5
changed isOlderThan(int) to double
2018-04-04 12:14:19 +03:00
Roumen Georgiev
f284483500
used isOlderThan
2018-04-04 09:37:08 +03:00
Roumen Georgiev
d50f31e7a6
change age(int) to boolean isOldetThan()
2018-04-04 09:35:45 +03:00
AdrianLxM
009f5dfa38
reset -> strings.xml
2018-04-03 18:37:34 +02:00
AdrianLxM
933b1acd7e
lp save button
2018-04-03 18:33:13 +02:00
AdrianLxM
f17deaedfb
lp isValid
2018-04-03 17:54:29 +02:00
AdrianLxM
b4c3c3f216
no lazy-loading of converted profile
2018-04-03 16:53:22 +02:00
AdrianLxM
75a91997b7
lp reset
2018-04-03 14:34:15 +02:00
Roumen Georgiev
ddf39e8d55
added color when values are old
...
harcoded values fo SAGE, CAGE ...
2018-04-03 09:18:01 +03:00
Roumen Georgiev
f800d695ff
SAGE, CAGE ... change color if old - second try
...
requested in #811
2018-04-03 09:15:28 +03:00
Markus M. May
9006721873
Version bump butterknife plugin
2018-04-02 22:43:20 +02:00
Milos Kozak
c06b89e8e4
targetSdkVersion 27
2018-04-02 12:03:41 +02:00
Milos Kozak
149818a902
Merge pull request #821 from triplem/g44
...
Gradle Update to 4.4
2018-04-02 10:28:13 +02:00
Milos Kozak
ad74a9ba9a
fix errors in tests
2018-04-02 10:29:19 +02:00
Markus M. May
6d6dee6f0b
Use org.junit instead of junit.framework, use static imports
2018-04-01 23:01:37 +02:00
Milos Kozak
3cfc9c16fe
check 3min timeout SMB right before execution
2018-04-01 22:33:32 +02:00
Milos Kozak
0e9366c6fe
log existing db record
2018-04-01 22:21:46 +02:00
Markus M. May
0bf84d4fa2
Break build on linting
2018-04-01 20:53:53 +02:00
Markus M. May
297c288e6a
Disable abortOnError on linting
2018-04-01 20:49:02 +02:00
Markus M. May
6024f0f5ee
Remove unnecessary gitignores
2018-04-01 20:49:02 +02:00
Markus M. May
5ef062c22f
inital gradle update
2018-04-01 20:49:02 +02:00
Milos Kozak
5a192d82d0
read pump status after pump driver change
2018-04-01 20:04:54 +02:00
Milos Kozak
5e2fdebc07
fix travis
2018-04-01 20:02:22 +02:00
Milos Kozak
5ce184e67d
fix time in dialogs during DST change
2018-04-01 18:44:58 +02:00
Milos Kozak
89ee73ef7d
fix state when new thread was not started during waiting for pump disconnection
2018-04-01 12:34:41 +02:00
Milos Kozak
5fa56b22c9
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-04-01 11:10:24 +02:00
Milos Kozak
0a03798de9
move treatments interface out of ConfigBuilder
2018-04-01 11:09:58 +02:00
Johannes Mockenhaupt
280ed14c6b
Unbreak WearPlugin.
2018-04-01 02:20:36 +02:00
Milos Kozak
8d35a89870
Merge pull request #818 from MilosKozak/insulin-plugins
...
remove old insulin plugins
2018-03-31 22:51:18 +02:00
Milos Kozak
e9c7bdc7f4
add necessity of profile switch to objectives
2018-03-31 22:30:42 +02:00
Milos Kozak
34ec1225c6
fix NSCLIENT after plugin refactor
2018-03-31 21:41:14 +02:00
Milos Kozak
a91aeec144
fix nsclient layout
2018-03-31 20:32:47 +02:00
AdrianLxM
45c7753175
remove old insulin plugins
2018-03-31 19:36:44 +02:00
Milos Kozak
c57d14aa05
MainAppTest
2018-03-31 15:00:32 +02:00
Milos Kozak
6e69b25d8a
Merge branch 'wip' into dev
2018-03-31 12:41:43 +02:00
Milos Kozak
66f6ddf052
Subscribe fix
2018-03-31 12:12:49 +02:00
Milos Kozak
364364f205
ConfigBuilderTest
2018-03-31 11:31:09 +02:00
Milos Kozak
1c6c5f85f7
DanaR pumps lifecycle
2018-03-31 10:36:57 +02:00
Milos Kozak
a30334f5d5
PluginDescriptionTest
2018-03-31 10:09:29 +02:00
Milos Kozak
3b3662af80
Merge branch 'dev' into wip
2018-03-31 00:39:35 +02:00
Milos Kozak
bcb733e42c
Plugins refactor
2018-03-31 00:36:03 +02:00
Markus M. May
314275d4b4
Remove unnecessary imports, rename method
2018-03-30 20:02:04 +02:00
Milos Kozak
e4f2049405
PumpEnactTestResult
2018-03-29 18:44:16 +02:00
Johannes Mockenhaupt
a36a9b0746
Move check for running setProfile command to KeepAlive.
2018-03-28 22:49:43 +02:00
Johannes Mockenhaupt
014864f0db
Trigger fabric event on user request, not queuing time.
2018-03-28 22:12:14 +02:00
Johannes Mockenhaupt
52c6d209af
Clean up initial profile push to pump.
2018-03-28 21:20:56 +02:00
Milos Kozak
259b5fa818
Merge pull request #809 from MilosKozak/tdds-again-merged
...
Tdds again merged
2018-03-28 17:35:23 +02:00
Milos Kozak
fc2da20743
fix conflict
2018-03-28 10:25:58 +02:00
Milos Kozak
e9b499314d
PUMP SMS command, connect to pump before reporting SMS STATUS
2018-03-28 10:22:10 +02:00
Milos Kozak
7b43971618
fix NPE
2018-03-27 21:49:10 +02:00
Milos Kozak
27c4fe3309
fix NPE
2018-03-27 21:43:35 +02:00
Milos Kozak
e49d430a50
revert DetailedBulusInflo cloning
2018-03-27 20:16:33 +02:00
Milos Kozak
cb4b117152
fix extended bolus NS upload
2018-03-27 20:00:34 +02:00
Milos Kozak
3567320788
fix test
2018-03-27 19:45:44 +02:00
Milos Kozak
eaecf48577
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-03-27 16:41:44 +02:00
Milos Kozak
95f2e5d913
IobTotalTest
2018-03-27 16:41:37 +02:00
Milos Kozak
6aa568a03e
Merge pull request #812 from jotomo/cleanups
...
Cleanups
2018-03-27 16:38:49 +02:00
Johannes Mockenhaupt
dffdc49c3b
SMB fragement: trim superflous newlines.
2018-03-27 14:52:36 +02:00
Johannes Mockenhaupt
da6f6dfe72
Clean up missed spots w.r.t. to FabricPrivacy transition.
2018-03-27 14:52:31 +02:00
Milos Kozak
689fda5969
IobTest
2018-03-27 14:36:43 +02:00
Milos Kozak
1b9b20cd41
1st ProfileSwitch must be with zero duration, ProfileIntervalsTest
2018-03-27 14:19:52 +02:00
Milos Kozak
0a87b0ede7
MealDataTest
2018-03-26 22:59:04 +02:00
Milos Kozak
f8c9fac7b1
NonOverlapingIntervalsTest 2nd
2018-03-26 22:55:38 +02:00
Milos Kozak
cc436a09d9
TempBasal, TempTarget refactor; NonOverlapingIntervalsTest
2018-03-26 22:37:53 +02:00
Milos Kozak
a4cb4cbbd5
OverlapingIntervalsTest
2018-03-26 19:46:18 +02:00
Milos Kozak
21c6827cf4
more GlucoseStatusTests
2018-03-26 17:47:25 +02:00
Milos Kozak
d071ca5b88
GlucoseStatusTest & fix
2018-03-26 16:51:25 +02:00
Milos Kozak
5c5b8ee2f0
DetailedBolusInfo test & fix
2018-03-26 13:25:53 +02:00
Milos Kozak
482d4f4454
1.60b-dev
2018-03-26 11:07:50 +02:00
Milos Kozak
cf619aa1fa
nicer scale on basal graph
2018-03-26 11:07:16 +02:00
Milos Kozak
d357b00ca6
display activate button properly
2018-03-26 10:56:56 +02:00
Milos Kozak
f0e779cb1f
set axisWidth based on dpi
2018-03-26 10:53:14 +02:00
Milos Kozak
8e6953cc92
activate button on NSProfile fragment
2018-03-26 09:25:57 +02:00
AdrianLxM
6c20d9b6c6
TDD 13 mergeconflict AbstractDanaPlugin
2018-03-26 08:51:17 +02:00
AdrianLxM
4a4982f6b8
TDD 12 mergeconflict Insight renaming
2018-03-26 08:47:44 +02:00
Milos Kozak
545debde92
fix displaying nsprofile
2018-03-26 08:46:26 +02:00
AdrianLxM
a5d0ec45cc
Merge remote-tracking branch 'milosremote/dev' into tdds-again-merged
2018-03-26 08:39:24 +02:00
Milos Kozak
d5e60fa16f
fix negative correction in wizard
2018-03-26 07:49:09 +02:00
Milos Kozak
afe3d68a10
display SMB reasons
2018-03-25 23:56:52 +02:00
Milos Kozak
4d6d7941ac
try to catch getProfile errors
2018-03-25 18:51:16 +02:00
Milos Kozak
afb0249072
try to catch iobcalculation error
2018-03-25 18:03:55 +02:00
Milos Kozak
ca12124c10
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-03-25 17:33:17 +02:00
Milos Kozak
f939994afa
more synchronized access in treatments
2018-03-25 17:33:03 +02:00
Milos Kozak
8c5a2ab524
Merge pull request #799 from jotomo/prime-fill-refresh
...
Prime/fill button refresh and some drive-by improvements
2018-03-25 16:10:39 +02:00
Johannes Mockenhaupt
7c959ce335
Create careportal events with explicit time.
2018-03-25 15:43:48 +02:00
Johannes Mockenhaupt
593174d6d2
Revert all changes to NSUpload.
2018-03-25 15:39:34 +02:00
Milos Kozak
51e0774021
prevent creating careportal event of the same time
2018-03-25 15:02:51 +02:00
Johannes Mockenhaupt
8a2d49b833
Fix the correct method.
2018-03-24 20:13:50 +01:00
Johannes Mockenhaupt
5a6af7f6d5
Unbreak NSUpload.updateProfileSwitch methods.
2018-03-24 20:03:45 +01:00
Milos Kozak
2cfa2ae8cf
overview graph rendering update
2018-03-24 18:10:57 +01:00
Milos Kozak
bcf71d70dc
increase font size
2018-03-24 17:33:23 +01:00
Milos Kozak
b2db393436
fix rendering in nsclient mode
2018-03-24 17:21:55 +01:00
Milos Kozak
1dfa8eb1a4
hide deviation slope
2018-03-24 17:10:33 +01:00
Milos Kozak
62d775b78e
DEV warning only for APS builds
2018-03-24 17:09:56 +01:00
Milos Kozak
9af8672cab
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-03-24 15:14:40 +01:00
Milos Kozak
90390c91ab
fix NPE when profile doesn't exists
2018-03-24 15:13:31 +01:00
Johannes Mockenhaupt
7694c80da9
Fix format specifiers in Spanish translation.
2018-03-24 10:53:46 +01:00
Milos Kozak
3d710dcf46
fix rendering TT in mmol
2018-03-23 23:55:38 +01:00
Johannes Mockenhaupt
a4e9cb4976
Fixes.
2018-03-23 23:15:38 +01:00
Johannes Mockenhaupt
8a7776fd74
Code dedup.
2018-03-23 23:07:01 +01:00
Johannes Mockenhaupt
3700ad9813
Ensure new Careportal entries don't use the same second.
2018-03-23 23:06:57 +01:00
Johannes Mockenhaupt
9838e2fabb
Rework prime/fill button.
2018-03-23 23:06:57 +01:00
Johannes Mockenhaupt
e5bfa1fb1d
Show boluses with the precision the pump actually supports.
2018-03-23 23:02:35 +01:00
Milos Kozak
22f50198fc
rename nsclientinternal -> nsclient
2018-03-23 22:44:37 +01:00
Milos Kozak
cbd60cfdbe
synchronized access to log in nsclient
2018-03-23 22:37:27 +01:00
Milos Kozak
22d617cbc0
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-03-23 20:53:44 +01:00
Milos Kozak
4502ed6807
1.60a-dev
2018-03-23 20:53:25 +01:00
Milos Kozak
9f67ad6b62
synchronized access to treatment data
2018-03-23 20:52:41 +01:00
Milos Kozak
044a3fc10f
LoopPluginTest
2018-03-23 20:10:45 +01:00
Milos Kozak
30f09dc416
show constraints on LoopFragment
2018-03-23 18:23:19 +01:00
Milos Kozak
661595792f
rename InsightPump -> Insight
2018-03-23 17:51:05 +01:00
Milos Kozak
15d8719508
collect most limited reason along with all reasons
2018-03-23 17:36:49 +01:00
Milos Kozak
3f5808eca3
show max basal limit on smb fragment
2018-03-23 09:59:07 +01:00
Milos Kozak
ad8ff15cdc
getMax... constraints functions
2018-03-22 23:20:10 +01:00
Milos Kozak
0f531a9954
objectives cleanup & basal hard limits to constraints
2018-03-22 23:05:00 +01:00
Milos Kozak
ba09538f46
AMA - Autosens cleanup
2018-03-22 22:18:40 +01:00
Milos Kozak
ae57241833
use default functions in constraint interface
2018-03-22 21:31:32 +01:00
Milos Kozak
76ee3c51e4
applyMaxIOBConstraints refactor & tests
2018-03-22 21:13:26 +01:00
Milos Kozak
1aba9a2564
applyCarbsConstraints refactor & tests
2018-03-22 10:31:07 +01:00
Milos Kozak
15158fb5ea
applyBolusConstraints refactor & tests
2018-03-21 23:01:30 +01:00
Milos Kozak
c68ab9f1ca
applyBasalPercentConstraints refactor & tests part2
2018-03-21 22:06:28 +01:00
Milos Kozak
e2ea44a8a8
applyBasalPercentConstraints reactor & tests part1
2018-03-21 20:24:02 +01:00
Milos Kozak
ca70cbdaec
Merge branch 'dev' into newconstraints
2018-03-21 10:48:23 +01:00
Milos Kozak
272fdb4747
Merge pull request #779 from jotomo/loop-results
...
Loop results
2018-03-21 10:44:13 +01:00
Milos Kozak
7a5d8e2ec9
use US locale in tests
2018-03-21 07:51:27 +01:00
Milos Kozak
51ca4cc8c6
show failed tests at the end of travis log
2018-03-21 07:41:03 +01:00
Milos Kozak
ad7ec4daca
fix tests
2018-03-20 23:47:37 +01:00
Milos Kozak
15ebfc1193
applyBasalConstraints reactor & tests
2018-03-20 22:09:22 +01:00
Johannes Mockenhaupt
e117527257
Revert "Merge pull request #770 from jotomo/new-bg-processing"
...
This reverts commit 7f0918d1473f04d10f79
2018-03-20 19:05:12 +01:00
AdrianLxM
60247daca2
Revert "Fixed typo: Temorär -> Temporär"
2018-03-20 16:19:51 +01:00
AdrianLxM
a14d698530
small correction to trigger travis again
2018-03-20 15:56:13 +01:00
Mathias Dalheimer
309ee1b9a6
Fixed typo: Temorär -> Temporär
2018-03-20 15:37:47 +01:00
Milos Kozak
d62a836f6c
resistant adult max bolus 25U
2018-03-20 10:07:52 +01:00
AdrianLxM
fd1e78acef
TDD 11 - fix DanaR
2018-03-19 23:15:13 +01:00
Milos Kozak
c2cfe4e7ea
isSMBModeEnabled reactor & tests
2018-03-19 23:14:04 +01:00
Milos Kozak
26ecc3dd60
isAMAModeEnabled reactor & tests
2018-03-19 22:59:25 +01:00
Milos Kozak
f8a3b7aee7
isAutosensModeEnabled reactor & tests
2018-03-19 22:36:08 +01:00
Milos Kozak
f6fdef7986
isClosedLoopAllowed & isLoopInvokationAllowed tests
2018-03-19 22:20:42 +01:00
AdrianLxM
fcf8569b1e
TDD 10 - split list and cumulative
2018-03-19 21:54:50 +01:00
AdrianLxM
9177307c37
TDD 09 - fix no data
2018-03-19 21:14:28 +01:00
AdrianLxM
088841ae23
TDD 08 - fix crash on empty
2018-03-19 20:23:45 +01:00
AdrianLxM
b6b7955dde
TDD 07
2018-03-19 20:03:15 +01:00
AdrianLxM
e0dac6f24e
TDD 06
2018-03-19 19:49:48 +01:00
AdrianLxM
954f73eabd
TDD 05
2018-03-19 19:10:54 +01:00
AdrianLxM
db7526a7b5
TDD 04
2018-03-19 19:10:40 +01:00
AdrianLxM
f33b4d4838
TDD 03
2018-03-19 19:10:24 +01:00
AdrianLxM
8700f20d5f
TDD 02 - combo
2018-03-19 19:10:09 +01:00
AdrianLxM
1e1a58468f
TDD 01
2018-03-19 19:08:51 +01:00
AdrianLxM
f4cebd8a7c
Merge remote-tracking branch 'milosremote/newconstraints' into newconstraints2
2018-03-19 18:49:26 +01:00
AdrianLxM
01a9e76827
refactor a bit
2018-03-19 18:45:23 +01:00
Milos Kozak
7178e1573a
fix CommandQueueTest
2018-03-19 18:44:11 +01:00
Milos Kozak
ce63655097
move constraints interface functions from ConfigBuilder to ConstraintsChecker class
2018-03-19 18:21:02 +01:00
Milos Kozak
52ffcba047
generic Constraint type
2018-03-19 17:38:48 +01:00
Milos Kozak
326229ebbb
limitClosedLoop & remove openloop flavor
2018-03-19 17:06:22 +01:00
Johannes Mockenhaupt
86b25174e2
Combo: unbreak basal rate conversion.
...
This aligns the combo with the changes from the nodefaultprofile
merge.
2018-03-19 15:59:23 +01:00
Milos Kozak
5a96b88499
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into newconstraints
2018-03-19 15:11:50 +01:00
Johannes Mockenhaupt
85d8730eae
Add missing return.
2018-03-19 14:33:57 +01:00
Johannes Mockenhaupt
ede1e719d2
CB.applyTBRRequest: enact same-rate TBR ...
...
if requested duration is at least 30m longer than the currently
running TBR.
2018-03-19 14:14:07 +01:00
Johannes Mockenhaupt
f918a5f303
More loop results cleanup and i18n.
2018-03-19 14:14:07 +01:00
Johannes Mockenhaupt
706bb913e9
LoopPlugin: fix 'waiting for pump' display for SMB.
2018-03-19 14:14:07 +01:00
Johannes Mockenhaupt
d1f1db859b
Translations cleanup.
2018-03-19 14:14:07 +01:00
Johannes Mockenhaupt
fad10af11b
Clean ups around PumpEnactResult, APSResult.
2018-03-19 14:08:39 +01:00
Johannes Mockenhaupt
379df79bf8
CB.applySMBRequest: return reason when skipping due to frequency.
2018-03-19 14:08:39 +01:00
Johannes Mockenhaupt
213fc7ccb4
Combo: when suspended, create 0% TBR record, suppress checks.
...
Fixes #774
2018-03-19 14:07:26 +01:00
AdrianLxM
69cfa63fe5
xml-format ro
2018-03-19 13:33:11 +01:00
AdrianLxM
3ade9be7a2
cleanup
2018-03-19 13:32:05 +01:00
Milos Kozak
b0a9f678f0
limitRunningLoop constraint
2018-03-19 13:11:25 +01:00
Milos Kozak
f413c005f6
CS translations
2018-03-19 10:07:28 +01:00
Milos Kozak
1c413cc49f
Merge pull request #771 from jotomo/remove-pre-bolus
...
Next round of button updates
2018-03-19 09:29:27 +01:00
Milos Kozak
0266a79201
show invalid profiles in treatments tab
2018-03-18 23:41:53 +01:00
Johannes Mockenhaupt
da014daec8
Merge branch 'dev' into remove-pre-bolus
2018-03-18 20:48:19 +01:00
Milos Kozak
7f0918d147
Merge pull request #770 from jotomo/new-bg-processing
...
Trigger loop only for new and current BGs from the active BG source
2018-03-18 20:47:28 +01:00
Johannes Mockenhaupt
643f3aee6c
Merge branch 'dev' into dev-merge
2018-03-18 20:20:40 +01:00
Milos Kozak
106de14f9a
Merge branch 'dev' into nodefaultprofile
2018-03-18 19:58:36 +01:00
Milos Kozak
22d89c3ffc
more ProfileTest
2018-03-18 19:59:28 +01:00
Johannes Mockenhaupt
946ce97dc2
Fix app init.
2018-03-18 19:57:28 +01:00
Johannes Mockenhaupt
89d59584d5
Merge remote-tracking branch 'origin/dev' into dev-merge
...
* origin/dev:
prepend line feed like suggested on jamoto code review
Rename method to reflect jomoto code review
Unit tests are always in engmode
Fix boolean stuff in accordance to code review with adrian
Cleanup boolean algrabra, add method for environment retrieval from logcontexxt
Determine directory from logback
more checks for null profile
Disallow profile store on pump if on dev branch but not in engineering mode
Disable profile switch if not in Engineering mode and on dev branch
Add info to About dialog when engineering mode is enabled.
On start, show notification if on dev-branch, but not EM, so CL is disabled.
Add basic Engineering mode.
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/MainActivity.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java
# app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
# app/src/main/res/values/strings.xml
2018-03-18 19:47:23 +01:00
Milos Kozak
e916cf4d06
ProfileTest update
2018-03-18 19:15:01 +01:00
Markus M. May
8b7b68003b
prepend line feed like suggested on jamoto code review
2018-03-18 17:39:55 +01:00
Markus M. May
f0bec534fa
Rename method to reflect jomoto code review
2018-03-18 17:38:05 +01:00
Milos Kozak
3ee586b6c0
Profile tests . -> , conversion
2018-03-18 15:09:26 +01:00
Milos Kozak
f7621c4cc5
Profile tests
2018-03-18 15:02:21 +01:00
Johannes Mockenhaupt
a2ac21ea67
Combo: only reject bolus requests if the requested bolus was delivered
...
recently
Since history is being read now (also just before starting to bolus),
it's safe to only reject boluses if the previous request actually
lead to insulin delivery.
Fixes #700 .
2018-03-18 14:36:58 +01:00
Johannes Mockenhaupt
c5ebb696a4
Extract EventNewBg.isCurrent() and use when relevant for decision making.
2018-03-18 11:26:15 +01:00
Milos Kozak
7961a9f00a
ver 1.60-dev
2018-03-18 10:36:38 +01:00
Milos Kozak
df3c226d5a
notify by SMS on new ProfileSwitch instead of profile
2018-03-18 10:35:37 +01:00
Milos Kozak
e6a606296d
profile comming from NS do not trigger EventNewBasalProfile
2018-03-18 10:14:27 +01:00
Milos Kozak
4f43feb12e
allow profile to be null
2018-03-17 23:18:34 +01:00
Johannes Mockenhaupt
b54a010614
CarbsButton: replace suspend option with 'hypo tt'.
2018-03-17 22:22:26 +01:00
Johannes Mockenhaupt
17219c08d1
Combo: fragment spacing fix.
2018-03-17 22:12:19 +01:00
Markus M. May
18521d6634
Unit tests are always in engmode
2018-03-17 21:48:58 +01:00
Markus M. May
c6e8ab35b6
Fix boolean stuff in accordance to code review with adrian
2018-03-17 21:35:16 +01:00
Markus M. May
0d4e8772a9
Cleanup boolean algrabra, add method for environment retrieval from logcontexxt
2018-03-17 21:23:45 +01:00
Markus M. May
72e8e5fd05
Determine directory from logback
2018-03-17 21:14:01 +01:00
Markus M. May
9b020f68db
Correct merge
2018-03-17 20:52:19 +01:00
Johannes Mockenhaupt
eae6c73671
Buttons: explicitely state that no action will be taken if nothing selected.
2018-03-17 20:39:58 +01:00
Johannes Mockenhaupt
766fe105b2
InsulinButton: remove broken pre-bolus calculation.
2018-03-17 20:02:24 +01:00
Johannes Mockenhaupt
17d5945a91
Don't run loop for back-filled BG either.
2018-03-17 19:46:15 +01:00
Milos Kozak
9a1d7b2c9f
remove duplicated code
2018-03-17 18:46:11 +01:00
Milos Kozak
3f29ca3b96
more checks for null profile
2018-03-17 18:07:22 +01:00
Johannes Mockenhaupt
612fc09e52
Merge remote-tracking branch 'origin/dev' into combo-dev-merge
...
* origin/dev:
Don't overlap time ticks with current time
history browser chart selection
Insulin button: allow negative presets, fix adding TT insulin.
Overview: symetric spacing.
Carbs button: send carbs to pump if pump supports carbs.
Carbs button: fix visibility pref, input type, allow negative increments.
Smallscreen fix
chart menu 4
chart menu 3
chart menu 2
chart menu 1
# Conflicts:
# app/src/main/res/values/strings.xml
2018-03-17 16:45:08 +01:00
Milos Kozak
6e5d5c4a26
Merge pull request #769 from jotomo/button-refinement
...
Button refinement
2018-03-17 15:28:41 +01:00
Milos Kozak
2cd1d2014d
Merge pull request #768 from AdrianLxM/chart-menu2
...
Chart menu - also for history-browser
2018-03-17 15:24:54 +01:00
AdrianLxM
42e1c61c90
Merge pull request #766 from AdrianLxM/chart-menu
...
Chart menu
2018-03-17 14:07:20 +01:00
Johannes Mockenhaupt
30a191c6eb
Combo: ruffyscripter: abort a command if an unparsable menu is encountered.
...
This happens when the pump is misconfigured (e.g. quick info is
labeled wrong), or the bolus history has no entries yet.
2018-03-17 14:06:39 +01:00
Johannes Mockenhaupt
926bea55c0
Combo: align with dev changes.
2018-03-17 13:51:42 +01:00
Johannes Mockenhaupt
1b38c9cf5e
Join pumps under Config.HWPUMPS switch.
2018-03-17 13:51:42 +01:00
Johannes Mockenhaupt
8457cd3843
Merge remote-tracking branch 'origin/dev' into combo-dev-merge
...
* origin/dev:
check for null profile
remove profile dependency from pump drivers, TRB optimalization
split enacting TRB and SMB
2018-03-17 13:51:40 +01:00
Johannes Mockenhaupt
de72fba92e
Combo: update button spacing to match overview.
2018-03-17 13:51:13 +01:00
Johannes Mockenhaupt
6a6359f1ee
Combo: Show count of boluses delivered and TBRs set on pump.
2018-03-17 13:51:13 +01:00
Johannes Mockenhaupt
a7ca483565
Rename isActiveBgSource -> isFromActiveBgSource.
2018-03-17 13:36:52 +01:00
Johannes Mockenhaupt
8849df639f
Invoke loop only for new BGs from active BG source.
2018-03-17 13:31:33 +01:00
Johannes Mockenhaupt
ad3bf19e4c
Handle received EventNewBg depending on args.
...
(cherry picked from commit 79b7a7b)
2018-03-17 13:28:49 +01:00
Johannes Mockenhaupt
7f45316a24
Add isActiveBg to EventNewBg.
...
(cherry picked from commit a8291ff)
2018-03-17 13:28:47 +01:00
Johannes Mockenhaupt
063505fdb3
Only invoke the loop for new BGs.
2018-03-17 13:27:56 +01:00
Milos Kozak
1e359184a9
check for null profile
2018-03-17 08:12:07 +01:00
AdrianLxM
a2ecfa89a0
history browser chart selection
2018-03-16 23:32:17 +01:00
Johannes Mockenhaupt
7c9824e37d
Insulin button: allow negative presets, fix adding TT insulin.
2018-03-16 22:54:38 +01:00
Johannes Mockenhaupt
194c7a2dbc
Overview: symetric spacing.
2018-03-16 22:54:31 +01:00
Johannes Mockenhaupt
8564cf172e
Carbs button: send carbs to pump if pump supports carbs.
2018-03-16 22:11:15 +01:00
Johannes Mockenhaupt
32108a7c2f
Carbs button: fix visibility pref, input type, allow negative increments.
2018-03-16 22:11:15 +01:00
AdrianLxM
90f9bf373c
Smallscreen fix
2018-03-16 21:52:02 +01:00
AdrianLxM
47c6c2d9a8
chart menu 4
2018-03-16 19:26:18 +01:00
AdrianLxM
067b264ae8
chart menu 3
2018-03-16 19:16:47 +01:00
AdrianLxM
21c3853461
chart menu 2
2018-03-16 18:10:13 +01:00
AdrianLxM
32894a092e
chart menu 1
2018-03-16 17:23:02 +01:00
Milos Kozak
b6ce7c03c6
remove profile dependency from pump drivers, TRB optimalization
2018-03-16 16:53:38 +01:00
Johannes Mockenhaupt
0205dc40b3
Combo: set SMB flag on bolus progress update for wear.
2018-03-16 15:56:31 +01:00
Johannes Mockenhaupt
6bebb30da0
Combo: use PrivacyFabric to align with dev.
2018-03-16 15:52:21 +01:00
Johannes Mockenhaupt
30d522e1a8
Combo: update PumpDescription to align with dev.
2018-03-16 15:49:12 +01:00
Johannes Mockenhaupt
db00404e43
Merge commit 'origin/dev^' into combo-dev-merge
...
* commit 'origin/dev^': (313 commits)
cleanup
draw profile in dana profile viewer
optimize imports
draw basal in profile viewer
BG autobackfill configurable
travis 2nd try
Save new profile when updating it
Add environment variable to handle testCoverage
do not pass DIA to SMB determine_basal
show Dana model properly after communication error
fix deviation slope calculations
Read maximum basal and bolus amount from pump
update maxIOB hard limits
Allow bolus record only in new treatment dialog
use safeGetString
JsonHelper test
food code cleanup
Show bolus progress
Missing import statement
Insight: add treatment to progress event
...
2018-03-16 15:44:54 +01:00
Markus M. May
2c3f28670c
Disallow profile store on pump if on dev branch but not in engineering mode
2018-03-15 23:00:08 +01:00
Markus M. May
39aae28101
Disable profile switch if not in Engineering mode and on dev branch
2018-03-15 21:51:43 +01:00
Markus M. May
e38f10dba0
Merge jamoto/engineering-mode
2018-03-15 21:10:18 +01:00
Milos Kozak
db7671cd23
split enacting TRB and SMB
2018-03-15 18:30:18 +01:00
AdrianLxM
5fd05158ac
cleanup
2018-03-15 17:00:57 +01:00
AdrianLxM
b481e77008
draw profile in dana profile viewer
2018-03-15 16:56:59 +01:00
AdrianLxM
d31c9a6ed6
optimize imports
2018-03-15 14:13:21 +01:00
AdrianLxM
212a9dcc94
draw basal in profile viewer
2018-03-15 14:08:00 +01:00
Milos Kozak
e9313c5b28
BG autobackfill configurable
2018-03-14 20:21:48 +01:00
Milos Kozak
d25855295d
travis 2nd try
2018-03-13 23:48:14 +01:00
Milos Kozak
52d558388d
Merge pull request #758 from triplem/travis_coverage
...
Add environment variable to handle testCoverage on travis
2018-03-13 20:55:32 +01:00
Milos Kozak
e92e05cfbd
Merge pull request #759 from TebbeUbben/dev
...
Save new profile when updating it to fix "endless loop"
2018-03-13 20:31:38 +01:00
TebbeUbben
11295b1e96
Save new profile when updating it
2018-03-13 20:15:58 +01:00
Markus M. May
b10f8f2fe1
Add environment variable to handle testCoverage
2018-03-13 19:24:08 +01:00
Johannes Mockenhaupt
a398d95bb4
Add info to About dialog when engineering mode is enabled.
2018-03-12 23:03:14 +01:00
Johannes Mockenhaupt
637b0c6189
On start, show notification if on dev-branch, but not EM, so CL is disabled.
2018-03-12 23:01:58 +01:00
Milos Kozak
8219332a2c
do not pass DIA to SMB determine_basal
2018-03-12 22:23:15 +01:00
Milos Kozak
4ff09a0125
show Dana model properly after communication error
2018-03-12 22:16:10 +01:00
Milos Kozak
5b064cd8f8
Merge pull request #756 from TebbeUbben/dev
...
Read maximum basal and bolus amount from pump
2018-03-12 21:46:29 +01:00
Milos Kozak
e134b94f13
fix deviation slope calculations
2018-03-12 21:13:48 +01:00
TebbeUbben
ffb7b068a8
Read maximum basal and bolus amount from pump
2018-03-12 20:53:39 +01:00
Milos Kozak
30d12622f7
update maxIOB hard limits
2018-03-12 17:59:42 +01:00
Milos Kozak
eb2b6f9bd8
Allow bolus record only in new treatment dialog
2018-03-12 17:52:52 +01:00
Milos Kozak
fc070c95a7
use safeGetString
2018-03-12 11:22:19 +01:00
Milos Kozak
601dbc1036
JsonHelper test
2018-03-12 11:12:41 +01:00
Milos Kozak
a5830cc452
Merge branch 'foodrefactor' into dev
2018-03-12 10:56:14 +01:00
Milos Kozak
38999d6598
food code cleanup
2018-03-12 10:53:23 +01:00
Tebbe Ubben
d4ede0a5b3
Merge branch 'dev' into dev
2018-03-11 22:59:11 +01:00
TebbeUbben
8fd68a082c
Show bolus progress
2018-03-11 22:53:18 +01:00
TebbeUbben
21dbeb299e
Missing import statement
2018-03-11 21:00:08 +01:00
AdrianLxM
3068089297
Insight: add treatment to progress event
2018-03-11 20:56:11 +01:00
AdrianLxM
f2d6b92394
Merge pull request #750 from TebbeUbben/dev
...
Improved rounding
2018-03-11 18:34:10 +01:00
TebbeUbben
ccabb099f0
Improved rounding
2018-03-11 17:52:53 +01:00
Milos Kozak
3ad783260b
max_daily_basal min value 0.1 -> 0.05
2018-03-11 17:17:34 +01:00
Milos Kozak
bd03c678d1
Merge pull request #748 from TebbeUbben/dev
...
Added some debug lines and missing digit in isThisProfileSet
2018-03-11 16:54:55 +01:00
TebbeUbben
46a1be97f7
Added some debug lines and missing digit in isThisProfileSet
2018-03-11 16:42:47 +01:00
Milos Kozak
2c21571cf4
fix NPE
2018-03-11 16:38:30 +01:00
Milos Kozak
6cf849ce76
allow 30min basal rates when pump supports it
2018-03-11 16:03:21 +01:00
Roumen Georgiev
60c4986ffa
Removed unneeded conversion to Md/dl which leads to a mgDl targets always
2018-03-11 09:06:50 +02:00
Milos Kozak
6117ac97cf
Merge pull request #745 from TebbeUbben/dev
...
Update to SightRemote 1.4.0
2018-03-10 23:39:52 +01:00
AdrianLxM
1aaec9142c
Merge pull request #746 from swissalpine/patch-3
...
Better layout of the Calculator Dialogue (German)
2018-03-10 22:37:09 +01:00
Milos Kozak
13933e6bb7
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-03-10 22:19:27 +01:00
swissalpine
203288e93a
Better layout of the Calculator Dialogue (German)
...
The string "15-Min.-Trend" was too long, at least on my phone.
2018-03-10 22:12:16 +01:00
TebbeUbben
51da08bf97
Undo history sync delay change
2018-03-10 21:27:50 +01:00
TebbeUbben
d47b067855
Updated SightParser library
2018-03-10 21:25:14 +01:00
TebbeUbben
7329d3abff
Merge branch 'dev' of https://github.com/TebbeUbben/AndroidAPS into dev
2018-03-10 21:24:04 +01:00
TebbeUbben
cd309780d1
Update to Asclepenius
...
Ability to change basal profile
2018-03-10 21:21:53 +01:00
Milos Kozak
2cd7a8e8df
Merge pull request #738 from MilosKozak/unify-target
...
Unify target
2018-03-10 21:19:49 +01:00
Milos Kozak
39c2d690e4
CS translations
2018-03-10 20:47:17 +01:00
Milos Kozak
8a197f41dc
Merge branch 'dialogmmol' into dev
2018-03-10 19:25:41 +01:00
Milos Kozak
ec1c43b905
carbs dialog: defaults for mmol, i18n
2018-03-10 19:22:31 +01:00
Milos Kozak
951ad26590
cleanup
2018-03-10 17:58:45 +01:00
AdrianLxM
6904cb8807
Merge pull request #702 from McHoffi/McHoffi-SMBnotify_true
...
enable SMB notify by default
2018-03-08 15:17:28 +01:00
AdrianLxM
5a5e0ca8b6
Merge pull request #734 from MilosKozak/watchsmb2
...
Watchface overhaul
2018-03-08 15:10:53 +01:00
AdrianLxM
b880a9bb10
unify target calculation 2
2018-03-08 15:04:48 +01:00
AdrianLxM
768f61bc07
unify target calculation
2018-03-08 15:04:38 +01:00
AdrianLxM
5f614b4072
TT unify target calculation
2018-03-08 15:04:30 +01:00
swissalpine
2d797e8ce3
Update StatuslinePlugin.java
2018-03-06 16:23:56 +01:00
swissalpine
237d55ee85
Add whitespace to xDrip status line
...
... which was removed by the last fix.
2018-03-06 11:21:44 +01:00
Johannes Mockenhaupt
090e1b13f8
Add basic Engineering mode.
...
- Insight plugin disabled unless EM enabled
- Closed loop constrainted unless EM enabled.
2018-03-05 22:45:00 +01:00
AdrianLxM
414f92bdf8
no double whitespace
2018-03-05 20:50:21 +01:00
AdrianLxM
118cdb3dce
buttons gone by default in smallheight
...
... same as on default layout
2018-03-04 20:12:33 +01:00
AdrianLxM
cdb58ed143
newinsulin dialog wrap content
2018-03-04 19:57:21 +01:00
AdrianLxM
5a4967e544
newcarb dialog wrap content
2018-03-04 19:56:34 +01:00
AdrianLxM
d2919f9577
Merge remote-tracking branch 'jotomoremote/watch-updater-service-worker-thread' into watchsmb2
2018-03-04 19:25:26 +01:00
PoweRGbg
ca9150ba5b
more readable low TT message
2018-03-04 16:06:54 +02:00
PoweRGbg
37b96d7e31
remove unused import (RadioButton)
2018-03-04 15:59:17 +02:00
AdrianLxM
7d8674aa61
fix 5m-impact parameter - always was 0
2018-03-02 21:09:09 +01:00
Roumen Georgiev
6443502808
reduced if...else to single line as Adrian suggested
2018-03-02 16:41:25 +02:00
Roumen Georgiev
ea29b6ad82
propper conversion from MMOL to MgDl
2018-03-02 16:33:53 +02:00
Roumen Georgiev
6c75b1b317
more readable var names and
2018-03-02 15:28:32 +02:00
Roumen Georgiev
e923bf2156
As Adrian asked .... Profile.toMgDl()
2018-03-02 15:09:03 +02:00
Roumen Georgiev
f3a12be0be
renaming ESMCheckbox to startEsTTCheckbox
2018-03-02 14:53:19 +02:00
Roumen Georgiev
9dd129bbe6
Revert "Update MainApp.java"
...
This reverts commit d3a7176209
2018-03-02 10:37:12 +02:00
Roumen Georgiev
ab39536876
Only one TT can be selected
2018-03-02 10:12:05 +02:00
Milos Kozak
ed11bb1d70
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
2018-03-02 00:00:09 +01:00
Milos Kozak
c61fcdbe3f
allow 15 & 30 pump disconnection
2018-03-01 23:59:44 +01:00
PoweRGbg
b3a10b47ce
undo the RadioButton tests
2018-03-01 21:57:30 +02:00
PoweRGbg
3edec79b8d
fixing identation and equals() to ==
2018-03-01 21:41:52 +02:00
PoweRGbg
2fb0e6edc1
format using the Profile class method and Constants
2018-03-01 18:40:06 +02:00
PoweRGbg
c6a46129df
format using the Profile class method and Constants
2018-03-01 18:38:56 +02:00
PoweRGbg
65ddf5ced5
format using the Profile class method and Constants
2018-03-01 18:31:29 +02:00
Johannes Mockenhaupt
d679481698
Remove unused method.
2018-03-01 16:12:41 +01:00
Johannes Mockenhaupt
8f813d52fa
WatchUpdaterService: process requests in a separate thread.
...
Previously, requests were executed on the main thread (base class
is Service, not IntentService), which prompted Android to kill
AAPS multiple times a day due to timeouts (of currently unknown
origins).
(cherry picked from commit 5ae45d5)
2018-03-01 16:12:41 +01:00
Roumen Georgiev
bea486d816
Don't show confirmation on empty message/input
2018-03-01 16:57:36 +02:00
Roumen Georgiev
38933ac323
Adding Eating soon TT check to carbs
...
I use that a lot for meal anouncement only
2018-03-01 16:27:52 +02:00
Roumen Georgiev
9456a24655
Adding Eating soon mode to options
2018-03-01 16:22:05 +02:00
Milos Kozak
75a6366115
translations cleanup
2018-03-01 15:08:55 +01:00
Roumen Georgiev
d3a7176209
Update MainApp.java
2018-03-01 15:20:00 +02:00
Roumen Georgiev
5b003c62e2
added fix for mmol profiles & targets
2018-03-01 14:07:35 +02:00
AdrianLxM
e5e76113cc
Disable Insight by default
2018-03-01 11:09:57 +01:00
Roumen Georgiev
7ca1fdc36e
removed unused var
2018-03-01 11:54:24 +02:00
Roumen Georgiev
9baea01225
Not everybody's profile & targets are in mg/dl :)
2018-03-01 11:32:00 +02:00
Milos Kozak
bd6fab3ca3
Merge pull request #721 from jamorham/floatmaxbasal
...
Make openapsama_current_basal_safety_multiplier Double instead of Int
2018-02-26 10:46:29 +01:00
Jamorham
805548dd1e
Make openapsama_current_basal_safety_multiplier Double instead of Integer
2018-02-25 21:30:11 +00:00
Milos Kozak
e93cfacb4f
fix insulin pattern
2018-02-25 21:55:22 +01:00
Milos Kozak
a1a3b14b18
fix displaying profile name if Ignore profile switch is checked
2018-02-25 21:13:27 +01:00
Milos Kozak
f62cac1b66
make new i & c buttons visible by default
2018-02-25 17:52:30 +01:00
Milos Kozak
7b91f0d490
allow to open G5 app from CGM button
2018-02-25 17:33:46 +01:00
Milos Kozak
e544d44799
overview layout cleanup
2018-02-25 16:20:20 +01:00
Milos Kozak
6eed00fae7
add xdrip icon to cgm button
2018-02-25 15:45:43 +01:00
Milos Kozak
32f2f4d6fa
Merge branch 'g5cal' into buttons
2018-02-25 15:31:43 +01:00
Milos Kozak
cb8fc905bb
catch if G5 app is missing
2018-02-25 15:23:25 +01:00
Milos Kozak
7e49f9039c
access overview preferences from configbuilder
2018-02-25 11:15:26 +01:00
Milos Kozak
a7da0bb67a
Merge pull request #719 from jotomo/buttons
...
Moar buttons.
2018-02-25 11:05:21 +01:00
Milos Kozak
b18c16ce3b
Merge pull request #708 from jotomo/watch-carb-only-request
...
Watch: don't bother pump with carbs if pump doesn't support it.
2018-02-25 10:10:09 +01:00
AdrianLxM
436e03aa03
wear only print valid boluses
2018-02-24 18:10:59 +01:00
AdrianLxM
6d3048a9b1
wear predictions update on loop run
2018-02-24 17:58:05 +01:00
Milos Kozak
31f7670f43
Merge pull request #716 from jamorham/dev
...
Improve Insight Connector life-cycle handling
2018-02-23 22:26:52 +01:00
Jamorham
4b630a1ac6
Remove inactive experimental code
2018-02-23 09:16:48 +00:00
Jamorham
7854a51cc0
Remove commented out old code
2018-02-23 09:15:47 +00:00
Jamorham
cd95a0f5dd
Insight: better connector lifecycle handling
2018-02-23 09:00:08 +00:00
Simon Pauwels
fcb59477a0
Merge pull request #34 from MilosKozak/combo
...
23 feb
2018-02-23 08:33:59 +01:00
Milos Kozak
9d3c69e1b4
Merge pull request #709 from jamorham/dev
...
Add Fabric Privacy option
2018-02-23 07:30:46 +01:00
Jamorham
b989cf5a3c
Revert NSClient service to previous for PR
2018-02-22 13:27:43 +00:00
Jamorham
9d985ec3b7
Add FabricPrivacy
2018-02-22 12:30:36 +00:00
Milos Kozak
dbab6b6809
Merge pull request #705 from jamorham/dev
...
Updated Insight plugin
2018-02-21 22:56:02 +01:00
Johannes Mockenhaupt
87a7249997
Watch: don't bother pump with carbs if pump doesn't support it.
2018-02-21 21:09:23 +01:00
Johannes Mockenhaupt
b6b86e8f4a
Show SMBs in graph on lower end of target area.
2018-02-21 16:54:57 +01:00
AdrianLxM
c22c22f1d7
wear settings for predictions
2018-02-21 15:56:13 +01:00
JamOrHam
bc2f749ef3
Merge branch 'dev' into dev
2018-02-21 13:43:18 +00:00
AdrianLxM
c6a3efb60e
wear adaptive prediction timeframe
2018-02-21 14:23:52 +01:00
Jamorham
67b397b417
Insight: preemptive connection preference option
2018-02-21 12:23:19 +00:00
Milos Kozak
1cb92861b5
Chinese to menu
2018-02-20 17:04:15 +01:00
AdrianLxM
88ea215f66
add boluses to wear payload
2018-02-20 12:27:47 +01:00
Milos Kozak
59744fbd1d
fix NPE
2018-02-19 23:28:07 +01:00
McHoffi
6ed8aceff3
Update WearPlugin.java
2018-02-19 20:52:10 +01:00
McHoffi
21d6745d02
Update pref_wear.xml
2018-02-19 20:50:17 +01:00
McHoffi
293eff837b
Update pref_wear.xml
2018-02-19 20:49:53 +01:00
McHoffi
9dcd1c70d5
Update pref_wear.xml
2018-02-19 20:48:54 +01:00
Milos Kozak
220c099591
last connection fix RS,Rv2
2018-02-19 20:37:51 +01:00
Milos Kozak
d3c23f6c33
allow to override zero base basal on combo
2018-02-19 10:44:15 +01:00
Milos Kozak
eeeda92857
do not add 30s to carbs time in Rv2 and RS
2018-02-19 07:44:31 +01:00
Milos Kozak
a063fb05b4
G5 calibration button
2018-02-19 00:22:27 +01:00
Milos Kozak
dc35c9f6b3
fix typos
2018-02-18 22:56:46 +01:00
Milos Kozak
92c7f2ee75
log pump unreachable
2018-02-18 22:55:04 +01:00
boysim
5c9173d14b
Added Dutch combo translations
2018-02-18 18:19:46 +01:00
Jamorham
2f1efc7d06
Duplicate Visibility fix from dev
2018-02-18 15:07:36 +00:00
Jamorham
208c3ed9b1
Don't wake screen in QueueThread use PARTIAL_WAKE_LOCK instead
2018-02-18 15:00:24 +00:00
Jamorham
9a76cdb3a1
Insight: add preemptive connection, keep-alive, statistics
2018-02-18 14:57:28 +00:00
Jamorham
448ebbc7bf
Add FeatureRunning event triggered by activities
2018-02-18 14:27:30 +00:00
Johannes Mockenhaupt
a42d95df14
Unbreak unit test.
2018-02-18 13:33:24 +01:00
Milos Kozak
8812428078
Merge pull request #690 from triplem/rework_configbuilder
...
Minor cleanup based on feedback of jomoto
2018-02-18 12:51:02 +01:00
Johannes Mockenhaupt
71dfb6d314
Set combo version.
2018-02-18 12:42:18 +01:00
Milos Kozak
0fe287bb79
Merge pull request #689 from AdrianLxM/smb-wear2
...
no wear vibrations on SMB (optional)
2018-02-18 12:39:36 +01:00
Milos Kozak
bc440817b8
Merge pull request #691 from swissalpine/patch-2
...
Set a higher hard limit for IC ratio
2018-02-18 12:36:10 +01:00
Johannes Mockenhaupt
832138398f
Crappy hack to deal with applying the first profile switch.
2018-02-18 11:53:41 +01:00
Johannes Mockenhaupt
bf2e567f9c
Moar buttons.
2018-02-18 11:06:36 +01:00
Johannes Mockenhaupt
1e3f6dd192
Disable wear plugin by default.
2018-02-18 02:20:49 +01:00
