Merge branch 'backport/fix_energy_scan_api_para_mismatch_v54' into 'release/v5.4'

chshu · chshu · commit 1754c8f8e58e · 2024-11-05T14:28:08.000+08:00
fix(openthread): set channel for energy scan(Backport v5.4)

See merge request espressif/esp-idf!34597
diff --git a/components/ieee802154/include/esp_ieee802154_types.h b/components/ieee802154/include/esp_ieee802154_types.h
@@ -9,6 +9,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 
+#define US_PER_SYMBLE 16
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/components/openthread/src/port/esp_openthread_radio.c b/components/openthread/src/port/esp_openthread_radio.c
@@ -412,7 +412,8 @@ void otPlatRadioClearSrcMatchExtEntries(otInstance *aInstance)
 
 otError otPlatRadioEnergyScan(otInstance *aInstance, uint8_t aScanChannel, uint16_t aScanDuration)
 {
-    esp_ieee802154_energy_detect(aScanDuration);
+    esp_ieee802154_set_channel(aScanChannel);
+    esp_ieee802154_energy_detect(aScanDuration * US_PER_MS / US_PER_SYMBLE);
 
     return OT_ERROR_NONE;
 }

Original file line number	Diff line number	Diff line change
`@@ -412,7 +412,8 @@ void otPlatRadioClearSrcMatchExtEntries(otInstance *aInstance)`
`412`	`412`
`413`	`413`	`otError otPlatRadioEnergyScan(otInstance *aInstance, uint8_t aScanChannel, uint16_t aScanDuration)`
`414`	`414`	`{`
`415`		`- esp_ieee802154_energy_detect(aScanDuration);`
	`415`	`+ esp_ieee802154_set_channel(aScanChannel);`
	`416`	`+ esp_ieee802154_energy_detect(aScanDuration * US_PER_MS / US_PER_SYMBLE);`
`416`	`417`
`417`	`418`	`return OT_ERROR_NONE;`
`418`	`419`	`}`