Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New package releases for ESP32-C6/H2 #176

Merged
merged 2 commits into from
Dec 12, 2023
Merged

New package releases for ESP32-C6/H2 #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2bdba53
Rename `I2S1` interrupt to `I2S0` for ESP32-C6/H2
jessebraham Dec 12, 2023
8b20814
New package releases for ESP32-C6/H2
jessebraham Dec 12, 2023
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 esp32c6/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "esp32c6"
version = "0.9.0"
version = "0.10.0"
edition = "2021"
rust-version = "1.67"
description = "Peripheral access crate for the ESP32-C6"
Expand Down
2 changes: 1 addition & 1 deletion esp32c6/device.x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ PROVIDE(HP_APM_M2 = DefaultHandler);
PROVIDE(HP_APM_M3 = DefaultHandler);
PROVIDE(LP_APM0 = DefaultHandler);
PROVIDE(MSPI = DefaultHandler);
PROVIDE(I2S1 = DefaultHandler);
PROVIDE(I2S0 = DefaultHandler);
PROVIDE(UHCI0 = DefaultHandler);
PROVIDE(UART0 = DefaultHandler);
PROVIDE(UART1 = DefaultHandler);
Expand Down
6 changes: 3 additions & 3 deletions esp32c6/src/interrupt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ pub enum Interrupt {
LP_APM0 = 39,
#[doc = "40 - MSPI"]
MSPI = 40,
#[doc = "41 - I2S1"]
I2S1 = 41,
#[doc = "41 - I2S0"]
I2S0 = 41,
#[doc = "42 - UHCI0"]
UHCI0 = 42,
#[doc = "43 - UART0"]
Expand Down Expand Up @@ -206,7 +206,7 @@ impl Interrupt {
38 => Ok(Interrupt::HP_APM_M3),
39 => Ok(Interrupt::LP_APM0),
40 => Ok(Interrupt::MSPI),
41 => Ok(Interrupt::I2S1),
41 => Ok(Interrupt::I2S0),
42 => Ok(Interrupt::UHCI0),
43 => Ok(Interrupt::UART0),
44 => Ok(Interrupt::UART1),
Expand Down
4 changes: 2 additions & 2 deletions esp32c6/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ extern "C" {
fn HP_APM_M3();
fn LP_APM0();
fn MSPI();
fn I2S1();
fn I2S0();
fn UHCI0();
fn UART0();
fn UART1();
Expand Down Expand Up @@ -183,7 +183,7 @@ pub static __EXTERNAL_INTERRUPTS: [Vector; 77] = [
},
Vector { _handler: LP_APM0 },
Vector { _handler: MSPI },
Vector { _handler: I2S1 },
Vector { _handler: I2S0 },
Vector { _handler: UHCI0 },
Vector { _handler: UART0 },
Vector { _handler: UART1 },
Expand Down
6 changes: 6 additions & 0 deletions esp32c6/svd/patches/esp32c6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@ HMAC:
dimIncrement: 0x4
size: 0x20

I2S0:
_modify:
_interrupts:
I2S1:
name: I2S0

RSA:
_modify:
"M_MEM*":
Expand Down
2 changes: 1 addition & 1 deletion esp32h2/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "esp32h2"
version = "0.5.0"
version = "0.6.0"
edition = "2021"
rust-version = "1.67"
description = "Peripheral access crate for the ESP32-H2"
Expand Down
2 changes: 1 addition & 1 deletion esp32h2/device.x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ PROVIDE(HP_APM_M1 = DefaultHandler);
PROVIDE(HP_APM_M2 = DefaultHandler);
PROVIDE(HP_APM_M3 = DefaultHandler);
PROVIDE(MSPI = DefaultHandler);
PROVIDE(I2S1 = DefaultHandler);
PROVIDE(I2S0 = DefaultHandler);
PROVIDE(UHCI0 = DefaultHandler);
PROVIDE(UART0 = DefaultHandler);
PROVIDE(UART1 = DefaultHandler);
Expand Down
6 changes: 3 additions & 3 deletions esp32h2/src/interrupt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ pub enum Interrupt {
HP_APM_M3 = 29,
#[doc = "30 - MSPI"]
MSPI = 30,
#[doc = "31 - I2S1"]
I2S1 = 31,
#[doc = "31 - I2S0"]
I2S0 = 31,
#[doc = "32 - UHCI0"]
UHCI0 = 32,
#[doc = "33 - UART0"]
Expand Down Expand Up @@ -172,7 +172,7 @@ impl Interrupt {
28 => Ok(Interrupt::HP_APM_M2),
29 => Ok(Interrupt::HP_APM_M3),
30 => Ok(Interrupt::MSPI),
31 => Ok(Interrupt::I2S1),
31 => Ok(Interrupt::I2S0),
32 => Ok(Interrupt::UHCI0),
33 => Ok(Interrupt::UART0),
34 => Ok(Interrupt::UART1),
Expand Down
4 changes: 2 additions & 2 deletions esp32h2/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ extern "C" {
fn HP_APM_M2();
fn HP_APM_M3();
fn MSPI();
fn I2S1();
fn I2S0();
fn UHCI0();
fn UART0();
fn UART1();
Expand Down Expand Up @@ -155,7 +155,7 @@ pub static __EXTERNAL_INTERRUPTS: [Vector; 65] = [
_handler: HP_APM_M3,
},
Vector { _handler: MSPI },
Vector { _handler: I2S1 },
Vector { _handler: I2S0 },
Vector { _handler: UHCI0 },
Vector { _handler: UART0 },
Vector { _handler: UART1 },
Expand Down
6 changes: 6 additions & 0 deletions esp32h2/svd/patches/esp32h2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,12 @@ HMAC:
dimIncrement: 0x4
size: 0x20

I2S0:
_modify:
_interrupts:
I2S1:
name: I2S0

RSA:
_modify:
"M_MEM*":
Expand Down