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

792 commits

Author SHA1 Message Date
Craig Leres f2c06622b7 Minor python3 fixes; pick up print_function from futures and 
convert some print statements to use print()
 2019-07-21 13:50:00 -07:00
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
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
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
Anurag Kar e5fe1c0e68 protocomm_ble : Example updated to use custom 128bit service UUID 
Also removed old hardcoded UUIDs from README of esp_prov
 2019-06-28 10:14:52 +00:00
Anurag Kar 09cf34c9aa esp_prov : Runtime discovery of Service UUID and endpoint name mapping 
List of changes:
* Retrieve UUID property from Bluez device object before connecting to retrieve UUID contained in advertisement
* Read Characteristic User Descriptions attribute of each UUID for mapping endpoint names
* To support older implementations with hardcoded Name-UUID map, revert to fallback mode in order if advertisement data has no UUID field
 2019-06-28 10:14:52 +00:00
Anurag Kar f94db7bba7 wifi_provisioning : Added Wi-Fi Scan list feature to Provisioning Manager 
List of changes in components/wifi_provisioning:
* Manager version is now v1.1
* .proto files and protocomm handler added for sending Wi-Fi scan command and receiving scan results
* Implemented handlers for wifi_scan protocomm endpoint
* Update manager context data structure to hold scan state and results
* scheme_softap now runs Wi-Fi in APSTA mode
* Wi-Fi is started in AP mode when provisioning is started. This is necessary for scan list to work
* Docs updates with information about new wifi_scan endpoint

List of changes in tools/esp_prov:
* Added functions for sending and receiving protobuf messages compatible with wifi_scan protocomm endpoint
* Added feature to display/refresh scan results and accept user selection at runtime
* New functions:
  * get_version() : only returns the protocol version string
  * has_capability() : check is a capability is present according to proto-ver response
* wifi_scan feature is provided only if the `wifi_scan` capability is present

Other changes:
* Replace recursive mutex with plain mutex
* assert on return value of mutex give / take calls
* replace all calls with macros ACQUIRE_LOCK and RELEASE_LOCK
* some checks added in scanning related private APIs
* free and nullify scanning context and state if service is stopped while ongoing scan
 2019-06-28 07:49:03 +00:00
Anurag Kar f7f02c9a43 esp_prov : Support new JSON format of version string while maintaining backward compatibility 
Other changes:
* Version check only happens if command line argument is specified
* Minor bugfix in processing apply_config response
 2019-06-28 07:49:03 +00:00
Angus Gratton f5ab51c9b7 Merge branch 'bugfix/error_on_unknown_component' into 'release/v3.3' 
cmake: error out when component is not found (v3.3)

See merge request idf/esp-idf!5299
 2019-06-28 15:39:21 +08:00
Renz Christian Bagaporo e9786e3038 cmake: make COMPONENT_TARGET available in components 2019-06-25 13:05:46 +08:00
Sachin Parekh ae1389afd9 unit-test-app: freertos_compliance config added 
Signed-off-by: Sachin Parekh <sachin.parekh@espressif.com>
 2019-06-25 04:33:32 +00:00
Sachin Parekh 92f1d7ae39 ref_clock: port*_CRITICAL vanilla FreeRTOS compliance 
Signed-off-by: Sachin Parekh <sachin.parekh@espressif.com>
 2019-06-25 04:33:32 +00:00
Renz Christian Bagaporo 0af6d8ffe3 cmake: error out when component is not found 
Closes https://github.com/espressif/esp-idf/issues/3637
 2019-06-20 12:10:41 +08:00
Angus Gratton b816edac3c Merge branch 'bugfix/idf_py_windows_relpath_v3.3' into 'release/v3.3' 
idf.py: Fix Windows issue if project and IDF are on different drives (v3.3)

See merge request idf/esp-idf!4731
 2019-06-13 13:53:07 +08:00
Angus Gratton 09515bdfde Merge branch 'fix/mfg_util_3.3' into 'release/v3.3' 
mfg_util: Fix unnecessary csv files creation for values with REPEAT tags (backport 3.3)

See merge request idf/esp-idf!5045
 2019-06-11 10:25:38 +08:00
Angus Gratton 081b623a34 Merge branch 'bugfix/fix_build_cmake_example_failing_v3.3' into 'release/v3.3' 
Fix false positive errors with CMake example builds (backport v3.3)

