Redo config options

Author: bugadani

esp-radio/CHANGELOG.md

@@ -48,6 +48,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Event handlers are now passed the event by reference (#4113)
 - Some build-time configuration options have been replaced by runtime options in `WifiConfig` (#4121)
 - Update to bt-hci version with flash usage improvements (#4146, #4165)
+- `scan_mode`, `(ap_)beacon_timeout`, `listen_interval` and `failure_retry_cnt` config options have been replaced by runtime options in `AccessPointConfig`, `ClientConfig` and `EapClientConfig` (#4224)
+- The `ieee802154_rx_queue_size` config option has been replaced by a runtime option in `esp_radio::ieee802154::Config` (#4224)
 
 ### Fixed
 

esp-radio/esp_config.yml

@@ -15,88 +15,7 @@ options:
  - type:
  validator: positive_integer
 
- # TODO Should be part of ClientConfig
- - name: listen_interval
- description: 'Interval for station to listen to beacon from AP.
- The unit of listen interval is one beacon interval.
- For example, if beacon interval is 100 ms and listen interval is 3,
- the interval for station to listen to beacon is 300 ms'
- default:
- - value: 3
-
- # TODO Should be part of ClientConfig
- - name: beacon_timeout
- description: 'For Station, If the station does not receive a beacon frame
- from the connected SoftAP during the inactive time, disconnect from SoftAP.
- Default 6s. Range 6-30'
- default:
- - value: 6
- constraints:
- - type:
- validator: integer_in_range
- value:
- start: 6
- end: 31
-
- # TODO Should be part of ApConfig
- - name: ap_beacon_timeout
- description: "For SoftAP, If the SoftAP doesn't receive any data from the connected STA
- during inactive time, the SoftAP will force deauth the STA. Default is 300s"
- default:
- - value: 300
-
- # TODO Should be part of ClientConfig
- - name: failure_retry_cnt
- description: "Number of connection retries station will do before moving to next AP.
- scan_method should be set as WIFI_ALL_CHANNEL_SCAN to use this config.
- Note: Enabling this may cause connection time to increase incase best AP
- doesn't behave properly. Defaults to 1"
- default:
- - value: 1
- constraints:
- - type:
- validator: positive_integer
-
- # TODO: this is a scan API argument
- - name: scan_method
- description: "0 = WIFI_FAST_SCAN, 1 = WIFI_ALL_CHANNEL_SCAN, defaults to 0"
- default:
- - value: 0
- constraints:
- - type:
- validator: integer_in_range
- value:
- start: 0
- end: 2
-
  - name: dump_packets
  description: "Dump packets via an info log statement"
  default:
  - value: false
-
- # TODO: Should these be esp_radio::init config options?
- - name: phy_enable_usb
- description: "Keeps USB running when using WiFi.
- This allows debugging and log messages via USB Serial JTAG.
- Turn off for best WiFi performance."
- default:
- - value: true
-
- - name: phy_skip_calibration_after_deep_sleep
- description: "Use PHY_RF_CAL_NONE after deep sleep."
- default:
- - value: false
-
- - name: phy_full_calibration
- description: "Use PHY_RF_CAL_FULL instead of PHY_RF_CAL_PARTIAL."
- default:
- - value: true
-
- # TODO: This could be a config option for Ieee802154::new
- - name: ieee802154_rx_queue_size
- description: Size of the RX queue in frames
- default:
- - value: 10
- constraints:
- - type:
- validator: positive_integer

esp-radio/src/ieee802154/mod.rs

@@ -84,6 +84,7 @@ pub struct Config {
  pub pan_id: Option<u16>,
  pub short_addr: Option<u16>,
  pub ext_addr: Option<u64>,
+ pub rx_queue_size: usize,
 }
 
 impl Default for Config {
@@ -102,6 +103,7 @@ impl Default for Config {
  pan_id: None,
  short_addr: None,
  ext_addr: None,
+ rx_queue_size: 10,
  }
  }
 }
@@ -157,6 +159,8 @@ impl<'a> Ieee802154<'a> {
 
  set_extended_address(0, address);
  }
+
+ raw::set_queue_size(cfg.rx_queue_size);
  }
 
  /// Start receiving frames

esp-radio/src/ieee802154/raw.rs

@@ -29,19 +29,18 @@ use super::{
 
 const PHY_ENABLE_VERSION_PRINT: u8 = 1;
 
-const RX_QUEUE_SIZE: usize =
- esp_config::esp_config_int!(usize, "ESP_RADIO_CONFIG_IEEE802154_RX_QUEUE_SIZE");
-
 static mut RX_BUFFER: [u8; FRAME_SIZE] = [0u8; FRAME_SIZE];
 
 struct IeeeState {
  state: Ieee802154State,
  rx_queue: Queue<RawReceived>,
+ rx_queue_size: usize,
 }
 
 static STATE: NonReentrantMutex<IeeeState> = NonReentrantMutex::new(IeeeState {
  state: Ieee802154State::Idle,
  rx_queue: Queue::new(),
+ rx_queue_size: 10,
 });
 
 unsafe extern "C" {
@@ -186,6 +185,12 @@ pub fn tx_init(frame: *const u8) {
  }
 }
 
+pub(crate) fn set_queue_size(rx_queue_size: usize) {
+ STATE.with(|state| {
+ state.rx_queue_size = rx_queue_size;
+ });
+}
+
 pub fn ieee802154_transmit(frame: *const u8, cca: bool) -> i32 {
  STATE.with(|state| {
  tx_init(frame);
@@ -385,7 +390,7 @@ fn zb_mac_handler() {
  );
  let mut state_for_notify = Ieee802154State::Idle;
  STATE.with(|state| {
- if state.rx_queue.len() <= RX_QUEUE_SIZE {
+ if state.rx_queue.len() <= state.rx_queue_size {
  let item = RawReceived {
  data: RX_BUFFER,
  channel: freq_to_channel(freq()),