Skip to content

Commit 48ad8b7

Browse files
committed
Merge branch 'bugfix/fix_link_err_for_vol_range' into 'master'
bugfix(esp_codec_dev): Fix link error for multiple definition of vol_range See merge request adf/esp-adf-internal!1429
2 parents 1e31f04 + caffa26 commit 48ad8b7

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

components/esp_codec_dev/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## v1.3.7
4+
5+
### Bug Fixed
6+
7+
- Fixed link error for `vol_range` redefinition.
8+
39
## v1.3.6
410

511
### Feature

components/esp_codec_dev/device/aw88298/aw88298.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ typedef struct {
2424
Volume control register 0x0C description:
2525
0xC0 - '-96dB' ... 0x00 - '+0dB'
2626
*/
27-
const esp_codec_dev_vol_range_t vol_range = {
27+
static const esp_codec_dev_vol_range_t vol_range = {
2828
.min_vol =
2929
{
3030
.vol = 0xC0,

components/esp_codec_dev/device/es8156/es8156.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ typedef struct {
2727
Volume control register 0x14 description:
2828
0x00 - '-95.5dB' ... 0xFF - '+32dB'
2929
*/
30-
const esp_codec_dev_vol_range_t vol_range = {
30+
static const esp_codec_dev_vol_range_t vol_range = {
3131
.min_vol =
3232
{
3333
.vol = 0x0,

0 commit comments

Comments
 (0)