Philoul
|
cd434ed4bb
|
Merge branch 'dev2_Insight_v2' into dev2_insight_dbHelper
# Conflicts:
# insight/src/main/java/info/nightscout/androidaps/insight/database/InsightDatabaseDao.kt
# insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java
|
2021-05-08 20:13:09 +02:00 |
|
Philoul
|
153168a4d4
|
Remove additional aapsLogger (3 left for further analysis with Insight V3 and site change)
|
2021-05-08 19:48:10 +02:00 |
|
Andy Rozman
|
2b43ee186f
|
- final changes to pumpSync integration
- removed commented code that is not used
|
2021-05-08 15:43:19 +01:00 |
|
Philoul
|
dd527d9908
|
Cleaning
|
2021-05-08 16:35:12 +02:00 |
|
Philoul
|
931980bcb6
|
Typo in variable names
|
2021-05-08 16:20:01 +02:00 |
|
Philoul
|
a146d54a50
|
Trail Add abstraction layer between InsightPlugin and dao
|
2021-05-08 16:18:47 +02:00 |
|
Philoul
|
0ea9c98469
|
Replace hard coded strings for EventType by enum
|
2021-05-07 23:54:02 +02:00 |
|
Philoul
|
dfd6c6e859
|
Move Insight database package outside plugins\pump
|
2021-05-07 11:33:51 +02:00 |
|
Philoul
|
ed7dcea38e
|
Clean Code, remove old code and add some Todo for verification and tests
|
2021-05-07 10:41:45 +02:00 |
|
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 |
|
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 |
|