Commit graph

11779 commits

Author SHA1 Message Date
Milos Kozak
194cf305fd Rv2,RKorean 2021-04-10 10:41:53 +02:00
Philoul
5a143b5444 Merge branch 'meallink' into meallink_VWU_v2 2021-04-09 12:38:42 +02:00
Philoul
5023225650 Add uel.log for Alert Carbs required 2021-04-09 12:00:33 +02:00
Milos Kozak
4a51b276f9 add DiaLink text 2021-04-09 10:16:47 +02:00
Milos Kozak
4120e9eef9 DanaR working 2021-04-09 08:02:46 +02:00
Philoul
ff0e6e9c87 Use icon of activeBgSource for uel Log 2021-04-08 18:47:00 +02:00
Philoul
8bba73a6ca Fix Plugin Type for BGSource in PluginStore.kt
I don't know if it could have side effect...
2021-04-08 11:24:10 +02:00
Philoul
6114effb22 Add BG sources for uel (Calibration and Sensor Change) 2021-04-08 10:06:00 +02:00
Andrei Vereha
feed6a2f63
Merge pull request #27 from 0pen-dash/andrei/retries
retries, error handling, session resynchronization
2021-04-07 20:55:08 +02:00
Milos Kozak
ec9efefb93
Merge pull request #462 from Philoul/meallink_VWU_v2
Remove dana dependency
2021-04-07 12:07:12 +02:00
Philoul
22dfea652d RRemove unused injection and try to fix tests...
It works for LoopPluginTest, but not for ClassicPrefsFormatTest as many other... (don't know if it's my config or not)
2021-04-06 23:58:54 +02:00
Philoul
ffa9c04496 Remove dependency and create 2 classes for drivers 2021-04-06 23:30:16 +02:00
Milos Kozak
d9f62b24c4
Merge pull request #461 from Philoul/meallink_VWU_v2
Update for uel.log
2021-04-06 13:39:34 +02:00
Philoul
e490c2df04 Update uel.log NSClientAddUpdateWorker 2021-04-06 00:43:51 +02:00
Milos Kozak
7b4ebbd440 2.8.2.1-dev-e2 2021-04-05 23:26:13 +02:00
Milos Kozak
d27b7a6139 Merge branch 'meallink' of https://github.com/nightscout/AndroidAPS into meallink 2021-04-05 23:13:17 +02:00
Milos Kozak
b04da525c1
Merge pull request #451 from Philoul/meallink_ValueWithUnit
Meallink ValueWithUnit Refactor
2021-04-05 22:42:50 +02:00
Milos Kozak
2463f8fc47 ExtendedBolus, TemporaryBasal -> room, DanaRS working 2021-04-05 22:41:28 +02:00
Philoul
f74cd6796f Same Color for DEV and BGI in menu + SEN value * 100 2021-04-05 10:44:52 +02:00
Andrei Vereha
821135edec dash ble: Supress deteket 2021-04-04 21:04:21 +02:00
Philoul
1e4983e659 Merge branch 'meallink' into meallink_ValueWithUnit 2021-04-04 19:55:36 +02:00
Andrei Vereha
40ac1d189a dash ble: detekt reduce number of arguments 2021-04-04 17:57:17 +02:00
Andrei Vereha
513007f6ae dash: undo the temporary discardButtonEnabled test 2021-04-04 17:15:44 +02:00
Andrei Vereha
0c35eb7da9 dash: bugfix DefaultStatusResponse and add more tests 2021-04-04 17:10:17 +02:00
Milos Kozak
0782878725
Merge pull request #458 from nightscout/meallink-carb-callback
callback if carbs are added to db but not pump
2021-04-04 16:18:27 +02:00
Andrei Vereha
6d2d5a7e76 dash ble: detekt 2021-04-04 16:06:39 +02:00
Philoul
cc3919e9fc Add SITE/RESERVOIR CHANGE Action and improve Colors 2021-04-04 15:05:43 +02:00
Philoul
c615afce95 Prepare Migration function 2021-04-04 14:00:39 +02:00
Philoul
b8bccdbeeb database v12 2021-04-04 13:58:18 +02:00
Philoul
22c1233201 Merge remote-tracking branch 'Nightscout/meallink' into Test_MealLink_VWU_Merge
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
#	app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
2021-04-04 13:51:53 +02:00
Andrei Vereha
c1426941cf dash: address feedback 2021-04-04 13:43:39 +02:00
Andrei Vereha
14af90e9e3 dash: ktlintFormat 2021-04-04 13:36:33 +02:00
Andrei Vereha
ff6a67cc97 detekt 2021-04-04 13:32:09 +02:00
Andrei Vereha
64fbea6afe dash ble: detekt 2021-04-04 13:16:05 +02:00
Andrei Vereha
210a446123 dash ble: ktLintFormat 2021-04-04 12:43:17 +02:00
Andrei Vereha
5b10ad13ec dash ble: handle disconnects 2021-04-04 12:40:28 +02:00
Philoul
3cc7a72b3d Fix XXXValueWithUnit Refactoring 2021-04-04 09:20:02 +02:00
Andrei Vereha
547454de6c dash ble: check for RTS 2021-04-03 23:31:43 +02:00
Andrei Vereha
9597922058 dash ble: fix reconnection and improve logging for BleCallbacks
When reconnecting, we have to use the discovered Characteristics and not
the ones that we used for the previous connection
2021-04-03 22:58:54 +02:00
AdrianLxM
94a0283eb6 callback if carbs are added to db but not pump 2021-04-03 22:51:34 +02:00
AdrianLxM
d62456f2e2 Merge branch 'meallink_ValueWithUnit' of https://github.com/Philoul/AndroidAPS into meallink_ValueWithUnit 2021-04-03 21:34:41 +02:00
AdrianLxM
c2b3e617df pair programming session 2021-04-03 21:29:26 +02:00
Philoul
ae9503dcc0 Add StringResource to uel.log Food 2021-04-03 19:04:08 +02:00
Philoul
be35597da4 Add Pump Sources (only Dana currently has an Entry, but required I think for pump history uploaded in AAPS, or Prime/Fill/ReservoirChange from pump) 2021-04-03 18:51:36 +02:00
Philoul
41ffa873f1 Add a new Color Group for Basal
when Loop entries are shown in fragment, it better...
2021-04-03 18:13:33 +02:00
Philoul
82299e430b Move MGDL and MMOL Constants to XXXValueWithUnits 2021-04-03 17:56:19 +02:00
Philoul
8d8abd65a7 Safe delete Units enum class in UserEntry 2021-04-03 16:35:57 +02:00
Philoul
2a03d1d7ca Remove presentation of StringResource with Param to avoid crash
Move String used in uel.log to core
2021-04-03 15:39:43 +02:00
Philoul
1f4b75a30d Add Rule Title in UserEntry for Automation (as note) 2021-04-03 13:35:15 +02:00
Philoul
206bac6da8 Safe Delete old ValueWithUnit Class in UserEntry 2021-04-03 12:51:49 +02:00