mirror of
https://github.com/espressif/esp-idf
synced 2025-03-10 01:29:21 -04:00
Merge branch 'fix/set_154_cca_duration_v5.1' into 'release/v5.1'
fix(15.4): set 15.4 energy scan duration before cca (v5.1) See merge request espressif/esp-idf!36427
This commit is contained in:
commit
0192db53df
@ -871,6 +871,7 @@ static inline esp_err_t ieee802154_transmit_internal(const uint8_t *frame, bool
|
|||||||
IEEE802154_SET_TXRX_PTI(IEEE802154_SCENE_TX);
|
IEEE802154_SET_TXRX_PTI(IEEE802154_SCENE_TX);
|
||||||
|
|
||||||
if (cca) {
|
if (cca) {
|
||||||
|
ieee802154_ll_set_ed_duration(CCA_DETECTION_TIME);
|
||||||
ieee802154_set_cmd(IEEE802154_CMD_CCA_TX_START);
|
ieee802154_set_cmd(IEEE802154_CMD_CCA_TX_START);
|
||||||
ieee802154_set_state(IEEE802154_STATE_TX_CCA);
|
ieee802154_set_state(IEEE802154_STATE_TX_CCA);
|
||||||
} else {
|
} else {
|
||||||
@ -920,6 +921,7 @@ esp_err_t ieee802154_transmit_at(const uint8_t *frame, bool cca, uint32_t time)
|
|||||||
tx_init(frame);
|
tx_init(frame);
|
||||||
IEEE802154_SET_TXRX_PTI(IEEE802154_SCENE_TX_AT);
|
IEEE802154_SET_TXRX_PTI(IEEE802154_SCENE_TX_AT);
|
||||||
if (cca) {
|
if (cca) {
|
||||||
|
ieee802154_ll_set_ed_duration(CCA_DETECTION_TIME);
|
||||||
tx_target_time = time - IEEE802154_ED_TRIG_TX_RAMPUP_TIME_US;
|
tx_target_time = time - IEEE802154_ED_TRIG_TX_RAMPUP_TIME_US;
|
||||||
ieee802154_set_state(IEEE802154_STATE_TX_CCA);
|
ieee802154_set_state(IEEE802154_STATE_TX_CCA);
|
||||||
ieee802154_enter_critical();
|
ieee802154_enter_critical();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user