caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity
11095 commits 1 branch 20 tags 140 MiB
Commit graph

11095 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Philoul
3cc7a72b3d Fix XXXValueWithUnit Refactoring 2021-04-04 09:20:02 +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
Philoul
195c810606 Update list of Sources in translator 2021-04-03 12:32:37 +02:00
Philoul
dc87bfa303 Replace all remaining ValueWithUnit by XXXValueWithUnit and remove Deprecated uel.log functions 2021-04-03 12:25:44 +02:00
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