Merge branch 'bugfix/fix_hplpgap_assert_in_pvt_func_v5.5' into 'release/v5.5'

feat(pvt): fix hplpgap assert error in pvt func on release v5.5

See merge request espressif/esp-idf!46799
This commit is contained in:
Jiang Jiang Jian
2026-04-17 11:06:54 +08:00
3 changed files with 21 additions and 9 deletions

View File

@@ -44,9 +44,13 @@ static uint8_t get_lp_hp_gap(void)
lp_hp_gap = gap_abs_value;
}
lp_hp_gap = lp_hp_gap - 8;
assert((lp_hp_gap >= -15) && (lp_hp_gap <= 7));
if (lp_hp_gap < 0 ) {
lp_hp_gap = 16 - lp_hp_gap;
if (lp_hp_gap < 0) {
if (lp_hp_gap >= -15) {
lp_hp_gap = 16 - lp_hp_gap;
} else {
// pvt offset value only has 4 bit
lp_hp_gap = 31;
}
}
}
return lp_hp_gap;

View File

@@ -44,9 +44,13 @@ static uint8_t get_lp_hp_gap(void)
pvt_offset = offset_value;
}
pvt_offset = pvt_offset - 2;
assert((pvt_offset >= -15) && (pvt_offset <= 13));
if (pvt_offset < 0 ) {
pvt_offset = 16 - pvt_offset;
if (pvt_offset < 0) {
if (pvt_offset >= -15) {
pvt_offset = 16 - pvt_offset;
} else {
// pvt offset value only has 4 bit
pvt_offset = 31;
}
}
}
return pvt_offset;

View File

@@ -43,9 +43,13 @@ static uint8_t get_lp_hp_gap(void)
lp_hp_gap = gap_abs_value;
}
lp_hp_gap = lp_hp_gap - 8;
assert((lp_hp_gap >= -15) && (lp_hp_gap <= 7));
if (lp_hp_gap < 0 ) {
lp_hp_gap = 16 - lp_hp_gap;
if (lp_hp_gap < 0) {
if (lp_hp_gap >= -15) {
lp_hp_gap = 16 - lp_hp_gap;
} else {
// pvt offset value only has 4 bit
lp_hp_gap = 31;
}
}
}
return lp_hp_gap;