Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
9081 commits 10 branches 75 tags 114 MiB
Commit graph

9081 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Balzer e97f72ea24 Merge remote-tracking branch 'upstream/release/v3.3' 
# Conflicts:
#	.gitlab-ci.yml
#	components/bootloader/project_include.cmake
#	components/bootloader_support/include/bootloader_common.h
#	components/bootloader_support/src/bootloader_common.c
#	components/bt/Kconfig
#	components/bt/bluedroid/btc/profile/std/include/btc_gap_ble.h
#	components/bt/bluedroid/stack/btm/btm_ble_gap.c
#	components/bt/bluedroid/stack/btm/btm_devctl.c
#	components/bt/bluedroid/stack/include/stack/hcidefs.h
#	components/bt/bluedroid/stack/smp/smp_act.c
#	components/bt/bt.c
#	components/bt/lib
#	components/driver/Kconfig
#	components/driver/include/driver/rmt.h
#	components/driver/test/test_spi_master.c
#	components/driver/uart.c
#	components/esp32/CMakeLists.txt
#	components/esp32/Kconfig
#	components/esp32/ld/esp32.project.ld.in
#	components/esp32/ld/esp32.spiram.rom-functions-dram.ld
#	components/esp32/ld/esp32.spiram.rom-functions-iram.ld
#	components/esp32/lib
#	components/esp32/spiram.c
#	components/esp32/spiram_psram.c
#	components/esp32/test/test_wifi.c
#	components/esp32/wifi_init.c
#	components/esp_http_server/include/esp_http_server.h
#	components/esp_http_server/src/esp_httpd_priv.h
#	components/esp_http_server/src/httpd_parse.c
#	components/esp_http_server/src/httpd_sess.c
#	components/esp_http_server/src/httpd_txrx.c
#	components/esp_http_server/src/httpd_uri.c
#	components/esp_http_server/test/test_http_server.c
#	components/esp_https_ota/src/esp_https_ota.c
#	components/ethernet/emac_main.c
#	components/freemodbus/Kconfig
#	components/idf_test/include/idf_performance.h
#	components/idf_test/integration_test/TC_IT_BLUEDROID_SMP.yml
#	components/lwip/Kconfig
#	components/newlib/test/test_time.c
#	components/nvs_flash/nvs_partition_generator/nvs_partition_gen.py
#	components/spi_flash/Kconfig
#	components/ulp/cmake/CMakeLists.txt
#	components/ulp/component_ulp_common.cmake
#	components/vfs/vfs.c
#	docs/conf_common.py
#	docs/en/api-reference/provisioning/wifi_provisioning.rst
#	examples/mesh/internal_communication/main/Kconfig.projbuild
#	examples/protocols/aws_iot/subscribe_publish/main/CMakeLists.txt
#	examples/protocols/aws_iot/thing_shadow/main/CMakeLists.txt
#	examples/protocols/coap_client/README.md
#	examples/protocols/coap_server/README.md
#	examples/protocols/modbus_slave/main/Kconfig.projbuild
#	examples/protocols/mqtt/ssl/mqtt_ssl_example_test.py
#	examples/protocols/mqtt/tcp/main/Kconfig.projbuild
#	examples/protocols/mqtt/ws/mqtt_ws_example_test.py
#	examples/protocols/mqtt/wss/mqtt_wss_example_test.py
#	examples/wifi/iperf/components/iperf/iperf.c
#	requirements.txt
#	tools/ci/build_examples.sh
#	tools/ci/test_build_system_cmake.sh
#	tools/cmake/idf_functions.cmake
#	tools/cmake/kconfig.cmake
#	tools/cmake/scripts/expand_requirements.cmake
#	tools/esp_prov/README.md
#	tools/esp_prov/esp_prov.py
#	tools/esp_prov/transport/ble_cli.py
#	tools/idf.py
#	tools/kconfig_new/confgen.py
#	tools/mass_mfg/docs/README.rst
#	tools/mass_mfg/samples/sample_config.csv
#	tools/tiny-test-fw/DUT.py
#	tools/tiny-test-fw/IDF/IDFApp.py
#	tools/tiny-test-fw/IDF/IDFDUT.py
#	tools/tiny-test-fw/TinyFW.py
#	tools/unit-test-app/tools/UnitTestParser.py
#	tools/unit-test-app/unit_test.py
 2019-07-20 22:11:10 +02:00
