Philoul
f789888afd
Fix SMB
...
remove comment linked to previous version
2021-05-07 10:21:34 +02:00
Andy Rozman
f285b59b44
- finished implementation of TBR and Bolus, needs more testing
...
- missing 35 minutes
2021-05-06 20:30:18 +01:00
Andy Rozman
9526e8228b
Merge branch 'dev2_dana_combo_only' into meallink-mdt
2021-05-05 17:02:03 +01:00
Andy Rozman
3b35c01f22
Merge branch 'dev2_dana_combo_only' of github.com:nightscout/AndroidAPS into dev2_dana_combo_only
2021-05-05 16:59:01 +01:00
Andy Rozman
7738520a2d
- dropbox dep
2021-05-05 16:58:37 +01:00
Andy Rozman
12a3609565
- started working TBR
...
- added Dropbox stuff (not part of project)
2021-05-05 16:57:48 +01:00
Philoul
acf29236bf
Merge remote-tracking branch 'Nightscout/dev2_dana_combo_only' into dev2_Insight_v2
2021-05-05 08:36:48 +02:00
Philoul
117fda4244
Fix SMB
...
remove comment linked to previous version
2021-05-05 08:27:41 +02:00
Philoul
8592ed3249
Update driver with pumpSync for boluses and TBR
2021-05-04 22:40:00 +02:00
Milos Kozak
61d5565d18
2.8.2.1-dev-e4
2021-05-04 21:27:11 +02:00
Milos Kozak
0f2f5cd1fa
Profile sync, removed NSProfile
2021-05-04 21:07:47 +02:00
Philoul
261fbbc759
Replace Hardcoded key by string
2021-05-04 18:41:11 +02:00
Milos Kozak
88f5eec306
do not run AcceptTemp on UI thread
2021-05-03 20:46:23 +02:00
Milos Kozak
e8ecf43894
ProfileSwitch improvements, resolve initial PS
2021-05-03 18:19:10 +02:00
Milos Kozak
5d55bdadf4
Merge branch 'dev2_dana_combo_only' of https://github.com/nightscout/AndroidAPS into dev2_dana_combo_only
2021-05-03 14:59:20 +02:00
Milos Kozak
07b3557b81
NSClientService -> kt
2021-05-03 14:59:10 +02:00
Milos Kozak
ac7da44336
Merge pull request #498 from jotomo/dev2_dana_combo_only
...
Fix: turn APSResult.bolusRequested into a function.
2021-05-03 14:42:59 +02:00
Milos Kozak
840de7b3b9
NSClient -> kt
2021-05-03 14:15:19 +02:00
Milos Kozak
c75d4e8e4e
eliminate old NS sync style
2021-05-03 12:49:11 +02:00
Milos Kozak
37bc7c040c
invalidateTemporaryBasalWithTempId
2021-05-03 10:56:26 +02:00
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
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
