Commit graph

408 commits

Author SHA1 Message Date
Andrei Vereha f6d0520fe2 save bolusPulsesRemainig 2021-06-06 21:25:40 +02:00
Andrei Vereha 95c9bd94a1 do not check pod status before deactivation. It will be deactivated anyway 2021-06-06 18:47:49 +02:00
Andrei Vereha 18735540fd Merge branch 'avereha/alarms' into avereha/bolus 2021-06-06 18:42:07 +02:00
Andrei Vereha b55dacd12c add checkPodKaput 2021-06-06 18:41:17 +02:00
Andrei Vereha aa719e0b9f handle Pod Alarm 2021-06-06 18:35:19 +02:00
Andrei Vereha 909eae3f3f log 2021-06-06 17:47:36 +02:00
Andrei Vereha a25fffd075 stop bolus 2021-06-06 13:43:44 +02:00
Andrei Vereha 4f459b9fc1 Merge branch 'avereha/alarms' into avereha/bolus 2021-06-06 13:11:16 +02:00
Andrei Vereha d82be68796 fix alerts(UNKNOWN will always match) 2021-06-06 13:09:27 +02:00
Andrei Vereha b80327c9bf bolus: send progress 2021-06-06 12:24:32 +02:00
Andrei Vereha 79b4a5d656 simplify executeProgrammingCommand. Start implementing alerts 2021-06-06 10:47:29 +02:00
Andrei Vereha c72f2f352f always enforceNew 2021-06-05 20:37:17 +02:00
Andrei Vereha d0c947c988 updates for display of temp basal 2021-06-05 20:32:35 +02:00
Andrei Vereha b440003de4 ignore enforeNew for now 2021-06-05 20:14:28 +02:00
Andrei Vereha fc919f24cd save temp basal to pod state 2021-06-05 18:14:13 +02:00
Andrei Vereha ffe3246fc0 remove 'Using connected state for unconfirmed commands' 2021-06-05 15:23:03 +02:00
Andrei Vereha 70eb5e6d0c recover unconfirmed basal 2021-06-05 14:52:58 +02:00
Andrei Vereha 7c20bfb7f0 implement basals 2021-06-05 14:18:04 +02:00
Andrei Vereha 33243a7ed4 create fake TBR on suspend. Fix createHistory timing bug 2021-06-04 22:56:58 +02:00
Andrei Vereha 5d3b2faeb9 pumpsync on suspend/resume 2021-06-04 19:32:00 +02:00
Andrei Vereha 76a0e93ee2 stop testing failed commands 2021-06-03 22:19:51 +02:00
Andrei Vereha 17c61db256 merge 2021-06-03 22:18:25 +02:00
Andrei Vereha 3dc4781692 use delivery status for checking if there is a tempbasal to cancel 2021-06-03 22:15:26 +02:00
Andrei Vereha 34103931f5 add comment 2021-06-03 22:00:42 +02:00
Andrei Vereha 25141d3939 undo the last change 2021-06-03 21:48:03 +02:00
Andrei Vereha 2afe220d28 suspend/resume 2021-06-03 19:43:59 +02:00
Milos Kozak fedba23405 code cleanup 2021-06-01 22:51:16 +02:00
Andrei Vereha d392caa6e9 move private fun at the end 2021-06-01 22:00:16 +02:00
Andrei Vereha 432e06adaa simplify: use lastUpdatedSystem for lastConnection 2021-06-01 21:50:55 +02:00
Andrei Vereha b91e8506a0 move the common code to getCommandConfirmationFromState 2021-06-01 21:41:13 +02:00
Andrei Vereha c8fee31ae8 cleanup 2021-06-01 08:12:03 +02:00
Andrei Vereha d0b1757268 bugfix: send error when we can't send the command 2021-06-01 00:18:38 +02:00
Andrei Vereha e867b1397d remove maybeMarkActiveCommandFailed. this logic was moved in "updateActiveCommand" 2021-05-31 22:15:39 +02:00
Andrei Vereha a20cc1cca3 simplify 2021-05-31 22:09:49 +02:00
Andrei Vereha 9d61c8ee8a remove unused function 2021-05-31 21:00:54 +02:00
Andrei Vereha 7dc01cb1f8 add comments 2021-05-31 00:13:52 +02:00
Andrei Vereha a2b3ab5991 add TODO 2021-05-31 00:04:25 +02:00
Andrei Vereha 8e64ca134f ktlintFormat 2021-05-31 00:01:54 +02:00
Andrei Vereha c989c6a1c5 duration is in ms 2021-05-30 23:55:47 +02:00
Andrei Vereha 3ca88ef51b bugfix: set the tempbasal timestamp to the time when the historyEntry was created, not a random number :) 2021-05-30 23:09:15 +02:00
Andrei Vereha 91957930ed display bluetooth connection status. display deliveryStatus. display lastConnection 2021-05-30 22:49:35 +02:00
Andrei Vereha 3b26068faf set temp basal beeps 2021-05-30 19:03:26 +02:00
Andrei Vereha 3314df7bb7 implement TempBasal pumpSync and confirmation 2021-05-30 18:35:53 +02:00
Andrei Vereha ebb3030169 make it compile 2021-05-28 23:37:00 +02:00
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 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
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
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
Andrei Vereha 1e4cda01a3 Revert "Revert "remove duplication""
This reverts commit d49b87d124.
2021-04-21 20:44:26 +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 24164eee98 PumpInterface rename 2021-04-14 19:36:13 +02:00
Andrei Vereha 821135edec dash ble: Supress deteket 2021-04-04 21:04:21 +02:00
Andrei Vereha 40ac1d189a dash ble: detekt reduce number of arguments 2021-04-04 17:57:17 +02:00
Andrei Vereha 513007f6ae dash: undo the temporary discardButtonEnabled test 2021-04-04 17:15:44 +02:00
Andrei Vereha 0c35eb7da9 dash: bugfix DefaultStatusResponse and add more tests 2021-04-04 17:10:17 +02:00
Andrei Vereha 6d2d5a7e76 dash ble: detekt 2021-04-04 16:06:39 +02:00
Andrei Vereha c1426941cf dash: address feedback 2021-04-04 13:43:39 +02:00
Andrei Vereha 14af90e9e3 dash: ktlintFormat 2021-04-04 13:36:33 +02:00
Andrei Vereha ff6a67cc97 detekt 2021-04-04 13:32:09 +02:00
Andrei Vereha 64fbea6afe dash ble: detekt 2021-04-04 13:16:05 +02:00
Andrei Vereha 210a446123 dash ble: ktLintFormat 2021-04-04 12:43:17 +02:00
Andrei Vereha 5b10ad13ec dash ble: handle disconnects 2021-04-04 12:40:28 +02:00
Andrei Vereha 547454de6c dash ble: check for RTS 2021-04-03 23:31:43 +02:00
Andrei Vereha 9597922058 dash ble: fix reconnection and improve logging for BleCallbacks
When reconnecting, we have to use the discovered Characteristics and not
the ones that we used for the previous connection
2021-04-03 22:58:54 +02:00
Andrei Vereha a29874dc6d implement EAP-AKA resynchronization 2021-04-03 12:20:11 +02:00
Andrei Vereha c4291113a6 fixes 2021-04-02 16:31:27 +02:00
Andrei Vereha 20179781ef dash ble: warnings 2021-04-02 14:33:18 +02:00
Andrei Vereha 0f58185109 simplify read error handling 2021-04-02 14:32:00 +02:00
Andrei Vereha e8bc50f458 merge 2021-04-02 14:31:12 +02:00
Milos Kozak e26e023ebf prepare TemporaryBasal 2021-04-01 23:46:21 +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
Andrei Vereha 89bcd52994 detekt 2021-03-30 23:33:59 +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
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
Andrei Vereha 8d2d38163a simplify exceptions 2021-03-28 21:43:32 +02:00
Andrei Vereha 4b49392200 improve error handling 2021-03-28 20:48:11 +02:00
Milos Kozak 7f0fe881b6 DetailedBolusInfo, MealLink UI 2021-03-25 17:48:07 +01:00
Andrei Vereha ae08e43109 add retries when sending commands 2021-03-21 15:12:33 +01:00
Andrei Vereha 7be0afda27 dash ble: implement retries when receiving messages 2021-03-21 14:56:32 +01:00
Bart Sopers 653deff0b6 Omnipod Dash: improve logging and fix prime timeouts 2021-03-20 20:45:53 +01:00
Andrei Vereha de6ca939ed dash ble: move parsing logic out of PayloadJoiner to BlePacket 2021-03-16 22:45:02 +01:00
Bart Sopers ebdc2aebe0 More WIP on Omnipod Dash Pod activation 2021-03-15 01:34:02 +01:00
Bart Sopers 6d4521ca6b WIP on integrating Omnipod Dash activation wizard 2021-03-15 00:51:07 +01:00
Bart Sopers dd480134e2 Remove unused variables 2021-03-14 23:13:41 +01:00
Bart Sopers 06de8a04e2 Log actual received message type for unknown Omnipod Dash responses 2021-03-14 23:11:48 +01:00
Bart Sopers 137908eb20 Fix crash in Omnipod Dash Pod activation 2021-03-14 22:49:25 +01:00
Bart Sopers 98dc2f92ef Add delay for prime and cannula insertion for Omnipod Dash 2021-03-14 22:39:07 +01:00
Andrei Vereha 8868f29ab2 dash ble: use higher timeout when reading a message
This timeout(4s) is the same that the PDM uses to send messaged with
`eqos` when they are not acknowledged
2021-03-14 22:06:52 +01:00
Bart Sopers 1872e1ceb7 Correctly handle NAK response for Omnipod Dash 2021-03-14 21:45:52 +01:00
Bart Sopers 10c316edd9 Omnipod Dash: provide and verify expected response type 2021-03-14 21:25:15 +01:00
Andrei Vereha 442a0b274f dash ble: add comment about why I think the NACK logic is not ok 2021-03-14 21:21:47 +01:00
Andrei Vereha 109f66a48d dash ble: start implementing retries
Handle NACKs for now.
2021-03-14 21:21:47 +01:00
AdrianLxM 95d7f0737c fix gitignore and tests 2021-03-14 21:19:24 +01:00
Bart Sopers aff38851e1 Add Omnipod Dash response parsing 2021-03-14 20:14:11 +01:00
AdrianLxM 7db5c28632 delint 2021-03-14 19:52:08 +01:00
AdrianLxM bf3fe19a4e only open for tests/debug 2021-03-14 19:42:02 +01:00
AdrianLxM 3d93e4d84d mock provider instead of constructor parameter 2021-03-14 18:24:15 +01:00
Andrei Vereha b33c55273c dash ble: fix detekt issues 2021-03-14 16:14:00 +01:00
Andrei Vereha b71f065974 dash ble tests: ktlintFormat 2021-03-14 16:00:59 +01:00
Andrei Vereha a94d6ce652 dash ble test: remove fixed TODO 2021-03-14 15:59:36 +01:00
Andrei Vereha 379c0cd8c7 dash bke tests: fix decrypt test
We were trying to use an encryption NONCE for decryption.
The fix was to replac data with data from logs.
2021-03-14 15:58:12 +01:00
Andrei Vereha 752f393f3b dash ble: add test for MessagePacket 2021-03-14 15:57:16 +01:00
Andrei Vereha eff6247f77 dash ble: remove unused class 2021-03-14 15:57:16 +01:00
Andrei Vereha eda52857e5 dash ble: add tests for StringLengthPrefixEncodingTest
We tested this part with a real pod and confirmed that it's working
2021-03-14 15:57:16 +01:00
Andrei Vereha 5f71e1b27f dash ble: add tests for payload splitting and joining 2021-03-14 15:57:16 +01:00
Andrei Vereha 50d1dad786 dash LTK: add test
Now that we know this part is working, I'm adding a test with data from
logs
Moved the key exchange logic to its own class so it is easier to
test
2021-03-14 15:44:28 +01:00
Andrei Vereha 27daa4554a
Merge pull request #22 from 0pen-dash/andrei/detekt-max-issues
dash detekt: set maxIssues to -1
2021-03-14 15:42:03 +01:00
Andrei Vereha 0396b9ca99 dash ble: use .let(Id::fromLong)
https://github.com/0pen-dash/AndroidAPS/pull/21#pullrequestreview-610227073
2021-03-11 23:06:00 +01:00
Andrei Vereha a1f8cf807d dash detekt: set maxIssues to -1
I noticed that with this setting I can detekt from android-studio and
see all the issues reported in the Build Output.

Without it, I can only see: "Build failed with X issues."
2021-03-11 21:43:25 +01:00
Andrei Vereha 27e9b25e86 dash: update TODO comment 2021-03-11 21:40:51 +01:00
Andrei Vereha 1a678a9507 dash/ble: stop reading a message on send
We were receiving a message in that case just because we used the `eqos`
parameter incorrectly.
2021-03-11 21:36:43 +01:00
Andrei Vereha 2aed2005ef dash ble: renames and fixes after testing 2021-03-11 21:27:18 +01:00
Andrei Vereha 8154e16c94 dash ble: add a separate method for activating a new pod
So we can call it explicitly instead of activating a new pod on
connect()
2021-03-09 23:19:22 +01:00
Andrei Vereha c337b52aa0 dash/ble: support both 1 and 2 byte command
It seems that the PDM is sending 1 byte commands and the POD answers
with 2 byte commands.

Add logging for decrypted responses.

I think `eqos` means that we are expecting an ACK for the last message.
Read (and log for now) a pending message if the POD is trying to sending it back while we want
to send a command.
2021-03-08 22:52:04 +01:00