Merge branch 'master' into release/v3.3

me-no-dev · web-flow · commit e8ccf1d5ab59 · 2020-01-20T21:30:10.000+02:00
diff --git a/sdkconfig b/sdkconfig
@@ -445,7 +445,7 @@ CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752
 CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32
 CONFIG_ESP32_WIFI_DEBUG_LOG_ENABLE=
 CONFIG_ESP32_WIFI_IRAM_OPT=y
-CONFIG_ESP32_WIFI_RX_IRAM_OPT=
+CONFIG_ESP32_WIFI_RX_IRAM_OPT=y
 
 #
 # PHY
diff --git a/tools/current_commit.sh b/tools/current_commit.sh
@@ -0,0 +1,2 @@
+IDF_COMMIT=$(wget -q -O- "https://github.com/espressif/arduino-esp32/search?q=update+idf&type=Commits" | grep -i "update idf" | grep -e "to [0-9a-f]*" | sed "s/^.*to \([0-9a-f]*\).*/\1/" | head -1)
+echo Current commit is $IDF_COMMIT

Original file line number	Diff line number	Diff line change
`@@ -445,7 +445,7 @@ CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752`
`445`	`445`	`CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32`
`446`	`446`	`CONFIG_ESP32_WIFI_DEBUG_LOG_ENABLE=`
`447`	`447`	`CONFIG_ESP32_WIFI_IRAM_OPT=y`
`448`		`-CONFIG_ESP32_WIFI_RX_IRAM_OPT=`
	`448`	`+CONFIG_ESP32_WIFI_RX_IRAM_OPT=y`
`449`	`449`
`450`	`450`	`#`
`451`	`451`	`# PHY`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+IDF_COMMIT=$(wget -q -O- "https://github.com/espressif/arduino-esp32/search?q=update+idf&type=Commits" \| grep -i "update idf" \| grep -e "to [0-9a-f]" \| sed "s/^.to \([0-9a-f]\)./\1/" \| head -1)`
	`2`	`+echo Current commit is $IDF_COMMIT`