Commit graph

4729 commits

Author SHA1 Message Date
Milos Kozak
53b9d97f5d
Merge pull request #1893 from MilosKozak/lint
lint recommendations - code style
2019-07-28 10:28:17 +02:00
Milos Kozak
7db694044d Merge branch 'dev' into iobfix 2019-07-28 01:49:52 +02:00
Milos Kozak
74bcf3e73e Rx drivers: set new TBR if running is expiring 2019-07-28 01:37:44 +02:00
Milos Kozak
f58a219d2d pass enforceNew properly 2019-07-28 01:22:00 +02:00
Milos Kozak
4bf1b777a2 Rx drivers: set new TBR if running is expiring 2019-07-27 23:59:27 +02:00
Milos Kozak
84ecb92771 lint recommendations 2019-07-27 19:56:07 +02:00
Milos Kozak
b448bbe670
Merge branch 'dev' into signature_verifier 2019-07-26 22:28:22 +02:00
Milos Kozak
3b2c9248a1 remove forgotten file 2019-07-26 22:20:02 +02:00
Milos Kozak
48316dbd4c fix calculation, conditional rendering 2019-07-26 20:30:58 +02:00
Milos Kozak
595bf0314c Merge branch 'dev' into iobfix 2019-07-26 00:39:40 +02:00
Milos Kozak
7735612daf
Merge pull request #1888 from MilosKozak/bwfix
Bolus wizard confirmation
2019-07-25 23:59:41 +02:00
Milos Kozak
76439777b0 Better bolus wizard warning 2019-07-25 23:32:00 +02:00
Johannes Mockenhaupt
d9de09d7f0
Confirm pump plugin activation for all hardware pumps (MDT, Insight). 2019-07-25 22:30:47 +02:00
Johannes Mockenhaupt
cf1bcf9943
Dedup pump activation confirmation. 2019-07-25 22:30:25 +02:00
Milos Kozak
75baa473f1 fix carbtime in BolusWizard 2019-07-25 21:45:54 +02:00
Milos Kozak
09270f36bf
Merge branch 'dev' into automation 2019-07-25 16:17:16 +02:00
Andy Rozman
29d0545d47 - fixed manufacturer and model 2019-07-25 13:41:57 +01:00
Milos Kozak
51bc5d3618 Merge branch 'dev' into medtronic_andy_merge 2019-07-25 13:40:37 +02:00
Andy Rozman
b1320c4bcb - added keys for preferences and fixes on all other places 2019-07-23 16:09:56 +01:00
Milos Kozak
f778e0ac0d fix code after merge 2019-07-23 13:32:21 +02:00
Milos Kozak
e02681ac31
Merge branch 'dev' into automation 2019-07-23 13:13:26 +02:00
Milos Kozak
29c8740e08
Merge pull request #1879 from MilosKozak/psfix
ProfileSwitch validation
2019-07-23 09:18:12 +02:00
Milos Kozak
ae7332df2d cleanup 2019-07-23 00:26:59 +02:00
Milos Kozak
47ed0acec2 ChooseTriggerDialog to kotlin 2019-07-23 00:04:44 +02:00
Milos Kozak
063c27fb89 ChooseActionDialog to kotlin 2019-07-22 22:47:26 +02:00
Milos Kozak
a809c0ac35 ActionListAdapter to kotlin 2019-07-22 21:41:42 +02:00
Milos Kozak
e539dbc112 fix tests, use location form service 2019-07-22 16:58:25 +02:00
Milos Kozak
c3b90275aa relocate trigger dummy objects 2019-07-22 16:28:53 +02:00
Milos Kozak
12f436c681 hide ok button on wrong input 2019-07-22 13:58:50 +02:00
Milos Kozak
11edd1b4a0
Merge pull request #1876 from andyrozman/ref_manufacturer
Ref manufacturer
2019-07-22 09:56:43 +02:00
Milos Kozak
03bcdf82b3 validate on focus change 2019-07-19 11:44:43 +02:00
Milos Kozak
d25f6f07b0 migrate to kotlin, remove butterknife, code claeanup 2019-07-18 23:49:59 +02:00
Andy Rozman
7de907f3d6 - fixed NPE in RiuleyLinkStatus History
- added 2 Broadcast Receivers:
    - TimeDateOrTZChangeReceiver, this one in registered with MainApp in MainApp
    - RileyLinkBluetoothReceiver, this one is registered with MainApp from RileyLinkService
