Commit graph

4675 commits

Author SHA1 Message Date
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
Milos Kozak
a7451c9b16 CompositeDisposable 2019-06-07 14:46:24 +02:00
Milos Kozak
10584d9b00 RxBus 2019-06-07 12:46:08 +02:00
Milos Kozak
643ddfae52 cleanup, hook to preferences change 2019-06-07 11:07:08 +02:00
Milos Kozak
01006b32ce remove explicit enable checkbox, test login 2019-06-07 09:13:29 +02:00
Milos Kozak
5dbdd5e437 layout improvement 2019-06-06 23:25:21 +02:00
Milos Kozak
ba0b7ec83d code tweaking, upload profile 2019-06-06 22:15:57 +02:00
Milos Kozak
21a49f731c code cleanup, set uuid properly 2019-06-05 16:29:19 +02:00
Milos Kozak
a0c00273bc remove window latency 2019-06-05 10:47:32 +02:00
Milos Kozak
8ea5968f4d reset time button 2019-06-05 00:22:57 +02:00
Milos Kozak
e32801ca6b preferences, button 2019-06-04 07:38:17 +02:00
Milos Kozak
4a07e01b7d fix NPE 2019-06-03 22:07:38 +02:00
Milos Kozak
5ab79f7f5a New login after removed dataset 2019-06-03 22:00:53 +02:00
Roumen Georgiev
116865896b
Automation (#69) (#70)
* Adding trigger AutosensValue

* new trigger and tests

* AS value in %

* adding tests

* fixed tests

* fix for maxValue and tests

* Using InputDouble

* icon added

* unavailable data and IS_NOT_AVAILABLE case

* Fixing after comments

* Autosens !=0 && IS_NOT_AVAILABLE doesn't exist enymore

* cleanup
2019-06-03 15:06:40 +03:00
Milos Kozak
048ea4d489 Tidepool test UI 2019-06-03 00:03:06 +02:00
Milos Kozak
e2364561ed transform to kotlin, cleanup, sort 2019-06-02 16:24:51 +02:00
Andy Rozman
43c472da17 0.10.4-SNAPSHOT
- fixed Tune up
- displaying power
2019-06-01 22:18:30 +01:00
Milos Kozak
42ceaac0f7 remove activeandroid 2019-06-01 22:29:57 +02:00
Milos Kozak
6f4d79bca8 fix copy paste errors 2019-06-01 18:51:41 +02:00
Milos Kozak
9b1acf6958 add missing classes. convert to use AAPS data 2019-06-01 18:40:33 +02:00
Andy Rozman
86ffc3370a Merge branch 'dev' into medtronic_andy 2019-06-01 17:34:30 +01:00
Milos Kozak
dd637021f7 tidepool xdrip port 2019-06-01 00:48:37 +02:00
Milos Kozak
15e997abb3 cleanup 2019-05-31 10:44:38 +02:00
Roumen Georgiev
5c4910ed5b added trigger Delta 2019-05-30 12:16:42 +03:00
Andy Rozman
67862d3385 - fix for task #126 - battery display, it will work for Alakaline and Lithium battery, but probably not for recharchargables 2019-05-26 14:44:33 +01:00
Roumen Georgiev
af739a3b66
Fixing after comments 2019-05-23 10:59:28 +03:00
Roumen Georgiev
27eb11e5df unavailable data and IS_NOT_AVAILABLE case 2019-05-20 11:21:51 +03:00
Andy Rozman
5a7146d3a9 - fix bolus saving 2019-05-18 20:28:25 +01:00
Andy Rozman
26d02c0062 0.10.3-SNAPSHOT
- fix for error
2019-05-18 18:25:40 +01:00
Andy Rozman
a897a72142 0.10.2-SNAPSHOT
- added functionality so that encoding can be changed on the fly
- chnaged TretmentService, rewrote method for createOrUpdate entry (fix for #125)
2019-05-18 14:49:44 +01:00
Milos Kozak
a20efab567 remove deprecated calls 2019-05-16 19:54:35 +02:00
Roumen Georgiev
ccd66d498c icon added 2019-05-16 16:03:05 +03:00
Milos Kozak
9a76f3386d androidx transition 2019-05-16 13:57:37 +02:00
Roumen Georgiev
4aaca7acb1 Using InputDouble 2019-05-16 12:08:36 +03:00
Andy Rozman
fe73eba2a2 0.10.1-SNAPSHOT
- Bolus Wizard entries (CH) is processed
- Better RSSI calculation for Tunning
- #124: Added retries to pump command (extended current retry functionality) that should take care of this problem
- Removed all un-needed logging and brining it under correct logging context (PUMP, PUMPCOMM, PUMPBTCOMM)
- added RileyLink Hardware encoding
2019-05-15 23:04:44 +01:00
Milos Kozak
5a478578e0 targetsdk 28 2019-05-15 23:26:07 +02:00
Milos Kozak
2ed1afa7c0
Merge pull request #1795 from MilosKozak/notiffix
Notification fix
2019-05-15 22:03:26 +02:00
Milos Kozak
2aea732326
Merge pull request #1796 from MilosKozak/basalrenderfix
fix basal rendering
2019-05-15 22:02:48 +02:00
Roumen Georgiev
3280f220ad fix for maxValue and tests 2019-05-15 17:11:47 +03:00
Roumen Georgiev
5d86ca742a AS value in % 2019-05-15 14:52:17 +03:00
Roumen Georgiev
e220a42e4b new trigger and tests 2019-05-14 16:50:07 +03:00
Milos Kozak
2505999a25
Merge pull request #1794 from MilosKozak/pumpcontrol-fix
Pump control: Fix crash when opening Insight paring activity
2019-05-12 14:56:56 +02:00
Milos Kozak
45d0d8ce13 Merge branch 'dev' into automation 2019-05-12 13:18:18 +02:00
Milos Kozak
4fda6c4c4f fix basal rendering 2019-05-12 10:52:25 +02:00
Milos Kozak
f4138a2fc0 fix index out of bouns 2019-05-12 10:43:32 +02:00
Tebbe Ubben
552298496f Pump control: Fix crash when opening Insight paring activity 2019-05-12 02:20:00 +02:00
Andy Rozman
bf49678572 - removed encoding for now, since it doesn't work correctly yet 2019-05-05 19:42:48 +01:00
Andy Rozman
7aedfde1c9 - added migration for settings for encoding 2019-05-05 18:00:55 +01:00
Andy Rozman
2ae7d0a292 - fixed problem with TDD
- added new command/action for Reset RileyLink (not working yet)
- added Hardware encoding for RileyLink
2019-05-05 17:22:10 +01:00
Milos Kozak
bf8870fdf4
Merge pull request #1767 from MilosKozak/devbranchcheck
better check for dev branch
2019-05-05 17:08:17 +02:00
Andy Rozman
cff20f78c8 - added functionality to map TBRs to Pump History Records (similar to Bolus)
- changed log size to 5 MB (as it was before)
2019-05-04 20:34:46 +01:00
Andy Rozman
b5da57e20f Merge branch 'dev' into medtronic_andy 2019-05-03 21:35:18 +01:00
Milos Kozak
a33e1f6d3c TriggerLocation 2019-05-03 07:37:49 +02:00
Andy Rozman
5cca0b821b Some gradle changes and fixes after merge. 2019-05-02 23:27:49 +01:00
Milos Kozak
3ab2a142d1 Merge remote-tracking branch 'origin/dev' into automation 2019-05-02 22:27:54 +02:00