A personal rust firmware for the Badger 2040 W

Getting close to being able to build again...

+2 -1
.gitignore
··· 1 1 /target 2 2 .DS_Store 3 - .env 3 + .env 4 + .idea
+485 -352
Cargo.lock
··· 38 38 ] 39 39 40 40 [[package]] 41 - name = "ahash" 42 - version = "0.8.11" 43 - source = "registry+https://github.com/rust-lang/crates.io-index" 44 - checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" 45 - dependencies = [ 46 - "cfg-if", 47 - "once_cell", 48 - "version_check", 49 - "zerocopy 0.7.35", 50 - ] 51 - 52 - [[package]] 53 41 name = "aho-corasick" 54 42 version = "1.1.3" 55 43 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 82 70 source = "registry+https://github.com/rust-lang/crates.io-index" 83 71 checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" 84 72 dependencies = [ 85 - "term", 73 + "term 0.7.0", 74 + ] 75 + 76 + [[package]] 77 + name = "ascii-canvas" 78 + version = "4.0.0" 79 + source = "registry+https://github.com/rust-lang/crates.io-index" 80 + checksum = "ef1e3e699d84ab1b0911a1010c5c106aa34ae89aeac103be5ce0c3859db1e891" 81 + dependencies = [ 82 + "term 1.2.0", 86 83 ] 87 84 88 85 [[package]] ··· 138 135 source = "registry+https://github.com/rust-lang/crates.io-index" 139 136 checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" 140 137 dependencies = [ 141 - "bit-vec", 138 + "bit-vec 0.6.3", 139 + ] 140 + 141 + [[package]] 142 + name = "bit-set" 143 + version = "0.8.0" 144 + source = "registry+https://github.com/rust-lang/crates.io-index" 145 + checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" 146 + dependencies = [ 147 + "bit-vec 0.8.0", 142 148 ] 143 149 144 150 [[package]] ··· 148 154 checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" 149 155 150 156 [[package]] 151 - name = "bitfield" 152 - version = "0.13.2" 157 + name = "bit-vec" 158 + version = "0.8.0" 153 159 source = "registry+https://github.com/rust-lang/crates.io-index" 154 - checksum = "46afbd2983a5d5a7bd740ccb198caf5b82f45c40c09c0eed36052d91cb92e719" 160 + checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" 155 161 156 162 [[package]] 157 163 name = "bitfield" 158 - version = "0.14.0" 164 + version = "0.13.2" 159 165 source = "registry+https://github.com/rust-lang/crates.io-index" 160 - checksum = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac" 166 + checksum = "46afbd2983a5d5a7bd740ccb198caf5b82f45c40c09c0eed36052d91cb92e719" 161 167 162 168 [[package]] 163 169 name = "bitflags" ··· 253 259 checksum = "8ec610d8f49840a5b376c69663b6369e71f4b34484b9b2eb29fb918d92516cb9" 254 260 dependencies = [ 255 261 "bare-metal", 256 - "bitfield 0.13.2", 262 + "bitfield", 257 263 "embedded-hal 0.2.7", 258 264 "volatile-register", 259 265 ] 260 266 261 267 [[package]] 262 268 name = "cortex-m-rt" 263 - version = "0.7.3" 269 + version = "0.7.5" 264 270 source = "registry+https://github.com/rust-lang/crates.io-index" 265 - checksum = "ee84e813d593101b1723e13ec38b6ab6abbdbaaa4546553f5395ed274079ddb1" 271 + checksum = "801d4dec46b34c299ccf6b036717ae0fce602faa4f4fe816d9013b9a7c9f5ba6" 266 272 dependencies = [ 267 273 "cortex-m-rt-macros", 268 274 ] 269 275 270 276 [[package]] 271 277 name = "cortex-m-rt-macros" 272 - version = "0.7.0" 278 + version = "0.7.5" 273 279 source = "registry+https://github.com/rust-lang/crates.io-index" 274 - checksum = "f0f6f3e36f203cfedbc78b357fb28730aa2c6dc1ab060ee5c2405e843988d3c7" 280 + checksum = "e37549a379a9e0e6e576fd208ee60394ccb8be963889eebba3ffe0980364f472" 275 281 dependencies = [ 276 282 "proc-macro2", 277 283 "quote", 278 - "syn 1.0.109", 284 + "syn 2.0.106", 279 285 ] 280 286 281 287 [[package]] ··· 315 321 checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" 316 322 dependencies = [ 317 323 "generic-array 0.14.7", 318 - "rand_core", 324 + "rand_core 0.6.4", 319 325 "subtle", 320 326 "zeroize", 321 327 ] ··· 341 347 342 348 [[package]] 343 349 name = "cyw43" 344 - version = "0.2.0" 345 - source = "git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6#f0a86070512ad739641cee7d9fa39d63f5c8a9f6" 350 + version = "0.5.0" 351 + source = "registry+https://github.com/rust-lang/crates.io-index" 352 + checksum = "85d050df7c6c6d253d1044fd5f011873ec6f434f77c202e7e7e88d5b12a1e943" 346 353 dependencies = [ 347 354 "cortex-m", 348 355 "cortex-m-rt", 349 - "embassy-futures 0.1.1 (git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6)", 350 - "embassy-net-driver-channel 0.3.0", 351 - "embassy-sync 0.6.0 (git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6)", 356 + "embassy-futures", 357 + "embassy-net-driver-channel", 358 + "embassy-sync", 352 359 "embassy-time", 353 360 "embedded-hal 1.0.0", 354 361 "futures", 355 362 "heapless 0.8.0", 356 - "num_enum", 363 + "num_enum 0.5.11", 357 364 ] 358 365 359 366 [[package]] 360 367 name = "cyw43-pio" 361 - version = "0.2.0" 362 - source = "git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6#f0a86070512ad739641cee7d9fa39d63f5c8a9f6" 368 + version = "0.8.0" 369 + source = "registry+https://github.com/rust-lang/crates.io-index" 370 + checksum = "86bd7dea4d32a73557be29bfadaaa916e758115ed8b42cfca4fda0a111f07644" 363 371 dependencies = [ 364 372 "cyw43", 365 - "defmt", 373 + "defmt 1.0.1", 366 374 "embassy-rp", 367 375 "fixed", 368 - "pio", 369 - "pio-proc", 370 376 ] 371 377 372 378 [[package]] ··· 390 396 "proc-macro2", 391 397 "quote", 392 398 "strsim", 393 - "syn 2.0.72", 399 + "syn 2.0.106", 394 400 ] 395 401 396 402 [[package]] ··· 401 407 dependencies = [ 402 408 "darling_core", 403 409 "quote", 404 - "syn 2.0.72", 410 + "syn 2.0.106", 405 411 ] 406 412 407 413 [[package]] ··· 412 418 413 419 [[package]] 414 420 name = "defmt" 415 - version = "0.3.8" 421 + version = "0.3.100" 416 422 source = "registry+https://github.com/rust-lang/crates.io-index" 417 - checksum = "a99dd22262668b887121d4672af5a64b238f026099f1a2a1b322066c9ecfe9e0" 423 + checksum = "f0963443817029b2024136fc4dd07a5107eb8f977eaf18fcd1fdeb11306b64ad" 424 + dependencies = [ 425 + "defmt 1.0.1", 426 + ] 427 + 428 + [[package]] 429 + name = "defmt" 430 + version = "1.0.1" 431 + source = "registry+https://github.com/rust-lang/crates.io-index" 432 + checksum = "548d977b6da32fa1d1fda2876453da1e7df63ad0304c8b3dae4dbe7b96f39b78" 418 433 dependencies = [ 419 434 "bitflags 1.3.2", 420 435 "defmt-macros", ··· 422 437 423 438 [[package]] 424 439 name = "defmt-macros" 425 - version = "0.3.9" 440 + version = "1.0.1" 426 441 source = "registry+https://github.com/rust-lang/crates.io-index" 427 - checksum = "e3a9f309eff1f79b3ebdf252954d90ae440599c26c2c553fe87a2d17195f2dcb" 442 + checksum = "3d4fc12a85bcf441cfe44344c4b72d58493178ce635338a3f3b78943aceb258e" 428 443 dependencies = [ 429 444 "defmt-parser", 430 - "proc-macro-error", 445 + "proc-macro-error2", 431 446 "proc-macro2", 432 447 "quote", 433 - "syn 2.0.72", 448 + "syn 2.0.106", 434 449 ] 435 450 436 451 [[package]] 437 452 name = "defmt-parser" 438 - version = "0.3.4" 453 + version = "1.0.0" 439 454 source = "registry+https://github.com/rust-lang/crates.io-index" 440 - checksum = "ff4a5fefe330e8d7f31b16a318f9ce81000d8e35e69b93eae154d16d2278f70f" 455 + checksum = "10d60334b3b2e7c9d91ef8150abfb6fa4c1c39ebbcf4a81c2e346aad939fee3e" 441 456 dependencies = [ 442 - "thiserror", 457 + "thiserror 2.0.17", 443 458 ] 444 459 445 460 [[package]] ··· 449 464 checksum = "bab697b3dbbc1750b7c8b821aa6f6e7f2480b47a99bc057a2ed7b170ebef0c51" 450 465 dependencies = [ 451 466 "critical-section", 452 - "defmt", 467 + "defmt 0.3.100", 453 468 ] 454 469 455 470 [[package]] ··· 528 543 "generic-array 0.14.7", 529 544 "group", 530 545 "hkdf", 531 - "rand_core", 546 + "rand_core 0.6.4", 532 547 "sec1", 533 548 "subtle", 534 549 "zeroize", ··· 536 551 537 552 [[package]] 538 553 name = "embassy-embedded-hal" 539 - version = "0.2.0" 540 - source = "git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6#f0a86070512ad739641cee7d9fa39d63f5c8a9f6" 554 + version = "0.5.0" 555 + source = "registry+https://github.com/rust-lang/crates.io-index" 556 + checksum = "554e3e840696f54b4c9afcf28a0f24da431c927f4151040020416e7393d6d0d8" 541 557 dependencies = [ 542 - "defmt", 543 - "embassy-futures 0.1.1 (git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6)", 544 - "embassy-sync 0.6.0 (git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6)", 545 - "embassy-time", 558 + "defmt 1.0.1", 559 + "embassy-futures", 560 + "embassy-hal-internal", 561 + "embassy-sync", 546 562 "embedded-hal 0.2.7", 547 563 "embedded-hal 1.0.0", 548 564 "embedded-hal-async", ··· 553 569 554 570 [[package]] 555 571 name = "embassy-executor" 556 - version = "0.6.0" 557 - source = "git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6#f0a86070512ad739641cee7d9fa39d63f5c8a9f6" 572 + version = "0.9.1" 573 + source = "registry+https://github.com/rust-lang/crates.io-index" 574 + checksum = "06070468370195e0e86f241c8e5004356d696590a678d47d6676795b2e439c6b" 558 575 dependencies = [ 559 576 "cortex-m", 560 577 "critical-section", 561 - "defmt", 578 + "defmt 1.0.1", 562 579 "document-features", 563 580 "embassy-executor-macros", 564 - "embassy-time-driver", 565 - "embassy-time-queue-driver", 581 + "embassy-executor-timer-queue", 566 582 ] 567 583 568 584 [[package]] 569 585 name = "embassy-executor-macros" 570 - version = "0.5.0" 571 - source = "git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6#f0a86070512ad739641cee7d9fa39d63f5c8a9f6" 586 + version = "0.7.0" 587 + source = "registry+https://github.com/rust-lang/crates.io-index" 588 + checksum = "dfdddc3a04226828316bf31393b6903ee162238576b1584ee2669af215d55472" 572 589 dependencies = [ 573 590 "darling", 574 591 "proc-macro2", 575 592 "quote", 576 - "syn 2.0.72", 593 + "syn 2.0.106", 577 594 ] 578 595 579 596 [[package]] 580 - name = "embassy-futures" 581 - version = "0.1.1" 582 - source = "git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6#f0a86070512ad739641cee7d9fa39d63f5c8a9f6" 597 + name = "embassy-executor-timer-queue" 598 + version = "0.1.0" 599 + source = "registry+https://github.com/rust-lang/crates.io-index" 600 + checksum = "2fc328bf943af66b80b98755db9106bf7e7471b0cf47dc8559cd9a6be504cc9c" 583 601 584 602 [[package]] 585 603 name = "embassy-futures" 586 - version = "0.1.1" 587 - source = "git+https://github.com/embassy-rs/embassy.git#2b031756c6d705f58de972de48f7300b4fdc673c" 604 + version = "0.1.2" 605 + source = "registry+https://github.com/rust-lang/crates.io-index" 606 + checksum = "dc2d050bdc5c21e0862a89256ed8029ae6c290a93aecefc73084b3002cdebb01" 588 607 589 608 [[package]] 590 609 name = "embassy-hal-internal" 591 - version = "0.2.0" 592 - source = "git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6#f0a86070512ad739641cee7d9fa39d63f5c8a9f6" 610 + version = "0.3.0" 611 + source = "registry+https://github.com/rust-lang/crates.io-index" 612 + checksum = "95285007a91b619dc9f26ea8f55452aa6c60f7115a4edc05085cd2bd3127cd7a" 593 613 dependencies = [ 594 614 "cortex-m", 595 615 "critical-section", 596 - "defmt", 616 + "defmt 1.0.1", 597 617 "num-traits", 598 618 ] 599 619 600 620 [[package]] 601 621 name = "embassy-net" 602 - version = "0.4.0" 603 - source = "git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6#f0a86070512ad739641cee7d9fa39d63f5c8a9f6" 622 + version = "0.7.1" 623 + source = "registry+https://github.com/rust-lang/crates.io-index" 624 + checksum = "0558a231a47e7d4a06a28b5278c92e860f1200f24821d2f365a2f40fe3f3c7b2" 604 625 dependencies = [ 605 - "defmt", 626 + "defmt 1.0.1", 606 627 "document-features", 607 - "embassy-net-driver 0.2.0 (git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6)", 608 - "embassy-sync 0.6.0 (git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6)", 628 + "embassy-net-driver", 629 + "embassy-sync", 609 630 "embassy-time", 610 631 "embedded-io-async", 611 632 "embedded-nal-async", ··· 617 638 [[package]] 618 639 name = "embassy-net-driver" 619 640 version = "0.2.0" 620 - source = "git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6#f0a86070512ad739641cee7d9fa39d63f5c8a9f6" 621 - dependencies = [ 622 - "defmt", 623 - ] 624 - 625 - [[package]] 626 - name = "embassy-net-driver" 627 - version = "0.2.0" 628 - source = "git+https://github.com/embassy-rs/embassy.git#2b031756c6d705f58de972de48f7300b4fdc673c" 629 - 630 - [[package]] 631 - name = "embassy-net-driver-channel" 632 - version = "0.2.0" 633 - source = "git+https://github.com/embassy-rs/embassy.git#2b031756c6d705f58de972de48f7300b4fdc673c" 641 + source = "registry+https://github.com/rust-lang/crates.io-index" 642 + checksum = "524eb3c489760508f71360112bca70f6e53173e6fe48fc5f0efd0f5ab217751d" 634 643 dependencies = [ 635 - "embassy-futures 0.1.1 (git+https://github.com/embassy-rs/embassy.git)", 636 - "embassy-net-driver 0.2.0 (git+https://github.com/embassy-rs/embassy.git)", 637 - "embassy-sync 0.6.0 (git+https://github.com/embassy-rs/embassy.git)", 644 + "defmt 0.3.100", 638 645 ] 639 646 640 647 [[package]] 641 648 name = "embassy-net-driver-channel" 642 - version = "0.3.0" 643 - source = "git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6#f0a86070512ad739641cee7d9fa39d63f5c8a9f6" 649 + version = "0.3.2" 650 + source = "registry+https://github.com/rust-lang/crates.io-index" 651 + checksum = "b7b2739fbcf6cd206ae08779c7d709087b16577d255f2ea4a45bc4bbbf305b3f" 644 652 dependencies = [ 645 - "embassy-futures 0.1.1 (git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6)", 646 - "embassy-net-driver 0.2.0 (git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6)", 647 - "embassy-sync 0.6.0 (git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6)", 653 + "embassy-futures", 654 + "embassy-net-driver", 655 + "embassy-sync", 648 656 ] 649 657 650 658 [[package]] 651 659 name = "embassy-net-wiznet" 652 - version = "0.1.0" 653 - source = "git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6#f0a86070512ad739641cee7d9fa39d63f5c8a9f6" 660 + version = "0.2.1" 661 + source = "registry+https://github.com/rust-lang/crates.io-index" 662 + checksum = "3035678b1fcb8322bbcc3ee9a32ea3ed04e6e388528057abd11ee8382a63abdf" 654 663 dependencies = [ 655 - "defmt", 656 - "embassy-futures 0.1.1 (git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6)", 657 - "embassy-net-driver-channel 0.3.0", 664 + "defmt 1.0.1", 665 + "embassy-futures", 666 + "embassy-net-driver-channel", 658 667 "embassy-time", 659 668 "embedded-hal 1.0.0", 660 669 "embedded-hal-async", ··· 662 671 663 672 [[package]] 664 673 name = "embassy-rp" 665 - version = "0.2.0" 666 - source = "git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6#f0a86070512ad739641cee7d9fa39d63f5c8a9f6" 674 + version = "0.8.0" 675 + source = "registry+https://github.com/rust-lang/crates.io-index" 676 + checksum = "1a284935af0a869de3fa14af74b5f932389dd66d7048012f1083b06f38d05399" 667 677 dependencies = [ 668 678 "atomic-polyfill", 669 679 "cfg-if", 670 680 "cortex-m", 671 681 "cortex-m-rt", 672 682 "critical-section", 673 - "defmt", 683 + "defmt 1.0.1", 674 684 "document-features", 675 685 "embassy-embedded-hal", 676 - "embassy-futures 0.1.1 (git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6)", 686 + "embassy-futures", 677 687 "embassy-hal-internal", 678 - "embassy-sync 0.6.0 (git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6)", 688 + "embassy-sync", 679 689 "embassy-time", 680 690 "embassy-time-driver", 681 - "embassy-usb-driver 0.1.0 (git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6)", 691 + "embassy-time-queue-utils", 692 + "embassy-usb-driver", 682 693 "embedded-hal 0.2.7", 683 694 "embedded-hal 1.0.0", 684 695 "embedded-hal-async", ··· 689 700 "embedded-storage-async", 690 701 "fixed", 691 702 "nb 1.1.0", 692 - "pio", 693 - "pio-proc", 694 - "rand_core", 703 + "pio 0.3.0", 704 + "rand_core 0.6.4", 705 + "rand_core 0.9.3", 695 706 "rp-pac", 696 707 "rp2040-boot2", 697 708 "sha2-const-stable", 698 - ] 699 - 700 - [[package]] 701 - name = "embassy-sync" 702 - version = "0.6.0" 703 - source = "git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6#f0a86070512ad739641cee7d9fa39d63f5c8a9f6" 704 - dependencies = [ 705 - "cfg-if", 706 - "critical-section", 707 - "defmt", 708 - "embedded-io-async", 709 - "futures-util", 710 - "heapless 0.8.0", 709 + "smart-leds", 711 710 ] 712 711 713 712 [[package]] 714 713 name = "embassy-sync" 715 - version = "0.6.0" 716 - source = "git+https://github.com/embassy-rs/embassy.git#2b031756c6d705f58de972de48f7300b4fdc673c" 714 + version = "0.7.2" 715 + source = "registry+https://github.com/rust-lang/crates.io-index" 716 + checksum = "73974a3edbd0bd286759b3d483540f0ebef705919a5f56f4fc7709066f71689b" 717 717 dependencies = [ 718 718 "cfg-if", 719 719 "critical-section", 720 + "defmt 1.0.1", 720 721 "embedded-io-async", 721 - "futures-util", 722 + "futures-core", 723 + "futures-sink", 722 724 "heapless 0.8.0", 723 725 ] 724 726 725 727 [[package]] 726 728 name = "embassy-time" 727 - version = "0.3.2" 728 - source = "git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6#f0a86070512ad739641cee7d9fa39d63f5c8a9f6" 729 + version = "0.5.0" 730 + source = "registry+https://github.com/rust-lang/crates.io-index" 731 + checksum = "f4fa65b9284d974dad7a23bb72835c4ec85c0b540d86af7fc4098c88cff51d65" 729 732 dependencies = [ 730 733 "cfg-if", 731 734 "critical-section", 732 - "defmt", 735 + "defmt 1.0.1", 733 736 "document-features", 734 737 "embassy-time-driver", 735 - "embassy-time-queue-driver", 736 738 "embedded-hal 0.2.7", 737 739 "embedded-hal 1.0.0", 738 740 "embedded-hal-async", 739 - "futures-util", 740 - "heapless 0.8.0", 741 + "futures-core", 741 742 ] 742 743 743 744 [[package]] 744 745 name = "embassy-time-driver" 745 - version = "0.1.0" 746 - source = "git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6#f0a86070512ad739641cee7d9fa39d63f5c8a9f6" 746 + version = "0.2.1" 747 + source = "registry+https://github.com/rust-lang/crates.io-index" 748 + checksum = "a0a244c7dc22c8d0289379c8d8830cae06bb93d8f990194d0de5efb3b5ae7ba6" 747 749 dependencies = [ 748 750 "document-features", 749 751 ] 750 752 751 753 [[package]] 752 - name = "embassy-time-queue-driver" 753 - version = "0.1.0" 754 - source = "git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6#f0a86070512ad739641cee7d9fa39d63f5c8a9f6" 755 - 756 - [[package]] 757 - name = "embassy-usb" 758 - version = "0.2.0" 759 - source = "git+https://github.com/embassy-rs/embassy.git#2b031756c6d705f58de972de48f7300b4fdc673c" 760 - dependencies = [ 761 - "embassy-futures 0.1.1 (git+https://github.com/embassy-rs/embassy.git)", 762 - "embassy-net-driver-channel 0.2.0", 763 - "embassy-sync 0.6.0 (git+https://github.com/embassy-rs/embassy.git)", 764 - "embassy-usb-driver 0.1.0 (git+https://github.com/embassy-rs/embassy.git)", 765 - "heapless 0.8.0", 766 - "ssmarshal", 767 - "usbd-hid", 768 - ] 769 - 770 - [[package]] 771 - name = "embassy-usb" 754 + name = "embassy-time-queue-utils" 772 755 version = "0.3.0" 773 - source = "git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6#f0a86070512ad739641cee7d9fa39d63f5c8a9f6" 756 + source = "registry+https://github.com/rust-lang/crates.io-index" 757 + checksum = "80e2ee86063bd028a420a5fb5898c18c87a8898026da1d4c852af2c443d0a454" 774 758 dependencies = [ 775 - "defmt", 776 - "embassy-futures 0.1.1 (git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6)", 777 - "embassy-net-driver-channel 0.3.0", 778 - "embassy-sync 0.6.0 (git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6)", 779 - "embassy-usb-driver 0.1.0 (git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6)", 759 + "embassy-executor-timer-queue", 780 760 "heapless 0.8.0", 781 - "ssmarshal", 782 - "usbd-hid", 783 761 ] 784 762 785 763 [[package]] 786 764 name = "embassy-usb-driver" 787 - version = "0.1.0" 788 - source = "git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6#f0a86070512ad739641cee7d9fa39d63f5c8a9f6" 789 - dependencies = [ 790 - "defmt", 791 - ] 792 - 793 - [[package]] 794 - name = "embassy-usb-driver" 795 - version = "0.1.0" 796 - source = "git+https://github.com/embassy-rs/embassy.git#2b031756c6d705f58de972de48f7300b4fdc673c" 797 - 798 - [[package]] 799 - name = "embassy-usb-logger" 800 765 version = "0.2.0" 801 - source = "git+https://github.com/embassy-rs/embassy.git#2b031756c6d705f58de972de48f7300b4fdc673c" 766 + source = "registry+https://github.com/rust-lang/crates.io-index" 767 + checksum = "17119855ccc2d1f7470a39756b12068454ae27a3eabb037d940b5c03d9c77b7a" 802 768 dependencies = [ 803 - "embassy-futures 0.1.1 (git+https://github.com/embassy-rs/embassy.git)", 804 - "embassy-sync 0.6.0 (git+https://github.com/embassy-rs/embassy.git)", 805 - "embassy-usb 0.2.0", 806 - "log", 769 + "defmt 1.0.1", 770 + "embedded-io-async", 807 771 ] 808 772 809 773 [[package]] ··· 881 845 source = "registry+https://github.com/rust-lang/crates.io-index" 882 846 checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" 883 847 dependencies = [ 884 - "defmt", 848 + "defmt 0.3.100", 885 849 ] 886 850 887 851 [[package]] ··· 890 854 source = "registry+https://github.com/rust-lang/crates.io-index" 891 855 checksum = "3ff09972d4073aa8c299395be75161d582e7629cd663171d62af73c8d50dba3f" 892 856 dependencies = [ 893 - "defmt", 857 + "defmt 0.3.100", 894 858 "embedded-io", 895 859 ] 896 860 897 861 [[package]] 898 862 name = "embedded-nal" 899 - version = "0.8.0" 863 + version = "0.9.0" 900 864 source = "registry+https://github.com/rust-lang/crates.io-index" 901 - checksum = "b8a943fad5ed3d3f8a00f1e80f6bba371f1e7f0df28ec38477535eb318dc19cc" 865 + checksum = "c56a28be191a992f28f178ec338a0bf02f63d7803244add736d026a471e6ed77" 902 866 dependencies = [ 903 867 "nb 1.1.0", 904 - "no-std-net", 905 868 ] 906 869 907 870 [[package]] 908 871 name = "embedded-nal-async" 909 - version = "0.7.1" 872 + version = "0.8.0" 910 873 source = "registry+https://github.com/rust-lang/crates.io-index" 911 - checksum = "72229137a4fc12d239b0b7f50f04b30790678da6d782a0f3f1909bf57ec4b759" 874 + checksum = "76959917cd2b86f40a98c28dd5624eddd1fa69d746241c8257eac428d83cb211" 912 875 dependencies = [ 913 876 "embedded-io-async", 914 877 "embedded-nal", 915 - "no-std-net", 916 878 ] 917 879 918 880 [[package]] ··· 961 923 dependencies = [ 962 924 "aes-gcm", 963 925 "atomic-polyfill", 964 - "defmt", 926 + "defmt 0.3.100", 965 927 "digest", 966 928 "embedded-io", 967 929 "embedded-io-async", ··· 971 933 "hkdf", 972 934 "hmac", 973 935 "p256", 974 - "rand_core", 936 + "rand_core 0.6.4", 975 937 "sha2", 976 938 "typenum", 977 939 ] ··· 984 946 dependencies = [ 985 947 "log", 986 948 ] 987 - 988 - [[package]] 989 - name = "encode_unicode" 990 - version = "0.3.6" 991 - source = "registry+https://github.com/rust-lang/crates.io-index" 992 - checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" 993 949 994 950 [[package]] 995 951 name = "equivalent" ··· 1003 959 source = "registry+https://github.com/rust-lang/crates.io-index" 1004 960 checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" 1005 961 dependencies = [ 1006 - "rand_core", 962 + "rand_core 0.6.4", 1007 963 "subtle", 1008 964 ] 1009 965 ··· 1061 1017 checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" 1062 1018 1063 1019 [[package]] 1020 + name = "fixedbitset" 1021 + version = "0.5.7" 1022 + source = "registry+https://github.com/rust-lang/crates.io-index" 1023 + checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99" 1024 + 1025 + [[package]] 1064 1026 name = "float-cmp" 1065 1027 version = "0.9.0" 1066 1028 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1101 1063 1102 1064 [[package]] 1103 1065 name = "futures-core" 1104 - version = "0.3.30" 1066 + version = "0.3.31" 1105 1067 source = "registry+https://github.com/rust-lang/crates.io-index" 1106 - checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" 1068 + checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" 1107 1069 1108 1070 [[package]] 1109 1071 name = "futures-io" ··· 1119 1081 dependencies = [ 1120 1082 "proc-macro2", 1121 1083 "quote", 1122 - "syn 2.0.72", 1084 + "syn 2.0.106", 1123 1085 ] 1124 1086 1125 1087 [[package]] ··· 1205 1167 checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" 1206 1168 dependencies = [ 1207 1169 "ff", 1208 - "rand_core", 1170 + "rand_core 0.6.4", 1209 1171 "subtle", 1210 1172 ] 1211 1173 ··· 1248 1210 1249 1211 [[package]] 1250 1212 name = "hashbrown" 1251 - version = "0.13.2" 1252 - source = "registry+https://github.com/rust-lang/crates.io-index" 1253 - checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" 1254 - dependencies = [ 1255 - "ahash", 1256 - ] 1257 - 1258 - [[package]] 1259 - name = "hashbrown" 1260 - version = "0.14.5" 1213 + version = "0.16.0" 1261 1214 source = "registry+https://github.com/rust-lang/crates.io-index" 1262 - checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" 1215 + checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" 1263 1216 1264 1217 [[package]] 1265 1218 name = "heapless" ··· 1293 1246 source = "registry+https://github.com/rust-lang/crates.io-index" 1294 1247 checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" 1295 1248 dependencies = [ 1296 - "defmt", 1249 + "defmt 0.3.100", 1297 1250 "hash32 0.3.1", 1298 1251 "serde", 1299 1252 "stable_deref_trait", ··· 1343 1296 1344 1297 [[package]] 1345 1298 name = "indexmap" 1346 - version = "2.3.0" 1299 + version = "2.11.4" 1347 1300 source = "registry+https://github.com/rust-lang/crates.io-index" 1348 - checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" 1301 + checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5" 1349 1302 dependencies = [ 1350 1303 "equivalent", 1351 - "hashbrown 0.14.5", 1304 + "hashbrown", 1352 1305 ] 1353 1306 1354 1307 [[package]] ··· 1368 1321 dependencies = [ 1369 1322 "hermit-abi", 1370 1323 "libc", 1371 - "windows-sys", 1324 + "windows-sys 0.52.0", 1372 1325 ] 1373 1326 1374 1327 [[package]] ··· 1381 1334 ] 1382 1335 1383 1336 [[package]] 1337 + name = "itertools" 1338 + version = "0.14.0" 1339 + source = "registry+https://github.com/rust-lang/crates.io-index" 1340 + checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" 1341 + dependencies = [ 1342 + "either", 1343 + ] 1344 + 1345 + [[package]] 1346 + name = "keccak" 1347 + version = "0.1.5" 1348 + source = "registry+https://github.com/rust-lang/crates.io-index" 1349 + checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" 1350 + dependencies = [ 1351 + "cpufeatures", 1352 + ] 1353 + 1354 + [[package]] 1384 1355 name = "lalrpop" 1385 1356 version = "0.19.12" 1386 1357 source = "registry+https://github.com/rust-lang/crates.io-index" 1387 1358 checksum = "0a1cbf952127589f2851ab2046af368fd20645491bb4b376f04b7f94d7a9837b" 1388 1359 dependencies = [ 1389 - "ascii-canvas", 1390 - "bit-set", 1360 + "ascii-canvas 3.0.0", 1361 + "bit-set 0.5.3", 1391 1362 "diff", 1392 1363 "ena", 1393 1364 "is-terminal", 1394 - "itertools", 1395 - "lalrpop-util", 1396 - "petgraph", 1365 + "itertools 0.10.5", 1366 + "lalrpop-util 0.19.12", 1367 + "petgraph 0.6.5", 1397 1368 "regex", 1398 1369 "regex-syntax 0.6.29", 1399 1370 "string_cache", 1400 - "term", 1371 + "term 0.7.0", 1401 1372 "tiny-keccak", 1402 1373 "unicode-xid", 1403 1374 ] 1404 1375 1405 1376 [[package]] 1377 + name = "lalrpop" 1378 + version = "0.22.2" 1379 + source = "registry+https://github.com/rust-lang/crates.io-index" 1380 + checksum = "ba4ebbd48ce411c1d10fb35185f5a51a7bfa3d8b24b4e330d30c9e3a34129501" 1381 + dependencies = [ 1382 + "ascii-canvas 4.0.0", 1383 + "bit-set 0.8.0", 1384 + "ena", 1385 + "itertools 0.14.0", 1386 + "lalrpop-util 0.22.2", 1387 + "petgraph 0.7.1", 1388 + "pico-args", 1389 + "regex", 1390 + "regex-syntax 0.8.4", 1391 + "sha3", 1392 + "string_cache", 1393 + "term 1.2.0", 1394 + "unicode-xid", 1395 + "walkdir", 1396 + ] 1397 + 1398 + [[package]] 1406 1399 name = "lalrpop-util" 1407 1400 version = "0.19.12" 1408 1401 source = "registry+https://github.com/rust-lang/crates.io-index" 1409 1402 checksum = "d3c48237b9604c5a4702de6b824e02006c3214327564636aef27c1028a8fa0ed" 1410 1403 dependencies = [ 1411 1404 "regex", 1405 + ] 1406 + 1407 + [[package]] 1408 + name = "lalrpop-util" 1409 + version = "0.22.2" 1410 + source = "registry+https://github.com/rust-lang/crates.io-index" 1411 + checksum = "b5baa5e9ff84f1aefd264e6869907646538a52147a755d494517a8007fb48733" 1412 + dependencies = [ 1413 + "regex-automata", 1414 + "rustversion", 1412 1415 ] 1413 1416 1414 1417 [[package]] ··· 1489 1492 checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" 1490 1493 1491 1494 [[package]] 1492 - name = "no-std-net" 1493 - version = "0.6.0" 1494 - source = "registry+https://github.com/rust-lang/crates.io-index" 1495 - checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" 1496 - 1497 - [[package]] 1498 1495 name = "nourl" 1499 1496 version = "0.1.1" 1500 1497 source = "registry+https://github.com/rust-lang/crates.io-index" 1501 1498 checksum = "b3c12edfda65fe16901d81d3bd93fd18ac07078b5007875a1c3b0d35f7725269" 1502 1499 dependencies = [ 1503 - "defmt", 1500 + "defmt 0.3.100", 1504 1501 ] 1505 1502 1506 1503 [[package]] ··· 1518 1515 source = "registry+https://github.com/rust-lang/crates.io-index" 1519 1516 checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" 1520 1517 dependencies = [ 1521 - "num_enum_derive", 1518 + "num_enum_derive 0.5.11", 1519 + ] 1520 + 1521 + [[package]] 1522 + name = "num_enum" 1523 + version = "0.7.4" 1524 + source = "registry+https://github.com/rust-lang/crates.io-index" 1525 + checksum = "a973b4e44ce6cad84ce69d797acf9a044532e4184c4f267913d1b546a0727b7a" 1526 + dependencies = [ 1527 + "num_enum_derive 0.7.4", 1528 + "rustversion", 1522 1529 ] 1523 1530 1524 1531 [[package]] ··· 1533 1540 ] 1534 1541 1535 1542 [[package]] 1543 + name = "num_enum_derive" 1544 + version = "0.7.4" 1545 + source = "registry+https://github.com/rust-lang/crates.io-index" 1546 + checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d" 1547 + dependencies = [ 1548 + "proc-macro2", 1549 + "quote", 1550 + "syn 2.0.106", 1551 + ] 1552 + 1553 + [[package]] 1536 1554 name = "object-chain" 1537 1555 version = "0.1.3" 1538 1556 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1562 1580 1563 1581 [[package]] 1564 1582 name = "panic-probe" 1565 - version = "0.3.2" 1583 + version = "1.0.0" 1566 1584 source = "registry+https://github.com/rust-lang/crates.io-index" 1567 - checksum = "4047d9235d1423d66cc97da7d07eddb54d4f154d6c13805c6d0793956f4f25b0" 1585 + checksum = "fd402d00b0fb94c5aee000029204a46884b1262e0c443f166d86d2c0747e1a1a" 1568 1586 dependencies = [ 1569 1587 "cortex-m", 1570 - "defmt", 1588 + "defmt 1.0.1", 1571 1589 ] 1572 1590 1573 1591 [[package]] ··· 1605 1623 source = "registry+https://github.com/rust-lang/crates.io-index" 1606 1624 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" 1607 1625 dependencies = [ 1608 - "fixedbitset", 1626 + "fixedbitset 0.4.2", 1627 + "indexmap", 1628 + ] 1629 + 1630 + [[package]] 1631 + name = "petgraph" 1632 + version = "0.7.1" 1633 + source = "registry+https://github.com/rust-lang/crates.io-index" 1634 + checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772" 1635 + dependencies = [ 1636 + "fixedbitset 0.5.7", 1609 1637 "indexmap", 1610 1638 ] 1611 1639 ··· 1617 1645 dependencies = [ 1618 1646 "siphasher", 1619 1647 ] 1648 + 1649 + [[package]] 1650 + name = "pico-args" 1651 + version = "0.5.0" 1652 + source = "registry+https://github.com/rust-lang/crates.io-index" 1653 + checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" 1620 1654 1621 1655 [[package]] 1622 1656 name = "pin-project-lite" ··· 1637 1671 checksum = "76e09694b50f89f302ed531c1f2a7569f0be5867aee4ab4f8f729bbeec0078e3" 1638 1672 dependencies = [ 1639 1673 "arrayvec", 1640 - "num_enum", 1674 + "num_enum 0.5.11", 1675 + "paste", 1676 + ] 1677 + 1678 + [[package]] 1679 + name = "pio" 1680 + version = "0.3.0" 1681 + source = "registry+https://github.com/rust-lang/crates.io-index" 1682 + checksum = "d0ba4153cee9585abc451271aa437d9e8defdea8b468d48ba6b8f098cbe03d7f" 1683 + dependencies = [ 1684 + "pio-core", 1685 + "pio-proc 0.3.0", 1686 + ] 1687 + 1688 + [[package]] 1689 + name = "pio-core" 1690 + version = "0.3.0" 1691 + source = "registry+https://github.com/rust-lang/crates.io-index" 1692 + checksum = "61d90fddc3d67f21bbf93683bc461b05d6a29c708caf3ffb79947d7ff7095406" 1693 + dependencies = [ 1694 + "arrayvec", 1695 + "num_enum 0.7.4", 1641 1696 "paste", 1642 1697 ] 1643 1698 ··· 1647 1702 source = "registry+https://github.com/rust-lang/crates.io-index" 1648 1703 checksum = "77532c2b8279aef98dfc7207ef15298a5a3d6b6cc76ccc8b65913d69f3a8dd6b" 1649 1704 dependencies = [ 1650 - "lalrpop", 1651 - "lalrpop-util", 1652 - "pio", 1705 + "lalrpop 0.19.12", 1706 + "lalrpop-util 0.19.12", 1707 + "pio 0.2.1", 1653 1708 "regex-syntax 0.6.29", 1709 + ] 1710 + 1711 + [[package]] 1712 + name = "pio-parser" 1713 + version = "0.3.0" 1714 + source = "registry+https://github.com/rust-lang/crates.io-index" 1715 + checksum = "825266c1eaddf54f636d06eefa4bf3c99d774c14ec46a4a6c6e5128a0f10d205" 1716 + dependencies = [ 1717 + "lalrpop 0.22.2", 1718 + "lalrpop-util 0.22.2", 1719 + "pio-core", 1654 1720 ] 1655 1721 1656 1722 [[package]] ··· 1660 1726 checksum = "6b04dc870fb3a4fd8b3e4ca8c61b53bc8ac4eb78b66805d2b3c2e5c4829e0d7a" 1661 1727 dependencies = [ 1662 1728 "codespan-reporting", 1663 - "lalrpop-util", 1664 - "pio", 1665 - "pio-parser", 1729 + "lalrpop-util 0.19.12", 1730 + "pio 0.2.1", 1731 + "pio-parser 0.2.2", 1666 1732 "proc-macro-error", 1667 1733 "proc-macro2", 1668 1734 "quote", ··· 1671 1737 ] 1672 1738 1673 1739 [[package]] 1740 + name = "pio-proc" 1741 + version = "0.3.0" 1742 + source = "registry+https://github.com/rust-lang/crates.io-index" 1743 + checksum = "ed4a76571f5fe51af43cc80ac870fe0c79cc0cdd686b9002a6c4c84bfdd0176b" 1744 + dependencies = [ 1745 + "codespan-reporting", 1746 + "lalrpop-util 0.22.2", 1747 + "pio-core", 1748 + "pio-parser 0.3.0", 1749 + "proc-macro-error2", 1750 + "proc-macro2", 1751 + "quote", 1752 + "syn 2.0.106", 1753 + ] 1754 + 1755 + [[package]] 1674 1756 name = "polyval" 1675 1757 version = "0.6.2" 1676 1758 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 1708 1790 source = "registry+https://github.com/rust-lang/crates.io-index" 1709 1791 checksum = "dee4364d9f3b902ef14fab8a1ddffb783a1cb6b4bba3bfc1fa3922732c7de97f" 1710 1792 dependencies = [ 1711 - "zerocopy 0.6.6", 1793 + "zerocopy", 1712 1794 ] 1713 1795 1714 1796 [[package]] ··· 1751 1833 ] 1752 1834 1753 1835 [[package]] 1836 + name = "proc-macro-error-attr2" 1837 + version = "2.0.0" 1838 + source = "registry+https://github.com/rust-lang/crates.io-index" 1839 + checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" 1840 + dependencies = [ 1841 + "proc-macro2", 1842 + "quote", 1843 + ] 1844 + 1845 + [[package]] 1846 + name = "proc-macro-error2" 1847 + version = "2.0.1" 1848 + source = "registry+https://github.com/rust-lang/crates.io-index" 1849 + checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" 1850 + dependencies = [ 1851 + "proc-macro-error-attr2", 1852 + "proc-macro2", 1853 + "quote", 1854 + "syn 2.0.106", 1855 + ] 1856 + 1857 + [[package]] 1754 1858 name = "proc-macro2" 1755 - version = "1.0.86" 1859 + version = "1.0.101" 1756 1860 source = "registry+https://github.com/rust-lang/crates.io-index" 1757 - checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" 1861 + checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de" 1758 1862 dependencies = [ 1759 1863 "unicode-ident", 1760 1864 ] ··· 1774 1878 source = "registry+https://github.com/rust-lang/crates.io-index" 1775 1879 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" 1776 1880 dependencies = [ 1777 - "rand_core", 1881 + "rand_core 0.6.4", 1778 1882 ] 1779 1883 1780 1884 [[package]] ··· 1784 1888 checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" 1785 1889 dependencies = [ 1786 1890 "ppv-lite86", 1787 - "rand_core", 1891 + "rand_core 0.6.4", 1788 1892 ] 1789 1893 1790 1894 [[package]] ··· 1792 1896 version = "0.6.4" 1793 1897 source = "registry+https://github.com/rust-lang/crates.io-index" 1794 1898 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" 1899 + 1900 + [[package]] 1901 + name = "rand_core" 1902 + version = "0.9.3" 1903 + source = "registry+https://github.com/rust-lang/crates.io-index" 1904 + checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" 1795 1905 1796 1906 [[package]] 1797 1907 name = "redox_syscall" ··· 1810 1920 dependencies = [ 1811 1921 "getrandom", 1812 1922 "libredox", 1813 - "thiserror", 1923 + "thiserror 1.0.63", 1814 1924 ] 1815 1925 1816 1926 [[package]] ··· 1850 1960 1851 1961 [[package]] 1852 1962 name = "reqwless" 1853 - version = "0.12.1" 1963 + version = "0.13.0" 1854 1964 source = "registry+https://github.com/rust-lang/crates.io-index" 1855 - checksum = "66584b58c3b0cd8cfea750408a932fe86df79ee05ccc87ee745a8e6be4a1abe0" 1965 + checksum = "fb1be74cb817fa6dbda417110f575d9b9ad5488817f1eb65f2f6468fe6d5d663" 1856 1966 dependencies = [ 1857 1967 "base64", 1858 1968 "buffered-io", 1859 - "defmt", 1969 + "defmt 0.3.100", 1860 1970 "embedded-io", 1861 1971 "embedded-io-async", 1862 1972 "embedded-nal-async", ··· 1866 1976 "httparse", 1867 1977 "nourl", 1868 1978 "rand_chacha", 1869 - "rand_core", 1979 + "rand_core 0.6.4", 1870 1980 ] 1871 1981 1872 1982 [[package]] 1983 + name = "rgb" 1984 + version = "0.8.52" 1985 + source = "registry+https://github.com/rust-lang/crates.io-index" 1986 + checksum = "0c6a884d2998352bb4daf0183589aec883f16a6da1f4dde84d8e2e9a5409a1ce" 1987 + 1988 + [[package]] 1873 1989 name = "rp-pac" 1874 - version = "6.0.0" 1875 - source = "git+https://github.com/embassy-rs/rp-pac.git?rev=a7f42d25517f7124ad3b4ed492dec8b0f50a0e6c#a7f42d25517f7124ad3b4ed492dec8b0f50a0e6c" 1990 + version = "7.0.0" 1991 + source = "registry+https://github.com/rust-lang/crates.io-index" 1992 + checksum = "8af65855c40b2c35079514c5489abffc0429347fef25d8467ff98ad84b4322d3" 1876 1993 dependencies = [ 1877 1994 "cortex-m", 1878 1995 "cortex-m-rt", ··· 1922 2039 "critical-section", 1923 2040 "cyw43", 1924 2041 "cyw43-pio", 1925 - "defmt", 2042 + "defmt 0.3.100", 1926 2043 "defmt-rtt", 1927 2044 "embassy-embedded-hal", 1928 2045 "embassy-executor", 1929 - "embassy-futures 0.1.1 (git+https://github.com/embassy-rs/embassy.git)", 1930 2046 "embassy-net", 1931 2047 "embassy-net-wiznet", 1932 2048 "embassy-rp", 1933 - "embassy-sync 0.6.0 (git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6)", 2049 + "embassy-sync", 1934 2050 "embassy-time", 1935 - "embassy-usb 0.3.0", 1936 - "embassy-usb-logger", 1937 2051 "embedded-graphics", 1938 2052 "embedded-hal 1.0.0", 1939 2053 "embedded-hal-async", ··· 1947 2061 "heapless 0.8.0", 1948 2062 "log", 1949 2063 "panic-probe", 1950 - "pio", 1951 - "pio-proc", 2064 + "pio 0.2.1", 2065 + "pio-proc 0.2.2", 1952 2066 "portable-atomic", 1953 2067 "postcard", 1954 2068 "rand", ··· 1968 2082 checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" 1969 2083 1970 2084 [[package]] 2085 + name = "same-file" 2086 + version = "1.0.6" 2087 + source = "registry+https://github.com/rust-lang/crates.io-index" 2088 + checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" 2089 + dependencies = [ 2090 + "winapi-util", 2091 + ] 2092 + 2093 + [[package]] 1971 2094 name = "scopeguard" 1972 2095 version = "1.2.0" 1973 2096 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 2035 2158 dependencies = [ 2036 2159 "proc-macro2", 2037 2160 "quote", 2038 - "syn 2.0.72", 2161 + "syn 2.0.106", 2039 2162 ] 2040 2163 2041 2164 [[package]] ··· 2056 2179 checksum = "5f179d4e11094a893b82fff208f74d448a7512f99f5a0acbd5c679b705f83ed9" 2057 2180 2058 2181 [[package]] 2182 + name = "sha3" 2183 + version = "0.10.8" 2184 + source = "registry+https://github.com/rust-lang/crates.io-index" 2185 + checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" 2186 + dependencies = [ 2187 + "digest", 2188 + "keccak", 2189 + ] 2190 + 2191 + [[package]] 2059 2192 name = "shtcx" 2060 2193 version = "1.0.0" 2061 2194 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 2075 2208 version = "1.13.2" 2076 2209 source = "registry+https://github.com/rust-lang/crates.io-index" 2077 2210 checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" 2211 + 2212 + [[package]] 2213 + name = "smart-leds" 2214 + version = "0.4.0" 2215 + source = "registry+https://github.com/rust-lang/crates.io-index" 2216 + checksum = "66df34e571fa9993fa6f99131a374d58ca3d694b75f9baac93458fe0d6057bf0" 2217 + dependencies = [ 2218 + "smart-leds-trait", 2219 + ] 2220 + 2221 + [[package]] 2222 + name = "smart-leds-trait" 2223 + version = "0.3.2" 2224 + source = "registry+https://github.com/rust-lang/crates.io-index" 2225 + checksum = "a7f4441a131924d58da6b83a7ad765c460e64630cce504376c3a87a2558c487f" 2226 + dependencies = [ 2227 + "rgb", 2228 + ] 2078 2229 2079 2230 [[package]] 2080 2231 name = "smoltcp" 2081 - version = "0.11.0" 2232 + version = "0.12.0" 2082 2233 source = "registry+https://github.com/rust-lang/crates.io-index" 2083 - checksum = "5a1a996951e50b5971a2c8c0fa05a381480d70a933064245c4a223ddc87ccc97" 2234 + checksum = "dad095989c1533c1c266d9b1e8d70a1329dd3723c3edac6d03bbd67e7bf6f4bb" 2084 2235 dependencies = [ 2085 2236 "bitflags 1.3.2", 2086 2237 "byteorder", 2087 2238 "cfg-if", 2088 - "defmt", 2239 + "defmt 0.3.100", 2089 2240 "heapless 0.8.0", 2090 2241 "managed", 2091 2242 ] ··· 2097 2248 checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" 2098 2249 dependencies = [ 2099 2250 "lock_api", 2100 - ] 2101 - 2102 - [[package]] 2103 - name = "ssmarshal" 2104 - version = "1.0.0" 2105 - source = "registry+https://github.com/rust-lang/crates.io-index" 2106 - checksum = "f3e6ad23b128192ed337dfa4f1b8099ced0c2bf30d61e551b65fda5916dbb850" 2107 - dependencies = [ 2108 - "encode_unicode", 2109 - "serde", 2110 2251 ] 2111 2252 2112 2253 [[package]] ··· 2162 2303 2163 2304 [[package]] 2164 2305 name = "syn" 2165 - version = "2.0.72" 2306 + version = "2.0.106" 2166 2307 source = "registry+https://github.com/rust-lang/crates.io-index" 2167 - checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" 2308 + checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6" 2168 2309 dependencies = [ 2169 2310 "proc-macro2", 2170 2311 "quote", ··· 2183 2324 ] 2184 2325 2185 2326 [[package]] 2327 + name = "term" 2328 + version = "1.2.0" 2329 + source = "registry+https://github.com/rust-lang/crates.io-index" 2330 + checksum = "2111ef44dae28680ae9752bb89409e7310ca33a8c621ebe7b106cf5c928b3ac0" 2331 + dependencies = [ 2332 + "windows-sys 0.61.1", 2333 + ] 2334 + 2335 + [[package]] 2186 2336 name = "termcolor" 2187 2337 version = "1.4.1" 2188 2338 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 2197 2347 source = "registry+https://github.com/rust-lang/crates.io-index" 2198 2348 checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" 2199 2349 dependencies = [ 2200 - "thiserror-impl", 2350 + "thiserror-impl 1.0.63", 2351 + ] 2352 + 2353 + [[package]] 2354 + name = "thiserror" 2355 + version = "2.0.17" 2356 + source = "registry+https://github.com/rust-lang/crates.io-index" 2357 + checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" 2358 + dependencies = [ 2359 + "thiserror-impl 2.0.17", 2201 2360 ] 2202 2361 2203 2362 [[package]] ··· 2208 2367 dependencies = [ 2209 2368 "proc-macro2", 2210 2369 "quote", 2211 - "syn 2.0.72", 2370 + "syn 2.0.106", 2371 + ] 2372 + 2373 + [[package]] 2374 + name = "thiserror-impl" 2375 + version = "2.0.17" 2376 + source = "registry+https://github.com/rust-lang/crates.io-index" 2377 + checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" 2378 + dependencies = [ 2379 + "proc-macro2", 2380 + "quote", 2381 + "syn 2.0.106", 2212 2382 ] 2213 2383 2214 2384 [[package]] ··· 2274 2444 ] 2275 2445 2276 2446 [[package]] 2277 - name = "usb-device" 2278 - version = "0.3.2" 2279 - source = "registry+https://github.com/rust-lang/crates.io-index" 2280 - checksum = "98816b1accafbb09085168b90f27e93d790b4bfa19d883466b5e53315b5f06a6" 2281 - dependencies = [ 2282 - "heapless 0.8.0", 2283 - "portable-atomic", 2284 - ] 2285 - 2286 - [[package]] 2287 - name = "usbd-hid" 2288 - version = "0.8.2" 2289 - source = "registry+https://github.com/rust-lang/crates.io-index" 2290 - checksum = "e6f291ab53d428685cc780f08a2eb9d5d6ff58622db2b36e239a4f715f1e184c" 2291 - dependencies = [ 2292 - "serde", 2293 - "ssmarshal", 2294 - "usb-device", 2295 - "usbd-hid-macros", 2296 - ] 2297 - 2298 - [[package]] 2299 - name = "usbd-hid-descriptors" 2300 - version = "0.8.2" 2301 - source = "registry+https://github.com/rust-lang/crates.io-index" 2302 - checksum = "0eee54712c5d778d2fb2da43b1ce5a7b5060886ef7b09891baeb4bf36910a3ed" 2303 - dependencies = [ 2304 - "bitfield 0.14.0", 2305 - ] 2306 - 2307 - [[package]] 2308 - name = "usbd-hid-macros" 2309 - version = "0.8.2" 2310 - source = "registry+https://github.com/rust-lang/crates.io-index" 2311 - checksum = "bb573c76e7884035ac5e1ab4a81234c187a82b6100140af0ab45757650ccda38" 2312 - dependencies = [ 2313 - "byteorder", 2314 - "hashbrown 0.13.2", 2315 - "log", 2316 - "proc-macro2", 2317 - "quote", 2318 - "serde", 2319 - "syn 1.0.109", 2320 - "usbd-hid-descriptors", 2321 - ] 2322 - 2323 - [[package]] 2324 2447 name = "vcell" 2325 2448 version = "0.1.3" 2326 2449 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 2348 2471 ] 2349 2472 2350 2473 [[package]] 2474 + name = "walkdir" 2475 + version = "2.5.0" 2476 + source = "registry+https://github.com/rust-lang/crates.io-index" 2477 + checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" 2478 + dependencies = [ 2479 + "same-file", 2480 + "winapi-util", 2481 + ] 2482 + 2483 + [[package]] 2351 2484 name = "wasi" 2352 2485 version = "0.11.0+wasi-snapshot-preview1" 2353 2486 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 2375 2508 source = "registry+https://github.com/rust-lang/crates.io-index" 2376 2509 checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" 2377 2510 dependencies = [ 2378 - "windows-sys", 2511 + "windows-sys 0.52.0", 2379 2512 ] 2380 2513 2381 2514 [[package]] ··· 2385 2518 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" 2386 2519 2387 2520 [[package]] 2521 + name = "windows-link" 2522 + version = "0.2.0" 2523 + source = "registry+https://github.com/rust-lang/crates.io-index" 2524 + checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65" 2525 + 2526 + [[package]] 2388 2527 name = "windows-sys" 2389 2528 version = "0.52.0" 2390 2529 source = "registry+https://github.com/rust-lang/crates.io-index" 2391 2530 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" 2392 2531 dependencies = [ 2393 2532 "windows-targets", 2533 + ] 2534 + 2535 + [[package]] 2536 + name = "windows-sys" 2537 + version = "0.61.1" 2538 + source = "registry+https://github.com/rust-lang/crates.io-index" 2539 + checksum = "6f109e41dd4a3c848907eb83d5a42ea98b3769495597450cf6d153507b166f0f" 2540 + dependencies = [ 2541 + "windows-link", 2394 2542 ] 2395 2543 2396 2544 [[package]] ··· 2464 2612 checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6" 2465 2613 dependencies = [ 2466 2614 "byteorder", 2467 - "zerocopy-derive 0.6.6", 2468 - ] 2469 - 2470 - [[package]] 2471 - name = "zerocopy" 2472 - version = "0.7.35" 2473 - source = "registry+https://github.com/rust-lang/crates.io-index" 2474 - checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" 2475 - dependencies = [ 2476 - "zerocopy-derive 0.7.35", 2615 + "zerocopy-derive", 2477 2616 ] 2478 2617 2479 2618 [[package]] ··· 2484 2623 dependencies = [ 2485 2624 "proc-macro2", 2486 2625 "quote", 2487 - "syn 2.0.72", 2488 - ] 2489 - 2490 - [[package]] 2491 - name = "zerocopy-derive" 2492 - version = "0.7.35" 2493 - source = "registry+https://github.com/rust-lang/crates.io-index" 2494 - checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" 2495 - dependencies = [ 2496 - "proc-macro2", 2497 - "quote", 2498 - "syn 2.0.72", 2626 + "syn 2.0.106", 2499 2627 ] 2500 2628 2501 2629 [[package]] ··· 2503 2631 version = "1.8.1" 2504 2632 source = "registry+https://github.com/rust-lang/crates.io-index" 2505 2633 checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" 2634 + 2635 + [[patch.unused]] 2636 + name = "embassy-time" 2637 + version = "0.3.2" 2638 + source = "git+https://github.com/embassy-rs/embassy.git?rev=f0a86070512ad739641cee7d9fa39d63f5c8a9f6#f0a86070512ad739641cee7d9fa39d63f5c8a9f6" 2506 2639 2507 2640 [[patch.unused]] 2508 2641 name = "trouble-host"
+19 -22
Cargo.toml
··· 1 1 [package] 2 2 name = "rusty_badger" 3 3 version = "0.1.0" 4 - edition = "2021" 4 + edition = "2024" 5 5 6 6 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html 7 7 8 8 [dependencies] 9 - embassy-embedded-hal = { version = "0.2.0", git = "https://github.com/embassy-rs/embassy.git", rev = "f0a86070512ad739641cee7d9fa39d63f5c8a9f6", features = [ 9 + embassy-embedded-hal = { version = "0.5.0", features = [ 10 10 "defmt", 11 11 ] } 12 - embassy-sync = { version = "0.6.0", git = "https://github.com/embassy-rs/embassy.git", rev = "f0a86070512ad739641cee7d9fa39d63f5c8a9f6", features = [ 12 + embassy-sync = { version = "0.7.2", features = [ 13 13 "defmt", 14 14 ] } 15 - embassy-executor = { git = "https://github.com/embassy-rs/embassy.git", rev = "f0a86070512ad739641cee7d9fa39d63f5c8a9f6", features = [ 16 - "task-arena-size-131072", 15 + embassy-executor = { version = "0.9.1", features = [ 17 16 "arch-cortex-m", 18 17 "executor-thread", 19 18 "executor-interrupt", 20 19 "defmt", 21 - "integrated-timers", 22 - 23 20 ] } 24 - embassy-time = { version = "0.3.2", git = "https://github.com/embassy-rs/embassy.git", rev = "f0a86070512ad739641cee7d9fa39d63f5c8a9f6", features = [ 21 + embassy-time = { version = "0.5.0", features = [ 25 22 "defmt", 26 23 "defmt-timestamp-uptime", 27 24 ] } 28 - embassy-rp = { version = "0.2.0", git = "https://github.com/embassy-rs/embassy.git", rev = "f0a86070512ad739641cee7d9fa39d63f5c8a9f6", features = [ 25 + embassy-rp = { version = "0.8.0", features = [ 29 26 "defmt", 30 27 "unstable-pac", 31 28 "time-driver", 32 29 "critical-section-impl", 33 30 "rp2040", 34 31 ] } 35 - embassy-usb = { git = "https://github.com/embassy-rs/embassy.git", rev = "f0a86070512ad739641cee7d9fa39d63f5c8a9f6", features = [ 36 - "defmt", 37 - ] } 38 - embassy-net = { version = "0.4.0", git = "https://github.com/embassy-rs/embassy.git", rev = "f0a86070512ad739641cee7d9fa39d63f5c8a9f6", features = [ 32 + #embassy-usb = { git = "https://github.com/embassy-rs/embassy.git", rev = "f0a86070512ad739641cee7d9fa39d63f5c8a9f6", features = [ 33 + # "defmt", 34 + #] } 35 + embassy-net = { version = "0.7.1", features = [ 39 36 "defmt", 40 37 "tcp", 41 38 "udp", ··· 44 41 "medium-ethernet", 45 42 "dns", 46 43 ] } 47 - embassy-net-wiznet = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy.git", rev = "f0a86070512ad739641cee7d9fa39d63f5c8a9f6", features = [ 44 + embassy-net-wiznet = { version = "0.2.1", features = [ 48 45 "defmt", 49 46 ] } 50 - embassy-futures = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy.git" } 51 - embassy-usb-logger = { version = "0.2.0", git = "https://github.com/embassy-rs/embassy.git" } 52 - cyw43 = { version = "0.2.0", git = "https://github.com/embassy-rs/embassy.git", rev = "f0a86070512ad739641cee7d9fa39d63f5c8a9f6", features = [ 47 + #embassy-futures = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy.git" } 48 + #embassy-usb-logger = { version = "0.2.0", git = "https://github.com/embassy-rs/embassy.git" } 49 + cyw43 = { version = "0.5.0", features = [ 53 50 # "defmt", 54 51 # "firmware-logs", 55 52 # "bluetooth", 56 53 ] } 57 - cyw43-pio = { version = "0.2.0", git = "https://github.com/embassy-rs/embassy.git", rev = "f0a86070512ad739641cee7d9fa39d63f5c8a9f6", features = [ 54 + cyw43-pio = { version = "0.8.0", features = [ 58 55 "defmt", 59 56 ] } 60 57 ··· 64 61 fixed-macro = "1.2" 65 62 66 63 # for web request example 67 - reqwless = { version = "0.12.0", features = ["defmt"] } 64 + reqwless = { version = "0.13.0", features = ["defmt"] } 68 65 serde = { version = "1.0.203", default-features = false, features = ["derive"] } 69 66 serde-json-core = "0.5.1" 70 67 ··· 73 70 # for assign resources example 74 71 #cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] } 75 72 cortex-m = { version = "0.7.6", features = ["inline-asm"] } 76 - cortex-m-rt = "0.7.0" 73 + cortex-m-rt = "0.7.5" 77 74 critical-section = "1.1" 78 - panic-probe = { version = "0.3", features = ["print-defmt"] } 75 + panic-probe = { version = "1.0.0", features = ["print-defmt"] } 79 76 80 - embedded-graphics = "0.8.0" 77 + embedded-graphics = "0.8.1" 81 78 byte-slice-cast = { version = "1.2.0", default-features = false } 82 79 83 80 heapless = { version = "0.8", features = ["serde"] }
+14 -5
src/cyw43_driver.rs
··· 1 1 use cyw43::Control; 2 - use cyw43_pio::PioSpi; 2 + use cyw43_pio::{DEFAULT_CLOCK_DIVIDER, PioSpi}; 3 3 use defmt::unwrap; 4 4 use embassy_executor::Spawner; 5 5 use embassy_net_wiznet::Device; ··· 41 41 // let fw = unsafe { core::slice::from_raw_parts(0x10100000 as *const u8, 224190) }; 42 42 // let clm = unsafe { core::slice::from_raw_parts(0x10140000 as *const u8, 4752) }; 43 43 44 - let pwr = Output::new(p_23, Level::Low); 45 - let cs = Output::new(p_25, Level::High); 46 - let mut pio = Pio::new(pio0, Irqs); 47 - let spi = PioSpi::new(&mut pio.common, pio.sm0, pio.irq0, cs, p_24, p_29, dma_ch0); 44 + let pwr = Output::new(*p_23, Level::Low); 45 + let cs = Output::new(*p_25, Level::High); 46 + let mut pio = Pio::new(*pio0, Irqs); 47 + let spi = PioSpi::new( 48 + &mut pio.common, 49 + pio.sm0, 50 + DEFAULT_CLOCK_DIVIDER, 51 + *pio.irq0, 52 + *cs, 53 + *p_24, 54 + *p_29, 55 + *dma_ch0, 56 + ); 48 57 // let input = Input::new(p_29, Pull::Up); 49 58 50 59 static STATE: StaticCell<cyw43::State> = StaticCell::new();
+40 -15
src/main.rs
··· 4 4 5 5 #![no_std] 6 6 #![no_main] 7 + 7 8 use badge_display::display_image::DisplayImage; 8 9 use badge_display::{ 9 - run_the_display, RecentWifiNetworksVec, Screen, CHANGE_IMAGE, CURRENT_IMAGE, DISPLAY_CHANGED, 10 - FORCE_SCREEN_REFRESH, RECENT_WIFI_NETWORKS, RTC_TIME_STRING, SCREEN_TO_SHOW, WIFI_COUNT, 10 + CHANGE_IMAGE, CURRENT_IMAGE, DISPLAY_CHANGED, FORCE_SCREEN_REFRESH, RECENT_WIFI_NETWORKS, 11 + RTC_TIME_STRING, RecentWifiNetworksVec, SCREEN_TO_SHOW, Screen, WIFI_COUNT, run_the_display, 11 12 }; 13 + use core::cell::RefCell; 12 14 use core::fmt::Write; 13 15 use core::str::from_utf8; 16 + use cyw43::JoinOptions; 14 17 use cyw43_driver::setup_cyw43; 15 18 use defmt::info; 16 19 use defmt::*; 20 + use embassy_embedded_hal::shared_bus::blocking::i2c::I2cDevice; 17 21 use embassy_executor::Spawner; 18 22 use embassy_net::dns::DnsSocket; 19 23 use embassy_net::tcp::client::{TcpClient, TcpClientState}; 20 24 use embassy_net::{Stack, StackResources}; 21 25 use embassy_rp::clocks::RoscRng; 22 26 use embassy_rp::flash::Async; 23 - use embassy_rp::gpio; 24 27 use embassy_rp::gpio::Input; 25 - use embassy_rp::peripherals::SPI0; 28 + use embassy_rp::i2c::I2c; 29 + use embassy_rp::peripherals::{I2C0, SPI0}; 26 30 use embassy_rp::rtc::{DateTime, DayOfWeek}; 27 31 use embassy_rp::spi::Spi; 28 32 use embassy_rp::spi::{self}; 33 + use embassy_rp::{gpio, i2c}; 34 + use embassy_sync::blocking_mutex::NoopMutex; 29 35 use embassy_sync::blocking_mutex::raw::NoopRawMutex; 30 36 use embassy_sync::mutex::Mutex; 31 37 use embassy_time::{Duration, Timer}; ··· 36 42 use rand::RngCore; 37 43 use reqwless::client::{HttpClient, TlsConfig, TlsVerify}; 38 44 use reqwless::request::Method; 39 - use save::{read_postcard_from_flash, save_postcard_to_flash, Save}; 45 + use save::{Save, read_postcard_from_flash, save_postcard_to_flash}; 40 46 use serde::Deserialize; 41 47 use static_cell::StaticCell; 42 48 use temp_sensor::run_the_temp_sensor; ··· 50 56 mod temp_sensor; 51 57 52 58 type Spi0Bus = Mutex<NoopRawMutex, Spi<'static, SPI0, spi::Async>>; 59 + type I2c0Bus = NoopMutex<RefCell<I2c<'static, I2C0, i2c::Blocking>>>; 53 60 54 61 const BSSID_LEN: usize = 1_000; 55 62 const ADDR_OFFSET: u32 = 0x100000; ··· 64 71 user_led.set_high(); 65 72 66 73 let (net_device, mut control) = setup_cyw43( 67 - p.PIO0, p.PIN_23, p.PIN_24, p.PIN_25, p.PIN_29, p.DMA_CH0, spawner, 74 + *p.PIO0, *p.PIN_23, *p.PIN_24, *p.PIN_25, *p.PIN_29, *p.DMA_CH0, spawner, 68 75 ) 69 76 .await; 70 77 ··· 115 122 let seed = rng.next_u64(); 116 123 117 124 // Init network stack 118 - static STACK: StaticCell<Stack<cyw43::NetDriver<'static>>> = StaticCell::new(); 125 + static STACK: StaticCell<Stack> = StaticCell::new(); 119 126 static RESOURCES: StaticCell<StackResources<5>> = StaticCell::new(); 120 - let stack = &*STACK.init(Stack::new( 127 + let (stack, runner) = embassy_net::new( 121 128 net_device, 122 129 config, 123 - RESOURCES.init(StackResources::<5>::new()), 130 + RESOURCES.init(StackResources::new()), 124 131 seed, 125 - )); 132 + ); 133 + // let stack = &*STACK.init(Stack::new( 134 + // net_device, 135 + // config, 136 + // RESOURCES.init(StackResources::<5>::new()), 137 + // seed, 138 + // )); 126 139 //rtc setup 127 140 let mut rtc = embassy_rp::rtc::Rtc::new(p.RTC); 128 141 129 - spawner.must_spawn(net_task(stack)); 142 + spawner.spawn(net_task(runner)); 130 143 //Attempt to connect to wifi to get RTC time loop for 2 minutes 131 144 let mut wifi_connection_attempts = 0; 132 145 let mut connected_to_wifi = false; ··· 134 147 let wifi_ssid = env_value("WIFI_SSID"); 135 148 let wifi_password = env_value("WIFI_PASSWORD"); 136 149 while wifi_connection_attempts < 30 { 137 - match control.join_wpa2(wifi_ssid, &wifi_password).await { 150 + match control 151 + .join(wifi_ssid, JoinOptions::new(wifi_password.as_bytes())) 152 + .await 153 + { 138 154 Ok(_) => { 139 155 connected_to_wifi = true; 140 156 info!("join successful"); ··· 261 277 let mut flash = embassy_rp::flash::Flash::<_, Async, FLASH_SIZE>::new(p.FLASH, p.DMA_CH3); 262 278 let mut save: Save = read_postcard_from_flash(ADDR_OFFSET, &mut flash, SAVE_OFFSET).unwrap(); 263 279 WIFI_COUNT.store(save.wifi_counted, core::sync::atomic::Ordering::Relaxed); 280 + 281 + //Setup i2c bus 282 + let config = embassy_rp::i2c::Config::default(); 283 + let mut i2c = i2c::I2c::new_blocking(p.I2C0, p.PIN_5, p.PIN_4, config); 284 + static I2C_BUS: StaticCell<I2c0Bus> = StaticCell::new(); 285 + // static I2C_BUS: StaticCell<I2c0Bus> = StaticCell::new(); 286 + let i2c_bus = NoopMutex::new(RefCell::new(i2c)); 287 + let i2c_bus = I2C_BUS.init(i2c_bus); 288 + 264 289 //Task spawning 265 - spawner.must_spawn(run_the_temp_sensor(p.I2C0, p.PIN_5, p.PIN_4)); 290 + spawner.must_spawn(run_the_temp_sensor(i2c_bus)); 266 291 spawner.must_spawn(run_the_display(spi_bus, cs, dc, busy, reset)); 267 292 268 293 //Input loop ··· 425 450 } 426 451 427 452 #[embassy_executor::task] 428 - async fn net_task(stack: &'static Stack<cyw43::NetDriver<'static>>) -> ! { 429 - stack.run().await 453 + async fn net_task(mut runner: embassy_net::Runner<'static, cyw43::NetDriver<'static>>) -> ! { 454 + runner.run().await 430 455 } 431 456 432 457 #[derive(Deserialize)]
+10 -7
src/temp_sensor.rs
··· 1 1 use defmt::*; 2 2 use embassy_rp::i2c::{I2c, SclPin, SdaPin}; 3 3 use embassy_rp::peripherals::I2C0; 4 - use embassy_rp::{i2c, Peripheral}; 5 4 use embassy_time::Timer; 6 5 use shtcx::{self, PowerMode}; 7 6 8 - use crate::badge_display::{HUMIDITY, TEMP}; // Import the necessary items from shtcx 7 + use crate::I2c0Bus; 8 + use crate::badge_display::{HUMIDITY, TEMP}; 9 + use embassy_embedded_hal::shared_bus::blocking::i2c::I2cDevice; 10 + // Import the necessary items from shtcx 9 11 10 12 #[embassy_executor::task] 11 13 pub async fn run_the_temp_sensor( 12 - i2c0: I2C0, 13 - scl: impl Peripheral<P = impl SclPin<I2C0>> + 'static, 14 - sda: impl Peripheral<P = impl SdaPin<I2C0>> + 'static, 14 + i2c_bus: &'static I2c0Bus, // i2c0: I2C0, 15 + // scl: impl Peripheral<P = impl SclPin<I2C0>> + 'static, 16 + // sda: impl Peripheral<P = impl SdaPin<I2C0>> + 'static, 15 17 ) { 16 - let i2c = I2c::new_blocking(i2c0, scl, sda, i2c::Config::default()); 18 + let i2c_dev = I2cDevice::new(i2c_bus); 19 + // let i2c = I2c::new_blocking(i2c0, scl, sda, i2c::Config::default()); 17 20 18 - let mut sht = shtcx::shtc3(i2c); 21 + let mut sht = shtcx::shtc3(i2c_dev); 19 22 let mut sht_delay = embassy_time::Delay; // Create a delay instance 20 23 21 24 loop {