kai
/
pounder_test
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge #409 

409: Updating NAL and minimq to allow broker reconnection r=jordens a=ryan-summers

This PR updates the smoltcp-nal and minimq dependencies to resolve an issue that was encountered where Stabilizer would not reconnect to the Broker if the broker was restarted.

### Testing

I started stabilizer, waited for telemetry to come in via MQTT, then restarted mosquitto. I observed my client disconnect, and then after a few seconds, observed a reconnection and telemetry resumed.

Co-authored-by: Ryan Summers <ryan.summers@vertigo-designs.com>
This commit is contained in:
bors[bot] 2021-07-20 15:55:37 +00:00 committed by GitHub
parent cc79deacf7 cacf519583
commit 8f7dcf32cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Cargo.lock generated
View File

@ -424,12 +424,13 @@ dependencies = [
[[package]] [[package]]
name = "minimq" name = "minimq"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/quartiq/minimq.git?rev=dbdbec0#dbdbec0b77d2e134dc6c025018a82c14cbdfbe34" source = "git+https://github.com/quartiq/minimq.git?rev=93813e3#93813e37e013b04ffb5e02aca7eca1859b1b2443"
dependencies = [ dependencies = [
"bit_field", "bit_field",
"embedded-nal", "embedded-nal",
"enum-iterator", "enum-iterator",
"heapless 0.7.3", "heapless 0.7.3",
"smlang",
] ]
[[package]] [[package]]
@ -747,6 +748,26 @@ dependencies = [
"embedded-hal", "embedded-hal",
] ]
[[package]]
name = "smlang"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de6880d53d3cffd26b03b95b37dfa80ab66937792a505a8c89c271bbde949ff5"
dependencies = [
"smlang-macros",
]
[[package]]
name = "smlang-macros"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32f0936dcbf984fe0371e049d3e41a5cf4f8033da8cdea376101665e199575c2"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]] [[package]]
name = "smoltcp" name = "smoltcp"
version = "0.8.0" version = "0.8.0"
@ -760,7 +781,7 @@ dependencies = [
[[package]] [[package]]
name = "smoltcp-nal" name = "smoltcp-nal"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/quartiq/smoltcp-nal.git?rev=5baf55f#5baf55fafbfe2c08d9fe56c836171e9d2fb468e8" source = "git+https://github.com/quartiq/smoltcp-nal.git?rev=0634188#063418836d112942203fb5e5fd501b946a6839b3"
dependencies = [ dependencies = [
"embedded-nal", "embedded-nal",
"heapless 0.7.3", "heapless 0.7.3",

4
Cargo.toml
View File

@ -75,11 +75,11 @@ rev = "9c826f8"
[dependencies.smoltcp-nal] [dependencies.smoltcp-nal]
git = "https://github.com/quartiq/smoltcp-nal.git" git = "https://github.com/quartiq/smoltcp-nal.git"
rev = "5baf55f" rev = "0634188"
[dependencies.minimq] [dependencies.minimq]
git = "https://github.com/quartiq/minimq.git" git = "https://github.com/quartiq/minimq.git"
rev = "dbdbec0" rev = "93813e3"
[features] [features]
nightly = ["cortex-m/inline-asm", "dsp/nightly"] nightly = ["cortex-m/inline-asm", "dsp/nightly"]