Commit graph

4048 commits

Author SHA1 Message Date
Johannes Mockenhaupt
c17ed80a34
Correct off-by-one error calculating average. 2018-10-12 16:05:32 +02:00
Johannes Mockenhaupt
34182b81a1
Combo: allow records created by the combo to be merged with existing records. 2018-10-12 00:46:05 +02:00
Milos Kozak
a0a60ea2d6 log carbs to pastSensitivity 2018-10-11 18:39:23 +02:00
Milos Kozak
898d7ef134 typo 2018-10-11 17:48:19 +02:00
Milos Kozak
9a84dade9a Fix libre data, add more bucketed data test 2018-10-06 22:00:43 +02:00
Milos Kozak
817a89c39b Better autosens logging and COB bug fix 2018-10-05 00:49:04 +02:00
Milos Kozak
c68783afd3 maintenance strings cleanup 2018-10-04 23:19:29 +02:00
Milos Kozak
97cc9a6370 log language used to fabric 2018-10-04 23:04:32 +02:00
Nico Schmitz
fb4da4859a Simplify SWItem.generateLayout() 2018-10-03 22:36:21 +02:00
Milos Kozak
52e6f6bde5 fix Korean driver 2018-09-26 20:03:40 +02:00
AdrianLxM
126f3925e0 don't send carbs entered in the past to the pump 2018-09-26 13:59:04 +02:00
AdrianLxM
e9883dcc3a Revert "fix carb generator"
This reverts commit 6403c5d997.
2018-09-26 13:37:24 +02:00
AdrianLxM
95ea377d71 Revert "fix addToHistoryTreatment"
This reverts commit d707ea7fb0.
2018-09-26 13:37:05 +02:00
Milos Kozak
794c80f7e3 Fix accesing wrong DanaRPump instance 2018-09-24 22:43:23 +02:00
Milos Kozak
d707ea7fb0 fix addToHistoryTreatment 2018-09-23 18:58:13 +02:00
Milos Kozak
1c44981494 Fix wrong message during refill 2018-09-22 21:25:07 +02:00
Milos Kozak
6403c5d997 fix carb generator 2018-09-21 23:24:50 +02:00
Julius de Bruijn
84e41122fc Fix TBR maximum for Animas Vibe
Animas actually supports 300% TBR, but uses a different way of
displaying it:

0% is the same as 100% in AAPS.
-100% (OFF) is 0% in AAPS
200% therefore is 300% in AAPS.

Maybe there should be a better indicator for this in AAPS, but for now
this fix gives better control of the TBR values, if using the open loop.
2018-09-21 11:09:41 +02:00
Andy Rozman
e2ddb48498 Some extension on VirtualPump for testing. 2018-09-20 18:04:06 +01:00
Andy Rozman
48e4a041f8 - First changes for CustomActions
- changed PumpInterface to add CustomActions
  - added class CustomActions and CustomActionType
  - changed all PumpImplementations to use new methods
  - started changing ActionsFragment (most should be done)
2018-09-20 17:23:36 +01:00
Milos Kozak
9a96d29dc3 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-09-17 19:57:15 +02:00
Milos Kozak
a7e64c79f0 remove static MainApp.sConfigBuilder 2018-09-17 19:56:56 +02:00
Milos Kozak
924bc97e3b remove static ConfigBuilderPlugin.commandQueue 2018-09-17 19:29:01 +02:00
Milos Kozak
f6c113550f remove static ConfigBuilderPlugin.activeSensitivity 2018-09-17 18:30:57 +02:00
Milos Kozak
dc563df5f0 remove static ConfigBuilderPlugin.activeInsulin 2018-09-17 18:18:50 +02:00
Milos Kozak
1b086e6776 remove static ConfigBuilderPlugin.activeAPS 2018-09-17 17:59:44 +02:00
Milos Kozak
0b32431f9e remove static ConfigBuilderPlugin.activeProfile 2018-09-17 17:48:11 +02:00
Milos Kozak
bc19973ce0 remove static ConfigBuilderPlugin.activePump 2018-09-17 17:43:42 +02:00
Milos Kozak
dcbf093514
Merge pull request #1399 from MarkMpn/temp-target-units
Assume md/dl units for temp targets created through Nightscout
2018-09-17 16:46:33 +02:00
dmelliott20
167ed27659
Update PumpType.java
Ammended the basebasalstep values fro the insight and the combo.

