Skip to content

Commit 4fcc867

Browse files
committed
Merge branch 'fix/fix_a_macro_issue' into 'master'
fix(ieee802154): fix a bug in the usage of a macro See merge request espressif/esp-idf!33762
2 parents 7b72c32 + 8a4ae33 commit 4fcc867

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

components/ieee802154/driver/esp_ieee802154_dev.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,7 @@ esp_err_t ieee802154_mac_init(void)
773773
ieee802154_ll_enable_rx_abort_events(BIT(IEEE802154_RX_ABORT_BY_TX_ACK_TIMEOUT - 1) | BIT(IEEE802154_RX_ABORT_BY_TX_ACK_COEX_BREAK - 1));
774774

775775
ieee802154_ll_set_ed_sample_mode(IEEE802154_ED_SAMPLE_AVG);
776-
#if !CONFIG_IEEE802154_TEST && CONFIG_ESP_COEX_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
776+
#if !CONFIG_IEEE802154_TEST && (CONFIG_ESP_COEX_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE)
777777
esp_coex_ieee802154_ack_pti_set(IEEE802154_MIDDLE);
778778
IEEE802154_SET_TXRX_PTI(IEEE802154_SCENE_IDLE);
779779
#else

components/ieee802154/driver/esp_ieee802154_util.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ uint8_t ieee802154_channel_to_freq(uint8_t channel)
2121
return (channel - 11) * 5 + 3;
2222
}
2323

24-
#if !CONFIG_IEEE802154_TEST && CONFIG_ESP_COEX_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
24+
#if !CONFIG_IEEE802154_TEST && (CONFIG_ESP_COEX_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE)
2525
void ieee802154_set_txrx_pti(ieee802154_txrx_scene_t txrx_scene)
2626
{
2727

components/ieee802154/private_include/esp_ieee802154_util.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ typedef enum {
265265
IEEE802154_SCENE_RX_AT, /*!< IEEE802154 radio coexistence scene RX AT */
266266
} ieee802154_txrx_scene_t;
267267

268-
#if !CONFIG_IEEE802154_TEST && CONFIG_ESP_COEX_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
268+
#if !CONFIG_IEEE802154_TEST && (CONFIG_ESP_COEX_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE)
269269

270270
/**
271271
* @brief Set the IEEE802154 radio coexistence scene during transmitting or receiving.

0 commit comments

Comments
 (0)