From fa841ec0ce24cde176b9d5f06f59f3d924788ead Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Tue, 26 Mar 2024 17:54:01 +0100 Subject: [PATCH] Changes toolchain --- Cargo.toml | 114 +++++++++++++++++++++++++++++++------------- rust-toolchain.toml | 4 +- src/main.rs | 2 +- 3 files changed, 84 insertions(+), 36 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 46db5b7..530ce08 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,45 +12,91 @@ embassy-executor = { version = "0.5.0", git = "https://github.com/embassy-rs/emb embassy-time = { version = "0.3.0", git = "https://github.com/embassy-rs/embassy", features = ["defmt", "defmt-timestamp-uptime"] } embassy-rp = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy", features = ["defmt", "unstable-pac", "time-driver", "critical-section-impl"] } embassy-usb = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy", features = ["defmt"] } -embassy-net = { version = "0.4.0", git = "https://github.com/embassy-rs/embassy", features = ["defmt", "tcp", "udp", "dhcpv4", "medium-ethernet"] } -embassy-net-wiznet = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy", features = ["defmt"] } embassy-futures = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy" } -embassy-usb-logger = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy" } -cyw43 = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy", features = ["defmt", "firmware-logs"] } -cyw43-pio = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy", features = ["defmt", "overclock"] } - -defmt = "0.3" -defmt-rtt = "0.4" -fixed = "1.23.1" -fixed-macro = "1.2" - -#cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] } cortex-m = { version = "0.7.6", features = ["inline-asm"] } cortex-m-rt = "0.7.0" -panic-probe = { version = "0.3", features = ["print-defmt"] } -futures = { version = "0.3.17", default-features = false, features = ["async-await", "cfg-target-has-atomic", "unstable"] } -display-interface-spi = "0.4.1" -embedded-graphics = "0.7.1" -st7789 = "0.6.1" -display-interface = "0.4.1" -byte-slice-cast = { version = "1.2.0", default-features = false } -smart-leds = "0.3.0" -heapless = "0.8" -usbd-hid = "0.6.1" -embedded-hal-1 = { package = "embedded-hal", version = "1.0" } -embedded-hal-async = "1.0" -embedded-hal-bus = { version = "0.1", features = ["async"] } -embedded-io-async = { version = "0.6.1", features = ["defmt-03"] } -embedded-storage = { version = "0.3" } -static_cell = "2" +defmt = "0.3" +usbd-hid = "*" portable-atomic = { version = "1.5", features = ["critical-section"] } -log = "0.4" -pio-proc = "0.2" -pio = "0.2.1" -rand = { version = "0.8.5", default-features = false } -embassy-usb-driver = "0.1.0" -enum_dispatch = "0.3.12" +defmt-rtt = "0.4.0" +panic-probe = "0.3.1" [profile.release] debug = 2 + + +# [dependencies] +# embassy-sync = { version = "0.5.0", git = "https://github.com/embassy-rs/embassy", features = ["defmt"] } +# embassy-executor = { version = "0.5.0", git = "https://github.com/embassy-rs/embassy", features = ["task-arena-size-32768", "arch-cortex-m", "executor-thread", "executor-interrupt", "defmt", "integrated-timers"] } +# embassy-time = { version = "0.3.0", git = "https://github.com/embassy-rs/embassy", features = ["defmt", "defmt-timestamp-uptime"] } +# embassy-rp = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy", features = ["defmt", "unstable-pac", "time-driver", "critical-section-impl"] } +# embassy-usb = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy", features = ["defmt"] } +# -embassy-net = { version = "0.4.0", git = "https://github.com/embassy-rs/embassy", features = ["defmt", "tcp", "udp", "dhcpv4", "medium-ethernet"] } +# -embassy-net-wiznet = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy", features = ["defmt"] } +# embassy-futures = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy" } +# -embassy-usb-logger = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy" } +# -cyw43 = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy", features = ["defmt", "firmware-logs"] } +# -cyw43-pio = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy", features = ["defmt", "overclock"] } + +# defmt = "0.3" +# -defmt-rtt = "0.4" +# -fixed = "1.23.1" +# -fixed-macro = "1.2" +# - +# -#cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] } +# -cortex-m = { version = "0.7.6", features = ["inline-asm"] } +# -cortex-m-rt = "0.7.0" +# -panic-probe = { version = "0.3", features = ["print-defmt"] } +# -futures = { version = "0.3.17", default-features = false, features = ["async-await", "cfg-target-has-atomic", "unstable"] } +# -display-interface-spi = "0.4.1" +# -embedded-graphics = "0.7.1" +# -st7789 = "0.6.1" +# -display-interface = "0.4.1" +# -byte-slice-cast = { version = "1.2.0", default-features = false } +# -smart-leds = "0.3.0" +# -heapless = "0.8" +# usbd-hid = "0.6.1" +# - +# -embedded-hal-1 = { package = "embedded-hal", version = "1.0" } +# -embedded-hal-async = "1.0" +# -embedded-hal-bus = { version = "0.1", features = ["async"] } +# -embedded-io-async = { version = "0.6.1", features = ["defmt-03"] } +# -embedded-storage = { version = "0.3" } +# -static_cell = "2" +# portable-atomic = { version = "1.5", features = ["critical-section"] } +# -log = "0.4" +# -pio-proc = "0.2" +# -pio = "0.2.1" +# -rand = { version = "0.8.5", default-features = false } +# -embassy-usb-driver = "0.1.0" +# -enum_dispatch = "0.3.12" + +# [profile.release] +# debug = 2 +# diff --git a/rust-toolchain.toml b/rust-toolchain.toml +# index 048e049..157fcfb 100644 +# --- a/rust-toolchain.toml +# +++ b/rust-toolchain.toml +# @@ -1,5 +1,7 @@ +# [toolchain] +# -channel = "nightly-2022-10-25" +# +# channel = "nightly-2022-10-25" +# +# channel = "nightly-2023-10-25" +# +channel = "1.77" +# components = [ "rust-src", "rustfmt" ] +# targets = [ +# "thumbv7em-none-eabi", +# diff --git a/src/main.rs b/src/main.rs +# index de33a0c..a9989e8 100644 +# --- a/src/main.rs +# +++ b/src/main.rs +# @@ -74,7 +74,7 @@ async fn main(_spawner: Spawner) { +# &mut config_descriptor, +# &mut bos_descriptor, +# &mut msos_descriptor, +# - &mut control_buf, +# + // &mut control_buf, +# ); + +# builder.handler(&mut device_handler); diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 048e049..157fcfb 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,7 @@ [toolchain] -channel = "nightly-2022-10-25" +# channel = "nightly-2022-10-25" +# channel = "nightly-2023-10-25" +channel = "1.77" components = [ "rust-src", "rustfmt" ] targets = [ "thumbv7em-none-eabi", diff --git a/src/main.rs b/src/main.rs index de33a0c..a9989e8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -74,7 +74,7 @@ async fn main(_spawner: Spawner) { &mut config_descriptor, &mut bos_descriptor, &mut msos_descriptor, - &mut control_buf, + // &mut control_buf, ); builder.handler(&mut device_handler);