Michael Balzer 40f01ec30a Merge remote-tracking branch 'upstream/release/v3.2' 2019-07-20 15:22:14 +02:00
Jiang Jiang Jian 6ba62f7b0b Merge branch 'bugfix/fix_the_watchdog_during_WiFi_scan_BLE_scan_v3.2' into 'release/v3.2' 
fix the watchdog bug during WiFi scan and BLE scan (v3.2)

See merge request espressif/esp-idf!5541
 2019-07-19 18:08:56 +08:00
Jiang Jiang Jian 91f29bef17 Merge branch 'bugfix/fix_the_watchdog_during_WiFi_scan_BLE_scan_v3.3' into 'release/v3.3' 
fix the watchdog bug during WiFi scan and BLE scan(v3.3)

See merge request espressif/esp-idf!5506
 2019-07-18 10:44:31 +08:00
Ivan Grokhotkov de7a50dca0 Merge branch 'bugfix/i2s_apll_clock_fix_v3.3' into 'release/v3.3' 
driver/i2s: fix apll_clock_rate for different sample rates (v3.3)

See merge request espressif/esp-idf!5448
 2019-07-17 14:33:59 +08:00
Angus Gratton a9eac4a124 Merge branch 'bugfix/spi_flash_mmap_stale_data_issue_v3.3' into 'release/v3.3' 
spi_flash: fix stale read issue for memory mapped partition (v3.3)

See merge request espressif/esp-idf!5435
 2019-07-17 14:26:33 +08:00
Jiang Jiang Jian 3e27184c38 Merge branch 'bugfix/fix_flash_read_error_in_dio_26MHz_mode_v3.3' into 'release/v3.3' 
bugfix(flash): fix flash read error in DIO/26MHz mode (backport v3.3)

See merge request espressif/esp-idf!5532
 2019-07-16 18:41:57 +08:00
Jiang Jiang Jian ed7664d19f Merge branch 'bugfix/fix_flash_read_error_in_dio_26MHz_mode_v3.2' into 'release/v3.2' 
bugfix(flash): fix flash read error in DIO/26MHz mode (backport v3.2)

See merge request espressif/esp-idf!5507
 2019-07-16 18:41:45 +08:00
zhangyanjiao 3675e3182f fix the watchdog bug during WiFi scan and BLE scan 2019-07-16 14:29:29 +08:00
zhangyanjiao 2d7124e319 fix the watchdog bug during WiFi scan and BLE scan 2019-07-16 10:31:19 +08:00
chenjianqiang 9821e533db bugfix(flash): fix flash read error in DIO/26MHz mode 2019-07-15 14:26:53 +08:00
Angus Gratton 7a79cc4a5e Merge branch 'bugfix/error_on_unknown_component_v3.2' into 'release/v3.2' 
cmake: error out when component is not found (backport v3.2)

See merge request espressif/esp-idf!5488
 2019-07-12 15:01:40 +08:00
Angus Gratton 6d8990f39b Merge branch 'bugfix/cmake_project_vars_not_set_by_redefinition_v3.3' into 'release/v3.3' 
cmake: set variables set by project call (backport v3.3)

See merge request espressif/esp-idf!5487
 2019-07-12 15:01:32 +08:00
Angus Gratton 83a9a4dc70 Merge branch 'bugfix/windows_detection_on_make_v3.3' into 'release/v3.3' 
Windows detection on Makefiles cleanup (backport v3.3)

See merge request espressif/esp-idf!5490
 2019-07-12 15:00:30 +08:00
Mahavir Jain 376377ceca Merge branch 'bugfix/i2s_apll_clock_fix_v3.2' into 'release/v3.2' 
driver/i2s: fix apll_clock_rate for different sample rates (v3.2)

See merge request espressif/esp-idf!5449
 2019-07-12 11:36:01 +08:00
chenjianqiang 490a7e682d bugfix(flash): fix flash read error in DIO/26MHz mode 2019-07-11 21:10:20 +08:00
Angus Gratton 1b9d62ad95 Merge branch 'bugfix/fix_uart_wait_done_bug_v3.2' into 'release/v3.2' 
bugfix(UART): fixed two UART issues for release/v3.2

See merge request espressif/esp-idf!5480
 2019-07-11 14:56:32 +08:00
Angus Gratton 630ffde6bb Merge branch 'bugfix/fix_uart_wait_done_bug_v3.3' into 'release/v3.3' 
bugfix(UART): fixed two UART issues for release/v3.3

