itsscb/esp-hal
1
0
Fork 0
mirror of https://github.com/esp-rs/esp-hal.git synced 2025-10-02 06:40:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make C6 ADC calibration work properly again (#1911)

Browse Source 
* Reverting changes which provoke wrong `ADC` behaviour

* Minor example fix

* clocks update
This commit is contained in:
Kirill Mikhailov 2024-08-08 13:52:08 +02:00 committed by GitHub
parent bb6e710327
commit 1574e53b0e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 53 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
esp-hal/src/clock/clocks_ll/esp32c6.rs
View File

@ -253,13 +253,6 @@ const REGI2C_DIG_REG: u8 = 0x6d;
const REGI2C_ULP_CAL: u8 = 0x61; const REGI2C_ULP_CAL: u8 = 0x61;
const REGI2C_SAR_I2C: u8 = 0x69; const REGI2C_SAR_I2C: u8 = 0x69;
const I2C_MST_ANA_CONF1_M: u32 = 0x00FFFFFF;
const REGI2C_BBPLL_RD_MASK: u32 = !(1 << 7) & I2C_MST_ANA_CONF1_M;
const REGI2C_BIAS_RD_MASK: u32 = !(1 << 6) & I2C_MST_ANA_CONF1_M;
const REGI2C_DIG_REG_RD_MASK: u32 = !(1 << 10) & I2C_MST_ANA_CONF1_M;
const REGI2C_ULP_CAL_RD_MASK: u32 = !(1 << 8) & I2C_MST_ANA_CONF1_M;
const REGI2C_SAR_I2C_RD_MASK: u32 = !(1 << 9) & I2C_MST_ANA_CONF1_M;
const REGI2C_RTC_SLAVE_ID_V: u8 = 0xFF; const REGI2C_RTC_SLAVE_ID_V: u8 = 0xFF;
const REGI2C_RTC_SLAVE_ID_S: u8 = 0; const REGI2C_RTC_SLAVE_ID_S: u8 = 0;
const REGI2C_RTC_ADDR_V: u8 = 0xFF; const REGI2C_RTC_ADDR_V: u8 = 0xFF;
@ -271,53 +264,59 @@ const REGI2C_RTC_DATA_S: u8 = 16;
const REGI2C_BBPLL: u8 = 0x66; const REGI2C_BBPLL: u8 = 0x66;
const REGI2C_BBPLL_DEVICE_EN: u16 = 1 << 5;
const REGI2C_BIAS_DEVICE_EN: u16 = 1 << 4;
const REGI2C_DIG_REG_DEVICE_EN: u16 = 1 << 8;
const REGI2C_ULP_CAL_DEVICE_EN: u16 = 1 << 6;
const REGI2C_SAR_I2C_DEVICE_EN: u16 = 1 << 7;
fn regi2c_enable_block(block: u8) { fn regi2c_enable_block(block: u8) {
let modem_lpcon = unsafe { &*crate::peripherals::MODEM_LPCON::ptr() }; let modem_lpcon = unsafe { &*crate::peripherals::MODEM_LPCON::ptr() };
let lp_i2c_ana = unsafe { &*crate::peripherals::LP_I2C_ANA_MST::ptr() }; let lp_i2c_ana = unsafe { &*crate::peripherals::LP_I2C_ANA_MST::ptr() };
modem_lpcon
.clk_conf()
.modify(|_, w| w.clk_i2c_mst_en().set_bit());
modem_lpcon
.i2c_mst_clk_conf()
.modify(|_, w| w.clk_i2c_mst_sel_160m().set_bit());
lp_i2c_ana
.date()
.modify(|_, w| w.lp_i2c_ana_mast_i2c_mat_clk_en().set_bit());
// Before config I2C register, enable corresponding slave.
unsafe { unsafe {
modem_lpcon
.clk_conf()
.modify(|_, w| w.clk_i2c_mst_en().set_bit());
modem_lpcon
.i2c_mst_clk_conf()
.modify(|_, w| w.clk_i2c_mst_sel_160m().set_bit());
lp_i2c_ana
.date()
.modify(|_, w| w.lp_i2c_ana_mast_i2c_mat_clk_en().set_bit());
// Before config I2C register, enable corresponding slave.
match block { match block {
REGI2C_BBPLL => { REGI2C_BBPLL => {
lp_i2c_ana.ana_conf1().modify(|r, w| { lp_i2c_ana.device_en().modify(|r, w| {
w.lp_i2c_ana_mast_ana_conf1() w.lp_i2c_ana_mast_i2c_device_en()
.bits(r.lp_i2c_ana_mast_ana_conf1().bits() | REGI2C_BBPLL_RD_MASK) .bits(r.lp_i2c_ana_mast_i2c_device_en().bits() | REGI2C_BBPLL_DEVICE_EN)
}); });
} }
REGI2C_BIAS => { REGI2C_BIAS => {
lp_i2c_ana.ana_conf1().modify(|r, w| { lp_i2c_ana.device_en().modify(|r, w| {
w.lp_i2c_ana_mast_ana_conf1() w.lp_i2c_ana_mast_i2c_device_en()
.bits(r.lp_i2c_ana_mast_ana_conf1().bits() | REGI2C_BIAS_RD_MASK) .bits(r.lp_i2c_ana_mast_i2c_device_en().bits() | REGI2C_BIAS_DEVICE_EN)
}); });
} }
REGI2C_DIG_REG => { REGI2C_DIG_REG => {
lp_i2c_ana.ana_conf1().modify(|r, w| { lp_i2c_ana.device_en().modify(|r, w| {
w.lp_i2c_ana_mast_ana_conf1() w.lp_i2c_ana_mast_i2c_device_en()
.bits(r.lp_i2c_ana_mast_ana_conf1().bits() | REGI2C_DIG_REG_RD_MASK) .bits(r.lp_i2c_ana_mast_i2c_device_en().bits() | REGI2C_DIG_REG_DEVICE_EN)
}); });
} }
REGI2C_ULP_CAL => { REGI2C_ULP_CAL => {
lp_i2c_ana.ana_conf1().modify(|r, w| { lp_i2c_ana.device_en().modify(|r, w| {
w.lp_i2c_ana_mast_ana_conf1() w.lp_i2c_ana_mast_i2c_device_en()
.bits(r.lp_i2c_ana_mast_ana_conf1().bits() | REGI2C_ULP_CAL_RD_MASK) .bits(r.lp_i2c_ana_mast_i2c_device_en().bits() | REGI2C_ULP_CAL_DEVICE_EN)
}); });
} }
REGI2C_SAR_I2C => { REGI2C_SAR_I2C => {
lp_i2c_ana.ana_conf1().modify(|r, w| { lp_i2c_ana.device_en().modify(|r, w| {
w.lp_i2c_ana_mast_ana_conf1() w.lp_i2c_ana_mast_i2c_device_en()
.bits(r.lp_i2c_ana_mast_ana_conf1().bits() | REGI2C_SAR_I2C_RD_MASK) .bits(r.lp_i2c_ana_mast_i2c_device_en().bits() | REGI2C_SAR_I2C_DEVICE_EN)
}); });
} }
_ => (), _ => (),
@ -326,38 +325,37 @@ fn regi2c_enable_block(block: u8) {
} }
fn regi2c_disable_block(block: u8) { fn regi2c_disable_block(block: u8) {
let lp_i2c_ana = unsafe { &*crate::peripherals::LP_I2C_ANA_MST::ptr() };
unsafe { unsafe {
let lp_i2c_ana = &*crate::peripherals::LP_I2C_ANA_MST::ptr();
match block { match block {
REGI2C_BBPLL => { REGI2C_BBPLL => {
lp_i2c_ana.ana_conf1().modify(|r, w| { lp_i2c_ana.device_en().modify(|r, w| {
w.lp_i2c_ana_mast_ana_conf1() w.lp_i2c_ana_mast_i2c_device_en()
.bits(r.lp_i2c_ana_mast_ana_conf1().bits() & !REGI2C_BBPLL_RD_MASK) .bits(r.lp_i2c_ana_mast_i2c_device_en().bits() & !REGI2C_BBPLL_DEVICE_EN)
}); });
} }
REGI2C_BIAS => { REGI2C_BIAS => {
lp_i2c_ana.ana_conf1().modify(|r, w| { lp_i2c_ana.device_en().modify(|r, w| {
w.lp_i2c_ana_mast_ana_conf1() w.lp_i2c_ana_mast_i2c_device_en()
.bits(r.lp_i2c_ana_mast_ana_conf1().bits() & !REGI2C_BIAS_RD_MASK) .bits(r.lp_i2c_ana_mast_i2c_device_en().bits() & !REGI2C_BIAS_DEVICE_EN)
}); });
} }
REGI2C_DIG_REG => { REGI2C_DIG_REG => {
lp_i2c_ana.ana_conf1().modify(|r, w| { lp_i2c_ana.device_en().modify(|r, w| {
w.lp_i2c_ana_mast_ana_conf1() w.lp_i2c_ana_mast_i2c_device_en()
.bits(r.lp_i2c_ana_mast_ana_conf1().bits() & !REGI2C_DIG_REG_RD_MASK) .bits(r.lp_i2c_ana_mast_i2c_device_en().bits() & !REGI2C_DIG_REG_DEVICE_EN)
}); });
} }
REGI2C_ULP_CAL => { REGI2C_ULP_CAL => {
lp_i2c_ana.ana_conf1().modify(|r, w| { lp_i2c_ana.device_en().modify(|r, w| {
w.lp_i2c_ana_mast_ana_conf1() w.lp_i2c_ana_mast_i2c_device_en()
.bits(r.lp_i2c_ana_mast_ana_conf1().bits() & !REGI2C_ULP_CAL_RD_MASK) .bits(r.lp_i2c_ana_mast_i2c_device_en().bits() & !REGI2C_ULP_CAL_DEVICE_EN)
}); });
} }
REGI2C_SAR_I2C => { REGI2C_SAR_I2C => {
lp_i2c_ana.ana_conf1().modify(|r, w| { lp_i2c_ana.device_en().modify(|r, w| {
w.lp_i2c_ana_mast_ana_conf1() w.lp_i2c_ana_mast_i2c_device_en()
.bits(r.lp_i2c_ana_mast_ana_conf1().bits() & !REGI2C_SAR_I2C_RD_MASK) .bits(r.lp_i2c_ana_mast_i2c_device_en().bits() & !REGI2C_SAR_I2C_DEVICE_EN)
}); });
} }
_ => (), _ => (),

6
examples/src/bin/adc_cal.rs
View File

@ -44,10 +44,10 @@ fn main() -> ! {
// them. Note that only AdcCalLine returns readings in mV; the other two // them. Note that only AdcCalLine returns readings in mV; the other two
// return raw readings in some unspecified scale. // return raw readings in some unspecified scale.
// //
//type AdcCal = (); // type AdcCal = ();
type AdcCal = esp_hal::analog::adc::AdcCalBasic<esp_hal::peripherals::ADC1>; type AdcCal = esp_hal::analog::adc::AdcCalBasic<esp_hal::peripherals::ADC1>;
// type AdcCal = esp_hal::analog::adc::AdcCalLine<ADC1>; // type AdcCal = esp_hal::analog::adc::AdcCalLine<esp_hal::peripherals::ADC1>;
// type AdcCal = esp_hal::analog::adc::AdcCalCurve<ADC1>; // type AdcCal = esp_hal::analog::adc::AdcCalCurve<esp_hal::peripherals::ADC1>;
let mut adc1_config = AdcConfig::new(); let mut adc1_config = AdcConfig::new();
let mut adc1_pin = let mut adc1_pin =