Commit graph

11130 commits

Author SHA1 Message Date
Robrub
6cf621d90a
Update strings.xml
Minor change : Omnipod needs 80U to be primed and not 85U. I've tested this many times with an insulin pen.
2021-04-03 11:38:15 +02:00
Philoul
442e64e3f0 Add dao for Fragment 2021-04-02 18:59:41 +02:00
Philoul
38fb53b4ce Prepare Translator for missing translations 2021-04-02 18:07:05 +02:00
Philoul
c0aedc7736 Move CSV generation to UserEntryPresentationHelper 2021-04-02 16:37:01 +02:00
Philoul
0b00f4b401 Remove redundancies in UserEntryLogger 2021-04-02 08:54:12 +02:00
Milos Kozak
e26e023ebf prepare TemporaryBasal 2021-04-01 23:46:21 +02:00
Philoul
bb147deb92 CalibrationDialog + CarbDialog 2021-04-01 23:22:22 +02:00
Philoul
16959d4de9 Merge branch 'meallink' into meallink_ValueWithUnit 2021-04-01 23:02:52 +02:00
Philoul
9b9bafb4bc CarePortal, ExtendedBolusDialog, FillDialog, InsulinDialog
Some cleaning in Imports
2021-04-01 22:59:05 +02:00
Philoul
1a1d718fa2 TreatmentDialog (fix missing uel.log if only carbs), BolusWizard, and TempTargetDialog 2021-04-01 22:23:53 +02:00
Philoul
bb3effcda3 Fix null XXXValueWithUnit and aapsLogger string 2021-04-01 20:17:11 +02:00
Philoul
83f4d25527 UserEntry refactor to include XXXValueWithUnit (Loop Dialog and ProfileSwitchDialog only) 2021-04-01 19:27:13 +02:00
Philoul
a07b685e8d UserEntry refactor to include XXXValueWithUnit (first test) 2021-04-01 18:26:13 +02:00
Milos Kozak
9f66f88832
Merge pull request #455 from jotomo/meallink+interface-iteration
Iterate on PumpInterface/PumpSync documentation.
2021-04-01 18:14:56 +02:00
Milos Kozak
46793abbfc Treatment cleanup 2021-04-01 18:14:31 +02:00
Johannes Mockenhaupt
808d3a5a5d
Mention VirtualPumpPlugin as an example how to push data to AAPS-core. 2021-04-01 12:51:07 +02:00
Johannes Mockenhaupt
e5be6b35b9
Iterate on PumpInterface/PumpSync documentation. 2021-04-01 12:43:56 +02:00
Philoul
e13e5e10eb Merge branch 'meallink' into meallink_ValueWithUnit 2021-04-01 08:13:48 +02:00
Milos Kozak
699413dd6f fix tests 2021-04-01 00:37:15 +02:00
Milos Kozak
ab0f64bd46 Merge branch 'meallink' of https://github.com/nightscout/AndroidAPS into meallink 2021-04-01 00:03:54 +02:00
Milos Kozak
2df8c4fc74 provide Worker failure results 2021-04-01 00:03:49 +02:00
Milos Kozak
28f366d5fe
Merge pull request #453 from jotomo/meallink+revert-lint-suggestion
Revert incorrect Lint suggestion.
2021-04-01 00:01:14 +02:00
Milos Kozak
cacf239d17 VirtualPump plugin remove init 2021-03-31 22:59:05 +02:00
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
Philoul
ab0c739281 Clean Imports and add missing Sources in existing uel 2021-03-31 00:18:55 +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
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