Commit graph

11298 commits

Author SHA1 Message Date
Andrei Vereha 684250a40f Merge branch 'avereha/dev2-merge' into avereha/temp-basals 2021-05-02 14:20:17 +02:00
Andrei Vereha c544ef6c19 merge tests 2021-05-02 14:19:46 +02:00
Andrei Vereha 5179670e9c merge for tests 2021-05-02 14:10:15 +02:00
Andrei Vereha dcfd9bcdbf merge 2021-05-02 14:02:10 +02:00
Andrei Vereha 976ae45057 ktlintFormat 2021-05-02 10:38:22 +02:00
Andrei Vereha dd8ebded1a merge: profile is not an interface 2021-05-02 10:37:06 +02:00
Andrei Vereha 2ae9f399aa s/utils.extensions/extensions/ 2021-05-02 10:31:47 +02:00
Andrei Vereha f197141cd5 merge:
.comment is now in Kotlin and it does not accept a String?
 symbol renames
2021-05-02 10:28:45 +02:00
Andrei Vereha c36e521efb use concat(listOf()) 2021-05-02 10:00:11 +02:00
Andrei Vereha 4bd5e7c625 observe there is no activeCommand 2021-05-01 20:56:02 +02:00
Andrei Vereha b7db79f296 interface updates 2021-05-01 20:28:42 +02:00
Andrei Vereha b7e705b581 fix compilation error 2021-05-01 20:19:11 +02:00
Andrei Vereha e3f7608de7 Merge remote-tracking branch 'upstream/dev2_dana_combo_only' into avereha/dev2-merge 2021-05-01 20:11:48 +02:00
Andrei Vereha 24e5223ad1 val 2021-05-01 19:28:01 +02:00
Andrei Vereha 9e770601f3 merge CommandConfirmed and CommandDenied 2021-05-01 19:19:18 +02:00
Andrei Vereha ee73cd5f2b remove comment 2021-05-01 18:54:17 +02:00
Andrei Vereha 912c847dcb rename to historyId 2021-05-01 18:43:11 +02:00
Andrei Vereha c759e651c5 remove TODO 2021-05-01 18:39:06 +02:00
Andrei Vereha 19ff47e53d add comments 2021-05-01 17:59:22 +02:00
Milos Kozak dbb24f437b
Merge pull request #484 from jotomo/dev2-cd+combo-mac
Combo driver: notify on pump change
2021-04-30 22:05:56 +02:00
Milos Kozak e48d317d55 ProfileSwitch NS sync 2021-04-30 17:21:24 +02:00
Johannes Mockenhaupt 572d7c4565
Combo: minor cleanups. 2021-04-29 22:20:15 +02:00
Johannes Mockenhaupt 92b441927e
Combo: class javadoc. 2021-04-29 22:11:27 +02:00
Milos Kozak 9b4653ac74 lib update 2021-04-29 22:02:49 +02:00
Johannes Mockenhaupt 1fed867eb3
Revert "Combo: show pump id in UI."
This reverts commit 76568cac
2021-04-29 22:00:50 +02:00
Johannes Mockenhaupt 84622a30a0
Combo: clean up SP access. 2021-04-29 21:59:28 +02:00
Milos Kozak 07fe79eb91 Merge branch 'dev2_dana_combo_only' of https://github.com/nightscout/AndroidAPS into dev2_dana_combo_only 2021-04-29 21:23:18 +02:00
Milos Kozak f008d14b0e google-services:4.3.5 2021-04-29 21:22:10 +02:00
Milos Kozak 0731ccb6d4
Merge pull request #487 from Philoul/uel.log_BolusCancel
Add uel.log for Cancel Bolus Button
2021-04-29 21:04:38 +02:00
Milos Kozak 37e3c4532a Profiles -> room (no NS sync yet) 2021-04-29 20:42:45 +02:00
Andrei Vereha 8d112a12ca rename 2021-04-26 21:57:32 +02:00
Andrei Vereha cddf7a3f68 add check for onError whent the command was sent 2021-04-26 21:56:54 +02:00
Johannes Mockenhaupt 76568cac38
Combo: show pump id in UI. 2021-04-24 23:48:09 +02:00
Andrei Vereha b64d530ae9 ktlintFormat 2021-04-21 23:29:16 +02:00
Andrei Vereha d3c73f9665 update on CommandSendNotConfirmed 2021-04-21 23:14:25 +02:00
Andrei Vereha 0fad1bc6c7 add comment 2021-04-21 22:54:47 +02:00
Andrei Vereha 20560f2a4e remove the active command if we get an error sending it 2021-04-21 22:52:22 +02:00
Andrei Vereha 3a2fa6d04f defer 2021-04-21 22:37:58 +02:00
Philoul 2ba10469b8 Fix UTC Offset in csv 2021-04-21 21:54:04 +02:00
Andrei Vereha 3ef983b732 fix crash on pod deactivation 2021-04-21 21:02:40 +02:00
Andrei Vereha 1e4cda01a3 Revert "Revert "remove duplication""
This reverts commit d49b87d124.
2021-04-21 20:44:26 +02:00
Philoul 0f18d43da8 Icon overview of userEntry updated 2021-04-20 22:28:58 +02:00
Philoul 0b928c3140 Add uel.log for Cancel Bolus Button 2021-04-20 20:00:07 +02:00
Andrei Vereha d49b87d124 Revert "remove duplication"
This reverts commit 05047029ea.
2021-04-19 21:55:45 +02:00
Andrei Vereha 05047029ea remove duplication 2021-04-19 21:46:50 +02:00
Milos Kozak cada2919d1 prepare Profile interface 2021-04-19 18:44:17 +02:00
Andrei Vereha 142ad126b5 add history, command confirmation for more commands 2021-04-18 21:54:50 +02:00
Andrei Vereha 842f196ae8 confirm/deny commands 2021-04-18 21:39:20 +02:00
Milos Kozak 430a871993 fix DeviceStatus upload 2021-04-18 18:31:21 +02:00
Johannes Mockenhaupt 97bf95a6fa
Combo: provide pump serial number, notify about pump change. 2021-04-18 16:29:38 +02:00