Commit graph

11341 commits

Author SHA1 Message Date
Milos Kozak 5747f97201 DanaHistoryDatabase 2021-05-03 09:33:14 +02:00
Andy Rozman 1e88a1a1ed Merge branch 'dev2_dana_combo_only' into meallink-mdt 2021-05-02 15:28:48 +01:00
Andy Rozman 40df9a023a Merge branch 'dev2_dana_combo_only' of github.com:nightscout/AndroidAPS into dev2_dana_combo_only 2021-05-02 15:27:06 +01:00
Milos Kozak 26c29b7185 Merge branch 'dev2_dana_combo_only' of https://github.com/nightscout/AndroidAPS into dev2_dana_combo_only 2021-05-02 16:09:03 +02:00
Milos Kozak a9e6cfaa66 sync TBR with temp id 2021-05-02 16:08:24 +02:00
Andy Rozman 49f345d425 - startted adding 35 minut - before reading functionality
- some refactoring
2021-05-02 13:45:56 +01:00
Andy Rozman 67a2c0dca3 Merge branch 'dev2_dana_combo_only' into meallink-mdt 2021-05-01 12:11:29 +01:00
Andy Rozman 5abdba0579 Merge branch 'dev2_dana_combo_only' of github.com:nightscout/AndroidAPS into dev2_dana_combo_only 2021-05-01 11:26:53 +01:00
Andy Rozman 5bd41d9abd - some cleanup
- prelim work on TBR
2021-05-01 11:24:50 +01:00
Johannes Mockenhaupt dc2d64ceb7
Fix: turn APSResult.bolusRequested into a function.
Previously this var was set while parsing determine-basal output, setting it to true if determine-basal provided a value which was assigned to var smb. However, the variable smb is changed when constraints are applied, making the val bolusRequested invalid afterwards. Hence, dynamically evaluate the smb var by turning bolusRequested into a function.
2021-05-01 00:23:32 +02:00
Milos Kozak dbb24f437b
Merge pull request #484 from jotomo/dev2-cd+combo-mac
Combo driver: notify on pump change
2021-04-30 22:05:56 +02:00
Andy Rozman a3f0bf41cd - removed unused (old) methods from MedtronicHistoryData
- PumpSyncStorage added method addCarbs, that is now used in PUmpPluginAbstract and in MetronicPumpPlugin and MedtronicHistoryData
- extended PumpDbEntry with other data classes: for Bolus, TBR (incomplete) and Carbs
2021-04-30 20:05:03 +01:00
Milos Kozak e48d317d55 ProfileSwitch NS sync 2021-04-30 17:21:24 +02:00
Andy Rozman 6504498cd2 - added bolus handling (complete)
- added PumpSyncStorage class for handling temporary data
2021-04-30 15:28:24 +01:00
Johannes Mockenhaupt 572d7c4565
Combo: minor cleanups. 2021-04-29 22:20:15 +02:00
Johannes Mockenhaupt 92b441927e
Combo: class javadoc. 2021-04-29 22:11:27 +02:00
Milos Kozak 9b4653ac74 lib update 2021-04-29 22:02:49 +02:00
Johannes Mockenhaupt 1fed867eb3
Revert "Combo: show pump id in UI."
This reverts commit 76568cac
2021-04-29 22:00:50 +02:00
Johannes Mockenhaupt 84622a30a0
Combo: clean up SP access. 2021-04-29 21:59:28 +02:00
Milos Kozak 07fe79eb91 Merge branch 'dev2_dana_combo_only' of https://github.com/nightscout/AndroidAPS into dev2_dana_combo_only 2021-04-29 21:23:18 +02:00
Milos Kozak f008d14b0e google-services:4.3.5 2021-04-29 21:22:10 +02:00
Milos Kozak 0731ccb6d4
Merge pull request #487 from Philoul/uel.log_BolusCancel
Add uel.log for Cancel Bolus Button
2021-04-29 21:04:38 +02:00
Milos Kozak 37e3c4532a Profiles -> room (no NS sync yet) 2021-04-29 20:42:45 +02:00
Johannes Mockenhaupt c62d92e984
Refactor: Remove (now) superflous BLUETOOTH from ACCU_CHEK_INSIGHT_BLUETHOOTH.
This aligns with the naming of other pumps and BLUETOOTH doesn't provide much information.
2021-04-29 14:58:58 +02:00
Johannes Mockenhaupt 884eb497bd
Refactor: Rename ACCU_CHEK_INSIGHT -> ACCU_CHEK_VIRTUAL. 2021-04-29 14:51:04 +02:00
Johannes Mockenhaupt c52526cf6f
Fix: Insight; change references to correct Pumpdescription. 2021-04-29 14:51:04 +02:00
Johannes Mockenhaupt 970aebc6db
Refactor: rename PumpDescription.setPumpDescription to pd.fillFor(). 2021-04-29 14:51:04 +02:00
Johannes Mockenhaupt 18e19ae4c9
Fix: Insight capabilities; fix reference to basal/bolus. 2021-04-29 14:51:03 +02:00
dependabot[bot] 358c738076
Bump dagger_version from 2.34.1 to 2.35.1
Bumps `dagger_version` from 2.34.1 to 2.35.1.

