Răsfoiți Sursa

Merge branch 'feature/increase_dynamic_tx_buffer_number' into 'master'

Feature/increase dynamic tx buffer number

See merge request !1473

Jiang Jiang Jian 8 ani în urmă
părinte
comite
da178e446d
3 a modificat fișierele cu 4 adăugiri și 2 ștergeri
  1. 1 1
      components/esp32/Kconfig
  2. 2 0
      components/esp32/include/esp_now.h
  3. 1 1
      components/esp32/lib

+ 1 - 1
components/esp32/Kconfig

@@ -856,7 +856,7 @@ config ESP32_WIFI_STATIC_TX_BUFFER_NUM
 config ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM
 config ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM
     int "Max number of WiFi dynamic TX buffers"
     int "Max number of WiFi dynamic TX buffers"
     depends on ESP32_WIFI_DYNAMIC_TX_BUFFER
     depends on ESP32_WIFI_DYNAMIC_TX_BUFFER
-    range 16 64
+    range 16 128
     default 32
     default 32
     help
     help
         Set the number of WiFi dynamic TX buffers. The size of each dynamic TX buffer is not fixed,
         Set the number of WiFi dynamic TX buffers. The size of each dynamic TX buffer is not fixed,

+ 2 - 0
components/esp32/include/esp_now.h

@@ -48,6 +48,7 @@ extern "C" {
 #define ESP_ERR_ESPNOW_NOT_FOUND    (ESP_ERR_ESPNOW_BASE + 4) /*!< ESPNOW peer is not found */
 #define ESP_ERR_ESPNOW_NOT_FOUND    (ESP_ERR_ESPNOW_BASE + 4) /*!< ESPNOW peer is not found */
 #define ESP_ERR_ESPNOW_INTERNAL     (ESP_ERR_ESPNOW_BASE + 5) /*!< Internal error */
 #define ESP_ERR_ESPNOW_INTERNAL     (ESP_ERR_ESPNOW_BASE + 5) /*!< Internal error */
 #define ESP_ERR_ESPNOW_EXIST        (ESP_ERR_ESPNOW_BASE + 6) /*!< ESPNOW peer has existed */
 #define ESP_ERR_ESPNOW_EXIST        (ESP_ERR_ESPNOW_BASE + 6) /*!< ESPNOW peer has existed */
+#define ESP_ERR_ESPNOW_IF           (ESP_ERR_ESPNOW_BASE + 7) /*!< Interface error */
 
 
 #define ESP_NOW_ETH_ALEN             6         /*!< Length of ESPNOW peer MAC address */
 #define ESP_NOW_ETH_ALEN             6         /*!< Length of ESPNOW peer MAC address */
 #define ESP_NOW_KEY_LEN              16        /*!< Length of ESPNOW peer local master key */
 #define ESP_NOW_KEY_LEN              16        /*!< Length of ESPNOW peer local master key */
@@ -191,6 +192,7 @@ esp_err_t esp_now_unregister_send_cb(void);
   *          - ESP_ERR_ESPNOW_INTERNAL : internal error
   *          - ESP_ERR_ESPNOW_INTERNAL : internal error
   *          - ESP_ERR_ESPNOW_NO_MEM : out of memory
   *          - ESP_ERR_ESPNOW_NO_MEM : out of memory
   *          - ESP_ERR_ESPNOW_NOT_FOUND : peer is not found
   *          - ESP_ERR_ESPNOW_NOT_FOUND : peer is not found
+  *          - ESP_ERR_ESPNOW_IF : current WiFi interface doesn't match that of peer
   */
   */
 esp_err_t esp_now_send(const uint8_t *peer_addr, const uint8_t *data, size_t len);
 esp_err_t esp_now_send(const uint8_t *peer_addr, const uint8_t *data, size_t len);
 
 

+ 1 - 1
components/esp32/lib

@@ -1 +1 @@
-Subproject commit b0ee6e697658a0f3756e44e375fbcd646604c6d5
+Subproject commit 4d59fe9623f5a7cab7ef4b0b4cda1772d4795631