From 178c9d15deeed69b97b8f9cc78e75a56a6985f23 Mon Sep 17 00:00:00 2001 From: fivdi Date: Sun, 27 Jan 2019 18:01:18 +0100 Subject: [PATCH 1/8] Fix comments in ULP MOVE instruction examples Merges https://github.com/espressif/esp-idf/pull/2992 --- docs/en/api-guides/ulp_instruction_set.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/api-guides/ulp_instruction_set.rst b/docs/en/api-guides/ulp_instruction_set.rst index 71d35d83a0..2a6e6d7077 100644 --- a/docs/en/api-guides/ulp_instruction_set.rst +++ b/docs/en/api-guides/ulp_instruction_set.rst @@ -336,9 +336,9 @@ Note that when accessing RTC memories and RTC registers, ULP coprocessor has low **Examples**:: - 1: MOVE R1, R2 //R1 = R2 >> R3 + 1: MOVE R1, R2 //R1 = R2 - 2: MOVE R1, 0x03 //R1 = R2 >> 0x03 + 2: MOVE R1, 0x03 //R1 = 0x03 3: .set value1, 0x03 //constant value1=0x03 MOVE R1, value1 //R1 = value1 From 6f5f40dae47d574602a3d214c2e2299178d6474c Mon Sep 17 00:00:00 2001 From: Akbar Hashim Date: Wed, 30 Jan 2019 09:55:51 +0530 Subject: [PATCH 2/8] updated buffer size too small for popular carrier in India Airtel -> airtelgprs.com Merges https://github.com/espressif/esp-idf/pull/3010 --- .../pppos_client/components/modem/src/esp_modem_dce_service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/protocols/pppos_client/components/modem/src/esp_modem_dce_service.c b/examples/protocols/pppos_client/components/modem/src/esp_modem_dce_service.c index ad59a8b3e8..4b73534cf3 100644 --- a/examples/protocols/pppos_client/components/modem/src/esp_modem_dce_service.c +++ b/examples/protocols/pppos_client/components/modem/src/esp_modem_dce_service.c @@ -101,7 +101,7 @@ err: esp_err_t esp_modem_dce_define_pdp_context(modem_dce_t *dce, uint32_t cid, const char *type, const char *apn) { modem_dte_t *dte = dce->dte; - char command[32]; + char command[64]; int len = snprintf(command, sizeof(command), "AT+CGDCONT=%d,\"%s\",\"%s\"\r", cid, type, apn); DCE_CHECK(len < sizeof(command), "command too long: %s", err, command); dce->handle_line = esp_modem_dce_handle_response_default; From e24ac7a346557645e5ff074c6474c9eaab7cf00a Mon Sep 17 00:00:00 2001 From: Sarena Meas <6563840+sarenameas@users.noreply.github.com> Date: Tue, 19 Feb 2019 12:39:12 -0800 Subject: [PATCH 3/8] Add another auto-generated file to .gitignore. * Update tools/kconfig/.gitignore for auto-generated file *.o. Merges https://github.com/espressif/esp-idf/pull/3073 --- tools/kconfig/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/kconfig/.gitignore b/tools/kconfig/.gitignore index 9e8c243333..30d8d4578a 100644 --- a/tools/kconfig/.gitignore +++ b/tools/kconfig/.gitignore @@ -11,6 +11,7 @@ zconf.hash.c gconf.glade.h *.pot *.mo +*.o # # configuration programs From 85653acfb4112e9feac0de063942c793447cdace Mon Sep 17 00:00:00 2001 From: Conrad Meyer Date: Tue, 12 Mar 2019 09:40:18 -0700 Subject: [PATCH 4/8] check-lxdialog.sh: Support libintl on FreeBSD To unbreak "make menuconfig." Merges https://github.com/espressif/esp-idf/pull/3168 --- tools/kconfig/lxdialog/check-lxdialog.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/kconfig/lxdialog/check-lxdialog.sh b/tools/kconfig/lxdialog/check-lxdialog.sh index 9e98145983..e9daa6270c 100755 --- a/tools/kconfig/lxdialog/check-lxdialog.sh +++ b/tools/kconfig/lxdialog/check-lxdialog.sh @@ -7,6 +7,10 @@ ldflags() if [ $(uname -s) == "Darwin" ]; then #OSX seems to need ncurses too echo -n "-lncurses " + elif [ $(uname -s) == "FreeBSD" ]; then + # On FreeBSD, the linker needs to know to search port libs for + # libintl + echo -n "-L/usr/local/lib -lintl " fi pkg-config --libs ncursesw 2>/dev/null && exit pkg-config --libs ncurses 2>/dev/null && exit @@ -44,6 +48,10 @@ ccflags() if [ $(uname -s) == "Darwin" ]; then #OSX doesn't have libintl echo -n "-DKBUILD_NO_NLS -Wno-format-security " + elif [ $(uname -s) == "FreeBSD" ]; then + # FreeBSD gettext port has libintl.h, but the compiler needs + # to know to search port includes + echo -n "-I/usr/local/include " fi } From e5e41e0a5e0d554afbc9e30c78947b8a001b49fa Mon Sep 17 00:00:00 2001 From: Hanh Tran Date: Fri, 8 Mar 2019 09:18:08 +0900 Subject: [PATCH 5/8] Fix comment typos in WiFi types header Merges https://github.com/espressif/esp-idf/pull/3145 --- components/esp32/include/esp_wifi_types.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/esp32/include/esp_wifi_types.h b/components/esp32/include/esp_wifi_types.h index 2d1c355c0d..8689e5fd44 100644 --- a/components/esp32/include/esp_wifi_types.h +++ b/components/esp32/include/esp_wifi_types.h @@ -262,7 +262,7 @@ typedef struct { } wifi_sta_list_t; typedef enum { - WIFI_STORAGE_FLASH, /**< all configuration will strore in both memory and flash */ + WIFI_STORAGE_FLASH, /**< all configuration will store in both memory and flash */ WIFI_STORAGE_RAM, /**< all configuration will only store in the memory */ } wifi_storage_t; @@ -394,7 +394,7 @@ typedef struct { bool stbc_htltf2_en; /**< enable to receive space time block code HT long training field(stbc-htltf2) data. Default enabled */ bool ltf_merge_en; /**< enable to generate htlft data by averaging lltf and ht_ltf data when receiving HT packet. Otherwise, use ht_ltf data directly. Default enabled */ bool channel_filter_en; /**< enable to turn on channel filter to smooth adjacent sub-carrier. Disable it to keep independence of adjacent sub-carrier. Default enabled */ - bool manu_scale; /**< manually scale the CSI data by left shifting or automatically scale the CSI data. If set true, please set the shift bits. false: automatically. true: manually. Default false */ + bool manu_scale; /**< manually scale the CSI data by left shifting or automatically scale the CSI data. If set true, please set the shift bits. false: automatically. true: manually. Default false */ uint8_t shift; /**< manually left shift bits of the scale of the CSI data. The range of the left shift bits is 0~15 */ } wifi_csi_config_t; From 36c73e6d701a8887aa707a65e350fad68e33e701 Mon Sep 17 00:00:00 2001 From: Per Malmberg Date: Tue, 5 Mar 2019 21:59:54 +0100 Subject: [PATCH 6/8] Easier use of -Wsign-conversion warnings needs changes. Merges https://github.com/espressif/esp-idf/pull/3129 --- components/driver/include/driver/gpio.h | 1 + components/freertos/include/freertos/portable.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/components/driver/include/driver/gpio.h b/components/driver/include/driver/gpio.h index c2231a625b..ffa88a45cc 100644 --- a/components/driver/include/driver/gpio.h +++ b/components/driver/include/driver/gpio.h @@ -128,6 +128,7 @@ extern "C" { #define GPIO_IS_VALID_OUTPUT_GPIO(gpio_num) ((GPIO_IS_VALID_GPIO(gpio_num)) && (gpio_num < 34)) /*!< Check whether it can be a valid GPIO number of output mode */ typedef enum { + GPIO_NUM_NC = -1, /*!< Use to signal not connected to S/W */ GPIO_NUM_0 = 0, /*!< GPIO0, input and output */ GPIO_NUM_1 = 1, /*!< GPIO1, input and output */ GPIO_NUM_2 = 2, /*!< GPIO2, input and output diff --git a/components/freertos/include/freertos/portable.h b/components/freertos/include/freertos/portable.h index ce189f31cd..7454441cf6 100644 --- a/components/freertos/include/freertos/portable.h +++ b/components/freertos/include/freertos/portable.h @@ -204,7 +204,7 @@ BaseType_t xPortInterruptedFromISRContext(); /* Multi-core: get current core ID */ static inline uint32_t IRAM_ATTR xPortGetCoreID() { - int id; + uint32_t id; __asm__ __volatile__ ( "rsr.prid %0\n" " extui %0,%0,13,1" From fc880e2429eb30dac6c85d5dfe9eec711fc7ab1f Mon Sep 17 00:00:00 2001 From: raldone01 Date: Fri, 22 Feb 2019 23:41:19 +0100 Subject: [PATCH 7/8] Fixed a small spelling mistake Merges https://github.com/espressif/esp-idf/pull/3089 --- docs/en/api-reference/system/intr_alloc.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/en/api-reference/system/intr_alloc.rst b/docs/en/api-reference/system/intr_alloc.rst index d03630df90..63cf5516e5 100644 --- a/docs/en/api-reference/system/intr_alloc.rst +++ b/docs/en/api-reference/system/intr_alloc.rst @@ -93,10 +93,9 @@ A handler will never be called when disabled, while **its source may still be tr Sources attached to non-shared interrupt do not support this feature. -Though the framework support this feature, you have to use it *very carefully*. There usually exist 2 ways to stop a interrupt from being triggered: *disable the sourse* or *mask peripheral interrupt status*. +Though the framework support this feature, you have to use it *very carefully*. There usually exist 2 ways to stop a interrupt from being triggered: *disable the source* or *mask peripheral interrupt status*. IDF only handles the enabling and disabling of the source itself, leaving status and mask bits to be handled by users. **Status bits should always be masked before the handler responsible for it is disabled, -or the status should be handled in other enabled interrupt properly**. You may leave some status bits unhandled if you just disable one of all the handlers without mask the status bits, which causes the interrupt being triggered infinitely, -and finally a system crash. +or the status should be handled in other enabled interrupt properly**. You may leave some status bits unhandled if you just disable one of all the handlers without masking the status bits, which causes the interrupt to trigger infinitely resulting in a system crash. API Reference ------------- From efcd10ea31588367a94427de4c50fa23bea211bc Mon Sep 17 00:00:00 2001 From: Balazs Racz Date: Tue, 22 Jan 2019 12:17:11 +0100 Subject: [PATCH 8/8] Fix missing declaration of __bswap64 in endian.h Merges https://github.com/espressif/esp-idf/pull/2983 --- components/wpa_supplicant/port/include/endian.h | 1 + 1 file changed, 1 insertion(+) diff --git a/components/wpa_supplicant/port/include/endian.h b/components/wpa_supplicant/port/include/endian.h index 655bc30135..f84f923cab 100644 --- a/components/wpa_supplicant/port/include/endian.h +++ b/components/wpa_supplicant/port/include/endian.h @@ -86,6 +86,7 @@ typedef __uint64_t uint64_t; #if 1 //BYTE_ORDER == _LITTLE_ENDIAN #define __bswap16 __bswap_16 #define __bswap32 __bswap_32 +#define __bswap64 __bswap_64 #define htobe16(x) bswap16((x)) #define htobe32(x) bswap32((x)) #define htobe64(x) bswap64((x))