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

Fix the addresses of signature module structs for some devices #216

Merged
merged 2 commits into from
Sep 13, 2024
Merged

Fix the addresses of signature module structs for some devices #216

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
d9421e2
Not all signatures are at the same address; adapt.
BryanKadzban Sep 11, 2024
b52e734
Add back three registers for 7x2/7x3/730 chips
BryanKadzban Sep 12, 2024
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
<!-- next-header -->
## [Unreleased] - ReleaseDate

### Fixed

- Use the right addresses for `signature` module structs on f7x2, f7x3, and f730 devices

## [0.8.0] - 2024-08-02

### Changed
Expand Down
15 changes: 15 additions & 0 deletions src/signature.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ pub struct Uid {
y: u16,
waf_lot: [u8; 8],
}
#[cfg(any(feature = "svd-f7x2", feature = "svd-f7x3", feature = "svd-f730"))]
define_ptr_type!(Uid, 0x1FF0_7A10);
#[cfg(not(any(feature = "svd-f7x2", feature = "svd-f7x3", feature = "svd-f730")))]
define_ptr_type!(Uid, 0x1FF0_F420);

impl Uid {
Expand Down Expand Up @@ -58,6 +61,9 @@ impl Uid {
#[derive(Debug)]
#[repr(C)]
pub struct FlashSize(u16);
#[cfg(any(feature = "svd-f7x2", feature = "svd-f7x3", feature = "svd-f730"))]
define_ptr_type!(FlashSize, 0x1FF0_7A22);
#[cfg(not(any(feature = "svd-f7x2", feature = "svd-f7x3", feature = "svd-f730")))]
define_ptr_type!(FlashSize, 0x1FF0_F442);

impl FlashSize {
Expand All @@ -76,6 +82,9 @@ impl FlashSize {
#[derive(Debug)]
#[repr(C)]
pub struct VrefCal(u16);
#[cfg(any(feature = "svd-f7x2", feature = "svd-f7x3", feature = "svd-f730"))]
define_ptr_type!(VrefCal, 0x1FF0_7A2A);
#[cfg(not(any(feature = "svd-f7x2", feature = "svd-f7x3", feature = "svd-f730")))]
define_ptr_type!(VrefCal, 0x1FF0_F44A);

impl VrefCal {
Expand All @@ -89,6 +98,9 @@ impl VrefCal {
#[derive(Debug)]
#[repr(C)]
pub struct VtempCal30(u16);
#[cfg(any(feature = "svd-f7x2", feature = "svd-f7x3", feature = "svd-f730"))]
define_ptr_type!(VtempCal30, 0x1FF0_7A2C);
#[cfg(not(any(feature = "svd-f7x2", feature = "svd-f7x3", feature = "svd-f730")))]
define_ptr_type!(VtempCal30, 0x1FF0_F44C);

impl VtempCal30 {
Expand All @@ -102,6 +114,9 @@ impl VtempCal30 {
#[derive(Debug)]
#[repr(C)]
pub struct VtempCal110(u16);
#[cfg(any(feature = "svd-f7x2", feature = "svd-f7x3", feature = "svd-f730"))]
define_ptr_type!(VtempCal110, 0x1FF0_7A2E);
#[cfg(not(any(feature = "svd-f7x2", feature = "svd-f7x3", feature = "svd-f730")))]
define_ptr_type!(VtempCal110, 0x1FF0_F44E);

impl VtempCal110 {
Expand Down