jamesmunns.com / ergot
scratch repo for intrusive networking
fork atom

Bump embassy dependencies on demo apps (#149)

* Bump embassy dependencies on demo apps

Bump embassy dependencie on demo apps to their latest. We're also
leaving ESP32 alone for now as it won't compile with latest
embassy-executor.

* esp32c3-serial: fix RxWorker instantiation

The constructor is `new_target()` fix it to get the demo to compile.

* Add esp32c3 to checkall.sh

Also build esp32c3 with checkall.sh otherwise regressions may be
missed.

* Add esp32c3 to build-demos-nostd workflow

Build esp32c3 in CI too.

authored by Felipe Balbi and committed by GitHub 575f0319 4efea2a0

options
unified split
Changed files
+222 -389
.github
workflows
build-demos-nostd.yml
checkall.sh
demos
esp32c3
Cargo.lock
esp32c3-serial
src
main.rs
microbit
Cargo.lock
Cargo.toml
nrf52840
Cargo.lock
Cargo.toml
nrf52840-eusb
src
main.rs
rp2040
Cargo.lock
Cargo.toml
rp2350
Cargo.lock
Cargo.toml
stm32f303vc
Cargo.lock
Cargo.toml
+6
.github/workflows/build-demos-nostd.yml
··· 46 46 working-directory: ./demos/rp2350 47 47 run: cargo build --all 48 48 # 49 + # ESP32C3 demos 50 + # 51 + - name: Check ESP32C3 Demos 52 + working-directory: ./demos/esp32c3 53 + run: cargo build --all 54 + # 49 55 # ESP32C6 demos 50 56 # 51 57 - name: Check ESP32C6 Demos
+1
checkall.sh
··· 13 13 cargo check --all --target=thumbv7em-none-eabi --manifest-path=./demos/microbit/Cargo.toml 14 14 cargo check --all --target=thumbv7em-none-eabi --manifest-path=./demos/nrf52840/Cargo.toml 15 15 cargo check --all --target=thumbv6m-none-eabi --manifest-path=./demos/rp2040/Cargo.toml 16 + cargo check --all --target=riscv32imc-unknown-none-elf --manifest-path=./demos/esp32c3/Cargo.toml 16 17 cargo check --all --target=riscv32imac-unknown-none-elf --manifest-path=./demos/esp32c6/Cargo.toml 17 18 cargo check --all --target=thumbv8m.main-none-eabihf --manifest-path=./demos/rp2350/Cargo.toml 18 19 cargo check --all --target=thumbv7em-none-eabi --manifest-path=./demos/stm32f303vc/Cargo.toml
+25 -7
demos/esp32c3/Cargo.lock
··· 288 288 "embassy-embedded-hal 0.4.0", 289 289 "embassy-futures", 290 290 "embassy-sync 0.6.2", 291 - "embassy-time", 291 + "embassy-time 0.4.0", 292 292 "embedded-hal 0.2.7", 293 293 "embedded-hal 1.0.0", 294 294 "embedded-hal-async", ··· 403 403 ] 404 404 405 405 [[package]] 406 + name = "embassy-time" 407 + version = "0.5.0" 408 + source = "registry+https://github.com/rust-lang/crates.io-index" 409 + checksum = "f4fa65b9284d974dad7a23bb72835c4ec85c0b540d86af7fc4098c88cff51d65" 410 + dependencies = [ 411 + "cfg-if", 412 + "critical-section", 413 + "document-features", 414 + "embassy-time-driver", 415 + "embedded-hal 0.2.7", 416 + "embedded-hal 1.0.0", 417 + "embedded-hal-async", 418 + "futures-core", 419 + ] 420 + 421 + [[package]] 406 422 name = "embassy-time-driver" 407 - version = "0.2.0" 423 + version = "0.2.1" 408 424 source = "registry+https://github.com/rust-lang/crates.io-index" 409 - checksum = "8d45f5d833b6d98bd2aab0c2de70b18bfaa10faf661a1578fd8e5dfb15eb7eba" 425 + checksum = "a0a244c7dc22c8d0289379c8d8830cae06bb93d8f990194d0de5efb3b5ae7ba6" 410 426 dependencies = [ 411 427 "document-features", 412 428 ] ··· 522 538 523 539 [[package]] 524 540 name = "ergot" 525 - version = "0.10.0" 541 + version = "0.11.0" 526 542 dependencies = [ 527 543 "bbq2", 528 544 "cobs 0.3.0", ··· 531 547 "cordyceps", 532 548 "critical-section", 533 549 "defmt 1.0.1", 534 - "embassy-time", 550 + "embassy-futures", 551 + "embassy-time 0.5.0", 535 552 "embedded-io-async", 536 553 "heapless 0.9.1", 537 554 "log", 538 555 "maitake-sync", 539 556 "mutex", 540 557 "pin-project", 558 + "portable-atomic", 541 559 "postcard", 542 560 "postcard-schema", 543 561 "serde", ··· 633 651 "document-features", 634 652 "embassy-executor", 635 653 "embassy-sync 0.6.2", 636 - "embassy-time", 654 + "embassy-time 0.4.0", 637 655 "embassy-time-driver", 638 656 "embassy-time-queue-utils", 639 657 "esp-config", ··· 757 775 "defmt 1.0.1", 758 776 "embassy-executor", 759 777 "embassy-sync 0.7.0", 760 - "embassy-time", 778 + "embassy-time 0.4.0", 761 779 "embedded-io-async", 762 780 "ergot", 763 781 "esp-bootloader-esp-idf",
+1 -1
demos/esp32c3/esp32c3-serial/src/main.rs
··· 52 52 53 53 // Create our USB-Serial interface, which implements the embedded-io-async traits 54 54 let (rx, tx) = UsbSerialJtag::new(p.USB_DEVICE).into_async().split(); 55 - let rx = RxWorker::new(&STACK, rx, ()); 55 + let rx = RxWorker::new_target(&STACK, rx, ()); 56 56 57 57 // Spawn I/O worker tasks 58 58 spawner.must_spawn(run_rx(rx, RECV_BUF.take(), SCRATCH_BUF.take()));
+40 -113
demos/microbit/Cargo.lock
··· 245 245 246 246 [[package]] 247 247 name = "defmt" 248 - version = "0.3.100" 249 - source = "registry+https://github.com/rust-lang/crates.io-index" 250 - checksum = "f0963443817029b2024136fc4dd07a5107eb8f977eaf18fcd1fdeb11306b64ad" 251 - dependencies = [ 252 - "defmt 1.0.1", 253 - ] 254 - 255 - [[package]] 256 - name = "defmt" 257 248 version = "1.0.1" 258 249 source = "registry+https://github.com/rust-lang/crates.io-index" 259 250 checksum = "548d977b6da32fa1d1fda2876453da1e7df63ad0304c8b3dae4dbe7b96f39b78" ··· 291 282 checksum = "b2cac3b8a5644a9e02b75085ebad3b6deafdbdbdec04bb25086523828aa4dfd1" 292 283 dependencies = [ 293 284 "critical-section", 294 - "defmt 1.0.1", 285 + "defmt", 295 286 ] 296 287 297 288 [[package]] ··· 305 296 306 297 [[package]] 307 298 name = "embassy-embedded-hal" 308 - version = "0.3.2" 299 + version = "0.5.0" 309 300 source = "registry+https://github.com/rust-lang/crates.io-index" 310 - checksum = "8c62a3bf127e03832fb97d8b01a058775e617653bc89e2a12c256485a7fb54c1" 301 + checksum = "554e3e840696f54b4c9afcf28a0f24da431c927f4151040020416e7393d6d0d8" 311 302 dependencies = [ 312 - "defmt 0.3.100", 313 - "embassy-embedded-hal 0.4.0", 314 - "embassy-futures", 315 - "embassy-sync 0.6.2", 316 - "embassy-time 0.4.0", 317 - "embedded-hal 0.2.7", 318 - "embedded-hal 1.0.0", 319 - "embedded-hal-async", 320 - "embedded-storage", 321 - "embedded-storage-async", 322 - "nb 1.1.0", 323 - ] 324 - 325 - [[package]] 326 - name = "embassy-embedded-hal" 327 - version = "0.4.0" 328 - source = "registry+https://github.com/rust-lang/crates.io-index" 329 - checksum = "d1611b7a7ab5d1fbed84c338df26d56fd9bded58006ebb029075112ed2c5e039" 330 - dependencies = [ 303 + "defmt", 331 304 "embassy-futures", 332 305 "embassy-hal-internal", 333 - "embassy-sync 0.7.2", 306 + "embassy-sync", 307 + "embassy-time", 334 308 "embedded-hal 0.2.7", 335 309 "embedded-hal 1.0.0", 336 310 "embedded-hal-async", ··· 341 315 342 316 [[package]] 343 317 name = "embassy-executor" 344 - version = "0.7.0" 318 + version = "0.9.1" 345 319 source = "registry+https://github.com/rust-lang/crates.io-index" 346 - checksum = "90327bcc66333a507f89ecc4e2d911b265c45f5c9bc241f98eee076752d35ac6" 320 + checksum = "06070468370195e0e86f241c8e5004356d696590a678d47d6676795b2e439c6b" 347 321 dependencies = [ 348 322 "cortex-m", 349 323 "critical-section", 350 - "defmt 0.3.100", 324 + "defmt", 351 325 "document-features", 352 326 "embassy-executor-macros", 327 + "embassy-executor-timer-queue", 353 328 ] 354 329 355 330 [[package]] 356 331 name = "embassy-executor-macros" 357 - version = "0.6.2" 332 + version = "0.7.0" 358 333 source = "registry+https://github.com/rust-lang/crates.io-index" 359 - checksum = "3577b1e9446f61381179a330fc5324b01d511624c55f25e3c66c9e3c626dbecf" 334 + checksum = "dfdddc3a04226828316bf31393b6903ee162238576b1584ee2669af215d55472" 360 335 dependencies = [ 361 336 "darling", 362 337 "proc-macro2", ··· 365 340 ] 366 341 367 342 [[package]] 343 + name = "embassy-executor-timer-queue" 344 + version = "0.1.0" 345 + source = "registry+https://github.com/rust-lang/crates.io-index" 346 + checksum = "2fc328bf943af66b80b98755db9106bf7e7471b0cf47dc8559cd9a6be504cc9c" 347 + 348 + [[package]] 368 349 name = "embassy-futures" 369 350 version = "0.1.2" 370 351 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 378 359 dependencies = [ 379 360 "cortex-m", 380 361 "critical-section", 381 - "defmt 1.0.1", 362 + "defmt", 382 363 "num-traits", 383 364 ] 384 365 ··· 396 377 dependencies = [ 397 378 "embassy-futures", 398 379 "embassy-net-driver", 399 - "embassy-sync 0.7.2", 380 + "embassy-sync", 400 381 ] 401 382 402 383 [[package]] 403 384 name = "embassy-nrf" 404 - version = "0.5.0" 385 + version = "0.8.0" 405 386 source = "registry+https://github.com/rust-lang/crates.io-index" 406 - checksum = "6ae20388606f23184ab567537b9c7758eef5ac20cf5f94db3d936a641b9f4b9e" 387 + checksum = "a8d63429d74ab5786cde7c9dc9a0338ea162a4da95e204ac5345c5ae36831fdb" 407 388 dependencies = [ 408 389 "bitflags 2.9.4", 409 390 "cfg-if", 410 391 "cortex-m", 411 392 "cortex-m-rt", 412 393 "critical-section", 413 - "defmt 1.0.1", 394 + "defmt", 414 395 "document-features", 415 - "embassy-embedded-hal 0.3.2", 396 + "embassy-embedded-hal", 416 397 "embassy-hal-internal", 417 - "embassy-sync 0.7.2", 418 - "embassy-time 0.4.0", 398 + "embassy-sync", 399 + "embassy-time", 419 400 "embassy-time-driver", 420 401 "embassy-time-queue-utils", 421 402 "embassy-usb-driver", ··· 434 415 435 416 [[package]] 436 417 name = "embassy-sync" 437 - version = "0.6.2" 438 - source = "registry+https://github.com/rust-lang/crates.io-index" 439 - checksum = "8d2c8cdff05a7a51ba0087489ea44b0b1d97a296ca6b1d6d1a33ea7423d34049" 440 - dependencies = [ 441 - "cfg-if", 442 - "critical-section", 443 - "embedded-io-async", 444 - "futures-sink", 445 - "futures-util", 446 - "heapless 0.8.0", 447 - ] 448 - 449 - [[package]] 450 - name = "embassy-sync" 451 418 version = "0.7.2" 452 419 source = "registry+https://github.com/rust-lang/crates.io-index" 453 420 checksum = "73974a3edbd0bd286759b3d483540f0ebef705919a5f56f4fc7709066f71689b" 454 421 dependencies = [ 455 422 "cfg-if", 456 423 "critical-section", 457 - "defmt 1.0.1", 424 + "defmt", 458 425 "embedded-io-async", 459 426 "futures-core", 460 427 "futures-sink", ··· 463 430 464 431 [[package]] 465 432 name = "embassy-time" 466 - version = "0.4.0" 467 - source = "registry+https://github.com/rust-lang/crates.io-index" 468 - checksum = "f820157f198ada183ad62e0a66f554c610cdcd1a9f27d4b316358103ced7a1f8" 469 - dependencies = [ 470 - "cfg-if", 471 - "critical-section", 472 - "defmt 0.3.100", 473 - "document-features", 474 - "embassy-time-driver", 475 - "embedded-hal 0.2.7", 476 - "embedded-hal 1.0.0", 477 - "embedded-hal-async", 478 - "futures-util", 479 - ] 480 - 481 - [[package]] 482 - name = "embassy-time" 483 433 version = "0.5.0" 484 434 source = "registry+https://github.com/rust-lang/crates.io-index" 485 435 checksum = "f4fa65b9284d974dad7a23bb72835c4ec85c0b540d86af7fc4098c88cff51d65" 486 436 dependencies = [ 487 437 "cfg-if", 488 438 "critical-section", 439 + "defmt", 489 440 "document-features", 490 441 "embassy-time-driver", 491 442 "embedded-hal 0.2.7", ··· 505 456 506 457 [[package]] 507 458 name = "embassy-time-queue-utils" 508 - version = "0.1.0" 459 + version = "0.3.0" 509 460 source = "registry+https://github.com/rust-lang/crates.io-index" 510 - checksum = "dc55c748d16908a65b166d09ce976575fb8852cf60ccd06174092b41064d8f83" 461 + checksum = "80e2ee86063bd028a420a5fb5898c18c87a8898026da1d4c852af2c443d0a454" 511 462 dependencies = [ 512 - "embassy-executor", 463 + "embassy-executor-timer-queue", 513 464 "heapless 0.8.0", 514 465 ] 515 466 ··· 521 472 dependencies = [ 522 473 "embassy-futures", 523 474 "embassy-net-driver-channel", 524 - "embassy-sync 0.7.2", 475 + "embassy-sync", 525 476 "embassy-usb-driver", 526 477 "embedded-io-async", 527 478 "heapless 0.8.0", ··· 535 486 source = "registry+https://github.com/rust-lang/crates.io-index" 536 487 checksum = "17119855ccc2d1f7470a39756b12068454ae27a3eabb037d940b5c03d9c77b7a" 537 488 dependencies = [ 538 - "defmt 1.0.1", 489 + "defmt", 539 490 "embedded-io-async", 540 491 ] 541 492 ··· 610 561 "const-fnv1a-hash", 611 562 "cordyceps", 612 563 "critical-section", 613 - "defmt 1.0.1", 564 + "defmt", 614 565 "embassy-futures", 615 - "embassy-time 0.5.0", 566 + "embassy-time", 616 567 "embassy-usb", 617 568 "heapless 0.9.1", 618 569 "log", ··· 663 614 checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" 664 615 665 616 [[package]] 666 - name = "futures-task" 667 - version = "0.3.31" 668 - source = "registry+https://github.com/rust-lang/crates.io-index" 669 - checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" 670 - 671 - [[package]] 672 - name = "futures-util" 673 - version = "0.3.31" 674 - source = "registry+https://github.com/rust-lang/crates.io-index" 675 - checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" 676 - dependencies = [ 677 - "futures-core", 678 - "futures-task", 679 - "pin-project-lite", 680 - "pin-utils", 681 - ] 682 - 683 - [[package]] 684 617 name = "generator" 685 618 version = "0.8.7" 686 619 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 761 694 source = "registry+https://github.com/rust-lang/crates.io-index" 762 695 checksum = "b1edcd5a338e64688fbdcb7531a846cfd3476a54784dcb918a0844682bc7ada5" 763 696 dependencies = [ 764 - "defmt 1.0.1", 697 + "defmt", 765 698 "hash32 0.3.1", 766 699 "serde", 767 700 "stable_deref_trait", ··· 857 790 "bbq2", 858 791 "cortex-m", 859 792 "cortex-m-rt", 860 - "defmt 1.0.1", 793 + "defmt", 861 794 "defmt-rtt", 862 795 "embassy-executor", 863 796 "embassy-nrf", 864 - "embassy-sync 0.7.2", 865 - "embassy-time 0.4.0", 797 + "embassy-sync", 798 + "embassy-time", 866 799 "embassy-usb", 867 800 "ergot", 868 801 "mutex", ··· 948 881 checksum = "fd402d00b0fb94c5aee000029204a46884b1262e0c443f166d86d2c0747e1a1a" 949 882 dependencies = [ 950 883 "cortex-m", 951 - "defmt 1.0.1", 884 + "defmt", 952 885 ] 953 886 954 887 [[package]] ··· 976 909 version = "0.2.16" 977 910 source = "registry+https://github.com/rust-lang/crates.io-index" 978 911 checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" 979 - 980 - [[package]] 981 - name = "pin-utils" 982 - version = "0.1.0" 983 - source = "registry+https://github.com/rust-lang/crates.io-index" 984 - checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" 985 912 986 913 [[package]] 987 914 name = "portable-atomic"
+3 -3
demos/microbit/Cargo.toml
··· 9 9 10 10 bbq2 = { version = "0.4.1", default-features = false, features = ["critical-section", "maitake-sync-0_2"] } 11 11 cortex-m = { version = "0.7.7", features = ["inline-asm", "critical-section-single-core"] } 12 - embassy-executor = { version = "0.7.0", features = ["task-arena-size-32768", "arch-cortex-m", "executor-thread", "executor-interrupt", "defmt"] } 13 - embassy-nrf = { version = "0.5.0", features = ["defmt", "nrf52833", "time-driver-rtc1", "gpiote", "unstable-pac", "time"] } 14 - embassy-time = { version = "0.4.0", features = ["defmt", "defmt-timestamp-uptime"] } 12 + embassy-executor = { version = "0.9.1", features = ["arch-cortex-m", "executor-thread", "executor-interrupt", "defmt"] } 13 + embassy-nrf = { version = "0.8.0", features = ["defmt", "nrf52833", "time-driver-rtc1", "gpiote", "unstable-pac", "time"] } 14 + embassy-time = { version = "0.5.0", features = ["defmt", "defmt-timestamp-uptime"] } 15 15 mutex = { version = "1.0.2", features = ["impl-unsafe-cortex-m-single-core"] } 16 16 panic-probe = { version = "1.0.0", features = ["print-defmt"] } 17 17
+41 -83
demos/nrf52840/Cargo.lock
··· 244 244 245 245 [[package]] 246 246 name = "defmt" 247 - version = "0.3.100" 248 - source = "registry+https://github.com/rust-lang/crates.io-index" 249 - checksum = "f0963443817029b2024136fc4dd07a5107eb8f977eaf18fcd1fdeb11306b64ad" 250 - dependencies = [ 251 - "defmt 1.0.1", 252 - ] 253 - 254 - [[package]] 255 - name = "defmt" 256 247 version = "1.0.1" 257 248 source = "registry+https://github.com/rust-lang/crates.io-index" 258 249 checksum = "548d977b6da32fa1d1fda2876453da1e7df63ad0304c8b3dae4dbe7b96f39b78" ··· 290 281 checksum = "b2cac3b8a5644a9e02b75085ebad3b6deafdbdbdec04bb25086523828aa4dfd1" 291 282 dependencies = [ 292 283 "critical-section", 293 - "defmt 1.0.1", 284 + "defmt", 294 285 ] 295 286 296 287 [[package]] ··· 304 295 305 296 [[package]] 306 297 name = "embassy-embedded-hal" 307 - version = "0.3.1" 298 + version = "0.5.0" 308 299 source = "registry+https://github.com/rust-lang/crates.io-index" 309 - checksum = "8578db196d74db92efdd5ebc546736dac1685499ee245b22eff92fa5e4b57945" 300 + checksum = "554e3e840696f54b4c9afcf28a0f24da431c927f4151040020416e7393d6d0d8" 310 301 dependencies = [ 311 - "defmt 1.0.1", 302 + "defmt", 312 303 "embassy-futures", 313 304 "embassy-hal-internal", 314 305 "embassy-sync", 315 - "embassy-time 0.4.0", 306 + "embassy-time", 316 307 "embedded-hal 0.2.7", 317 308 "embedded-hal 1.0.0", 318 309 "embedded-hal-async", ··· 323 314 324 315 [[package]] 325 316 name = "embassy-executor" 326 - version = "0.7.0" 317 + version = "0.9.1" 327 318 source = "registry+https://github.com/rust-lang/crates.io-index" 328 - checksum = "90327bcc66333a507f89ecc4e2d911b265c45f5c9bc241f98eee076752d35ac6" 319 + checksum = "06070468370195e0e86f241c8e5004356d696590a678d47d6676795b2e439c6b" 329 320 dependencies = [ 330 321 "cortex-m", 331 322 "critical-section", 332 - "defmt 0.3.100", 323 + "defmt", 333 324 "document-features", 334 325 "embassy-executor-macros", 326 + "embassy-executor-timer-queue", 335 327 ] 336 328 337 329 [[package]] 338 330 name = "embassy-executor-macros" 339 - version = "0.6.2" 331 + version = "0.7.0" 340 332 source = "registry+https://github.com/rust-lang/crates.io-index" 341 - checksum = "3577b1e9446f61381179a330fc5324b01d511624c55f25e3c66c9e3c626dbecf" 333 + checksum = "dfdddc3a04226828316bf31393b6903ee162238576b1584ee2669af215d55472" 342 334 dependencies = [ 343 335 "darling", 344 336 "proc-macro2", ··· 347 339 ] 348 340 349 341 [[package]] 342 + name = "embassy-executor-timer-queue" 343 + version = "0.1.0" 344 + source = "registry+https://github.com/rust-lang/crates.io-index" 345 + checksum = "2fc328bf943af66b80b98755db9106bf7e7471b0cf47dc8559cd9a6be504cc9c" 346 + 347 + [[package]] 350 348 name = "embassy-futures" 351 - version = "0.1.1" 349 + version = "0.1.2" 352 350 source = "registry+https://github.com/rust-lang/crates.io-index" 353 - checksum = "1f878075b9794c1e4ac788c95b728f26aa6366d32eeb10c7051389f898f7d067" 351 + checksum = "dc2d050bdc5c21e0862a89256ed8029ae6c290a93aecefc73084b3002cdebb01" 354 352 355 353 [[package]] 356 354 name = "embassy-hal-internal" ··· 360 358 dependencies = [ 361 359 "cortex-m", 362 360 "critical-section", 363 - "defmt 1.0.1", 361 + "defmt", 364 362 "num-traits", 365 363 ] 366 364 ··· 383 381 384 382 [[package]] 385 383 name = "embassy-nrf" 386 - version = "0.5.0" 384 + version = "0.8.0" 387 385 source = "registry+https://github.com/rust-lang/crates.io-index" 388 - checksum = "6ae20388606f23184ab567537b9c7758eef5ac20cf5f94db3d936a641b9f4b9e" 386 + checksum = "a8d63429d74ab5786cde7c9dc9a0338ea162a4da95e204ac5345c5ae36831fdb" 389 387 dependencies = [ 390 388 "bitflags 2.9.1", 391 389 "cfg-if", 392 390 "cortex-m", 393 391 "cortex-m-rt", 394 392 "critical-section", 395 - "defmt 1.0.1", 393 + "defmt", 396 394 "document-features", 397 395 "embassy-embedded-hal", 398 396 "embassy-hal-internal", 399 397 "embassy-sync", 400 - "embassy-time 0.4.0", 398 + "embassy-time", 401 399 "embassy-time-driver", 402 400 "embassy-time-queue-utils", 403 401 "embassy-usb-driver", ··· 416 414 417 415 [[package]] 418 416 name = "embassy-sync" 419 - version = "0.7.0" 417 + version = "0.7.2" 420 418 source = "registry+https://github.com/rust-lang/crates.io-index" 421 - checksum = "cef1a8a1ea892f9b656de0295532ac5d8067e9830d49ec75076291fd6066b136" 419 + checksum = "73974a3edbd0bd286759b3d483540f0ebef705919a5f56f4fc7709066f71689b" 422 420 dependencies = [ 423 421 "cfg-if", 424 422 "critical-section", 425 - "defmt 1.0.1", 423 + "defmt", 426 424 "embedded-io-async", 425 + "futures-core", 427 426 "futures-sink", 428 - "futures-util", 429 427 "heapless 0.8.0", 430 428 ] 431 429 432 430 [[package]] 433 431 name = "embassy-time" 434 - version = "0.4.0" 435 - source = "registry+https://github.com/rust-lang/crates.io-index" 436 - checksum = "f820157f198ada183ad62e0a66f554c610cdcd1a9f27d4b316358103ced7a1f8" 437 - dependencies = [ 438 - "cfg-if", 439 - "critical-section", 440 - "defmt 0.3.100", 441 - "document-features", 442 - "embassy-time-driver", 443 - "embedded-hal 0.2.7", 444 - "embedded-hal 1.0.0", 445 - "embedded-hal-async", 446 - "futures-util", 447 - ] 448 - 449 - [[package]] 450 - name = "embassy-time" 451 432 version = "0.5.0" 452 433 source = "registry+https://github.com/rust-lang/crates.io-index" 453 434 checksum = "f4fa65b9284d974dad7a23bb72835c4ec85c0b540d86af7fc4098c88cff51d65" 454 435 dependencies = [ 455 436 "cfg-if", 456 437 "critical-section", 438 + "defmt", 457 439 "document-features", 458 440 "embassy-time-driver", 459 441 "embedded-hal 0.2.7", ··· 473 455 474 456 [[package]] 475 457 name = "embassy-time-queue-utils" 476 - version = "0.1.0" 458 + version = "0.3.0" 477 459 source = "registry+https://github.com/rust-lang/crates.io-index" 478 - checksum = "dc55c748d16908a65b166d09ce976575fb8852cf60ccd06174092b41064d8f83" 460 + checksum = "80e2ee86063bd028a420a5fb5898c18c87a8898026da1d4c852af2c443d0a454" 479 461 dependencies = [ 480 - "embassy-executor", 462 + "embassy-executor-timer-queue", 481 463 "heapless 0.8.0", 482 464 ] 483 465 ··· 503 485 source = "registry+https://github.com/rust-lang/crates.io-index" 504 486 checksum = "17119855ccc2d1f7470a39756b12068454ae27a3eabb037d940b5c03d9c77b7a" 505 487 dependencies = [ 506 - "defmt 1.0.1", 488 + "defmt", 507 489 "embedded-io-async", 508 490 ] 509 491 ··· 578 560 "const-fnv1a-hash", 579 561 "cordyceps", 580 562 "critical-section", 581 - "defmt 1.0.1", 563 + "defmt", 582 564 "embassy-futures", 583 - "embassy-time 0.5.0", 565 + "embassy-time", 584 566 "embassy-usb", 585 567 "heapless 0.9.1", 586 568 "log", ··· 625 607 checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" 626 608 627 609 [[package]] 628 - name = "futures-task" 629 - version = "0.3.31" 630 - source = "registry+https://github.com/rust-lang/crates.io-index" 631 - checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" 632 - 633 - [[package]] 634 - name = "futures-util" 635 - version = "0.3.31" 636 - source = "registry+https://github.com/rust-lang/crates.io-index" 637 - checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" 638 - dependencies = [ 639 - "futures-core", 640 - "futures-task", 641 - "pin-project-lite", 642 - "pin-utils", 643 - ] 644 - 645 - [[package]] 646 610 name = "generator" 647 611 version = "0.8.5" 648 612 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 723 687 source = "registry+https://github.com/rust-lang/crates.io-index" 724 688 checksum = "b1edcd5a338e64688fbdcb7531a846cfd3476a54784dcb918a0844682bc7ada5" 725 689 dependencies = [ 726 - "defmt 1.0.1", 690 + "defmt", 727 691 "hash32 0.3.1", 728 692 "serde", 729 693 "stable_deref_trait", ··· 866 830 "bbq2", 867 831 "cortex-m", 868 832 "cortex-m-rt", 869 - "defmt 1.0.1", 833 + "defmt", 870 834 "defmt-rtt", 871 835 "embassy-executor", 872 836 "embassy-nrf", 873 837 "embassy-sync", 874 - "embassy-time 0.4.0", 838 + "embassy-time", 875 839 "embassy-usb", 876 840 "ergot", 877 841 "mutex", ··· 885 849 dependencies = [ 886 850 "cortex-m", 887 851 "cortex-m-rt", 888 - "defmt 1.0.1", 852 + "defmt", 889 853 "defmt-rtt", 890 854 "embassy-executor", 891 855 "embassy-nrf", 892 - "embassy-time 0.4.0", 856 + "embassy-time", 893 857 "ergot", 894 858 "mutex", 895 859 "panic-probe", ··· 933 897 checksum = "fd402d00b0fb94c5aee000029204a46884b1262e0c443f166d86d2c0747e1a1a" 934 898 dependencies = [ 935 899 "cortex-m", 936 - "defmt 1.0.1", 900 + "defmt", 937 901 ] 938 902 939 903 [[package]] ··· 961 925 version = "0.2.16" 962 926 source = "registry+https://github.com/rust-lang/crates.io-index" 963 927 checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" 964 - 965 - [[package]] 966 - name = "pin-utils" 967 - version = "0.1.0" 968 - source = "registry+https://github.com/rust-lang/crates.io-index" 969 - checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" 970 928 971 929 [[package]] 972 930 name = "portable-atomic"
+3 -3
demos/nrf52840/Cargo.toml
··· 10 10 11 11 bbq2 = { version = "0.4.1", default-features = false, features = ["critical-section", "maitake-sync-0_2"] } 12 12 cortex-m = { version = "0.7.7", features = ["inline-asm", "critical-section-single-core"] } 13 - embassy-executor = { version = "0.7.0", features = ["task-arena-size-32768", "arch-cortex-m", "executor-thread", "executor-interrupt", "defmt"] } 14 - embassy-nrf = { version = "0.5.0", features = ["defmt", "nrf52840", "time-driver-rtc1", "gpiote", "unstable-pac", "time"] } 15 - embassy-time = { version = "0.4.0", features = ["defmt", "defmt-timestamp-uptime"] } 13 + embassy-executor = { version = "0.9.1", features = ["arch-cortex-m", "executor-thread", "executor-interrupt", "defmt"] } 14 + embassy-nrf = { version = "0.8.0", features = ["defmt", "nrf52840", "time-driver-rtc1", "gpiote", "unstable-pac", "time"] } 15 + embassy-time = { version = "0.5.0", features = ["defmt", "defmt-timestamp-uptime"] } 16 16 mutex = { version = "1.0.2", features = ["impl-unsafe-cortex-m-single-core"] } 17 17 panic-probe = { version = "1.0.0", features = ["print-defmt"] } 18 18
+1 -1
demos/nrf52840/nrf52840-eusb/src/main.rs
··· 32 32 const MAX_PACKET_SIZE: usize = 1024; 33 33 34 34 // Our nrf52840-specific USB driver 35 - type AppDriver = usb::Driver<'static, USBD, HardwareVbusDetect>; 35 + type AppDriver = usb::Driver<'static, HardwareVbusDetect>; 36 36 // The type of our RX Worker 37 37 type RxWorker = kit::RxWorker<&'static Queue, ThreadModeRawMutex, AppDriver>; 38 38 // The type of our netstack
+30 -64
demos/rp2040/Cargo.lock
··· 402 402 403 403 [[package]] 404 404 name = "embassy-embedded-hal" 405 - version = "0.3.1" 405 + version = "0.5.0" 406 406 source = "registry+https://github.com/rust-lang/crates.io-index" 407 - checksum = "8578db196d74db92efdd5ebc546736dac1685499ee245b22eff92fa5e4b57945" 407 + checksum = "554e3e840696f54b4c9afcf28a0f24da431c927f4151040020416e7393d6d0d8" 408 408 dependencies = [ 409 409 "embassy-futures", 410 410 "embassy-hal-internal", 411 411 "embassy-sync", 412 - "embassy-time 0.4.0", 413 412 "embedded-hal 0.2.7", 414 413 "embedded-hal 1.0.0", 415 414 "embedded-hal-async", ··· 420 419 421 420 [[package]] 422 421 name = "embassy-executor" 423 - version = "0.7.0" 422 + version = "0.9.1" 424 423 source = "registry+https://github.com/rust-lang/crates.io-index" 425 - checksum = "90327bcc66333a507f89ecc4e2d911b265c45f5c9bc241f98eee076752d35ac6" 424 + checksum = "06070468370195e0e86f241c8e5004356d696590a678d47d6676795b2e439c6b" 426 425 dependencies = [ 427 426 "cortex-m", 428 427 "critical-section", 429 - "defmt 0.3.100", 428 + "defmt 1.0.1", 430 429 "document-features", 431 430 "embassy-executor-macros", 431 + "embassy-executor-timer-queue", 432 432 ] 433 433 434 434 [[package]] 435 435 name = "embassy-executor-macros" 436 - version = "0.6.2" 436 + version = "0.7.0" 437 437 source = "registry+https://github.com/rust-lang/crates.io-index" 438 - checksum = "3577b1e9446f61381179a330fc5324b01d511624c55f25e3c66c9e3c626dbecf" 438 + checksum = "dfdddc3a04226828316bf31393b6903ee162238576b1584ee2669af215d55472" 439 439 dependencies = [ 440 440 "darling", 441 441 "proc-macro2", ··· 444 444 ] 445 445 446 446 [[package]] 447 + name = "embassy-executor-timer-queue" 448 + version = "0.1.0" 449 + source = "registry+https://github.com/rust-lang/crates.io-index" 450 + checksum = "2fc328bf943af66b80b98755db9106bf7e7471b0cf47dc8559cd9a6be504cc9c" 451 + 452 + [[package]] 447 453 name = "embassy-futures" 448 - version = "0.1.1" 454 + version = "0.1.2" 449 455 source = "registry+https://github.com/rust-lang/crates.io-index" 450 - checksum = "1f878075b9794c1e4ac788c95b728f26aa6366d32eeb10c7051389f898f7d067" 456 + checksum = "dc2d050bdc5c21e0862a89256ed8029ae6c290a93aecefc73084b3002cdebb01" 451 457 452 458 [[package]] 453 459 name = "embassy-hal-internal" ··· 480 486 481 487 [[package]] 482 488 name = "embassy-rp" 483 - version = "0.6.0" 489 + version = "0.8.0" 484 490 source = "registry+https://github.com/rust-lang/crates.io-index" 485 - checksum = "d298ea0ae8797fbbc835d7ef321b1762916879b9df49695826f54d31c487f5de" 491 + checksum = "1a284935af0a869de3fa14af74b5f932389dd66d7048012f1083b06f38d05399" 486 492 dependencies = [ 487 493 "atomic-polyfill", 488 494 "cfg-if", ··· 495 501 "embassy-futures", 496 502 "embassy-hal-internal", 497 503 "embassy-sync", 498 - "embassy-time 0.4.0", 504 + "embassy-time", 499 505 "embassy-time-driver", 500 506 "embassy-time-queue-utils", 501 507 "embassy-usb-driver", ··· 520 526 521 527 [[package]] 522 528 name = "embassy-sync" 523 - version = "0.7.0" 529 + version = "0.7.2" 524 530 source = "registry+https://github.com/rust-lang/crates.io-index" 525 - checksum = "cef1a8a1ea892f9b656de0295532ac5d8067e9830d49ec75076291fd6066b136" 531 + checksum = "73974a3edbd0bd286759b3d483540f0ebef705919a5f56f4fc7709066f71689b" 526 532 dependencies = [ 527 533 "cfg-if", 528 534 "critical-section", 529 535 "embedded-io-async", 536 + "futures-core", 530 537 "futures-sink", 531 - "futures-util", 532 538 "heapless 0.8.0", 533 539 ] 534 540 535 541 [[package]] 536 542 name = "embassy-time" 537 - version = "0.4.0" 538 - source = "registry+https://github.com/rust-lang/crates.io-index" 539 - checksum = "f820157f198ada183ad62e0a66f554c610cdcd1a9f27d4b316358103ced7a1f8" 540 - dependencies = [ 541 - "cfg-if", 542 - "critical-section", 543 - "defmt 0.3.100", 544 - "document-features", 545 - "embassy-time-driver", 546 - "embedded-hal 0.2.7", 547 - "embedded-hal 1.0.0", 548 - "embedded-hal-async", 549 - "futures-util", 550 - ] 551 - 552 - [[package]] 553 - name = "embassy-time" 554 543 version = "0.5.0" 555 544 source = "registry+https://github.com/rust-lang/crates.io-index" 556 545 checksum = "f4fa65b9284d974dad7a23bb72835c4ec85c0b540d86af7fc4098c88cff51d65" 557 546 dependencies = [ 558 547 "cfg-if", 559 548 "critical-section", 549 + "defmt 1.0.1", 560 550 "document-features", 561 551 "embassy-time-driver", 562 552 "embedded-hal 0.2.7", ··· 576 566 577 567 [[package]] 578 568 name = "embassy-time-queue-utils" 579 - version = "0.1.0" 569 + version = "0.3.0" 580 570 source = "registry+https://github.com/rust-lang/crates.io-index" 581 - checksum = "dc55c748d16908a65b166d09ce976575fb8852cf60ccd06174092b41064d8f83" 571 + checksum = "80e2ee86063bd028a420a5fb5898c18c87a8898026da1d4c852af2c443d0a454" 582 572 dependencies = [ 583 - "embassy-executor", 573 + "embassy-executor-timer-queue", 584 574 "heapless 0.8.0", 585 575 ] 586 576 ··· 708 698 "critical-section", 709 699 "defmt 1.0.1", 710 700 "embassy-futures", 711 - "embassy-time 0.5.0", 701 + "embassy-time", 712 702 "embassy-usb", 713 703 "heapless 0.9.1", 714 704 "log", ··· 759 749 checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" 760 750 761 751 [[package]] 762 - name = "futures-task" 763 - version = "0.3.31" 764 - source = "registry+https://github.com/rust-lang/crates.io-index" 765 - checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" 766 - 767 - [[package]] 768 - name = "futures-util" 769 - version = "0.3.31" 770 - source = "registry+https://github.com/rust-lang/crates.io-index" 771 - checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" 772 - dependencies = [ 773 - "futures-core", 774 - "futures-task", 775 - "pin-project-lite", 776 - "pin-utils", 777 - ] 778 - 779 - [[package]] 780 752 name = "generator" 781 753 version = "0.8.5" 782 754 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1208 1180 checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" 1209 1181 1210 1182 [[package]] 1211 - name = "pin-utils" 1212 - version = "0.1.0" 1213 - source = "registry+https://github.com/rust-lang/crates.io-index" 1214 - checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" 1215 - 1216 - [[package]] 1217 1183 name = "pio" 1218 1184 version = "0.3.0" 1219 1185 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1454 1420 "embassy-executor", 1455 1421 "embassy-rp", 1456 1422 "embassy-sync", 1457 - "embassy-time 0.4.0", 1423 + "embassy-time", 1458 1424 "embassy-usb", 1459 1425 "ergot", 1460 1426 "maitake-sync", ··· 1474 1440 "defmt-rtt", 1475 1441 "embassy-executor", 1476 1442 "embassy-rp", 1477 - "embassy-time 0.4.0", 1443 + "embassy-time", 1478 1444 "ergot", 1479 1445 "maitake-sync", 1480 1446 "mutex", ··· 1494 1460 "embassy-executor", 1495 1461 "embassy-futures", 1496 1462 "embassy-rp", 1497 - "embassy-time 0.4.0", 1463 + "embassy-time", 1498 1464 "ergot", 1499 1465 "maitake-sync", 1500 1466 "mutex",
+4 -4
demos/rp2040/Cargo.toml
··· 9 9 [workspace.dependencies] 10 10 bbq2 = { version = "0.4.1", default-features = false, features = ["critical-section", "maitake-sync-0_2"] } 11 11 cortex-m = { version = "0.7.6", features = ["inline-asm"] } 12 - embassy-executor = { version = "0.7.0", features = ["task-arena-size-32768", "arch-cortex-m", "executor-thread", "executor-interrupt", "defmt"] } 13 - embassy-rp = { version = "0.6.0", features = ["rp2040", "defmt", "unstable-pac", "time-driver", "critical-section-impl"] } 14 - embassy-time = { version = "0.4.0", features = ["defmt", "defmt-timestamp-uptime"] } 12 + embassy-executor = { version = "0.9.1", features = ["arch-cortex-m", "executor-thread", "executor-interrupt", "defmt"] } 13 + embassy-rp = { version = "0.8.0", features = ["rp2040", "defmt", "unstable-pac", "time-driver", "critical-section-impl"] } 14 + embassy-time = { version = "0.5.0", features = ["defmt", "defmt-timestamp-uptime"] } 15 15 ergot = { path = "../../crates/ergot", features = ["embassy-usb-v0_5"] } 16 16 maitake-sync = { version = "0.2.2", default-features = false } 17 17 panic-probe = { version = "0.3", features = ["print-defmt"] } 18 18 portable-atomic = { version = "1.6.0", features = ["critical-section"] } 19 19 serde = { version = "1.0", default-features = false, features = ["derive"] } 20 - embassy-futures = "0.1.1" 20 + embassy-futures = "0.1.2" 21 21 cortex-m-rt = "0.7.5" 22 22 defmt = "1.0.1" 23 23 defmt-rtt = "1.0.0"
+30 -64
demos/rp2350/Cargo.lock
··· 402 402 403 403 [[package]] 404 404 name = "embassy-embedded-hal" 405 - version = "0.3.1" 405 + version = "0.5.0" 406 406 source = "registry+https://github.com/rust-lang/crates.io-index" 407 - checksum = "8578db196d74db92efdd5ebc546736dac1685499ee245b22eff92fa5e4b57945" 407 + checksum = "554e3e840696f54b4c9afcf28a0f24da431c927f4151040020416e7393d6d0d8" 408 408 dependencies = [ 409 409 "embassy-futures", 410 410 "embassy-hal-internal", 411 411 "embassy-sync", 412 - "embassy-time 0.4.0", 413 412 "embedded-hal 0.2.7", 414 413 "embedded-hal 1.0.0", 415 414 "embedded-hal-async", ··· 420 419 421 420 [[package]] 422 421 name = "embassy-executor" 423 - version = "0.7.0" 422 + version = "0.9.1" 424 423 source = "registry+https://github.com/rust-lang/crates.io-index" 425 - checksum = "90327bcc66333a507f89ecc4e2d911b265c45f5c9bc241f98eee076752d35ac6" 424 + checksum = "06070468370195e0e86f241c8e5004356d696590a678d47d6676795b2e439c6b" 426 425 dependencies = [ 427 426 "cortex-m", 428 427 "critical-section", 429 - "defmt 0.3.100", 428 + "defmt 1.0.1", 430 429 "document-features", 431 430 "embassy-executor-macros", 431 + "embassy-executor-timer-queue", 432 432 ] 433 433 434 434 [[package]] 435 435 name = "embassy-executor-macros" 436 - version = "0.6.2" 436 + version = "0.7.0" 437 437 source = "registry+https://github.com/rust-lang/crates.io-index" 438 - checksum = "3577b1e9446f61381179a330fc5324b01d511624c55f25e3c66c9e3c626dbecf" 438 + checksum = "dfdddc3a04226828316bf31393b6903ee162238576b1584ee2669af215d55472" 439 439 dependencies = [ 440 440 "darling", 441 441 "proc-macro2", ··· 444 444 ] 445 445 446 446 [[package]] 447 + name = "embassy-executor-timer-queue" 448 + version = "0.1.0" 449 + source = "registry+https://github.com/rust-lang/crates.io-index" 450 + checksum = "2fc328bf943af66b80b98755db9106bf7e7471b0cf47dc8559cd9a6be504cc9c" 451 + 452 + [[package]] 447 453 name = "embassy-futures" 448 - version = "0.1.1" 454 + version = "0.1.2" 449 455 source = "registry+https://github.com/rust-lang/crates.io-index" 450 - checksum = "1f878075b9794c1e4ac788c95b728f26aa6366d32eeb10c7051389f898f7d067" 456 + checksum = "dc2d050bdc5c21e0862a89256ed8029ae6c290a93aecefc73084b3002cdebb01" 451 457 452 458 [[package]] 453 459 name = "embassy-hal-internal" ··· 480 486 481 487 [[package]] 482 488 name = "embassy-rp" 483 - version = "0.6.0" 489 + version = "0.8.0" 484 490 source = "registry+https://github.com/rust-lang/crates.io-index" 485 - checksum = "d298ea0ae8797fbbc835d7ef321b1762916879b9df49695826f54d31c487f5de" 491 + checksum = "1a284935af0a869de3fa14af74b5f932389dd66d7048012f1083b06f38d05399" 486 492 dependencies = [ 487 493 "atomic-polyfill", 488 494 "cfg-if", ··· 495 501 "embassy-futures", 496 502 "embassy-hal-internal", 497 503 "embassy-sync", 498 - "embassy-time 0.4.0", 504 + "embassy-time", 499 505 "embassy-time-driver", 500 506 "embassy-time-queue-utils", 501 507 "embassy-usb-driver", ··· 520 526 521 527 [[package]] 522 528 name = "embassy-sync" 523 - version = "0.7.0" 529 + version = "0.7.2" 524 530 source = "registry+https://github.com/rust-lang/crates.io-index" 525 - checksum = "cef1a8a1ea892f9b656de0295532ac5d8067e9830d49ec75076291fd6066b136" 531 + checksum = "73974a3edbd0bd286759b3d483540f0ebef705919a5f56f4fc7709066f71689b" 526 532 dependencies = [ 527 533 "cfg-if", 528 534 "critical-section", 529 535 "embedded-io-async", 536 + "futures-core", 530 537 "futures-sink", 531 - "futures-util", 532 538 "heapless 0.8.0", 533 539 ] 534 540 535 541 [[package]] 536 542 name = "embassy-time" 537 - version = "0.4.0" 538 - source = "registry+https://github.com/rust-lang/crates.io-index" 539 - checksum = "f820157f198ada183ad62e0a66f554c610cdcd1a9f27d4b316358103ced7a1f8" 540 - dependencies = [ 541 - "cfg-if", 542 - "critical-section", 543 - "defmt 0.3.100", 544 - "document-features", 545 - "embassy-time-driver", 546 - "embedded-hal 0.2.7", 547 - "embedded-hal 1.0.0", 548 - "embedded-hal-async", 549 - "futures-util", 550 - ] 551 - 552 - [[package]] 553 - name = "embassy-time" 554 543 version = "0.5.0" 555 544 source = "registry+https://github.com/rust-lang/crates.io-index" 556 545 checksum = "f4fa65b9284d974dad7a23bb72835c4ec85c0b540d86af7fc4098c88cff51d65" 557 546 dependencies = [ 558 547 "cfg-if", 559 548 "critical-section", 549 + "defmt 1.0.1", 560 550 "document-features", 561 551 "embassy-time-driver", 562 552 "embedded-hal 0.2.7", ··· 576 566 577 567 [[package]] 578 568 name = "embassy-time-queue-utils" 579 - version = "0.1.0" 569 + version = "0.3.0" 580 570 source = "registry+https://github.com/rust-lang/crates.io-index" 581 - checksum = "dc55c748d16908a65b166d09ce976575fb8852cf60ccd06174092b41064d8f83" 571 + checksum = "80e2ee86063bd028a420a5fb5898c18c87a8898026da1d4c852af2c443d0a454" 582 572 dependencies = [ 583 - "embassy-executor", 573 + "embassy-executor-timer-queue", 584 574 "heapless 0.8.0", 585 575 ] 586 576 ··· 719 709 "critical-section", 720 710 "defmt 1.0.1", 721 711 "embassy-futures", 722 - "embassy-time 0.5.0", 712 + "embassy-time", 723 713 "embassy-usb", 724 714 "heapless 0.9.1", 725 715 "log", ··· 770 760 checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" 771 761 772 762 [[package]] 773 - name = "futures-task" 774 - version = "0.3.31" 775 - source = "registry+https://github.com/rust-lang/crates.io-index" 776 - checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" 777 - 778 - [[package]] 779 - name = "futures-util" 780 - version = "0.3.31" 781 - source = "registry+https://github.com/rust-lang/crates.io-index" 782 - checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" 783 - dependencies = [ 784 - "futures-core", 785 - "futures-task", 786 - "pin-project-lite", 787 - "pin-utils", 788 - ] 789 - 790 - [[package]] 791 763 name = "generator" 792 764 version = "0.8.5" 793 765 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1219 1191 checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" 1220 1192 1221 1193 [[package]] 1222 - name = "pin-utils" 1223 - version = "0.1.0" 1224 - source = "registry+https://github.com/rust-lang/crates.io-index" 1225 - checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" 1226 - 1227 - [[package]] 1228 1194 name = "pio" 1229 1195 version = "0.3.0" 1230 1196 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1465 1431 "embassy-executor", 1466 1432 "embassy-rp", 1467 1433 "embassy-sync", 1468 - "embassy-time 0.4.0", 1434 + "embassy-time", 1469 1435 "embassy-usb", 1470 1436 "ergot", 1471 1437 "maitake-sync", ··· 1485 1451 "defmt-rtt", 1486 1452 "embassy-executor", 1487 1453 "embassy-rp", 1488 - "embassy-time 0.4.0", 1454 + "embassy-time", 1489 1455 "ergot", 1490 1456 "maitake-sync", 1491 1457 "mutex", ··· 1506 1472 "embassy-futures", 1507 1473 "embassy-rp", 1508 1474 "embassy-sync", 1509 - "embassy-time 0.4.0", 1475 + "embassy-time", 1510 1476 "embassy-usb", 1511 1477 "embedded-hal 1.0.0", 1512 1478 "embedded-hal-async",
+4 -4
demos/rp2350/Cargo.toml
··· 9 9 [workspace.dependencies] 10 10 bbq2 = { version = "0.4.1", default-features = false, features = ["critical-section", "maitake-sync-0_2"] } 11 11 cortex-m = { version = "0.7.6", features = ["inline-asm"] } 12 - embassy-executor = { version = "0.7.0", features = ["task-arena-size-32768", "arch-cortex-m", "executor-thread", "executor-interrupt", "defmt"] } 13 - embassy-rp = { version = "0.6.0", features = ["rp235xa", "defmt", "unstable-pac", "time-driver", "critical-section-impl"] } 14 - embassy-time = { version = "0.4.0", features = ["defmt", "defmt-timestamp-uptime"] } 12 + embassy-executor = { version = "0.9.1", features = ["arch-cortex-m", "executor-thread", "executor-interrupt", "defmt"] } 13 + embassy-rp = { version = "0.8.0", features = ["rp235xa", "defmt", "unstable-pac", "time-driver", "critical-section-impl"] } 14 + embassy-time = { version = "0.5.0", features = ["defmt", "defmt-timestamp-uptime"] } 15 15 ergot = { path = "../../crates/ergot", features = ["embassy-usb-v0_5"] } 16 16 maitake-sync = { version = "0.2.2", default-features = false } 17 17 panic-probe = { version = "0.3", features = ["print-defmt"] } ··· 20 20 embedded-hal-bus = { version = "0.3.0", features = ["async"] } 21 21 embedded-hal = "1.0.0" 22 22 embedded-hal-async = "1.0.0" 23 - embassy-futures = "0.1.1" 23 + embassy-futures = "0.1.2" 24 24 cortex-m-rt = "0.7.5" 25 25 defmt = "1.0.1" 26 26 defmt-rtt = "1.0.0"
+30 -39
demos/stm32f303vc/Cargo.lock
··· 318 318 319 319 [[package]] 320 320 name = "embassy-embedded-hal" 321 - version = "0.4.0" 321 + version = "0.5.0" 322 322 source = "registry+https://github.com/rust-lang/crates.io-index" 323 - checksum = "d1611b7a7ab5d1fbed84c338df26d56fd9bded58006ebb029075112ed2c5e039" 323 + checksum = "554e3e840696f54b4c9afcf28a0f24da431c927f4151040020416e7393d6d0d8" 324 324 dependencies = [ 325 325 "defmt 1.0.1", 326 326 "embassy-futures", 327 327 "embassy-hal-internal", 328 328 "embassy-sync", 329 - "embassy-time 0.4.0", 329 + "embassy-time", 330 330 "embedded-hal 0.2.7", 331 331 "embedded-hal 1.0.0", 332 332 "embedded-hal-async", ··· 337 337 338 338 [[package]] 339 339 name = "embassy-executor" 340 - version = "0.8.0" 340 + version = "0.9.1" 341 341 source = "registry+https://github.com/rust-lang/crates.io-index" 342 - checksum = "f102d5e04befe3ea74b6f41a0e26218740124636eb2f59e1cc215b5839b96df2" 342 + checksum = "06070468370195e0e86f241c8e5004356d696590a678d47d6676795b2e439c6b" 343 343 dependencies = [ 344 344 "cortex-m", 345 345 "critical-section", 346 346 "defmt 1.0.1", 347 347 "document-features", 348 348 "embassy-executor-macros", 349 + "embassy-executor-timer-queue", 349 350 ] 350 351 351 352 [[package]] ··· 361 362 ] 362 363 363 364 [[package]] 365 + name = "embassy-executor-timer-queue" 366 + version = "0.1.0" 367 + source = "registry+https://github.com/rust-lang/crates.io-index" 368 + checksum = "2fc328bf943af66b80b98755db9106bf7e7471b0cf47dc8559cd9a6be504cc9c" 369 + 370 + [[package]] 364 371 name = "embassy-futures" 365 - version = "0.1.1" 372 + version = "0.1.2" 366 373 source = "registry+https://github.com/rust-lang/crates.io-index" 367 - checksum = "1f878075b9794c1e4ac788c95b728f26aa6366d32eeb10c7051389f898f7d067" 374 + checksum = "dc2d050bdc5c21e0862a89256ed8029ae6c290a93aecefc73084b3002cdebb01" 368 375 369 376 [[package]] 370 377 name = "embassy-hal-internal" ··· 400 407 401 408 [[package]] 402 409 name = "embassy-stm32" 403 - version = "0.3.0" 410 + version = "0.4.0" 404 411 source = "registry+https://github.com/rust-lang/crates.io-index" 405 - checksum = "e2eb597acf7ecf8f8f6427ee29ce863d1ab7430e3a76e605957b7ca19e5bf8ef" 412 + checksum = "0d972eab325cc96afee98f80a91ca6b00249b6356dc0fdbff68b70c200df9fae" 406 413 dependencies = [ 407 414 "aligned", 408 415 "bit_field", ··· 419 426 "embassy-hal-internal", 420 427 "embassy-net-driver", 421 428 "embassy-sync", 422 - "embassy-time 0.4.0", 429 + "embassy-time", 423 430 "embassy-time-driver", 424 431 "embassy-time-queue-utils", 425 432 "embassy-usb-driver", ··· 449 456 450 457 [[package]] 451 458 name = "embassy-sync" 452 - version = "0.7.1" 459 + version = "0.7.2" 453 460 source = "registry+https://github.com/rust-lang/crates.io-index" 454 - checksum = "03c372c90d3525a648684fa1c131decaf7d9ff181030db09c876fad6043443b9" 461 + checksum = "73974a3edbd0bd286759b3d483540f0ebef705919a5f56f4fc7709066f71689b" 455 462 dependencies = [ 456 463 "cfg-if", 457 464 "critical-section", ··· 464 471 465 472 [[package]] 466 473 name = "embassy-time" 467 - version = "0.4.0" 468 - source = "registry+https://github.com/rust-lang/crates.io-index" 469 - checksum = "f820157f198ada183ad62e0a66f554c610cdcd1a9f27d4b316358103ced7a1f8" 470 - dependencies = [ 471 - "cfg-if", 472 - "critical-section", 473 - "defmt 0.3.100", 474 - "document-features", 475 - "embassy-time-driver", 476 - "embedded-hal 0.2.7", 477 - "embedded-hal 1.0.0", 478 - "embedded-hal-async", 479 - "futures-util", 480 - ] 481 - 482 - [[package]] 483 - name = "embassy-time" 484 474 version = "0.5.0" 485 475 source = "registry+https://github.com/rust-lang/crates.io-index" 486 476 checksum = "f4fa65b9284d974dad7a23bb72835c4ec85c0b540d86af7fc4098c88cff51d65" 487 477 dependencies = [ 488 478 "cfg-if", 489 479 "critical-section", 480 + "defmt 1.0.1", 490 481 "document-features", 491 482 "embassy-time-driver", 492 483 "embedded-hal 0.2.7", ··· 506 497 507 498 [[package]] 508 499 name = "embassy-time-queue-utils" 509 - version = "0.2.0" 500 + version = "0.3.0" 510 501 source = "registry+https://github.com/rust-lang/crates.io-index" 511 - checksum = "59b742d6fec7afcfa77c91b476520627151da3735fca6373b287c4c94b69e171" 502 + checksum = "80e2ee86063bd028a420a5fb5898c18c87a8898026da1d4c852af2c443d0a454" 512 503 dependencies = [ 513 - "embassy-executor", 504 + "embassy-executor-timer-queue", 514 505 "heapless 0.8.0", 515 506 ] 516 507 ··· 542 533 543 534 [[package]] 544 535 name = "embassy-usb-synopsys-otg" 545 - version = "0.3.0" 536 + version = "0.3.1" 546 537 source = "registry+https://github.com/rust-lang/crates.io-index" 547 - checksum = "79841982f857f113946b8cc0d46a69d124c523d5e4077282a608c8084ff655d9" 538 + checksum = "288751f8eaa44a5cf2613f13cee0ca8e06e6638cb96e897e6834702c79084b23" 548 539 dependencies = [ 549 540 "critical-section", 550 541 "defmt 1.0.1", ··· 648 639 "critical-section", 649 640 "defmt 1.0.1", 650 641 "embassy-futures", 651 - "embassy-time 0.5.0", 642 + "embassy-time", 652 643 "embassy-usb", 653 644 "heapless 0.9.1", 654 645 "log", ··· 1258 1249 1259 1250 [[package]] 1260 1251 name = "stm32-metapac" 1261 - version = "17.0.0" 1252 + version = "18.0.0" 1262 1253 source = "registry+https://github.com/rust-lang/crates.io-index" 1263 - checksum = "5b44329ff285800f88ccc1666218808c6ed0e6dc570383b5f661caadb8101133" 1254 + checksum = "6fd8ec3a292a0d9fc4798416a61b21da5ae50341b2e7b8d12e662bf305366097" 1264 1255 dependencies = [ 1265 1256 "cortex-m", 1266 1257 "cortex-m-rt", ··· 1277 1268 "defmt-rtt", 1278 1269 "embassy-executor", 1279 1270 "embassy-stm32", 1280 - "embassy-time 0.4.0", 1271 + "embassy-time", 1281 1272 "embedded-hal 1.0.0", 1282 1273 "ergot", 1283 1274 "heapless 0.9.1", ··· 1295 1286 "defmt-rtt", 1296 1287 "embassy-executor", 1297 1288 "embassy-stm32", 1298 - "embassy-time 0.4.0", 1289 + "embassy-time", 1299 1290 "embedded-hal 1.0.0", 1300 1291 "ergot", 1301 1292 "heapless 0.9.1",
+3 -3
demos/stm32f303vc/Cargo.toml
··· 15 15 mutex = "1.0.2" 16 16 17 17 cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } 18 - embassy-executor = { version = "0.8.0", features = ["arch-cortex-m", "executor-thread", "executor-interrupt", "defmt"] } 19 - embassy-stm32 = { version = "0.3.0", features = [ "defmt", "stm32f303vc", "unstable-pac", "memory-x", "time-driver-tim2", "exti"] } 20 - embassy-time = { version = "0.4.0", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } 18 + embassy-executor = { version = "0.9.1", features = ["arch-cortex-m", "executor-thread", "executor-interrupt", "defmt"] } 19 + embassy-stm32 = { version = "0.4.0", features = [ "defmt", "stm32f303vc", "unstable-pac", "memory-x", "time-driver-tim2", "exti"] } 20 + embassy-time = { version = "0.5.0", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } 21 21 heapless = { version = "0.9", default-features = false } 22 22 panic-probe = { version = "1.0.0", features = ["print-defmt"] } 23 23 postcard-schema = { version = "0.2.5", features = ["derive"] }