From 105f9f466e9f1823d6869030603075d92e6b84b6 Mon Sep 17 00:00:00 2001 From: Chris Morgan Date: Tue, 22 Aug 2017 14:52:44 -0400 Subject: [PATCH 01/12] openssl_server: Rename openssl_client_init() to openssl_server_init() to match usage Merges https://github.com/espressif/esp-idf/pull/928 --- .../openssl_server/main/openssl_server_example_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/protocols/openssl_server/main/openssl_server_example_main.c b/examples/protocols/openssl_server/main/openssl_server_example_main.c index bc0f7c355..00d5c5ba7 100755 --- a/examples/protocols/openssl_server/main/openssl_server_example_main.c +++ b/examples/protocols/openssl_server/main/openssl_server_example_main.c @@ -194,7 +194,7 @@ failed1: return ; } -static void openssl_client_init(void) +static void openssl_server_init(void) { int ret; xTaskHandle openssl_handle; @@ -219,7 +219,7 @@ static esp_err_t wifi_event_handler(void *ctx, system_event_t *event) break; case SYSTEM_EVENT_STA_GOT_IP: xEventGroupSetBits(wifi_event_group, CONNECTED_BIT); - openssl_client_init(); + openssl_server_init(); break; case SYSTEM_EVENT_STA_DISCONNECTED: /* This is a workaround as ESP32 WiFi libs don't currently From 8c1acb036378a1adc0c808e45d7bb08105532da3 Mon Sep 17 00:00:00 2001 From: Deomid Ryabkov Date: Tue, 15 Aug 2017 14:36:06 +0100 Subject: [PATCH 02/12] Provide a default for CONFIG_BT_RESERVE_DRAM ...when BT is not built Merges https://github.com/espressif/esp-idf/pull/910 --- components/esp32/ld/esp32.ld | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/components/esp32/ld/esp32.ld b/components/esp32/ld/esp32.ld index b27a49eeb..2df1b3e89 100644 --- a/components/esp32/ld/esp32.ld +++ b/components/esp32/ld/esp32.ld @@ -16,6 +16,11 @@ */ #include "sdkconfig.h" +/* If BT is not built at all */ +#ifndef CONFIG_BT_RESERVE_DRAM +#define CONFIG_BT_RESERVE_DRAM 0 +#endif + MEMORY { /* All these values assume the flash cache is on, and have the blocks this uses subtracted from the length From 1e3dd2a4fad3146f6335c3c82408e843038d014e Mon Sep 17 00:00:00 2001 From: Stephen Casner Date: Fri, 11 Aug 2017 14:06:06 -0700 Subject: [PATCH 03/12] Add missing debug log message for out-of-sockets case Merges https://github.com/espressif/esp-idf/pull/903 --- components/lwip/api/sockets.c | 1 + 1 file changed, 1 insertion(+) diff --git a/components/lwip/api/sockets.c b/components/lwip/api/sockets.c index 7335246eb..33d4a97e7 100755 --- a/components/lwip/api/sockets.c +++ b/components/lwip/api/sockets.c @@ -1501,6 +1501,7 @@ lwip_socket(int domain, int type, int protocol) i = alloc_socket(conn, 0); if (i == -1) { + LWIP_DEBUGF(SOCKETS_DEBUG, ("-1 / ENFILE (could not allocate socket)\n")); netconn_delete(conn); set_errno(ENFILE); return -1; From 762d5fcb4cb0dd7c0ae51b31c18b82b12f8e7a27 Mon Sep 17 00:00:00 2001 From: phuzi Date: Thu, 27 Jul 2017 09:54:10 +0100 Subject: [PATCH 04/12] Update documentation for esp_avrc_api Updated documentation for esp_err_t esp_avrc_ct_send_passthrough_cmd to show both pressed and released key states Merges https://github.com/espressif/esp-idf/pull/846 --- components/bt/bluedroid/api/include/esp_avrc_api.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/bluedroid/api/include/esp_avrc_api.h b/components/bt/bluedroid/api/include/esp_avrc_api.h index 719a19f19..e30742098 100644 --- a/components/bt/bluedroid/api/include/esp_avrc_api.h +++ b/components/bt/bluedroid/api/include/esp_avrc_api.h @@ -136,7 +136,7 @@ esp_err_t esp_avrc_ct_deinit(void); * @param[in] tl : transaction label, 0 to 15, consecutive commands should use different values. * @param[in] key_code : passthrough command code, e.g. ESP_AVRC_PT_CMD_PLAY, ESP_AVRC_PT_CMD_STOP, etc. * @param[in] key_state : passthrough command key state, ESP_AVRC_PT_CMD_STATE_PRESSED or - * ESP_AVRC_PT_CMD_STATE_PRESSED + * ESP_AVRC_PT_CMD_STATE_RELEASED * * @return * - ESP_OK: success From 76cb1bac2b6af7d1445cb4869cd7dc66b1644c70 Mon Sep 17 00:00:00 2001 From: Patrick Hobusch Date: Thu, 15 Jun 2017 15:21:31 +0200 Subject: [PATCH 05/12] Fix distinction between shared and non-shared interrupts in docs Merges https://github.com/espressif/esp-idf/pull/701 --- docs/api-reference/system/intr_alloc.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api-reference/system/intr_alloc.rst b/docs/api-reference/system/intr_alloc.rst index 7411c4936..7fc20dfc8 100644 --- a/docs/api-reference/system/intr_alloc.rst +++ b/docs/api-reference/system/intr_alloc.rst @@ -15,7 +15,7 @@ install the given interrupt handler and ISR to it. This code has two different types of interrupts it handles differently: Shared interrupts and non-shared interrupts. The simplest of the two are non-shared interrupts: a separate interrupt is allocated per esp_intr_alloc call and this interrupt is solely used for -the peripheral attached to it, with only one ISR that will get called. Non-shared interrupts can have multiple peripherals triggering +the peripheral attached to it, with only one ISR that will get called. Shared interrupts can have multiple peripherals triggering it, with multiple ISRs being called when one of the peripherals attached signals an interrupt. Thus, ISRs that are intended for shared interrupts should check the interrupt status of the peripheral they service in order to see if any action is required. From c61b3e89f193194854ebcd0114dc4eafedb71e67 Mon Sep 17 00:00:00 2001 From: Lacy Rhoades Date: Sun, 23 Jul 2017 20:33:20 -0400 Subject: [PATCH 06/12] Typo fixes Merges https://github.com/espressif/esp-idf/pull/831 --- components/esp32/include/esp_intr_alloc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp32/include/esp_intr_alloc.h b/components/esp32/include/esp_intr_alloc.h index 63555c208..d0ca1df90 100644 --- a/components/esp32/include/esp_intr_alloc.h +++ b/components/esp32/include/esp_intr_alloc.h @@ -104,7 +104,7 @@ typedef intr_handle_data_t* intr_handle_t ; esp_err_t esp_intr_mark_shared(int intno, int cpu, bool is_in_iram); /** - * @brief Reserve an interrupt to be used outside of this framewoek + * @brief Reserve an interrupt to be used outside of this framework * * This will mark a certain interrupt on the specified CPU as * reserved, not to be allocated for any reason. From eb8bd937c6c93a9e7b3a42c0ac46706e42ea98ae Mon Sep 17 00:00:00 2001 From: Geza Husi Date: Fri, 18 Aug 2017 09:27:54 +0200 Subject: [PATCH 07/12] deep_sleep: RTC-GPIO pin calculation incorrect Merges https://github.com/espressif/esp-idf/pull/822 --- components/esp32/deep_sleep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp32/deep_sleep.c b/components/esp32/deep_sleep.c index f2ae8e139..f9b5f307e 100644 --- a/components/esp32/deep_sleep.c +++ b/components/esp32/deep_sleep.c @@ -327,7 +327,7 @@ uint64_t esp_deep_sleep_get_ext1_wakeup_status() if ((status & BIT(rtc_pin)) == 0) { continue; } - gpio_mask |= BIT(gpio); + gpio_mask |= 1ULL << gpio; } return gpio_mask; } From f77020ee5f3952e6cbd4061a6c3e739ebd1713fa Mon Sep 17 00:00:00 2001 From: lf Date: Thu, 13 Jul 2017 00:05:07 -0500 Subject: [PATCH 08/12] Add quotes to PATH declarations This is necessary in case someone has a space in their PATH variable (which is within the realm of possibility) Merges https://github.com/espressif/esp-idf/pull/800 --- docs/get-started/linux-setup.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/get-started/linux-setup.rst b/docs/get-started/linux-setup.rst index c8ae0060a..2caf323dd 100644 --- a/docs/get-started/linux-setup.rst +++ b/docs/get-started/linux-setup.rst @@ -46,11 +46,11 @@ ESP32 toolchain for Linux is available for download from Espressif website: To use it, you will need to update your ``PATH`` environment variable in ``~/.profile`` file. To make ``xtensa-esp32-elf`` available for all terminal sessions, add the following line to your ``~/.profile`` file:: - export PATH=$PATH:$HOME/esp/xtensa-esp32-elf/bin + export PATH="$PATH:$HOME/esp/xtensa-esp32-elf/bin" Alternatively, you may create an alias for the above command. This way you can get the toolchain only when you need it. To do this, add different line to your ``~/.profile`` file:: - alias get_esp32="export PATH=$PATH:$HOME/esp/xtensa-esp32-elf/bin" + alias get_esp32='export PATH="$PATH:$HOME/esp/xtensa-esp32-elf/bin"' Then when you need the toolchain you can type ``get_esp32`` on the command line and the toolchain will be added to your ``PATH``. From 3e6c515d5b5c05569f7cfc77cd8d042ecbf43a56 Mon Sep 17 00:00:00 2001 From: Deomid Ryabkov Date: Mon, 19 Jun 2017 23:34:36 +0100 Subject: [PATCH 09/12] Using a 128-bit UUID is not an error Merges https://github.com/espressif/esp-idf/pull/713 --- components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c b/components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c index 43ab55e65..f8c39446a 100644 --- a/components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c +++ b/components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c @@ -298,7 +298,7 @@ static void btc_to_bta_adv_data(esp_ble_adv_data_t *p_adv_data, tBTA_BLE_ADV_DAT bta_adv_data->p_services_128b = osi_malloc(sizeof(tBTA_BLE_128SERVICE)); if (NULL != bta_adv_data->p_services_128b) { - LOG_ERROR("%s - In 128-UUID_data", __FUNCTION__); + LOG_DEBUG("%s - In 128-UUID_data", __FUNCTION__); mask |= BTM_BLE_AD_BIT_SERVICE_128; memcpy(bta_adv_data->p_services_128b->uuid128, bt_uuid.uu.uuid128, LEN_UUID_128); From c8d8fb58e7cf5240bbaa29503ce6a574c61c181e Mon Sep 17 00:00:00 2001 From: Simon Werner Date: Wed, 7 Jun 2017 16:56:05 +1200 Subject: [PATCH 10/12] Fixed incorrect value in comments for GPIO_NUM_33. Merges https://github.com/espressif/esp-idf/pull/676 --- components/driver/include/driver/gpio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/driver/include/driver/gpio.h b/components/driver/include/driver/gpio.h index c68caee79..1b184f604 100644 --- a/components/driver/include/driver/gpio.h +++ b/components/driver/include/driver/gpio.h @@ -162,7 +162,7 @@ typedef enum { GPIO_NUM_27 = 27, /*!< GPIO27, input and output */ GPIO_NUM_32 = 32, /*!< GPIO32, input and output */ - GPIO_NUM_33 = 33, /*!< GPIO32, input and output */ + GPIO_NUM_33 = 33, /*!< GPIO33, input and output */ GPIO_NUM_34 = 34, /*!< GPIO34, input mode only */ GPIO_NUM_35 = 35, /*!< GPIO35, input mode only */ GPIO_NUM_36 = 36, /*!< GPIO36, input mode only */ From 4f812eb29ce412390476aeaa821011c5bfb1d2c5 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Wed, 30 Aug 2017 15:16:11 +1000 Subject: [PATCH 11/12] Remove redundant code line from uart.c Merges part of https://github.com/espressif/esp-idf/pull/650 --- components/driver/uart.c | 1 - 1 file changed, 1 deletion(-) diff --git a/components/driver/uart.c b/components/driver/uart.c index 976efda3d..3f0daaaaa 100644 --- a/components/driver/uart.c +++ b/components/driver/uart.c @@ -616,7 +616,6 @@ static void uart_rx_intr_handler_default(void *param) uart_reg->int_clr.rxfifo_tout = 1; uart_reg->int_clr.rxfifo_full = 1; UART_EXIT_CRITICAL_ISR(&uart_spinlock[uart_num]); - uart_event.type = UART_DATA; uart_event.size = rx_fifo_len; //If we fail to push data to ring buffer, we will have to stash the data, and send next time. //Mainly for applications that uses flow control or small ring buffer. From e183897924931fdaf8eeaa75a5bea72e160a3aed Mon Sep 17 00:00:00 2001 From: Josh Lospinoso Date: Thu, 18 May 2017 14:33:37 -0500 Subject: [PATCH 12/12] README: Converting URLs from HTTP to HTTPS Merges https://github.com/espressif/esp-idf/pull/622 --- README.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 8463a131c..8a3ed824c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Espressif IoT Development Framework -[![alt text](https://readthedocs.org/projects/docs/badge/?version=latest "Documentation Status")](http://esp-idf.readthedocs.io/en/latest/?badge=latest) +[![alt text](https://readthedocs.org/projects/docs/badge/?version=latest "Documentation Status")](https://esp-idf.readthedocs.io/en/latest/?badge=latest) ESP-IDF is the official development framework for the [ESP32](https://espressif.com/en/products/hardware/esp32/overview) chip. @@ -10,9 +10,9 @@ ESP-IDF is the official development framework for the [ESP32](https://espressif. See setup guides for detailed instructions to set up the ESP-IDF: -* [Windows Setup Guide](http://esp-idf.readthedocs.io/en/latest/get-started/windows-setup.html) -* [Mac OS Setup Guide](http://esp-idf.readthedocs.io/en/latest/get-started/macos-setup.html) -* [Linux Setup Guide](http://esp-idf.readthedocs.io/en/latest/get-started/linux-setup.html) +* [Windows Setup Guide](https://esp-idf.readthedocs.io/en/latest/get-started/windows-setup.html) +* [Mac OS Setup Guide](https://esp-idf.readthedocs.io/en/latest/get-started/macos-setup.html) +* [Linux Setup Guide](https://esp-idf.readthedocs.io/en/latest/get-started/linux-setup.html) ## Finding a Project @@ -52,7 +52,7 @@ You don't need to run `make all` before running `make flash`, `make flash` will ## Viewing Serial Output -The `make monitor` target uses the [idf_monitor tool](http://esp-idf.readthedocs.io/en/latest/get-started/idf-monitor.html) to display serial output from the ESP32. idf_monitor also has a range of features to decode crash output and interact with the device. [Check the documentation page for details](http://esp-idf.readthedocs.io/en/latest/get-started/idf-monitor.html). +The `make monitor` target uses the [idf_monitor tool](https://esp-idf.readthedocs.io/en/latest/get-started/idf-monitor.html) to display serial output from the ESP32. idf_monitor also has a range of features to decode crash output and interact with the device. [Check the documentation page for details](https://esp-idf.readthedocs.io/en/latest/get-started/idf-monitor.html). Exit the monitor by typing Ctrl-]. @@ -106,11 +106,12 @@ This can be combined with other targets, ie `make erase_flash flash` will erase # Resources -* Documentation for the latest version: http://esp-idf.readthedocs.io/. This documentation is built from the [docs directory](docs) of this repository. +* Documentation for the latest version: https://esp-idf.readthedocs.io/. This documentation is built from the [docs directory](docs) of this repository. -* The [esp32.com forum](http://esp32.com/) is a place to ask questions and find community resources. +* The [esp32.com forum](https://esp32.com/) is a place to ask questions and find community resources. * [Check the Issues section on github](https://github.com/espressif/esp-idf/issues) if you find a bug or have a feature request. Please check existing Issues before opening a new one. -* If you're interested in contributing to ESP-IDF, please check the [Contributions Guide](http://esp-idf.readthedocs.io/en/latest/contribute/index.html). +* If you're interested in contributing to ESP-IDF, please check the [Contributions Guide](https://esp-idf.readthedocs.io/en/latest/contribute/index.html). +