See merge request espressif/esp-idf!5481
 2019-07-11 14:56:14 +08:00
Mahavir Jain 6af30250a8 spi_flash: add test case for stale read issue on memory mapped partition 2019-07-11 04:23:51 +00:00
Mahavir Jain 30d2f13358 spi_flash: fix stale read issue for memory mapped partition 
On flash program operation (either erase or write), if corresponding address has
cache mapping present then cache is explicitly flushed (for both pro and app cpu)

Closes https://github.com/espressif/esp-idf/issues/2146
 2019-07-11 04:23:51 +00:00
Jiang Jiang Jian 21601f00f4 Merge branch 'bugfix/fix_no_disconnect_event_when_rx_disassoc_after_send_auth_v3.2' into 'release/v3.2' 
wifi: fix the bug no disconnect event when STA recv disassoc after sending auth (backport v3.2)

See merge request espressif/esp-idf!5099
 2019-07-10 15:40:23 +08:00
Angus Gratton dca5ed2263 Merge branch 'bugfix/supplicant_security_fixes_v3.3' into 'release/v3.3' 
wpa_supplicant: Fix sprintf security bugs. (v3.3)

See merge request espressif/esp-idf!5464
 2019-07-10 12:31:37 +08:00
Renz Christian Bagaporo 0ef3af367d ldgen,make: simplify os check 2019-07-10 12:04:56 +08:00
V.Dudnik 9afe47425b project_config_mk: fix if condition 2019-07-10 12:04:20 +08:00
Renz Christian Bagaporo 81139df91e cmake: error out when component is not found 
Closes https://github.com/espressif/esp-idf/issues/3637
 2019-07-10 11:56:47 +08:00
Renz Christian Bagaporo f5d33fa889 cmake: set variables set by project call 
ESP-IDF overrides project() definition for user convenience. This
redefinition lacks setting the variables documented at
the project command documentation
https://cmake.org/cmake/help/v3.5/command/project.html in the parent
scope.

This commit sets those variables.

Closes https://github.com/espressif/esp-idf/issues/3611.
 2019-07-10 11:51:17 +08:00
Jiang Jiang Jian e5c15c068e Merge branch 'bugfix/btdm_can_not_get_informations_of_song_v3.2' into 'release/v3.2' 
components/bt: Fix iphone can't get song's informations

See merge request espressif/esp-idf!5473
 2019-07-09 15:17:22 +08:00
Jiang Jiang Jian 29cef5a9cc Merge branch 'bugfix/btdm_can_not_get_informations_of_song_v3.3' into 'release/v3.3' 
components/bt: Fix iphone can't get song's informations

See merge request espressif/esp-idf!5472
 2019-07-09 15:13:24 +08:00
kooho 40171d7307 bugfix(UART): fixed two UART issues: 
1. uart_wait_tx_done works incorrect when sending a byte of data.
2. uart_set_rx_timeout sets an incorrect rx timeout value when ref_tick is enabled
 2019-07-09 14:56:26 +08:00
kooho 7e2465995f bugfix(UART): fixed two UART issues: 
1. uart_wait_tx_done works incorrect when sending a byte of data.
2. uart_set_rx_timeout sets an incorrect rx timeout value when ref_tick is enabled.
 2019-07-09 14:47:04 +08:00
baohongde aaa0853572 components/bt: Fix iphone can't get song's informations 2019-07-08 19:46:10 +08:00
baohongde e64bae3a0c components/bt: Fix iphone can't get song's informations 2019-07-08 19:40:22 +08:00
Angus Gratton a71fad46d4 Merge branch 'fix/update_curr_page_state_3.3' into 'release/v3.3' 
nvs_util: Set previous page state to FULL before creating new page (v3.3)

See merge request espressif/esp-idf!5327
 2019-07-08 15:19:56 +08:00
Angus Gratton 878d70d9e6 Merge branch 'fix/update_curr_page_state_3.2' into 'release/v3.2' 
nvs_util: Set previous page state to FULL before creating new page (v3.2)

See merge request espressif/esp-idf!5326
 2019-07-08 14:05:40 +08:00
Angus Gratton 2c9acce0ff Merge branch 'bugfix/prov_examples_strlcpy_backport_v3.3' into 'release/v3.3' 
Various bugfixes in Protocomm / Unified Provisioning (backport v3.3)

See merge request espressif/esp-idf!5369
 2019-07-08 14:04:49 +08:00
