Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nrf52-code/boards/dk-solution/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ embassy-time = "0.5"
embedded-hal = "1.0"
nb = "1"
grounded = { version = "0.2.0", features = ["cas"] }
hal = { package = "embassy-nrf", version = "0.8", features = ["nrf52840", "unstable-pac"] }
hal = { package = "embassy-nrf", version = "0.9", features = ["nrf52840", "unstable-pac"] }

[features]
advanced = []
Expand Down
8 changes: 4 additions & 4 deletions nrf52-code/boards/dk/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nrf52-code/boards/dk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ embassy-time = "0.5"
embedded-hal = "1.0"
nb = "1"
grounded = { version = "0.2.0", features = ["cas"] }
hal = { package = "embassy-nrf", version = "0.8", features = ["nrf52840", "unstable-pac"] }
hal = { package = "embassy-nrf", version = "0.9", features = ["nrf52840", "unstable-pac"] }

[features]
advanced = []
Expand Down
2 changes: 1 addition & 1 deletion nrf52-code/boards/dk/src/usbd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ pub fn bmrequesttype(usbd: &Usbd) -> u8 {

/// Reads the BREQUEST register and returns the 8-bit BREQUEST component of a setup packet
pub fn brequest(usbd: &Usbd) -> u8 {
usbd.brequest().read().brequest() as u8
usbd.brequest().read().brequest().to_bits()
}

/// Reads the WLENGTHL and WLENGTHH registers and returns the 16-bit WLENGTH component of a setup packet
Expand Down
8 changes: 4 additions & 4 deletions nrf52-code/hal-app/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions nrf52-code/radio-app/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions nrf52-code/usb-app-solutions/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion nrf52-code/usb-app-solutions/src/bin/usb-2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ fn on_event(usbd: &Usbd, event: Event) {
// the BMREQUESTTYPE register contains information about data recipient, transfer type and direction
let bmrequesttype = usbd.bmrequesttype().read().0 as u8;
// the BREQUEST register stores the type of the current request (e.g. SET_ADDRESS, GET_DESCRIPTOR, ...)
let brequest = usbd.brequest().read().brequest() as u8;
let brequest = usbd.brequest().read().brequest().to_bits();
// wLength denotes the number of bytes to transfer (if any)
// composed of a high register (WLENGTHH) and a low register (WLENGTHL)
let wlength = (u16::from(usbd.wlengthh().read().wlengthh()) << 8)
Expand Down
8 changes: 4 additions & 4 deletions nrf52-code/usb-app/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.