this was preventing AAPS from implementing zero basals where the basalstep was higher than the current running basal rate e.g. basal of 0.06u\hr running and a basalstep 0f 0.1u\hr resulted in no zero temp being enacted because of logic in the loop plugin.
2018-09-17 12:26:00 +00:00
Sebastian Lenz
6323f2dd49 fixed typo 2018-09-16 18:32:51 +02:00
Milos Kozak
53389fea3b fix import settings 2018-09-14 17:54:32 +02:00
Milos Kozak
9d4674faff FillDialog formating fix 2018-09-14 14:29:25 +02:00
Milos Kozak
241d3f0c7c fix MsgSetExtendedBolusStart.java 2018-09-14 14:10:24 +02:00
Milos Kozak
bcda4c93bf
Merge pull request #1428 from PoweRGbg/dev
DanaR.comm tests
2018-09-14 14:08:55 +02:00
Milos Kozak
cc804ac36f
Merge pull request #1360 from MilosKozak/insightfix
WIP Insightfix
2018-09-14 14:06:18 +02:00
Milos Kozak
514bdcda31 copy pumpId when converting EB -> TRB 2018-09-14 10:04:48 +02:00
Milos Kozak
7025d021f5 Insight logging 2018-09-14 09:06:03 +02:00
PoweRGbg
3a078c4084 DanaR.comm tests 2018-09-14 10:00:00 +03:00
Milos Kozak
665958d59c false errors removed from DbAccessReceiver 2018-09-14 08:57:57 +02:00
Sebastian Lenz
b02921b23f use profilename of currently active profile 2018-09-14 01:00:19 +02:00
Milos Kozak
dd90051b97 Insight get rid of Date.class 2018-09-13 19:00:57 +02:00
Milos Kozak
57e7d63794 Insight EB handling 2018-09-13 18:53:16 +02:00
Milos Kozak
65ffc3cdd2 Merge branch 'dev' into insightfix 2018-09-12 14:59:15 +02:00
Milos Kozak
bbb6c5f3cc fix rounding in dialogs 2018-09-12 14:58:47 +02:00
Milos Kozak
2fc9b40f9d Merge branch 'dev' into insihgtfix 2018-09-12 08:56:58 +02:00
Milos Kozak
fb4582a888 request issue description in email with logs 2018-09-12 08:44:21 +02:00
Milos Kozak
fd2b9bdf94 request time in email with logs 2018-09-12 08:40:56 +02:00
Milos Kozak
0a52bc9976 VirtualPump: do not cancel percent temp prior adding new 2018-09-11 23:23:59 +02:00
Milos Kozak
874be7ff48 openloop mode fix 2018-09-11 22:32:04 +02:00
Milos Kozak
f7269a806d nsclient allow general preferences 2018-09-11 20:08:59 +02:00
Milos Kozak
98b8d67e3b Merge branch 'dev' into insightfix 2018-09-11 19:06:35 +02:00
Milos Kozak
37c384e1c9 better wizard and constraint logging 2018-09-11 19:03:36 +02:00
Milos Kozak
0563420996 Constraints logging 2018-09-11 14:56:42 +02:00
Milos Kozak
018a5f5e43 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-09-11 14:27:51 +02:00
Milos Kozak
e9f8862776 maintenance plugin logging 2018-09-11 14:27:38 +02:00
Milos Kozak
48c8863ccb fix NPE 2018-09-11 10:09:29 +02:00
Milos Kozak
d2c35173dc fix NPE 2018-09-11 00:19:34 +02:00
Milos Kozak
3416f77a04 fix EXTENDEDBOLUS search in db 2018-09-10 23:57:24 +02:00
Milos Kozak
2fbf4324d5 typo in logging 2018-09-10 23:55:52 +02:00
Milos Kozak
39f1b130b6 Insight proper removing TBR from NS 2018-09-10 23:20:31 +02:00
Milos Kozak
52c85501c6
Merge pull request #1407 from jwoglom/dev
update other "G5 Native" source reference for G6
2018-09-10 21:17:03 +02:00
Milos Kozak
a97c66169b Merge branch 'dev' into insightfix 2018-09-10 20:31:33 +02:00
Milos Kozak
93a4afd567 Insight add 1 sec between cancel TBR and EB 2018-09-10 20:28:45 +02:00
Milos Kozak
7070c0a72b allign Insight logging with AAPS 2018-09-10 19:28:03 +02:00
James Woglom
1823371433 update other "G5 Native" source reference for G6 2018-09-10 11:56:33 -04:00
Milos Kozak
0f2a620ebe fix NewInsulinDialog message 2018-09-10 12:41:57 +02:00
Milos Kozak
6f53afbbe3 Objectives: remove static code, cleanup 2018-09-10 12:23:24 +02:00
Milos Kozak
640a7d3b87 fix NPE 2018-09-09 13:13:34 +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
55d1dd0847
Merge pull request #1392 from MilosKozak/openloop
Openloop
2018-09-07 12:55:25 +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
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
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
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
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
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
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
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
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
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
Johannes Mockenhaupt
0eb08c2eaf
Combo: remove fabric logging. 2018-08-27 19:10:08 +02:00
Milos Kozak
4fd4d71187 fix min percent value in careportal 2018-08-27 16:05:30 +02:00
Milos Kozak
e5d96e5c17 fix bucketed data 2018-08-25 20:03: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
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
2e9da51daf register VP plugin on start 2018-08-24 10:24:04 +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
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
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
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
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
1b6e54f8a8 iobplugin tests 2018-08-17 19:49:39 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Mark Carrington
7be49571ae Get profile for specific time for percentage -> absolute conversion 2018-08-02 12:27:56 +01: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
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
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
e26f33081a fix wrong merge 2018-08-01 11:41:36 +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
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
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
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
4ec0ebfa74 move profile function from ConfigBuilder to extra class 2018-07-30 14:21:11 +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
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
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
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
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
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
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
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
AdrianLxM
b435c09771 preserve carbs 2018-07-22 14:26:56 +02:00
AdrianLxM
9824b45640 NSClient -> owl 2018-07-22 01:32:09 +02:00
Milos Kozak
213a45c1e5 unique autosens debug tag 2018-07-21 22:56:08 +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
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
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
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
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
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
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
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
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
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
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
3a0fb59aee Merge branch 'dev' into last-2.0-something-stuff 2018-07-02 18:54:32 +02:00
Milos Kozak
60e9ea05a8 fix objectives typo 2018-07-02 15:52:20 +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
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 268dec0059, reversing
changes made to ab41541c69.
2018-06-29 22:43:54 +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
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
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