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

Jump to bottom

Fix some clippy/build warnings, clean up root Cargo manifest #1230

Merged
merged 3 commits into from
Mar 1, 2024
Merged

Fix some clippy/build warnings, clean up root Cargo manifest #1230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00c6812
Remove old package names from workspace exclude list
jessebraham Feb 29, 2024
34c1c24
Fix warning in `esp-hal-procmacros`
jessebraham Feb 29, 2024
6d50f67
Resolve clippy warnings
jessebraham Mar 1, 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
8 changes: 0 additions & 8 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,5 @@ exclude = [
"esp-hal-smartled",
"esp-lp-hal",
"esp-riscv-rt",
"esp32-hal",
"esp32c2-hal",
"esp32c3-hal",
"esp32c6-hal",
"esp32h2-hal",
"esp32p4-hal",
"esp32s2-hal",
"esp32s3-hal",
"examples",
]
2 changes: 1 addition & 1 deletion esp-hal-procmacros/src/interrupt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use proc_macro::{self, TokenStream};
use proc_macro::TokenStream;
use syn::{parse::Error, spanned::Spanned, AttrStyle, Attribute};

pub(crate) enum WhiteListCaller {
Expand Down
2 changes: 1 addition & 1 deletion esp-hal/src/soc/esp32c6/trng.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ pub(crate) fn ensure_randomness() {
let pattern_one: u32 = (SAR2_CHANNEL << 2) | SAR2_ATTEN; // we want channel 9 with max attenuation
let pattern_two: u32 = SAR1_ATTEN; // we want channel 0 with max attenuation, channel doesn't really matter here
let pattern_table: u32 =
0 | (pattern_two << 3 * PATTERN_BIT_WIDTH) | pattern_one << 2 * PATTERN_BIT_WIDTH;
(pattern_two << (3 * PATTERN_BIT_WIDTH)) | (pattern_one << (2 * PATTERN_BIT_WIDTH));

reg_write(APB_SARADC_SAR_PATT_TAB1_REG, pattern_table);

Expand Down
10 changes: 1 addition & 9 deletions esp-hal/src/soc/esp32h2/trng.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,6 @@ const I2C_SARADC_SAR1_INIT_CODE_LSB: u8 = 3;
const I2C_SARADC_SAR1_INIT_CODE_LSB_MSB: u8 = 7;
const I2C_SARADC_SAR1_INIT_CODE_LSB_LSB: u8 = 0;

const DTEST_RTC_MSB: u8 = 1;
const DTEST_RTC_LSB: u8 = 0;
const ENT_RTC_MSB: u8 = 3;
const ENT_RTC_LSB: u8 = 3;
const SARADC1_ENCAL_REF_MSB: u8 = 4;
const SARADC1_ENCAL_REF_LSB: u8 = 4;
const SARADC2_ENCAL_REF_MSB: u8 = 6;
const SARADC2_ENCAL_REF_LSB: u8 = 6;
const SAR2_CHANNEL: u32 = 9;
const SAR2_ATTEN: u32 = 1;
const SAR1_ATTEN: u32 = 1;
Expand Down Expand Up @@ -195,7 +187,7 @@ pub(crate) fn ensure_randomness() {
let pattern_one: u32 = (SAR2_CHANNEL << 2) | SAR2_ATTEN; // we want channel 9 with max attenuation
let pattern_two: u32 = SAR1_ATTEN; // we want channel 0 with max attenuation, channel doesn't really matter here
let pattern_table: u32 =
0 | (pattern_two << 3 * PATTERN_BIT_WIDTH) | pattern_one << 2 * PATTERN_BIT_WIDTH;
(pattern_two << (3 * PATTERN_BIT_WIDTH)) | (pattern_one << (2 * PATTERN_BIT_WIDTH));
reg_write(APB_SARADC_SAR_PATT_TAB1_REG, pattern_table);

// set pattern length to 2 (APB_SARADC_SAR_PATT_LEN counts from 0)
Expand Down
Loading