mirror of
https://github.com/espressif/esp-idf.git
synced 2024-09-20 10:46:02 -04:00
Merge branch 'bugfix/fixes_from_github' into 'master'
Fixes from Github See merge request idf/esp-idf!4510
This commit is contained in:
commit
47b5c5bc90
@ -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
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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"
|
||||
|
@ -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))
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
-------------
|
||||
|
@ -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;
|
||||
|
1
tools/kconfig/.gitignore
vendored
1
tools/kconfig/.gitignore
vendored
@ -11,6 +11,7 @@ zconf.hash.c
|
||||
gconf.glade.h
|
||||
*.pot
|
||||
*.mo
|
||||
*.o
|
||||
|
||||
#
|
||||
# configuration programs
|
||||
|
@ -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
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user