Milos Kozak
5817d57e84
Merge branch 'dev2_dana_combo_only' of https://github.com/nightscout/AndroidAPS into dev2_dana_combo_only
2021-05-03 10:13:20 +02:00
Milos Kozak
0a86c63ace
fix tests
2021-05-03 09:49:26 +02:00
Milos Kozak
e17f96ac5c
Merge pull request #497 from jotomo/dev2-cd+insight
...
Insight fixes and refactorings
2021-05-03 09:36:03 +02:00
Milos Kozak
5747f97201
DanaHistoryDatabase
2021-05-03 09:33:14 +02:00
bartsopers
7dd5ca972c
Merge pull request #30 from 0pen-dash/avereha/dev2-merge
...
avereha/dev2 merge
2021-05-02 20:14:12 +02:00
bartsopers
c19989d649
Merge pull request #29 from 0pen-dash/andrei/confirm-deny-command
...
Andrei/confirm deny command
2021-05-02 19:48:05 +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
Andrei Vereha
684250a40f
Merge branch 'avereha/dev2-merge' into avereha/temp-basals
2021-05-02 14:20:17 +02:00
Andrei Vereha
c544ef6c19
merge tests
2021-05-02 14:19:46 +02:00
Andrei Vereha
5179670e9c
merge for tests
2021-05-02 14:10:15 +02:00
Andrei Vereha
dcfd9bcdbf
merge
2021-05-02 14:02:10 +02:00
Andrei Vereha
976ae45057
ktlintFormat
2021-05-02 10:38:22 +02:00
Andrei Vereha
dd8ebded1a
merge: profile is not an interface
2021-05-02 10:37:06 +02:00
Andrei Vereha
2ae9f399aa
s/utils.extensions/extensions/
2021-05-02 10:31:47 +02:00
Andrei Vereha
f197141cd5
merge:
...
.comment is now in Kotlin and it does not accept a String?
symbol renames
2021-05-02 10:28:45 +02:00
Andrei Vereha
c36e521efb
use concat(listOf())
2021-05-02 10:00:11 +02:00
Andrei Vereha
4bd5e7c625
observe there is no activeCommand
2021-05-01 20:56:02 +02:00
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