See merge request idf/esp-idf!4984
 2019-06-11 09:05:42 +08:00
Angus Gratton 871e95087e Merge branch 'bugfix/restore_ccache_use' into 'release/v3.3' 
CMake : Restore ccache use (backport v3.3)

See merge request idf/esp-idf!4985
 2019-06-11 09:03:54 +08:00
Angus Gratton a3b3f9ae2d Merge branch 'bugfix/win_fullclean_symlink_v3.3' into 'release/v3.3' 
idf.py: Detect symlinks on Windows during fullclean (v3.3)

See merge request idf/esp-idf!4924
 2019-06-11 08:26:36 +08:00
Angus Gratton 8b54542a88 Merge branch 'bugfix/custom_bootloader_subproject_build_v3.2' into 'release/v3.2' 
CMake: Fix custom bootloader does not override original (v3.2)

See merge request idf/esp-idf!5082
 2019-06-11 08:26:08 +08:00
Angus Gratton fb6f343ce5 Merge branch 'protocomm_ble_128bit_uuid_v3.3' into 'release/v3.3' 
protocomm_ble : Fix support for custom service UUIDs (backport v3.3)

See merge request idf/esp-idf!5017
 2019-06-07 07:47:19 +08:00
Angus Gratton e1069de9aa Merge branch 'feature/confserver_v2_v3.3' into 'release/v3.3' 
confserver: Add v2 confserver protocol with separate visibility info  (backport v3.3)

See merge request idf/esp-idf!4513
 2019-06-07 06:31:41 +08:00
Angus Gratton 8f8113f5cd idf.py: Fix Windows issue if project and IDF are on different drives 
Closes https://github.com/espressif/esp-idf/issues/2753
 2019-06-06 07:45:47 +00:00
Renz Christian Bagaporo 261c5bf6a8 ci: check that build uses ccache when present 2019-06-04 23:28:02 +08:00
Renz Christian Bagaporo 6132d7bce3 cmake: restore ccache use when present 
Closes https://github.com/espressif/esp-idf/issues/3116
 2019-06-04 23:27:18 +08:00
Renz Christian Bagaporo 9e7d9ef385 ci: check that custom bootloader overrides original 2019-06-04 23:04:47 +08:00
Anurag Kar 13a3edee8a protocomm_ble : Example updated to use custom 128bit service UUID 
Also removed old hardcoded UUIDs from README of esp_prov
 2019-06-03 08:26:48 +00:00
Anurag Kar 56866567ae esp_prov : Runtime discovery of Service UUID and endpoint name mapping 
List of changes:
* Retrieve UUID property from Bluez device object before connecting to retrieve UUID contained in advertisement
* Read Characteristic User Descriptions attribute of each UUID for mapping endpoint names
* To support older implementations with hardcoded Name-UUID map, revert to fallback mode in order if advertisement data has no UUID field
 2019-06-03 08:26:48 +00:00
Shivani Tipnis cd9249970f mfg_util: Fix unnecessary csv files creation for values with REPEAT tags 
(cherry picked from commit 8b96668c9123fbbf8c78b347479215f471b102ed)
 2019-05-31 13:55:03 +05:30
Shivani Tipnis 492c682dbe mfg_util: Fix unnecessary csv files creation for values with REPEAT tags 
(cherry picked from commit 8b96668c9123fbbf8c78b347479215f471b102ed)
 2019-05-31 13:53:01 +05:30
Renz Christian Bagaporo e821c22a8c ci: check that custom bootloader overrides original 2019-05-27 17:04:23 +08:00
Angus Gratton 8c57aa0242 Merge branch 'feature/allow_multiple_fragment_definitions_for_library' into 'release/v3.3' 
Combine definitions of multiple mapping fragments referring to the same library

See merge request idf/esp-idf!4243
 2019-05-20 13:58:25 +08:00
Renz Christian Bagaporo fc3aa765cf ci: fix cmake example build fail 2019-05-13 11:58:41 +08:00
Roland Dobai 26e7f3fde6 idf.py: Detect symlinks on Windows during fullclean 
Closes https://github.com/espressif/esp-idf/issues/3377
 2019-05-06 09:41:39 +02:00