2019-07-18 18:09:49 +01:00
Milos Kozak
1b937bfe08 fix passcode generation 2019-07-17 21:16:36 +02:00
Milos Kozak
1c8aae9757 fix tests 2019-07-16 22:35:46 +02:00
Andy Rozman
cd4868f781 - changed manufacturer() and model() methods in PumpInterface... both now return enums...
- manufacturer can be used with ManufacturerType.getDescription()
- model can be used with PumpType.getModel()
2019-07-16 21:12:36 +01:00
Milos Kozak
58da7fc854 Preconditions, code cleanup 2019-07-16 21:57:45 +02:00
Andy Rozman
be05ff3510 - Added 2 receivers... 2019-07-16 20:36:37 +01:00
Andy Rozman
cfc1d7135f - Removed double methods that are not used 2019-07-16 18:40:35 +01:00
Milos Kozak
67b06f51fe remove loop from actions 2019-07-16 17:05:51 +02:00
Milos Kozak
888a63a5b0 Merge branch 'automation' of https://github.com/MilosKozak/AndroidAPS into automation 2019-07-16 16:00:21 +02:00
Milos Kozak
75b2f7f77f Location interval as constant 2019-07-16 15:58:47 +02:00
Milos Kozak
c0d85e85a0 Merge branch 'dev' into iobfix 2019-07-15 15:52:02 +02:00
Milos Kozak
b26b583f2b
Merge pull request #1867 from Paulusma/IA-in-BG-graph
Insulin Activity in bg graph
2019-07-15 15:27:04 +02:00
Milos Kozak
7ddf5dd5f6 make translation easier 2019-07-15 12:33:03 +02:00
Andy Rozman
c3de5d7f58 Changed files with changes to PumpInterface and Profile 2019-07-14 22:24:41 +01:00
Andy Rozman
f0cc3d4ab2
Merge pull request #5 from jotomo/mdt-dialogs
Mdt dialogs
2019-07-14 20:18:40 +01:00
Milos Kozak
c4ba821dc1
Merge branch 'dev' into automation 2019-07-14 20:00:42 +02:00
Milos Kozak
8c2c2b21ea
Merge branch 'dev' into medtronic_andy_merge 2019-07-14 19:50:07 +02:00
Milos Kozak
72ff3e1e7f
Merge branch 'dev' into IA-in-BG-graph 2019-07-14 19:44:01 +02:00
Milos Kozak
9d15ea608e static version in OpenDatasetMessage 2019-07-14 17:13:07 +01:00
Johannes Mockenhaupt
9ee6194ce3
Use OKDialog, ErrorHelper in place of MessageDialog. 2019-07-14 17:18:53 +02:00
Milos Kozak
d7a28bf713 Session test 2019-07-14 16:11:27 +01:00
Johannes Mockenhaupt
240c83e83a
Proper exception logging. 2019-07-14 16:59:00 +02:00
Milos Kozak
beb4e004bf better null checks 2019-07-14 15:01:12 +01:00
Andy Rozman
675dcc1b5b Fixes:
- removed unneeded classes and xml
- some fixes: MedtronicUtil, using different method to determine if pump driver is selected
2019-07-13 19:15:44 +01:00
Paulus
106d30394c Included insulin activity on both primary and secondary graphs 2019-07-13 18:28:16 +02:00
Paulus
2a4e9e2cc6 Changed scale factor so IA is always displayed at same scale (even if only selected option) 2019-07-13 17:54:27 +02:00
Paulus
d528e800f6 Fixed code so IA is also correctly displayed in ssecondary if it is the only selected option. 2019-07-13 17:46:57 +02:00
Milos Kozak
968bccaacc Merge branch 'dev' into tidepool 2019-07-13 17:45:34 +02:00
Paulus
96d20d835f Modified string resources, included IA on both primary and secondary graph 2019-07-13 17:03:04 +02:00
Andy Rozman
8c8fba5522 - Added separate method for TreatmentService.createOrUpdate for Medtronic (createOrUpdateMedtronic)
- MedtronicUtil added method to detect if pump is Medtronic (reads ConfigBuilder.getActivePump().deviceID)
- TreatementService call from NS checks pump type and calls correct method
- TreatmentPlugin checks pumptype and calls correct createOrUpdate method
2019-07-13 14:28:24 +01:00
Andy Rozman
0b1ef81d40 Updated files that had only formating changes and removed lcoal files. 2019-07-13 12:26:42 +01:00
Paulus
d7cb84e693 Fixed handling of null profile 2019-07-13 10:26:15 +02:00
Milos Kozak
1eed348fe0 Merge branch 'dev' into automation 2019-07-13 10:11:14 +02:00
Milos Kozak
606122bae0 fix kotlin warnings 2019-07-13 10:09:57 +02:00
Andy Rozman
39c3f5ddfe Added engineering mode for Medtronic driver. 2019-07-12 19:31:43 +01:00
Andy Rozman
a5a36332f3 Prepared for PR 2019-07-12 19:29:36 +01:00
Andy Rozman
264bbdee20 Merge branch 'dev' into medtronic_andy 2019-07-12 18:54:15 +01:00
Paulus
fc1dd360b3 split menu for 1st & secondary graphs 2019-07-11 21:17:41 +02:00
Milos Kozak
f5c22a33ff icons 2019-07-11 18:56:50 +01:00
Milos Kozak
4df1127a8c jetpack compliance, code cleanup, extracted resources 2019-07-11 18:18:05 +01:00
Paulus
4ff9206dad #1851 included code from fra-orolo, now using color identifier for activity and line is optional in graph 2019-07-09 11:42:40 +02:00
Andy Rozman
7aa4716870 - changed all ui files to conform to androidx classes/implementation 2019-07-05 16:04:54 +01:00
Andy Rozman
992f69daaa medtronic-0.12.0-SNAPSHOT
- Merge branch 'dev' into medtronic_andy
2019-07-05 14:18:28 +01:00
Andy Rozman
4088b38883 - minor change in code
- renamed version to 0.11, preparing for tag
2019-07-05 12:21:49 +01:00
Paulus
4b5189403c #1851 initial commit 2019-07-05 12:12:19 +02:00
Milos Kozak
635e7cc60f uncomment 2019-07-05 00:28:19 +01:00
Milos Kozak
f48cb6af2c automation in engineering mode 2019-07-05 00:22:45 +01:00
Milos Kozak
9706f68be2 automation -> jetpack 2019-07-05 00:21:31 +01:00
Andy Rozman
7713270524 medtronic-0.11.12-SNAPSHOT
- another look at duplicate bolus problem. This should have fixed the problem, if we still get duplicated, we will
have to investigate NS angle
2019-07-05 00:15:45 +01:00
Johannes Mockenhaupt
a17947ff12
RuffyScripter: reset unparsableMenuEncountered flag on command start. 2019-07-05 00:57:07 +02:00
Milos Kozak
c0345ce56c
Merge branch 'dev' into automation 2019-07-04 23:37:36 +01:00
Milos Kozak
6258d473b0 fix merge 2019-07-04 20:28:22 +01:00
Milos Kozak
61097b3ac6
Merge branch 'dev' into sdk28 2019-07-04 20:06:09 +01:00
Andy Rozman
38f13cd6db medtronic-0.11.11-SNAPSHOT
- #152 fixed double bolus problem: code is now looking for AAPS Events that happened within 2 minutes.
2019-07-04 13:24:46 +01:00
Andy Rozman
be5c79f370 medtronic-0.11.10-SNAPSHOT
- #151 - when searching for AAPS events (treatments, TempBasals) we don't look at +/- 5 min anymore, just +/- 40s
2019-07-02 17:20:36 +01:00
Andy Rozman
08cae9a3bb medtronic-0.11.9-SNAPSHOT
- #150 BolusWizard512 problems
2019-07-01 12:00:50 +01:00
AdrianLxM
b274647f68
get last notification 2019-06-30 15:58:04 +02:00
AdrianLxM
1282e3ed9e
Get Singleton Notification 2019-06-30 15:57:04 +02:00
Milos Kozak
323c282b9f Tidepool in engineering mode only 2019-06-30 15:38:30 +02:00
AdrianLxM
d42794137f
call startForeground() 2019-06-30 15:38:04 +02:00
AdrianLxM
bdf0b0e07d
Make updateNotification public 2019-06-30 15:36:30 +02:00
AdrianLxM
3dc5c61984
DummyService has nonNull notification 2019-06-30 14:12:40 +02:00
AdrianLxM
b2c46b67b6
Always create Notification 2019-06-30 14:07:41 +02:00
Milos Kozak
e86094a250 updateGui to Rx 2019-06-30 01:05:33 +02:00
Andy Rozman
f544f19a02 - Small fix in case that saved date is invalid (shouldn't be) 2019-06-29 21:02:51 +01:00
Andy Rozman
9a1377fd78 - Small log change in DateTimeUtil.toLocalDate 2019-06-29 19:49:35 +01:00
Andy Rozman
982a5001b3 medtronic-0.11.8-SNAPSHOT
- #147 - Prevent update of tive if over 24h
- #148 - Pump History Dialog has filter
- #146 - Battery not updated every hour
- #149 - If BasalProfile fails its never retried
2019-06-29 16:24:47 +01:00
Milos Kozak
1512064c53 always run startForeground() 2019-06-29 12:49:29 +02:00
Milos Kozak
df2ae1c52f start DummyService only if there is Notification ready 2019-06-29 10:59:10 +02:00
Milos Kozak
6ccf3788be fix dummy service start 2019-06-27 22:05:22 +02:00
Andy Rozman
f0b8aefc14 medtronic-0.11.6-SNAPSHOT
- fixed problem with GettingBasal
- fixed problem with writing data into logs
2019-06-26 23:02:35 +01:00
Andy Rozman
570e93273c medtronic-0.11.5-SNAPSHOT
- little more cleanup
- removed code that reads 1.5 days history on every start
2019-06-26 13:26:03 +01:00
Andy Rozman
32fad688fc Merge branch 'dev' into medtronic_andy 2019-06-25 14:50:41 +01:00
Andy Rozman
2a680cd8e9 medtronic-0.11.3-SNAPSHOT:
- fix for problem with TBRs
- added code to prevent crashing if it comes to error by parsing (will possibly be removed later) or modified
- fixed problem with configuration parsing (returns error/or rather retries if configuration is too short)
- added validation for BasalProfiles... might need to extend that though...
2019-06-25 14:18:52 +01:00
Roumen Georgiev
93aa22a48a Merge branch 'triggerLastBolus' of https://github.com/PoweRGbg/AndroidAPS into triggerLastBolus 2019-06-24 16:26:15 +03:00
Andy Rozman
5878a33ac7 Medtronic-0.11.2-SNAPSHOT
- #122 - TBRs processing
- #139 - Set Time in Pump
- #126 - Calculate Battery
- #140 - Be aware of Time/TZ changes
2019-06-23 00:01:11 +01:00
Roumen Georgiev
c5efe01163 addedd missing L 2019-06-21 16:41:36 +03:00
Milos Kozak
7e8059c3d8
Merge branch 'automation' into triggerLastBolus 2019-06-21 15:34:06 +02:00
Milos Kozak
a9d8420451
Merge branch 'automation' into deltaTrigger 2019-06-21 15:22:40 +02:00
Milos Kozak
8d9c18dd35
Merge pull request #1834 from MilosKozak/boluswizard
BolusWizard -> kt, code consolidation
2019-06-21 14:54:45 +02:00
Tebbe Ubben
d014962fc8
Merge pull request #1843 from MilosKozak/foreground-service-fix
resolve dangling else and private constructor for singleton
2019-06-21 14:32:08 +02:00
AdrianLxM
45805ed410 BolusWizard privacy 2019-06-21 13:23:37 +02:00
Milos Kozak
7b15cfb395 fix comparing bolus size granularity 2019-06-21 11:41:50 +02:00
AdrianLxM
f87b30771b
resolve dangling else and private constructor for singleton 2019-06-21 09:05:39 +02:00
Tebbe Ubben
412c06bd15
Merge pull request #1841 from MilosKozak/foreground-service-fix
Also show notification when no profile is set
2019-06-20 23:25:17 +02:00
Tebbe Ubben
bbd26f047d Also show notification when no profile is set 2019-06-20 23:22:10 +02:00
Roumen Georgiev
046e2b7495 added triggerCob 2019-06-20 11:12:03 +03:00
Roumen Georgiev
15f6a577c2 trigger bolusAgo 2019-06-19 14:58:13 +03:00
Roumen Georgiev
f8b3878899 icon 2019-06-19 12:11:10 +03:00
Milos Kozak
66e2ce5180 don't call update if == null 2019-06-19 09:24:16 +02:00
Tebbe Ubben
5af80ceb02 Support for new Dexcom app 2019-06-19 01:38:55 +02:00
Andy Rozman
654b8ab0f6 0.11.1-SNAPSHOT
- fix to suspend code
2019-06-18 21:37:21 +01:00
Roumen Georgiev
3f86788eb4 Added DeltaType tests and negative delta values allowed 2019-06-18 14:47:44 +03:00
Roumen Georgiev
b9ddbe7011 tests 2019-06-18 10:56:27 +03:00
Roumen Georgiev
f15ead9c6f fixed tests and added DeltaType testing 2019-06-17 16:49:57 +03:00
Roumen Georgiev
6e14e3df90 working again 2019-06-17 16:03:35 +03:00
Roumen Georgiev
2a023232a7 added enum DeltaType 2019-06-17 11:22:58 +03:00
Andy Rozman
c460d1d3ef - Process Suspend delivery items 2019-06-16 20:12:10 +01:00
Milos Kozak
af0d4f23b1 kotlin lint 2019-06-16 09:11:11 +02:00
Milos Kozak
09e4106182 BolusWizard -> kt, code consolidation 2019-06-16 09:00:47 +02:00
Andy Rozman
00f141aa03 Medtronic 0.10.6:
- Fix Superbolus problem #138
- Fix Disconnect problem #136
- Fix Clear Bolus Block #137
- Fix problem with history DalyTotal515 (for RaulAC)
- Clean code from driver
- Fix RileyLink status, before Pump initialized #130
- Fixed basal profile rounding #134
2019-06-15 19:52:20 +01:00
Johannes Mockenhaupt
ab96e62ded
Incomplete TidepoolFragment with kotlin-android-extension. 2019-06-15 18:13:57 +02:00
Johannes Mockenhaupt
1b0d6ff413
Reflect name of Kotlin class. 2019-06-15 18:13:45 +02:00
Milos Kozak
d4858305a9 fix double value 2019-06-14 12:09:27 +02:00
Milos Kozak
89fef312c5
Merge pull request #1830 from andyrozman/bug_1828
Solution for bug 1828
2019-06-14 11:44:24 +02:00
Milos Kozak
d9bd1c6c98 remove unneeded file 2019-06-14 10:53:13 +02:00
Milos Kozak
75c13cef8f bus observeOn, Tandem as manufacture 2019-06-14 10:52:41 +02:00
Andy Rozman
125fa5fef9 Fix for problem 1631, problem with issueing of super bolus. We now check what type of TBR pump has, if its absolute it calles tempBasalAbsolute or else tempBasalPercent method 2019-06-13 23:57:36 +01:00
Andy Rozman
1432ad81e6 Solution for bug 1828 - If suspend is called from Overview, it checks which TBR type is supported by default and
then starts correct TBR method...
2019-06-13 00:14:28 +01:00
Andy Rozman
85381af2fb Fixing problem with history
Fix for log
2019-06-09 22:26:50 +01:00
Andy Rozman
bb466595e6 Minor change with collection 2019-06-09 18:54:19 +01:00
Andy Rozman
a19d71df89 0.10.5-SNAPSHOT
- added custom comnand for reseting RL configuration
- removed guava Splitter and use my own code
- remove old unsused code
2019-06-09 16:58:23 +01:00
Milos Kozak
9d90c36a94 process TBR correctly 2019-06-09 15:17:16 +02:00
Milos Kozak
243e6c5801 pump manufacters etc 2019-06-09 14:02:33 +02:00
Milos Kozak
c49da9a818 conditional upload 2019-06-08 23:39:14 +02:00
Milos Kozak
d2e7cc9041 Provide manufacter, model, SN for pump 2019-06-08 22:39:26 +02:00
Milos Kozak
edb4844b7a more kotlin, less java 2019-06-07 16:09:10 +02:00
Milos Kozak
7d6ed94491 Scrollview 2019-06-07 15:40:05 +02:00