Commit graph

1056 commits

Author SHA1 Message Date
Philoul f7f6f4b7c1 Merge branch 'User_Entry_ValueWithUnits' into UE_ExportXML 2021-03-08 18:22:50 +01:00
Philoul 816fd531a2 Merge remote-tracking branch 'Nightscout/dev' into User_Entry_ValueWithUnits 2021-03-08 18:21:57 +01:00
Milos Kozak bcfa449ec8 lints 2021-03-07 19:26:08 +01:00
Milos Kozak 658f565cf2 Notofocation -> kt 2021-03-07 17:46:21 +01:00
Milos Kozak 563bee2faf PumpDescription -> kt 2021-03-07 15:19:51 +01:00
Philoul c259aa345c Csv format (not xml) modified to Excel default
remove unnecessary " and use ; as separator
2021-03-07 10:43:33 +01:00
Philoul 6096825f4c Formatage xml 1ère version 2021-03-07 03:09:30 +01:00
Philoul 177bf214fd xml export initialization 2021-03-06 16:14:44 +01:00
Milos Kozak 23c23ea0b8 TrendArrow calculation 2021-03-05 23:08:43 +01:00
Philoul c065672179 Merge remote-tracking branch 'Nightscout/dev' into UE_VWU_Dev
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
2021-03-04 23:19:08 +01:00
Milos Kozak 04f074caf9 MainApp -> kt, the rest of DatabaseHelperInterface 2021-03-04 19:23:01 +01:00
Philoul 37777d7d82 Convert Long duration to min (TT from NS) 2021-03-04 00:22:40 +01:00
Philoul e89aaf4d11 Merge Dev, Fix new uel.log in NSClientPlugin 2021-03-03 23:53:15 +01:00
Philoul 4ce59b929a Merge remote-tracking branch 'Nightscout/dev' into User_Entry_VWU
# 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/InsulinDialog.kt
#	app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
#	app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.kt
#	app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
2021-03-03 22:49:31 +01:00
Philoul efa9e18f83 Constructor for formated Strings with param, add notes, convert to AAPS units in fragment 2021-03-02 22:43:18 +01:00
Milos Kozak efddea0eee
Merge pull request #386 from nightscout/tt
TempTarget -> room
2021-03-02 22:41:36 +01:00
Milos Kozak 06f35dc522 small fixes 2021-03-01 23:37:14 +01:00
Milos Kozak ae86cfea77 log errors without tags 2021-03-01 23:11:59 +01:00
Milos Kozak 05d5f8217c fix tests 2021-03-01 17:22:12 +01:00
Milos Kozak 3b5b945fea TemporaryTarget -> room database 2021-03-01 12:42:42 +01:00
Philoul df995724a7 Merge remote-tracking branch 'Nightscout/dev' into User_Entry_ValueWithUnits_Draft
# Conflicts:
#	automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt
2021-03-01 08:34:40 +01:00
AdrianLxM d098f81241 missing import 2021-02-28 20:02:36 +01:00
AdrianLxM d42e8fbe92 call confirm wear event 2021-02-28 19:48:33 +01:00
Philoul 8798be0c34 Update uel.log entries, Increase database version 3=>4, update migration3to4 2021-02-28 15:54:37 +01:00
Milos Kozak b9d03e4d00 make classes static where possible 2021-02-24 13:50:35 +01:00
Milos Kozak fdb6bcc178 @NonNull lints 2021-02-24 13:46:38 +01:00
Milos Kozak 07bf16b07b rename core strings 2021-02-22 18:04:30 +01:00
Milos Kozak aaa1ecea8d
Merge pull request #364 from bartsopers/dash
More Omnipod Dash preparation + some Eros fixes
2021-02-22 17:33:13 +01:00
Milos Kozak a0632f7753 automation module 2021-02-22 17:22:30 +01:00
Bart Sopers f52b11c78e Merge remote-tracking branch 'upstream/dev' into dash 2021-02-22 12:04:35 +01:00
Bart Sopers 567c215388 More work in progress on moving stuff from omnipod-eros to omnipod-common 2021-02-21 22:01:59 +01:00
Milos Kozak 5e36b49e5a fix notification logging 2021-02-21 11:12:57 +01:00
Philoul 820566fa62 Switched to Enum class for UserEntryLogger 2021-02-21 00:28:44 +01:00
Milos Kozak fe3c049999 Nitification store logging 2021-02-20 19:34:19 +01:00
Bart Sopers b56a3d8132 Merge remote-tracking branch 'upstream/dev' into dash 2021-02-20 18:48:06 +01:00
Philoul 14454f6c15 Create keys for uel.log 2021-02-20 13:30:34 +01:00
Milos Kozak a025fc8ece disable deprecation warning for android auto 2021-02-20 11:34:01 +01:00
Milos Kozak 52eecd75ca log SMS reply 2021-02-19 21:30:54 +01:00
Milos Kozak 051cbe7870
Merge pull request #348 from nightscout/jacoco2
Jacoco, tests and gradle cleanup
2021-02-19 19:53:24 +01:00
Milos Kozak aae0c03ae4
Merge pull request #333 from nightscout/adrian/system-carb-timer
Adrian/system carb timer
2021-02-19 16:21:33 +01:00
Bart Sopers ecfabccffb Move several parts of Omnipod Eros driver to omnipod-common, did some renaming and added some preliminary Dash stuff 2021-02-19 09:40:59 +01:00
Milos Kozak f3fb533cf0 fix tests and dependencies 2021-02-18 21:38:36 +01:00
Milos Kozak 531c74de6a use fun instead of val in pump interface 2021-02-17 19:28:43 +01:00
Milos Kozak 341a536011 PumpInterface -> kt 2021-02-16 21:30:47 +01:00
Milos Kozak 2ac0411939 forgotten data access 2021-02-16 14:08:09 +01:00
Milos Kozak 6f3266e845 IobCobCalculatorPlugin -> kt 2021-02-16 13:48:59 +01:00
AdrianLxM 3314cbfbc2 Merge branch 'dev' into adrian/system-carb-timer 2021-02-16 00:06:09 +01:00
AdrianLxM 2f05c431aa layout CarbDialog alarm and use timer for automation alarms 2021-02-15 23:55:57 +01:00
Milos Kozak e1c7963c98 LoggerUtils -> kt 2021-02-15 22:20:25 +01:00
Milos Kozak 5c910306c6 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-02-15 12:54:43 +01:00