Anton Maklakov 36fff1d751 ci: Fix the parsing of submodule paths 2019-04-28 03:46:29 +00:00
Jiang Jiang Jian 9d6cace1fd Merge branch 'test/detect_exception_in_idf_dut_v3.2' into 'release/v3.2' 
tiny-test-fw: support detect exception in IDFDUT (backport v3.2)

See merge request idf/esp-idf!4543
 2019-04-28 10:26:48 +08:00
Jiang Jiang Jian a5b007f6bb Merge branch 'bugfix/msys_cancel_idfpy_v3.2' into 'release/v3.2' 
tools: re-run idf.py in MSYS with winpty (backport v3.2)

See merge request idf/esp-idf!4456
 2019-04-28 10:26:10 +08:00
Jiang Jiang Jian 0beb60e8fc Merge branch 'test/fix_unit_test_job_pass_even_no_test_executed_v3.2' into 'release/v3.2' 
test: fix CI UT job pass even ut app bootup fail (backport v3.2)

See merge request idf/esp-idf!4388
 2019-04-28 10:25:53 +08:00
Renz Christian Bagaporo 1b3c6fb1a1 ldgen: rename common module 2019-04-14 12:48:27 +08:00
Jiang Jiang Jian f7177095cf Merge branch 'bugfix/name_conflict_esp32_project_ld_v3.3' into 'release/v3.3' 
esp32: Rename esp32.common.ld to esp32.project.ld to avoid build errors when downgrading (v3.3)

See merge request idf/esp-idf!4732
 2019-04-14 10:29:39 +08:00
Jiang Jiang Jian c4f39094d3 Merge branch 'bugfix/cmake_component_path_v3.2' into 'release/v3.2' 
cmake: Set COMPONENT_PATH during early expansion of dependencies (v3.2)

See merge request idf/esp-idf!4594
 2019-04-14 02:57:16 +08:00
Angus Gratton b354c11db7 esp32: Rename esp32.common.ld to esp32.project.ld to avoid build errors when downgrading 
Linker script generator produces build/esp32/esp32.common.ld from
components/esp32/ld/esp32.common.ld.in

This works fine until IDF is downgraded to V3.1 which uses components/esp32/ld/esp32.common.ld and
doesn't track build/esp32/esp32.common.ld at all.

At this point, the linker runs in the build/esp32 directory and "-T esp32.common.ld" picks up the
linker script generated .ld file, which causes mis-builds.

As reported on forums: https://esp32.com/viewtopic.php?f=13&t=9684&p=40105
 2019-04-09 10:20:33 +10:00
Renz Christian Bagaporo 2f72645320 ldgen: allow combining mapping fragment definitions 2019-04-05 13:12:32 +08:00
Shivani Tipnis 006442cd9d mfg_util: Add changes to mfg_util as per changes in nvs_util 
revert changeson this file

Update README for mfg util

Update to correct coding style of script

(cherry picked from commit a88b40483d)
 2019-04-04 18:28:10 +05:30
Shivani Tipnis 4be28a798f mfg_util: Add support for comments in input config csv file only 2019-04-04 18:25:03 +05:30
Shivani Tipnis 3368783bf0 mfg_util: Add changes to mfg_util as per changes in nvs_util 
revert changeson this file

Update README for mfg util

Update to correct coding style of script

(cherry picked from commit a88b4048)
 2019-04-04 13:46:39 +05:30
Angus Gratton 1cb29ac446 Merge branch 'feature/nvs_part_util_3.3' into 'release/v3.3' 
Add support as per encryption and multipage blob changes in NVS Partition Utility (backport v3.3)

See merge request idf/esp-idf!4626
 2019-04-02 13:31:57 +08:00
Angus Gratton 7b368fc211 Merge branch 'bugfix/esp_prov_ble_rw_except_backport_v3d3' into 'release/v3.3' 
esp_prov : Catch DBus exception when reading/writing to BLE GATT characteristic (backport v3.3)

See merge request idf/esp-idf!4659
 2019-04-02 12:20:15 +08:00
Angus Gratton b87e440c69 Merge branch 'update/nvs_part_util_v3.2' into 'release/v3.2' 
Update/nvs partition utility v3.2 (backport v3.2)

See merge request idf/esp-idf!4280
 2019-04-02 11:58:56 +08:00