Philoul
|
3d9ef71045
|
Merge branch 'meallink' into meallink_ValueWithUnit
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
|
2021-03-31 22:18:50 +02:00 |
|
|
Milos Kozak
|
6af1beeea5
|
Merge pull request #454 from jotomo/meallink+pumpinterface-contract
Document PumpInterface.deliverTreatment contract.
|
2021-03-31 21:56:29 +02:00 |
|
|
Milos Kozak
|
a5ea0d9027
|
DeviceStatus
|
2021-03-31 21:54:49 +02:00 |
|
|
Johannes Mockenhaupt
|
edcdc4c785
|
Revert incorrect Lint suggestion.
|
2021-03-31 20:44:35 +02:00 |
|
|
Johannes Mockenhaupt
|
f4a76a1e24
|
Document PumpInterface.deliverTreatment contract.
|
2021-03-31 20:44:04 +02:00 |
|
|
Bart Sopers
|
a7ee6ed323
|
Merge branch 'dash' into bart/implement-pump-plugin
|
2021-03-31 11:30:23 +02:00 |
|
|
bartsopers
|
210872d6c6
|
Merge pull request #26 from 0pen-dash/bart/create-responses
Parse responses
|
2021-03-31 11:27:24 +02:00 |
|
|
Bart Sopers
|
afd28656d9
|
Merge branch 'bart/create-responses' into bart/implement-pump-plugin
|
2021-03-31 11:25:20 +02:00 |
|
|
Bart Sopers
|
12dad6662c
|
Merge branch 'dash' into bart/create-responses
|
2021-03-31 11:21:59 +02:00 |
|
|
Bart Sopers
|
fe9c5d00a7
|
WIP on implementing OmnipodDashPumpPlugin + some autoformatting
|
2021-03-31 11:18:58 +02:00 |
|
|
Andrei Vereha
|
470b21aad4
|
detekt
|
2021-03-31 08:26:35 +02:00 |
|
|
Bart Sopers
|
811f136830
|
Implement most methods in OmnipodDashManagerImpl + cleanup
|
2021-03-31 01:10:21 +02:00 |
|
|
Philoul
|
ab0c739281
|
Clean Imports and add missing Sources in existing uel
|
2021-03-31 00:18:55 +02:00 |
|
|
Andrei Vereha
|
89bcd52994
|
detekt
|
2021-03-30 23:33:59 +02:00 |
|
|
Philoul
|
21f382f0ae
|
Remove unused code
|
2021-03-30 23:29:43 +02:00 |
|
|
AdrianLxM
|
93b1b37021
|
expandable carbs query extended
|
2021-03-30 23:24:31 +02:00 |
|
|
AdrianLxM
|
d9ceeb043e
|
expandable carbs query
|
2021-03-30 23:19:53 +02:00 |
|
|
Philoul
|
348c260d3d
|
QuickWizard
|
2021-03-30 23:13:20 +02:00 |
|
|
Philoul
|
bf218e9ff4
|
Merge remote-tracking branch 'Nightscout/meallink' into meallink_ValueWithUnit
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientRemoveWorker.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
|
2021-03-30 23:05:19 +02:00 |
|
|
Milos Kozak
|
299d0a9b01
|
finish Dana pumps
|
2021-03-30 22:45:45 +02:00 |
|
|
Philoul
|
9b0226719f
|
Remove used import
|
2021-03-30 22:25:28 +02:00 |
|
|
Philoul
|
78a98358d7
|
Add QuickWizard Source (final solution)
|
2021-03-30 22:20:21 +02:00 |
|
|
Milos Kozak
|
07d060c2b5
|
carbs with duration
|
2021-03-30 22:05:44 +02:00 |
|
|
Milos Kozak
|
1ae4823a9a
|
Merge remote-tracking branch 'ns/dev' into meallink
|
2021-03-30 19:39:22 +02:00 |
|
|
Milos Kozak
|
7ca9caba18
|
Merge pull request #445 from nightscout/adrian/wear-tests
load Action String Handler
|
2021-03-30 19:38:12 +02:00 |
|
|
Milos Kozak
|
903ed1134b
|
Merge pull request #448 from andyrozman/bug423_historyProblem
Bug423 history problem
|
2021-03-30 19:37:41 +02:00 |
|
|
Milos Kozak
|
e9f4f87894
|
Remove Tratment.class where possible
|
2021-03-30 19:37:26 +02:00 |
|
|
Philoul
|
07e2e0eaf4
|
Add QuickWizard Source (final solution)
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
# app/src/main/java/info/nightscout/androidaps/utils/wizard/QuickWizardEntry.kt
|
2021-03-30 12:22:49 +02:00 |
|
|
Bart Sopers
|
19a132c596
|
Remove unused constants
|
2021-03-30 01:33:01 +02:00 |
|
|
Bart Sopers
|
76c4d01ee7
|
Bugfix in setting Dash basal
|
2021-03-30 01:21:35 +02:00 |
|
|
Philoul
|
61d84e66fe
|
Add QuickWizard Source (Solution TBC, information got through Note, so I create a "complicated String" to avoid Fake QuickWizard in UserEntry)
|
2021-03-29 23:47:21 +02:00 |
|
|
Philoul
|
d607b855b0
|
Add QuickWizard Source (not sure if it's the best solution...)
|
2021-03-29 23:03:53 +02:00 |
|
|
Philoul
|
6c8b4dfab0
|
Merge branch 'meallink' into meallink_ValueWithUnit
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
|
2021-03-29 22:39:12 +02:00 |
|
|
Philoul
|
e829a6918c
|
Fix uel after merge
|
2021-03-29 22:30:44 +02:00 |
|
|
Milos Kozak
|
cb298a2646
|
eliminate treatments cache from TreatmentsPlugin
|
2021-03-29 19:15:46 +02:00 |
|
|
Philoul
|
22384ef2e8
|
Merge branch 'Adrian_ValueWithUnit_Refactor' into meallink_ValueWithUnit
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
# app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientRemoveWorker.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/CarbsGenerator.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
# app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
# automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt
# automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTarget.kt
# combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
# core/src/main/java/info/nightscout/androidaps/data/DetailedBolusInfo.java
# core/src/main/java/info/nightscout/androidaps/logging/UserEntryLogger.kt
# database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
# omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/data/ActiveBolus.java
|
2021-03-29 13:51:28 +02:00 |
|
|
Milos Kozak
|
0a61585836
|
core.pump.common cleanup
|
2021-03-29 10:45:48 +02:00 |
|
|
Philoul
|
6956a17bf6
|
Move Colored Action to UserEntryPresentationHelper.kt
Treatment is now replaced by Bolus + Carbs (blue and orange)
|
2021-03-29 09:49:08 +02:00 |
|
|
Milos Kozak
|
f37e3ab4c2
|
Simplify IOB calculation call
|
2021-03-29 09:43:25 +02:00 |
|
|
Milos Kozak
|
e3ac451f8d
|
PumpSync interface, VirtualPump, remove pump driver dependency to database
|
2021-03-29 00:31:40 +02:00 |
|
|
Andrei Vereha
|
5209386fc1
|
compile
|
2021-03-28 23:24:38 +02:00 |
|
|
Andrei Vereha
|
189b791c5c
|
detekt
|
2021-03-28 23:24:12 +02:00 |
|
|
Andrei Vereha
|
6c9aa90679
|
ktLintFormat
|
2021-03-28 23:17:15 +02:00 |
|
|
Andrei Vereha
|
b630c4d21a
|
format
|
2021-03-28 23:15:42 +02:00 |
|
|
Andrei Vereha
|
96b1b177a6
|
call readyToRead on BleIOs
|
2021-03-28 23:14:41 +02:00 |
|
|
Andrei Vereha
|
2f87620050
|
compile
|
2021-03-28 23:12:17 +02:00 |
|
|
Andrei Vereha
|
38a1d9c6bc
|
add BusyException
|
2021-03-28 23:09:44 +02:00 |
|
|
Philoul
|
74b911d875
|
Remove SerializedName (all) and Text (Sources)
|
2021-03-28 21:45:40 +02:00 |
|
|
Andy Rozman
|
e3a75a55eb
|
Merge branch 'dev' into bug423_historyProblem
|
2021-03-28 20:45:19 +01:00 |
|
|
Andrei Vereha
|
8d2d38163a
|
simplify exceptions
|
2021-03-28 21:43:32 +02:00 |
|