Commit graph

11517 commits

Author SHA1 Message Date
Andrei Vereha
b7db79f296 interface updates 2021-05-01 20:28:42 +02:00
Andrei Vereha
b7e705b581 fix compilation error 2021-05-01 20:19:11 +02:00
Andrei Vereha
e3f7608de7 Merge remote-tracking branch 'upstream/dev2_dana_combo_only' into avereha/dev2-merge 2021-05-01 20:11:48 +02:00
Andrei Vereha
24e5223ad1 val 2021-05-01 19:28:01 +02:00
Andrei Vereha
9e770601f3 merge CommandConfirmed and CommandDenied 2021-05-01 19:19:18 +02:00
Andrei Vereha
ee73cd5f2b remove comment 2021-05-01 18:54:17 +02:00
Andrei Vereha
912c847dcb rename to historyId 2021-05-01 18:43:11 +02:00
Andrei Vereha
c759e651c5 remove TODO 2021-05-01 18:39:06 +02:00
Andrei Vereha
19ff47e53d add comments 2021-05-01 17:59:22 +02: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
Andrei Vereha
8d112a12ca rename 2021-04-26 21:57:32 +02:00
Andrei Vereha
cddf7a3f68 add check for onError whent the command was sent 2021-04-26 21:56:54 +02: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
Andrei Vereha
b64d530ae9 ktlintFormat 2021-04-21 23:29:16 +02:00
Andrei Vereha
d3c73f9665 update on CommandSendNotConfirmed 2021-04-21 23:14:25 +02:00
Andrei Vereha
0fad1bc6c7 add comment 2021-04-21 22:54:47 +02:00
Andrei Vereha
20560f2a4e remove the active command if we get an error sending it 2021-04-21 22:52:22 +02:00
Andrei Vereha
3a2fa6d04f defer 2021-04-21 22:37:58 +02:00
Philoul
2ba10469b8 Fix UTC Offset in csv 2021-04-21 21:54:04 +02:00
Andrei Vereha
3ef983b732 fix crash on pod deactivation 2021-04-21 21:02:40 +02:00
Andrei Vereha
1e4cda01a3 Revert "Revert "remove duplication""
This reverts commit d49b87d124.
2021-04-21 20:44:26 +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