Sagar Bijwe 8e58b31a69 wpa_supplicant: Fix sprintf security bugs. 
Revert back to using os_snprintf instead of sprintf.

Closes WIFI-624
 2019-07-08 10:39:20 +05:30
Angus Gratton a8916daeb2 Merge branch 'fix/nvs_util_keylen_3.2' into 'release/v3.2' 
nvs_util: Add check for keylen in input csv (v3.2)

See merge request espressif/esp-idf!5396
 2019-07-08 12:59:55 +08:00
Angus Gratton bf152907a4 Merge branch 'fix/nvs_util_keylen_3.3' into 'release/v3.3' 
nvs_util: Add check for keylen in input csv (v3.3)

See merge request espressif/esp-idf!5395
 2019-07-08 12:59:05 +08:00
Jiang Jiang Jian 47ca5d53df Merge branch 'feature/config_spi_pins_based_on_efuse_value_v3.3' into 'release/v3.3' 
feat(psram): config SPI psram pins based on efuse value (backport v3.3)

See merge request espressif/esp-idf!5240
 2019-07-08 11:52:24 +08:00
zhangyanjiao b7a2516242 wifi bugfix: 
1. fix the bug no disconnect event when STA recv disassoc after sending auth
2. fix the bug full scan send multi events when recv deauth/disassoc
 2019-07-08 11:42:36 +08:00
Anurag Kar c1fe8ceb83 esp_prov : Minor refactoring in argument dependent logic 
Other changes:
* Command line argument name and descriptions updated and formatted
* Some exception messages updated for clarity
* READMEs updated for tool and all provisioning examples
* Minor update in example test scripts due to change in esp_prov.get_transport() API
* Transport_Softap renamed to Transport_HTTP
* Transport_HTTP now forces connect on initialization
 2019-07-07 12:45:06 +05:30
Jiang Jiang Jian 4a9f339447 Merge branch 'mesh/bugfix_0628' into 'release/v3.2' 
mesh: bugfix (backport3.2)

See merge request espressif/esp-idf!5402
 2019-07-05 22:43:16 +08:00
Jiang Jiang Jian db38c37cf7 Merge branch 'mesh/bugfix_0628_v3.3' into 'release/v3.3' 
mesh: bugfix (backport 3.3)

See merge request espressif/esp-idf!5438
 2019-07-05 22:33:24 +08:00
Anurag Kar 71ce87c79e protocomm_ble : Bugfix for unbound memcpy on prepare write buffer 
Closes https://github.com/espressif/esp-idf/issues/3633
 2019-07-05 13:20:40 +00:00
Anurag Kar 611c300a92 Protocomm : Minor fixes 
List of changes:
* protocomm_httpd : Reset session_id static variable on start and stop
* security1 : Typo in checking failed dynamic allocation
 2019-07-05 13:20:40 +00:00
Anurag Kar b7eb82d191 Provisioning Examples : Bugfix in copying Wi-Fi SSID and Passphrase 2019-07-05 13:20:40 +00:00
Anurag Kar 933674301f Wi-Fi Provisioning : Bugfix in copying SSID and Passphrase 
These changes guarantee that the SSID and Passphrase received via protocomm are NULL terminated and size limited to their standard lengths.

List of changes:
* Corrected length of passphrase field in wifi_prov_config_set_data_t structure
* Performing length checks on SSID, passphrase and bssid, when populating wifi_prov_config_set_data_t structure with received credentials
 2019-07-05 13:20:40 +00:00
Mahavir Jain c1af728239 Merge branch 'bugfix/prov_examples_strlcpy_backport_v3.2' into 'release/v3.2' 
Various bugfixes in Protocomm / Unified Provisioning (backport v3.2)

See merge request espressif/esp-idf!5372
 2019-07-05 20:56:35 +08:00
Jiang Jiang Jian 35789eef16 Merge branch 'bugfix/improve_flash_dio_read_timing_v3.2' into 'release/v3.2' 
bugfix(flash): fix flash dio read mode configuration error on SPI0 (backport v3.2)

See merge request espressif/esp-idf!5288
 2019-07-05 20:42:06 +08:00
Jiang Jiang Jian 3b2e231ae3 Merge branch 'bugfix/btdm_fix_rxwinsz_assert_in_wifi_ble_coex_v3.3' into 'release/v3.3' 
component/bt: fix rxwinsz assert in ble and wifi coex(backport v3.3)

See merge request espressif/esp-idf!5447
 2019-07-05 20:28:17 +08:00