Merge branch 'bugfix/docs_rtd_failure_on_missing_submodule_v3_2_bis' into 'release/v3.2'

docs: Add mqtt submodule to RTD build configuration to correct file and delete...

See merge request idf/esp-idf!5310

.readthedocs.yml

@@ -14,4 +14,9 @@ formats:
 python:
   version: 2.7
   install:
-    - requirements: docs/requirements.txt
+    - requirements: docs/requirements.txt
+
+# We need to list all the submodules included in documenation build by Doxygen
+submodules: 
+  include:
+    - components/mqtt/esp-mqtt

components/driver/spi_slave.c

@@ -429,12 +429,14 @@ static void SPI_SLAVE_ISR_ATTR spi_intr(void *arg)
         }
     }
 
+    //Disable interrupt before checking to avoid concurrency issue.
+    esp_intr_disable(host->intr);
     //Grab next transaction
     r = xQueueReceiveFromISR(host->trans_queue, &trans, &do_yield);
-    if (!r) {
-        //No packet waiting. Disable interrupt.
-        esp_intr_disable(host->intr);
-    } else {
+    if (r) {
+        //enable the interrupt again if there is packet to send
+        esp_intr_enable(host->intr);
+
         //We have a transaction. Send it.
         host->hw->slave.trans_done = 0; //clear int bit
         host->cur_trans = trans;

components/idf_test/integration_test/KnownIssues

@@ -12,19 +12,6 @@ WIFI_SCAN_0303
 WIFI_SCAN_0303_01
 WIFI_CONN_0302
 WIFI_CONN_0302_01
-WIFI_CONN_0101
-WIFI_CONN_0101_01
-WIFI_CONN_0102
-WIFI_CONN_0103
-WIFI_CONN_0103_01
-WIFI_SCAN_0101
-WIFI_SCAN_0101_01
-WIFI_SCAN_0102
-WIFI_SCAN_0102_01
-WIFI_SCAN_0103
-WIFI_SCAN_0103_01
-WIFI_SCAN_0104
-WIFI_SCAN_0104_01
 WIFI_MODE_0102
 WIFI_MODE_0103
 WIFI_ADDR_0102

components/idf_test/integration_test/TC_IT_WIFI_CONN.yml

@@ -13,13 +13,13 @@ test cases:
   - ''
   - - SSC SSC1 ap -S -s <target_ssid> -t 0
     - - R SSC1 C +SAP:OK
-  - - SSC SSC2 sta -C -s <target_ssid> -p <target_password>
+  - - SSC SSC2 sta -C -s <target_ssid>
     - - R SSC2 RE "\+JAP:CONNECTED,%%s"%%(<target_ssid>)
   - - SSC SSC1 ap -S -s <target_ssid> -p <target_password> -t 2
     - - R SSC1 C +SAP:OK
   - - SSC SSC2 sta -C -s <target_ssid> -p <target_password>
     - - R SSC2 RE "\+JAP:CONNECTED,%%s"%%(<target_ssid>)
-  - - SSC SSC1 ap -S -s <target_ssid> -p <target_password> -t <target_auth_enum>
+  - - SSC SSC1 ap -S -s <target_ssid> -p <target_password> -t 3
     - - R SSC1 C +SAP:OK
   - - SSC SSC2 sta -C -s <target_ssid> -p <target_password>
     - - R SSC2 RE "\+JAP:CONNECTED,%%s"%%(<target_ssid>)
@@ -29,6 +29,8 @@ test cases:
     - - R SSC2 RE "\+JAP:CONNECTED,%%s"%%(<target_ssid>)
   - - SSC SSC1 ap -S -s <target_ssid> -p <target_password> -t 1
     - - R SSC1 C +SAP:OK
+  - - SSC SSC2 sta -D
+    - - R SSC2 C +QAP:OK
   - - SSC SSC2 sta -S
     - - R SSC2 RE "\+SCAN:%%s,.+,0,\d+"%%(<target_ssid>) C +SCANDONE
   - - SSC SSC1 ap -S -s <target_ssid> -p <target_password> -t 5
@@ -69,16 +71,18 @@ test cases:
   - ''
   - - SSC SSC1 ap -S -s <target_ssid> -t 0 -n 1
     - - R SSC1 C +SAP:OK
-  - - SSC SSC2 sta -C -s <target_ssid> -p <target_password>
+  - - SSC SSC2 sta -C -s <target_ssid>
     - - R SSC2 RE "\+JAP:CONNECTED,%%s"%%(<target_ssid>)
   - - SSC SSC1 ap -S -s <target_ssid> -t 0 -n 13
     - - R SSC1 C +SAP:OK
-  - - SSC SSC2 sta -C -s <target_ssid> -p <target_password>
+  - - SSC SSC2 sta -C -s <target_ssid>
     - - R SSC2 RE "\+JAP:CONNECTED,%%s"%%(<target_ssid>)
   - - SSC SSC1 ap -S -s <target_ssid> -n 15
     - - R SSC1 C +SAP:OK
-  - - SSC SSC2 sta -C -s <target_ssid> -p <target_password>
+  - - SSC SSC2 sta -C -s <target_ssid>
     - - R SSC2 RE "\+JAP:CONNECTED,%%s"%%(<target_ssid>)
+  - - SSC SSC2 sta -D
+    - - R SSC2 C +QAP:OK
   - - SSC SSC2 sta -S
     - - R SSC2 RE "\+SCAN:%%s,.+,\d+,1"%%(<target_ssid>)
   execution time: 0.0
@@ -937,43 +941,6 @@ test cases:
   test point 1: basic function
   test point 2: beacon delay
   version: v1 (2016-8-15)
-- CI ready: 'Yes'
-  ID: WIFI_CONN_1101
-  SDK: ESP32_IDF
-  Test App: SSC
-  allow fail: ''
-  auto test: 'Yes'
-  category: Function
-  cmd set:
-  - ''
-  - - SSC SSC1 ram -Q
-    - - R SSC1 A <FREg>:\+FREEHEAP:(\d+)\r\n
-  - - SSC SSC1 op -W -a start
-    - - R SSC1 C +MODE:OK
-  - - SSC SSC1 op -W -a stop
-    - - R SSC1 C +MODE:OK
-  - - SSC SSC1 ram -Q
-    - - R SSC1 P <FREg>
-  execution time: 0
-  expected result: |
-    1. get current heap size
-    2.OK
-    3.OK
-    4.heap size unchanged
-  initial condition: WIFISTO
-  level: Integration
-  module: WIFI MAC
-  steps: |
-    1. check heap size
-    2. wifi start
-    3. wifi stop
-    4. check heap size
-  sub module: WIFI Connect
-  summary: wifi start and stop, heap size unchanged
-  test environment: SSC_T1_4
-  test point 1: basic function
-  test point 2: wifi start and stop, heap size unchanged
-  version: v1 (2016-12-31)
 - CI ready: 'Yes'
   ID: WIFI_CONN_1201
   SDK: ESP32_IDF