alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-09-20 10:46:02 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
10,950 Commits 19 Branches 147 Tags 377 MiB
6e14b6265b
Commit Graph

7527 Commits

Author SHA1 Message Date
aleks
6e14b6265b freemodbus: fix merge issues 2019-11-26 11:25:12 +01:00
aleks
cf4c95532f freemodbus: fix clang warnings 2019-11-26 10:37:14 +01:00
Angus Gratton
81c9ca52ed Merge branch 'feature/ws_config_agent_header' into 'master' 
ws_client: Add User-Agent and additional headers to esp_websocket_client

See merge request espressif/esp-idf!6777
 2019-11-26 14:42:01 +08:00
Alex Lisitsyn
67f62a79c1 freemodbus: add modbus master ascii 
add support of modbus master ascii
rename base dir name of master and slave example to be mb_slave, mb_master to avoid conflict with sdio/slave example test
add Kconfig option to enable ASCII and RTU mode separately
update ASCII options + remove cast for errors
added baudrate for examples into Kconfig
updated magic numbers for timer timeout
put ascii private definitions into one file
 2019-11-26 13:16:25 +08:00
Andrew
1669dc40d1 spi_slave.c:fix DMA channel set to zero which might gets conflict with assert 
close #2740
 2019-11-26 13:11:48 +08:00
Jiang Jiang Jian
54eeb77a56 Merge branch 'feature/support_pmf' into 'master' 
Feature/support pmf

See merge request espressif/esp-idf!5708
 2019-11-26 12:13:43 +08:00
kooho
5286c8308c bugfic(i2c): fix i2c driver ut issue. 2019-11-25 07:03:02 +00:00
Angus Gratton
f2a1a6105a Merge branch 'feat/mcpwm_hal' 
Manual merge of !6626
 2019-11-25 17:18:48 +11:00
Angus Gratton
dbae85dde8 Merge branch 'bugfix/timer_driver_ut' into 'master' 
driver/timer: fix software reset UT (again)

See merge request espressif/esp-idf!6801
 2019-11-25 12:54:52 +08:00
Nachiket Kukade
75ea0df916 Add encryption/decryption support for PMF 
1. Add CCMP, AES crypto modules for unicast protected Mgmt frames
2. Add support for computing SHA256 MIC on Bcast Mgmt frames
3. Add support for storing iGTK during 4-way handshake.
4. Provide APIs to MLME for utilizing the SW crypto modules
5. Link PMF changes from WiFi library submodule
 2019-11-25 04:11:09 +00:00
Nachiket Kukade
773e095a65 Add support for PMF configuration and negotiation 
1. Add APIs for configuring PMF through set config.
2. Map Supplicant and Wifi Cipher types.
3. Add support for PMF negotiation while generating RSN IE.
 2019-11-25 04:11:09 +00:00
Jiang Jiang Jian
ddef4f9129 Merge branch 'feature/set_dhcp_timeout' into 'master' 
Add feature for set dhcp time out

Closes WIFI-797 and IDF-1100

See merge request espressif/esp-idf!6370
 2019-11-25 12:04:20 +08:00
Angus Gratton
6dd36fd571 Merge branch 'refactor/hal_gpio_driver' 
Manual merge of !5597
 2019-11-25 10:49:40 +11:00
Angus Gratton
f34edba8f3 Merge branch 'feature/adc_driver_hal_support' 
Manual merge of !6044
 2019-11-25 10:22:06 +11:00
Ivan Grokhotkov
82d89afe1f driver/timer: fix software reset UT (again) 2019-11-24 21:10:50 +01:00
michael
538540ce21 mcpwm: add HAL layer support 
Also improved the unit tests a bit.
 2019-11-25 00:36:30 +08:00
michael
1fb2fd89de mcpwm: fix the fault handling and capture issues 
1. The fault signal 3 for unit 2 is corrected to the right value

2. Now `mcpwm_fault_set_oneshot_mode` will clear the status before, no
need to reset the peripheral.

3. The capture feature relies on the prescaler, but it's only
initialized in the mcpwm_init funciton, which is used to initialize a
PWM channel. This means, the capture may not work correctly if no PWM
channel is enabled.

   Now the prescaler is also updated when `mcpwm_capture_enable` is
called.
 2019-11-25 00:36:30 +08:00
michael
0f6dd34971 mcpwm: enable some unit tests again 2019-11-25 00:36:30 +08:00
Angus Gratton
b7b4cd3418 Merge branch 'bugfix/timer_group_reset_ut' into 'master' 
timer: remove check for POWERON_RESET in the test case, add esp_reset_reason API for s2beta

See merge request espressif/esp-idf!6747
 2019-11-23 14:04:41 +08:00
Ivan Grokhotkov
719c8eb627 Merge branch 'bugfix/esp_netif_early_fixes' into 'master' 
esp-netif: fixed early issues on esp-netif

See merge request espressif/esp-idf!6792
 2019-11-22 20:19:20 +08:00
Ivan Grokhotkov
6fda3df953 Merge branch 'bugfix/gpio_pin_bit_mask_truncation' into 'master' 
driver: fix gpio pin_bit_mask truncation in sdspi_host and others

See merge request espressif/esp-idf!6746
 2019-11-22 17:41:05 +08:00
Jiang Jiang Jian
0deeae38a9 Merge branch 'bugfix/fix_timer_deleted_and_run_broken_callback' into 'master' 
esp_timer: fix the bug that when timeout of timer happens try to run callback,...

Closes WIFI-1214

See merge request espressif/esp-idf!6765
 2019-11-22 17:37:51 +08:00