Updates `dagger-compiler` from 2.34.1 to 2.35.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.34.1...dagger-2.35.1)

Updates `dagger-android-processor` from 2.34.1 to 2.35.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.34.1...dagger-2.35.1)

Updates `dagger-android` from 2.34.1 to 2.35.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.34.1...dagger-2.35.1)

Updates `dagger-android-support` from 2.34.1 to 2.35.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.34.1...dagger-2.35.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-28 07:11:47 +00:00
Andy Rozman 727862c743 - DailyTotals changes
- GraphData merge
2021-04-25 18:15:53 +01:00
Johannes Mockenhaupt 76568cac38
Combo: show pump id in UI. 2021-04-24 23:48:09 +02:00
Andy Rozman e7d4f57c84 Merge branch 'dev2_dana_combo_only' into meallink-mdt 2021-04-24 19:22:57 +01:00
Andy Rozman edb7f42e7f Merge branch 'dev2_dana_combo_only' of github.com:nightscout/AndroidAPS into dev2_dana_combo_only 2021-04-24 19:19:09 +01:00
Andy Rozman 28c0f1b894 - all files kotlinized
- started some refactoring
- added adrians refactoring of MedtronicCommunicationManager
2021-04-24 19:11:01 +01:00
Philoul e7578b4c8f Loop Dialog, hide loop buttons if pump disconnected or loop suspended 2021-04-23 00:31:40 +02:00
Philoul 2ba10469b8 Fix UTC Offset in csv 2021-04-21 21:54:04 +02:00
Andy Rozman 08a5c50037 - kotlin changes almost done, 1 file left 2021-04-20 23:23:03 +01:00
Philoul 0f18d43da8 Icon overview of userEntry updated 2021-04-20 22:28:58 +02:00
Philoul 0b928c3140 Add uel.log for Cancel Bolus Button 2021-04-20 20:00:07 +02:00
Andy Rozman 6b7efdcb95 - more kotlinize, MedtronicHistoryActivity not yet working 2021-04-20 16:45:29 +01:00
Milos Kozak cada2919d1 prepare Profile interface 2021-04-19 18:44:17 +02:00
dependabot[bot] 7ebb199de3
Bump byteBuddyVersion from 1.10.22 to 1.11.0
Bumps `byteBuddyVersion` from 1.10.22 to 1.11.0.

Updates `byte-buddy` from 1.10.22 to 1.11.0
- [Release notes](https://github.com/raphw/byte-buddy/releases)
- [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md)
- [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.10.22...byte-buddy-1.11.0)

Updates `byte-buddy-android` from 1.10.22 to 1.11.0
- [Release notes](https://github.com/raphw/byte-buddy/releases)
- [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md)
- [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.10.22...byte-buddy-1.11.0)

Updates `byte-buddy-agent` from 1.10.22 to 1.11.0
- [Release notes](https://github.com/raphw/byte-buddy/releases)
- [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md)
- [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.10.22...byte-buddy-1.11.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-19 08:44:20 +00:00
Milos Kozak 430a871993 fix DeviceStatus upload 2021-04-18 18:31:21 +02:00
Andy Rozman a202178426 - kotlin changes to most of the classes, most of it is tested 2021-04-18 15:30:05 +01:00
Johannes Mockenhaupt 97bf95a6fa
Combo: provide pump serial number, notify about pump change. 2021-04-18 16:29:38 +02:00
Johannes Mockenhaupt 38bab84047
Combo: add reading MAC address to RuffyCommands. 2021-04-18 16:27:00 +02:00
Milos Kozak 3928b579a7 TDD -> room 2021-04-18 13:31:25 +02:00
Andy Rozman bb657a2498 - kotlin changes
- disabled problem in Fragment for now
2021-04-16 23:41:24 +01:00
Andy Rozman 0d1ff8dd41 Merge branch 'dev2_dana_combo_only' into meallink-mdt 2021-04-16 21:53:29 +01:00
Andy Rozman 99946dd728 Merge branch 'dev2_dana_combo_only' of github.com:nightscout/AndroidAPS into dev2_dana_combo_only 2021-04-16 21:49:31 +01:00