David Cermak
d9433ef692 mdns: fixed forgotten merge conflicts in debug code 2019-11-22 10:31:06 +01:00
David Cermak
c5a6bc9985 esp_netif: added missing C++ guards 
Closes https://github.com/espressif/esp-idf/issues/4389
 2019-11-22 10:31:06 +01:00
xiongyu
a3b79e9202 refactor(gpio): add hal gpio driver 2019-11-22 17:24:53 +08:00
xueyunfei
2eea2dbeb4 Add feature for set dhcp time out 2019-11-22 17:24:16 +08:00
Ivan Grokhotkov
e4f641f5a9 Merge branch 'bugfix/i2s_driver_apll_test_regression' into 'master' 
i2s: fix regression in retrieval of chip revision causing apll test to fail

See merge request espressif/esp-idf!6786
 2019-11-22 17:06:29 +08:00
Angus Gratton
989825908b Merge branch 'feature/esp32s2beta_ulp_projbuild' into 'master' 
Support esp32s2beta ULP in build system

See merge request espressif/esp-idf!5412
 2019-11-22 15:59:44 +08:00
fuzhibo
f49b192a5e refactor the adc driver 2019-11-22 15:42:16 +08:00
Mahavir Jain
25c0752682 i2s: fix regression in retrieval of chip revision causing apll test to fail 2019-11-22 11:46:38 +05:30
Dmitry
b38bc2f8f5 s2 support for make build removed. 2019-11-22 09:03:23 +03:00
Dmitry
1518c410bc A switch between esp32 and esp32s2betta added to the ULP build process. 
The new bin utils will have extension esp32s2ulp-elf, and they have to be placed to the bin directory.
 2019-11-22 09:03:13 +03:00
Wang Jia Lin
a8d3e3ab4a Merge branch 'feature/dac_driver_hal_support' into 'master' 
dac: add hal for dac driver

See merge request espressif/esp-idf!5591
 2019-11-22 13:59:32 +08:00
Alexey Gerenkov
27ce4d13df coredump: change data format to ELF 2019-11-22 13:25:43 +08:00
fuzhibo
03ac1aaafd dac: refactor driver add hal 2019-11-22 11:44:46 +08:00
Angus Gratton
0e0994092e Merge branch 'feature/esp32s2beta_fix_rtc_peripheral_driver' into 'master' 
Driver: fix touch driver and deep sleep example

See merge request espressif/esp-idf!6476
 2019-11-22 11:39:41 +08:00
Angus Gratton
ea29c101cd Merge branch 'bugfix/fix_iram_intr_alloc_test' into 'master' 
ccomp_timer: fix broken unit test

See merge request espressif/esp-idf!6779
 2019-11-22 08:41:50 +08:00
Angus Gratton
dc00c360ab Merge branch 'bugfix/esp32s2beta_crtbegin' into 'master' 
esp32s2beta: fix crash at startup due to toolchain crtbegin being linked

See merge request espressif/esp-idf!6783
 2019-11-22 07:01:32 +08:00
Ivan Grokhotkov
477e66103c Merge branch 'feature/esp32s2beta_apptrace_port' into 'master' 
esp32s2: Adds apptrace support

Closes IDF-510 and IDF-1032

See merge request espressif/esp-idf!5610
 2019-11-22 05:33:35 +08:00
David N. Junod
9200250f51 Add User-Agent and additional headers to esp_websocket_client 
Merges https://github.com/espressif/esp-idf/pull/4345
 2019-11-21 21:14:29 +01:00
Ivan Grokhotkov
ad986849a6 timer: remove check for POWERON_RESET in the test case 
The test case may run after an RTC_WDT_RESET (if we are on rev. 0
ESP32), or software reset (when running test cases locally).

Also moving the test case next to the other timer group driver tests.
 2019-11-21 20:03:26 +01:00
Ivan Grokhotkov
ea99137e62 esp32s2beta: implement esp_reset_reason API 2019-11-21 20:03:26 +01:00
Ivan Grokhotkov
38520d3b65 Merge branch 'feature/build_apps_script' into 'master' 
tools: add build_apps.py, script to build multiple apps

Closes IDF-641

See merge request espressif/esp-idf!6101
 2019-11-22 02:54:28 +08:00
Ivan Grokhotkov
e1452f5d6c lw-ip: silence a warning related to CONFIG_LWIP_TCP_WND_DEFAULT value 2019-11-21 15:36:06 +01:00
Ivan Grokhotkov
096dc8fc2b esp32s2beta: rename output linker script 2019-11-21 15:29:00 +01:00
Jack
50fe7e540e esp_timer: fix the bug that when timeout of timer happens try to run callback, and high priority task delete the timer and break the callback 2019-11-21 13:54:50 +00:00
houwenxiang
28286183d1 feature(I2C): Add i2c hal support. 2019-11-21 20:34:07 +08:00
fuzhibo
246242dbd5 driver: fix sens_struct.h; 
driver: fix timer wakeup dsleep;
example: fix EXT1 wakeup dsleep;
example: fix touch pad wakeup dsleep;
 2019-11-21 20:31:34 +08:00
Mahavir Jain
43411da465 Merge branch 'bugfix/freertos_critical_section_compliance' into 'master' 
Changes in uart and esp_timer for critical section compliance with vanilla FreeRTOS

See merge request espressif/esp-idf!6733
 2019-11-21 19:25:14 +08:00
Ivan Grokhotkov
04324e4c3c esp32s2beta: re-enable entering the debugger on panic 2019-11-21 11:52:10 +01:00