alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
26,324 Commits 20 Branches 148 Tags 384 MiB
54d0d870a6
Commit Graph

636 Commits

Author SHA1 Message Date
Mahavir Jain
0054732991 Fix debug print to handle URL in internal testing scenarios as well 2021-12-14 14:29:02 +05:30
Harshit Malpani
66a8615c18 Fix for advanced_ota_redirect_url example failure in CI 2021-12-13 10:50:43 +05:30
Eric Fontaine
53b0263342
print Firmware Upgrade URL to help user debug 2021-12-08 12:09:42 -05:00
Fu Hanxi
ef685456ab example: use pytest-embedded to replace examples/system/console test scripts 2021-11-30 09:42:12 +08:00
david zuhn
0742790408 console: Console example prints the correct chip model 
This commit updates the console example's components so that
the correct chip model name is printed instead of "Unknown"

Closes https://github.com/espressif/esp-idf/pull/7717

[darian@espressif.com: Update chip names, used const char, updated commit message]
Signed-off-by: Darian Leung <darian@espressif.com>
 2021-11-25 00:04:56 +08:00
radim.karnis
5d55d34481 docs: Update references to esptool docs 2021-11-24 10:28:39 +01:00
Harshit Malpani
b93d63b067 Fix 'address already in use' exception in OTA tests 
We will stop the server instance at the end of each test case. This will solve the "address already in use" exception
 2021-11-24 11:32:15 +08:00
Aditya Patwardhan
5d61eea847 efuse_example_test: Fix the example test ( broken due to latest change 
in info message)

*Unify the log messages when UART ROM Download mode is kept enabled
 2021-11-23 15:21:32 +05:30
Shubham Kulkarni
d959a35e28 advanced_https_ota: Move example tests on ethernet runners 
Move BT tests to nightly run
 2021-11-19 15:07:31 +05:30
Shubham Kulkarni
91ccac08f8 native_ota_example: Move all example tests to ethernet based runners 2021-11-19 15:07:31 +05:30
Shubham Kulkarni
40a72ef3cf simple_ota_example: Move redundant and failing example_tests to nightly run 2021-11-19 15:07:31 +05:30
Anton Maklakov
a7347cdf1a Merge branch 'feat/add_track_startup_time_to_startup_time_example' into 'master' 
feat: Added tracking startup_time example startup times

Closes IDFCI-823

See merge request espressif/esp-idf!14976
 2021-11-19 03:08:52 +00:00
KonstantinKondrashov
209702d055 esp_ipc: Update documentation and API descriptions 
This commit updates the documentation and API descriptions of
the esp_ipc and esp_ipc_isr features.
 2021-11-18 21:34:50 +08:00
morris
2e008825a9 Merge branch 'feat/rm_makefiles' into 'master' 
Build & config: Remove leftover files from the unsupported make build system

Closes IDF-4273 and IDF-2827

See merge request espressif/esp-idf!15829
 2021-11-16 03:44:41 +00:00
Mahavir Jain
1e6d07d80c examples: esp_timer: disable secondary console for S3/C3 that can affect test timing 2021-11-12 17:27:07 +05:30
Roland Dobai
766aa57084 Build & config: Remove leftover files from the unsupported "make" build system 2021-11-11 15:32:36 +01:00
Roland Dobai
9c1d4f5b54 Build & config: Remove the "make" build system 
The "make" build system was deprecated in v4.0 in favor of idf.py
(cmake). The remaining support is removed in v5.0.
 2021-11-10 09:53:53 +01:00
Omar Chebib
0a3cdd4e4f Example: Fix eventfd example test and added a diagram to explain printed values 2021-11-08 14:16:04 +08:00
Alexey Gerenkov
c9bc16e35d docs: Updates apptrace menuconfig options in examples 2021-11-04 01:33:24 +03:00
Alexey Gerenkov
bd1af716fc example/gcov: Adds support for esp32s2, esp32s3, esp32c3 and esp32h2 2021-11-04 01:33:24 +03:00
Alexey Gerenkov
bb9cd84cdc debug_stubs: Refactor and add support for RISCV 2021-11-04 01:33:24 +03:00
KonstantinKondrashov
bf9829df5b efuse example: Fix pre-load SB test for S2, C3 (erase revoke bits) 2021-11-02 15:26:24 +08:00
Aleksei Apaseev
d2745e090f feat: Added tracking startup_time example startup times 2021-10-26 19:41:52 +08:00
morris
e2275b1f63 gptimer: clean up hal and ll for driver-ng 2021-10-20 18:40:08 +08:00
Ivan Grokhotkov
b46183a539 Merge branch 'feature/esp_timer_example_reenable' into 'master' 
examples: esp_timer: enable for all targets

Closes IDF-2022

See merge request espressif/esp-idf!15028
 2021-10-18 09:43:17 +00:00
Marek Fiala
ff18a96f7d tools: replace _ with - in idf.py 
Closes https://github.com/espressif/esp-idf/issues/5126
 2021-10-13 17:30:38 +08:00
Kevin (Lao Kaiyao)
a9faafee3c Merge branch 'feature/touch_sensor_driver_support_for_esp32s3' into 'master' 
driver(touch): support touch sensor for esp32s3 platform

Closes IDF-1784 and IDF-3302

See merge request espressif/esp-idf!14102
 2021-10-12 05:50:58 +00:00
Jakob Hasse
81e9266204 [examples]: removed hyphens 
Replaced hyphens with underscores in examples
project definition for all examples which had
hyphens in their project name. dpp-enrollee is
an exceptions because the name matches the
project directory name while the project
directory also contains hyphens.
 2021-10-09 13:58:24 +08:00
fuzhibo
057b9d61b5 driver(touch): support touch sensor for esp32s3 platform 2021-10-08 10:39:46 +08:00
Ivan Grokhotkov
bfae073454 examples: esp_timer: enable for all targets 
The example compiles and works correctly on all supported targets now,
re-enable it in CI.
 2021-10-04 16:12:47 +08:00
Zim Kalinowski
e35a87f723 Merge branch 'feature/github-7365-second' into 'master' 
Typo fix in cmd_nvs.c

See merge request espressif/esp-idf!15317
 2021-10-03 12:49:59 +00:00
Zim Kalinowski
ea7122e3fb Merge branch 'master' into feature/github-7365-second 2021-10-03 18:40:13 +08:00
Zim Kalinowski
002cd296e1 Merge remote-tracking branch 'origin/master' into feature/github-7022 2021-10-03 12:25:39 +08:00
KonstantinKondrashov
709abee65c example_tests: Deletes usage esp32c3 ECO0 in CI (by default ECO3) 2021-09-24 13:55:07 +08:00
Fu Hanxi
923e862ed2 ci: temporarily disable s3 build for a few examples 2021-09-16 12:20:11 +08:00
Roland Dobai
e37e877374 CI: Check the number of detected cores of apptrace 2021-09-06 21:52:27 +03:00
morris
aafb628683 Merge branch 'examples/network_folder' into 'master' 
examples: Created a new folder structure for generic network examples

Closes IDF-3311

See merge request espressif/esp-idf!14513
 2021-08-25 11:45:21 +00:00
Roland Dobai
98a6538877 Merge branch 'feature/gcov_dump_in_thread' into 'master' 
gcov dump in a special thread

Closes OCD-216 and IDF-1034

See merge request espressif/esp-idf!13328
 2021-08-20 10:22:58 +00:00
Erhan Kurubas
56176b69dd gcov: enable single core tests 2021-08-20 15:00:55 +08:00
Erhan Kurubas
f6f7ab2e7f gcov: readme update for ESP32-S2 2021-08-20 15:00:55 +08:00
Shubham Kulkarni
5eb1570a01 advanced_https_ota_example: Enable debug logs for partial HTTP download test 2021-08-20 09:35:40 +05:30
Jeff Kent
02bc5df476
Typo fix in cmd_nvs.c 2021-08-03 23:51:55 -05:00
Konstantin Kondrashov
4972605b16 esp_common: Add API for IPC to run small pieces of code on the other CPU, in the context of the level 4 interrupt 2021-08-03 14:35:29 +08:00
Ondrej Kosta
4ac24549ad examples: create a new folder structure for generic network examples 
simple_sniffer was moved from /wifi folder to /network folder

network_tests was moved from /system to /network folder

README's were updated accordingly to reflect new structure
 2021-07-26 12:25:19 +02:00
Alexey Gerenkov
a9db7831b0 Merge branch 'bugfix/sysview_timestamp' into 'master' 
sysview: fix tiemrgroup as sv timestamp

See merge request espressif/esp-idf!14374
 2021-07-21 19:15:45 +00:00
Marius Vikhammer
11ea7c9072 docs: fixed two dead readme links 2021-07-21 15:20:57 +08:00
morris
0c7b43c3b0 sysview: fix tiemrgroup as sv timestamp 2021-07-18 16:13:32 +08:00
Omar Chebib
0fd74a43c8 console: re-use the available REPL console API and improve linenoise 
Console example doesn't duplicate code in `console` component.
Linenoise has been improved: it now has a parametrized command line
length. It is now possible to paste data efficiently to the console.
Note: this can only be done if the cursor is at the end of the line.

Closes https://github.com/espressif/esp-idf/issues/7057
 2021-07-15 11:37:11 +08:00
Shubham Kulkarni
3398ee2687 OTA examples: Updated server certificate 2021-07-13 13:14:32 +08:00
morris
8887897f54 Merge branch 'bugfix/timer_example_crashed_not_calling_timer_group_set_alarm_value_in_isr' into 'master' 
driver/timer: fixed auto reload problem in default isr callback

Closes IDFGH-5229

See merge request espressif/esp-idf!13528
 2021-07-09 10:18:18 +00:00
Marius Vikhammer
71c1da8952 timer group: add timer group and WDT support for ESP32S3 
Regenerate timer group header files and update LL, check examples
and update docs.
 2021-07-06 16:21:43 +08:00
Ivan Grokhotkov
d7928bf1db Merge branch 'feature/esp32c3_apptrace' into 'master' 
apptrace: refactoring & esp32c3 support

See merge request espressif/esp-idf!11702
 2021-06-28 06:00:24 +00:00
laokaiyao
1138be502e driver/timer: only re-enable alarm in callback when auto reload is true 
closes https://github.com/espressif/esp-idf/issues/7001
 2021-06-25 15:44:23 +08:00
Marius Vikhammer
386739595f RISCV-ULP: Add DS18B20 1wire RISCV-ULP example 2021-06-25 11:26:39 +08:00
Alexey Gerenkov
821869d98d apptrace: Refactors apptrace for better support various tracing HW 2021-06-24 13:16:13 +03:00
Konstantin Kondrashov
f339b3fc96 efuse(esp32): Deprecate esp_efuse_burn_new_values() & esp_efuse_write_random_key() 
These functions were used only for esp32 in secure_boot and flash encryption.
Use idf efuse APIs instead of efuse regs.
 2021-06-17 07:21:36 +08:00
Marius Vikhammer
b1aa9269fd docs: updated link to partition table docs 2021-06-04 10:14:53 +08:00
Shubham Kulkarni
ab9e5d3ea4 advanced_https_ota: Remove check for CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK for validating image. 
Image should be validated even if CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE is enabled
 2021-06-02 11:19:30 +00:00
a2800276
bdea007a37 Update README.md 
Made some grammatical corrections and improved reading flow.

Signed-off-by: Shubham Kulkarni <shubham.kulkarni@espressif.com>

Closes: https://github.com/espressif/esp-idf/pull/7050
 2021-06-02 11:19:30 +00:00
Ivan Grokhotkov
38d902f544 Merge branch 'feature/gdbstubs_rt' into 'master' 
Extension of GDBStub component for handling GDB by serial port at runtime.

See merge request espressif/esp-idf!10312
 2021-05-18 17:14:51 +00:00
Andrey Starodubtsev
6e343c1f8b Fix typo 
s/\bUnknow\b/Unknown/g
 2021-05-14 18:26:22 +03:00
Angus Gratton
b7ad39f694 Merge branch 'bugfix/pthread_docs' into 'master' 
Fix and improve pthread docs, create pthread example

Closes IDF-731 and IDFGH-5085

See merge request espressif/esp-idf!13314
 2021-05-14 01:19:02 +00:00
Angus Gratton
e6d15a0975 docs: Rename esp_pthread docs to pthread, expand details of supported APIs 
- Move the code that was in the document out to an example
 2021-05-14 10:03:11 +10:00
Dmitry
00a7ecb5a3 Code cleanup. Bugfix after rebase with master. Formating. 2021-05-13 15:03:40 +03:00
Dmitry
7bb91f912c gdbstub component 2021-05-11 15:55:39 +03:00
KonstantinKondrashov
2e4b625f59 simple_ota_example: Adds sha256 check for app images 2021-05-05 22:18:40 +08:00
Angus Gratton
cdef1ea38a examples: Add example for fastest startup time 
Example includes README and sdkconfig.defaults with notes about trade-offs
made for minimum boot time.
 2021-04-23 18:27:20 +10:00
Shubham Kulkarni
691e30e659 advanced_https_ota: Add example test for OTA with OpenSSL server with binary file aligned to 289 byte boundary 2021-04-21 20:57:58 +05:30
Chinmay Chhajed
3eaf78d462 advanced_https_ota: Added BLE GATTS code. 
`advanced_https_ota` can run a minimal BLE GATT server while
downloading OTA update. Both NimBLE and Bluedroid stack can be used
here by configuring relevant options in menuconfig.

Signed-off-by: Chinmay Chhajed <chinmay.chhajed@espressif.com>
 2021-04-20 15:34:53 +05:30
Ivan Grokhotkov
7c60ba8a7d examples: eventfd: remove IRAM placement of timer ISR callback 
esp_vfs_write (a.k.a "write") is not in IRAM, so placing just the
ISR callback into IRAM doesn't make the callback IRAM-compatible.
 2021-04-19 17:20:47 +02:00
Ivan Grokhotkov
80213b6203 examples: eventfd: remove use of deprecated timer_spinlock functions 2021-04-19 14:43:08 +02:00
Ivan Grokhotkov
fa72ef6bd8 Merge branch 'feature/add-eventfd' into 'master' 
vfs: add eventfd support

See merge request espressif/esp-idf!12573
 2021-04-16 10:33:06 +00:00
Angus Gratton
bc3d45026c Merge branch 'bugfix/deep_sleep_skip_verify_rtc_mem_heap' into 'master' 
Fix bootloader "skip validate on exiting deep sleep" option if "use RTC memory as heap" is enabled

See merge request espressif/esp-idf!12032
 2021-04-15 23:56:39 +00:00
Jiacheng Guo
bbb0e7a573 vfs: fix build & ci errors 2021-04-15 15:19:00 +08:00
Jiacheng Guo
0d986de363 vfs: add default initializer for vfs_eventfd 2021-04-15 15:19:00 +08:00
Jiacheng Guo
37a992bbde vfs: add example for eventfd 2021-04-15 15:18:59 +08:00
Angus Gratton
7f0fc3a37b ci: Consolidate deep sleep example test configs 2021-04-15 16:24:44 +10:00
Angus Gratton
b68d46c8a0 deep sleep example: Extend test coverage to ESP32-S2 
* Modify the example on ESP32-S2 to print same output pattern as ESP32
* Add example test verification that "fast booting" (skipping of verification) is working
 2021-04-15 16:20:58 +10:00
Shubham Kulkarni
0a395134d4 Split example_tests with Example_WIFI tag group into Example_OTA and Example_Protocols 2021-04-15 04:00:06 +00:00
KonstantinKondrashov
af3cbe2888 simple_ota_example: Adds configs to test on_update_no_secure_boot option (RSA&ECDSA) 2021-04-13 11:28:13 +00:00
Angus Gratton
936523b904 Merge branch 'feature/secure_bootv2_c3' into 'master' 
secure_boot_v2: Support SB_V2 for ESP32-C3 ECO3

Closes IDF-2647

See merge request espressif/esp-idf!13040
 2021-04-12 01:31:25 +00:00
KonstantinKondrashov
ec4de4fe5c example_tests: CI uses ECO0 for esp32c3 tests 2021-04-09 14:26:06 +08:00
Angus Gratton
70cab5bd81 Merge branch 'bugfix/ulp_riscv_unintended_wake' into 'master' 
ulp: unintended wakeup in ulp_riscv

See merge request espressif/esp-idf!12894
 2021-04-08 01:52:41 +00:00
pedro.minatel
da471dfcd1 Examples README's updated on peripherals, system and wifi 
Updated main examples README to add missing examples folders and Getting Started links
Updated wifi/fastscan example README
Updated wifi examples README
Updated wifi main examples README
Added instructions and removed obviousness from examples README
Updates on example README in peripherals, system and wifi
Updates on example README in peripherals and added wave form pictures on wave_gen example
Updates and review on example README
Revision on unit style convention
Added the getting started link for each supported version
Readme review and recommended enhancements
Added the default note on the wave form option info
Added the ESP32-C3 support information on the temperature sensor example README
Added Getting Started information for ESP32-S2 and ESP32-C3
Issue fixed on the supported target on README
Resolved merge conflict
 2021-04-07 14:24:38 +00:00
Renz Bagaporo
754c8fcaa5 ci: modify ulp_riscv example to detect unintended wake 2021-03-31 17:15:55 +08:00
Marius Vikhammer
3fea0727b0 system: enable C3 light sleep related example tests 2021-03-30 10:45:27 +08:00
Angus Gratton
2a6dd33d35 Merge branch 'feature/c3_flash_enc_tests' into 'master' 
flash enc: add flash encryption unit and example test for C3

Closes IDF-2936

See merge request espressif/esp-idf!12774
 2021-03-29 06:45:32 +00:00
Krzysztof Budzynski
d25d3789e9 Merge branch 'doc/update_dead_url_links_to_iot_solution_repo' into 'master' 
fix dead links directed to ESP-IoT-Solution repo

Closes DOC-1101 and IDFCI-472

See merge request espressif/esp-idf!12535
 2021-03-26 14:23:06 +00:00
Hao Ning
80da446be7 fix dead links directed to iot solution repo 
resolve confilcts

modify a board name

rebase master

fix ota example link in readme
 2021-03-26 15:19:10 +08:00
Marius Vikhammer
d3d145285d flash enc: add flash encryption unit and example test for C3 2021-03-25 17:51:22 +08:00
Michael (XIAO Xufeng)
67ba80f2ec Merge branch 'bugfix/reduce_the_consumption_of_touch_sensor_during_deep_sleep' into 'master' 
fix: reduce the consumption of touch sensor during deep sleep

See merge request espressif/esp-idf!12248
 2021-03-22 07:10:44 +00:00
fuzhibo
6b361ed70f fix: reduce the consumption of touch sensor during deep sleep 2021-03-15 03:59:54 +00:00
Marius Vikhammer
c85d949c1f ci: run Example_GENERIC for C3 
Add support for running example_GENERIC tests for C3 on label.

Fix examples that fail.
 2021-03-15 10:27:07 +08:00
Angus Gratton
429ea0a1c1 Merge branch 'feature/riscv_ulp_s2_example_test' into 'master' 
ci: RISCV-ULP example test

Closes IDF-2505

See merge request espressif/esp-idf!12397
 2021-03-10 23:53:47 +00:00
yuanjm
07d784f7fe examples: Add OTA bind specified interface example 
Closes https://github.com/espressif/esp-idf/issues/6090
 2021-03-10 02:19:29 +00:00
Mahavir Jain
f5f25d2b53 Merge branch 'bugfix/ota_docs_openssl_windows' into 'master' 
examples: Document OTA examples with openssl on windows tips/issues

See merge request espressif/esp-idf!12372
 2021-03-09 08:21:38 +00:00
David Cermak
7a020ea16f examples: Document OTA examples with openssl on windows tips/issues 2021-03-04 08:05:25 +01:00
David Cermak
79d596bcdc docs/ota: Allow example_test.py to run a custom https-server 2021-03-04 08:05:16 +01:00
Shubham Kulkarni
fb0beefefb advanced_https_ota: Add example_test for partial HTTP download 2021-03-02 16:48:18 +05:30
Hassan DRAGA
b2eb199502 Update native_ota_example.c 
* assert(update_partition) should be before trying to use update_partition in ESP_LOGI().
* if we show detailed description about the error ESP_ERR_OTA_VALIDATE_FAILED, why show it again using esp_err_to_name() ?

Merges https://github.com/espressif/esp-idf/pull/6623

Signed-off-by: Shubham Kulkarni <shubham.kulkarni@espressif.com>
 2021-03-01 14:00:27 +00:00
Renz Bagaporo
e5b3824f61 ci: add example test for ulp_riscv example 2021-02-26 13:34:09 +08:00
Cao Sen Miao
a8343bc470 esp_system: support gpio wakeup from deep sleep on esp32c3 2021-02-26 12:26:49 +08:00
morris
0f5d1c1c46 rtc: supported disable rom log temporarily 2021-02-22 20:56:43 +08:00
Marius Vikhammer
04df1f3a42 CI: enable example builds for C3 
Enables building C3 examples in CI.

Fixes related warnings/errors and disables examples that cannot run.
 2021-02-09 12:04:02 +08:00
Angus Gratton
f7a8593a3b Merge branch 'style/python_isort_double_quote_fixer' into 'master' 
style: format python files with isort and double-quote-string-fixer

See merge request espressif/esp-idf!12149
 2021-01-27 12:25:39 +08:00
Fu Hanxi
0146f258d7 style: format python files with isort and double-quote-string-fixer 2021-01-26 10:49:01 +08:00
Angus Gratton
241af87c58 examples console: Fix parts of the code related to deep sleep on ESP32-C3 
Example not yet working on ESP32-C3, crashes in _findenv_r
 2021-01-25 17:20:04 +00:00
Angus Gratton
1cfd65f8c4 examples: Update deep sleep example for ESP32-C3 2021-01-25 17:20:04 +00:00
Jiang Jiang Jian
76bb9565af Merge branch 'bugfix/fix_wifi_interface_use' into 'master' 
esp_wifi: Modify ESP_IF_WIFI_STA to WIFI_IF_STA

See merge request espressif/esp-idf!12050
 2021-01-25 12:18:27 +08:00
yuanjm
7e17f64a2d Make OTA example support keepalive 2021-01-22 06:56:28 +00:00
Jiang Jiang Jian
9c5a9ae8fd Merge branch 'bugfix/support_esp32c3_lightsleep_master_cpu_pd_issue' into 'master' 
fix cpu pd bug of normal light sleep

See merge request espressif/esp-idf!12083
 2021-01-22 14:03:10 +08:00
Li Shuai
eaa6ab4dab light sleep: add system light sleep example support 2021-01-20 22:17:24 +08:00
Aditya Patwardhan
a02be97fda nvs_flash: Modify the default NVS initialization API with internal nvs encryption 
handling (only when nvs encryption is enabled)
    * NVS Encryption will now be turned on by default with flash encryption
    * Updated the flash encryption example to shocase NVS encryption
    along with information on how to configure and use NVS encryption
    * Updated respective test case
    * Added two partition tables for NVS encryption
     i) Table 1- Single factory app, no OTA, encrypted NVS
     ii) Table 2- Factory app, Two OTA, encrypted NVS
 2021-01-20 11:12:14 +00:00
xiehang
b8a8fe3f54 esp_wifi: Modify ESP_IF_WIFI_STA to WIFI_IF_STA 2021-01-19 11:55:44 +08:00
xiehang
c260c223e9 example: We should not check the return value of esp_wifi_connect() in any case 2021-01-11 14:40:18 +08:00
Angus Gratton
66d2c9196f example ulp_riscv: Set IDF_TARGET to esp32s2 2020-12-24 14:18:02 +11:00
Angus Gratton
01696afc34 esp32c3: Add new esp_sleep_is_valid_wakeup_gpio() function 2020-12-24 13:40:01 +11:00
Angus Gratton
7472d76db0 Merge branch 'bugfix/after_ligth_sleep_esp_timer_forms_one_event' into 'master' 
esp_timer: Add an option skip_unhandled_events

See merge request espressif/esp-idf!10969
 2020-12-11 06:04:58 +08:00
KonstantinKondrashov
aa96c9a4d8 esp_timer: Add an option to skip unhandled events for periodic timers 
- Added an option to skip unhandled events for periodic timers. Useful for light sleep.
- Added doc about this case
- Added Test a latency between a call of callback and real event (14-16us). and UT to check skip_unhandled_events.
- Fixed for esp_timer_dump() if name of timer is NULL
- Refactored timer_process_alarm()
- Added the delete function after using in UTs
 2020-12-09 17:19:19 +08:00
Shubham Kulkarni
4874f52d96 Update advanced_https_ota_example and native_ota_example to use esp_ota_abort in case of error 2020-12-03 14:49:55 +05:30
Angus Gratton
893a42e72c Merge branch 'bugfix/ci_example_test_check_performance_exception' into 'master' 
CI: remove fake binary size check in example test

Closes IDFCI-255, IDFCI-256, and IDFCI-257

See merge request espressif/esp-idf!11356
 2020-11-25 20:36:08 +08:00
He Yin Ling
a908174c06 test: remove fake binary size check in example test: 
the binary size check in example test was removed long time ago. Now we
have updated ttfw_idf to raise exception when performance standard is
not found. These fake performance check will be regarded as error.
Remove them now.
 2020-11-24 17:53:33 +08:00
Michael (XIAO Xufeng)
af992c26bc Merge branch 'bugfix/fix_x32k_startup_slow_bug' into 'master' 
bugfix: Fix xtal 32k not oscillate or oscillate too slowly issue for esp32

See merge request espressif/esp-idf!10519
 2020-11-24 17:37:29 +08:00
chaijie
a48b5246cc ESP32: Fix xtal 32k not oscillate or oscillate too slowly issue 
ESP32 in revision0 and revision1 uses touchpad to provide
current to oscillate xtal 32k. But revision2 and revision3
do not need to do that.
Note: touchpad can not work and toupad/ULP wakeup sources
are not available when toupad provides current to xtal 32k
 2020-11-23 19:38:11 +08:00
Chen Yu Dong
454edcc0a8 ci: all jobs use python3 by default 2020-11-19 03:27:58 +00:00
Shubham Kulkarni
cda61a87da Update OTA example to demonstate anti_rollback feature 
Add example_test for anti_rollback feature
 2020-11-11 11:51:28 +00:00
Angus Gratton
66fb5a29bb Whitespace: Automated whitespace fixes (large commit) 
Apply the pre-commit hook whitespace fixes to all files in the repo.

(Line endings, blank lines at end of file, trailing whitespace)
 2020-11-11 07:36:35 +00:00
Shubham Kulkarni
76860cc939 example_test.py: In ota example_test, open file in binary mode to avoid UnicodeDecodeError 2020-10-10 06:18:30 +00:00
Ivan Grokhotkov
5925d21346 Merge branch 'feature/power_consumption_graphs' into 'master' 
Power consumption graphs

Closes IDF-208

See merge request espressif/esp-idf!10476
 2020-09-20 21:16:29 +08:00
Martin Valik
815d9ec6bd Power consumption graphs were added to ulp and wifi power save examples 
Closes IDF-208
 2020-09-17 13:20:09 +02:00
Shubham Kulkarni
b930f7a96d simple_ota_example: Add example test with flash encryption enabled 2020-09-14 13:47:39 +00:00
Roland Dobai
6358f3fb8a CI: Fix regex in ulp_adc example test 2020-09-11 10:45:41 +02:00
David Čermák
6f7ae1d751 Merge branch 'bugfix/fix_netsuite_tx_wrap' into 'master' 
CI: esp_netif tests: Fix netsuite driver layer per wifi optimization changes

See merge request espressif/esp-idf!10344
 2020-09-11 02:15:56 +08:00
David Cermak
59471c9f3f CI: esp_netif tests: Fix netsuite driver layer per wifi optimization changes 
esp-wifi introcuded wifi tx optimization in !9147 . Update needed in netsuite to pass the tx data using  function
 2020-09-10 11:52:01 +02:00
Ivan Grokhotkov
b6467257b9 Merge branch 'feature/cmock_component' into 'master' 
cmock as component replacing unity

See merge request espressif/esp-idf!9859
 2020-09-10 16:06:20 +08:00
Mahavir Jain
33d0024034 esp_https_ota: change erase to incremental during flash write 2020-09-04 12:05:06 +05:30
Jakob Hasse
20c068ef3b cmock: added cmock as component 
* changing dependencies from unity->cmock
* added component.mk and Makefile.projbuild
* ignore test dir in gen_esp_err_to_name.py
* added some brief introduction of CMock in IDF
 2020-09-02 16:38:37 +08:00
Shubham Kulkarni
78356d1336 advanced_https_ota_example: Demonstrate use of init_complete_callback to set custom headers 2020-08-29 09:05:52 +00:00
Shubham Kulkarni
7d3618a86c Update OTA README to mention advanced_https_ota example and add reference to API documentation of esp_https_ota component 
Closes: https://github.com/espressif/esp-idf/issues/5487
 2020-08-29 09:05:52 +00:00
Roland Dobai
6a73c74d71 Follow-up improvements for the gcov example test 2020-08-24 08:29:03 +00:00
Renz Bagaporo
b30522f701 esp32, esp32s2: move sleep modes code to esp_system 2020-08-17 19:09:23 +08:00
Fu Hanxi
19ad15a1b4 modify example tests. delete unused arguments 2020-08-04 13:27:16 +08:00
fuzhibo
1568b6913d driver(touch): fix touch sensor driver redundancy 2020-07-27 03:37:29 +00:00
Alexey Gerenkov
0e3c7918e4 examples: Fixes 'apptrace_to_host' to work with updated OpenOCD tracing command 2020-07-22 06:49:27 +00:00
Felipe Neves
b6dba84323 ulp: added support to building code for riscv ULP coprocessor 2020-07-15 15:28:49 -03:00
houwenxiang
8e00522cd7 vfs: support vfs uart set line endings with specified uart number 2020-07-10 11:15:09 +08:00
Mahavir Jain
5341688c7e Merge branch 'feature/add_status_code_check' into 'master' 
esp_https_ota: Add check for HTTP error codes

Closes IDFGH-3593

See merge request espressif/esp-idf!9486
 2020-07-08 13:12:46 +08:00
Shubham Kulkarni
60fcf1bae6 Increase receive timeout in sdkconfig.ci to fix CI failures 2020-07-08 04:03:26 +00:00
Marius Vikhammer
a80cff924b docs: fix broken links in example READMEs 2020-07-08 10:39:33 +08:00
morris
a4d0033c03 esp_rom: extract common GPIO apis into esp_rom_gpio.h 2020-07-07 11:40:19 +08:00
Roland Dobai
b9eb7cb7f0 tools: Fix IDF Monitor so it will wait for the device to reconnect 2020-06-29 09:18:05 +02:00
Ivan Grokhotkov
3e7506ccda examples/console: error out if built with USB CDC enabled 2020-06-26 15:38:49 +02:00
Ivan Grokhotkov
b767e6191d examples/console: add check for CONFIG_ESP_CONSOLE_UART_NUM 2020-06-26 15:38:49 +02:00
Ivan Grokhotkov
9548aea3e4 examples: add console_usb example for USB CDC 2020-06-26 15:38:49 +02:00
Ivan Grokhotkov
dafc6676ae examples/console: allow not registering sleep related commands 2020-06-24 15:50:51 +02:00
Ivan Grokhotkov
cf155161c4 Merge branch 'feature/higher_level_com_gdb' into 'master' 
CI: Use higher-level interaction with GDB in example tests and test apps

Closes IDF-1622

See merge request espressif/esp-idf!8840
 2020-06-19 16:13:01 +08:00
Mahavir Jain
c533674120 simple_ota_example: add SPIRAM enabled configuration 
This commit adds one example test case for OTA with SPIRAM
enabled configuration. Additionally it also keeps
`SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY` enabled to catch any issues
of sort "cache disabled but cached region accessed".

https://github.com/espressif/esp-idf/issues/5354
 2020-06-12 05:45:02 +00:00
Fu Hanxi
bde4b1b350 ci: Modify some dut-unrelated example tests env tag from Example_WIFI to Example_GENERIC 2020-06-11 14:22:05 +08:00
Shubham Kulkarni
c287ca1363 example_test.py: Update OTA example tests to make it compatible with python3 2020-06-09 11:58:35 +00:00
Roland Dobai
493c852b73 CI: Use higher-level interaction with GDB in example tests and test apps 2020-06-05 14:58:34 +00:00
Renz Bagaporo
e24c8eada3 examples: additional changes to app_trace example README for esp32s2 2020-06-01 17:04:12 +08:00
Renz Bagaporo
666ee00ebe examples: update app_trace pins for esp32s2 2020-06-01 17:04:12 +08:00
Renz Bagaporo
7c09cb1739 examples: update app_trace example relevant paths in README 2020-06-01 17:04:12 +08:00
Michael (XIAO Xufeng)
94ce4836ae Merge branch 'bugfix/fix_gpio_wakeup_light_sleep' into 'master' 
driver(gpio): fix gpio can't wakeup light sleep

Closes IDF-1361

See merge request espressif/esp-idf!8522
 2020-05-14 11:45:40 +08:00
Roland Dobai
29c95d3919 CI: Require runner with PSRAM for himem example test 2020-05-13 18:19:44 +00:00
fuzhibo
d91e64cea4 driver(gpio): fix gpio can't wakeup light sleep 2020-05-12 07:15:13 +00:00
Ivan Grokhotkov
d82b60905f Merge branch 'feature/jtag_examples' into 'master' 
Add JTAG related example tests

Closes IDF-1147

See merge request espressif/esp-idf!8393
 2020-05-05 21:40:38 +08:00
Mahavir Jain
ce2a99dc23 Merge branch 'bugfix/fix_ci_exception' into 'master' 
Fix broken pipe exception in CI for OTA examples

See merge request espressif/esp-idf!8519
 2020-05-05 18:08:42 +08:00
Roland Dobai
79e58eff8f Add JTAG related example tests 2020-05-05 11:08:33 +02:00
Shubham Kulkarni
b1e29232ea example_test.py: Override SimpleHTTPRequestHandler to catch broken pipe exception 2020-05-05 14:07:51 +05:30
Ivan Grokhotkov
466998d487 examples/console: add note about Ctrl+C 2020-04-29 23:46:58 +02:00
Ivan Grokhotkov
19f6da99ed examples/console: match prompt to the target name 2020-04-29 23:44:46 +02:00
Ivan Grokhotkov
ece41b04e3 console: make empty line behavior run-time configurable 2020-04-29 23:44:46 +02:00
Michael 'ASAP' Weinrich
8a2413b5c0 Added filtering blank lines from history 2020-04-29 23:44:46 +02:00
MadnessASAP
8680394167 Break the input loop on error or EOF 2020-04-29 23:44:46 +02:00
Roland Dobai
e1dc92b60b Add system example tests 2020-04-28 14:52:15 +02:00
Krzysztof Budzynski
e1ab4b6711 Merge branch 'bugfix/uart_echo_readme' into 'master' 
example: Remove duplicate commands and invalid serial port information

Closes IDFGH-3022

See merge request espressif/esp-idf!8295
 2020-04-11 01:52:01 +08:00
Fu Hanxi
5b2fa1a5ad build_app: make multi target support readable 2020-04-09 16:40:57 +08:00
Roland Dobai
6adb1a0609 example: Remove duplicate commands and invalid serial port information 
Closes https://github.com/espressif/esp-idf/issues/5049
 2020-04-08 13:17:48 +02:00
Ivan Grokhotkov
651dbe48e7 Merge branch 'feature/gcovr' into 'master' 
app_trace: Add coverage generations by gcovr

Closes IDF-780

See merge request espressif/esp-idf!8168
 2020-04-08 15:57:08 +08:00
Anton Maklakov
fa3131b870 Merge branch 'bugfix/bash_bin_env' into 'master' 
global: use '/usr/bin/env bash' instead of '/usr/bin/bash' in shebangs

Closes IDFGH-708

See merge request espressif/esp-idf!8235
 2020-04-06 17:51:43 +08:00
Ivan Grokhotkov
e94288da31 global: use '/usr/bin/env bash' instead of '/usr/bin/bash' in shebangs 
Using the method from @cemeyer
(https://github.com/espressif/esp-idf/pull/3166):

find . -name \*.sh -exec sed -i "" -e 's|^#!.*bin/bash|#!/usr/bin/env bash|' {} +

Closes https://github.com/espressif/esp-idf/pull/3166.
 2020-04-03 01:10:02 +02:00
fuzhibo
baa7898e35 driver(adc/dac): fix adc dac driver for esp32s2 
1. update register file about adc; 2. fix adc driver; 3. add UT for adc/dac;

See merge request espressif/esp-idf!7776
 2020-04-01 12:41:51 +08:00
Roland Dobai
26695df5c8 app_trace: Add coverage generation by gcovr 2020-03-30 13:34:06 +02:00
Angus Gratton
2415531f44 Merge branch 'refactor/esp_event_examples_new_interface' into 'master' 
Examples: esp event examples use new register API

See merge request espressif/esp-idf!7928
 2020-03-27 18:05:45 +08:00
fuzhibo
340563f479 Driver(touch): fix touch sensor driver for esp32s2. 
1.update touch sensor driver for esp32s2;
2.update unit test for touch sensor;
3.update register files about touch sensor;
 2020-03-25 22:45:57 +08:00
Jakob Hasse
1cf2312734 Examples: some examples use new event register API 
* getting started - station
* softap
* iperf
* fast scan
* Power save
 2020-03-25 10:36:47 +08:00
Angus Gratton
62426a6c90 Merge branch 'refactor/use_new_component_registration_functions' into 'master' 
CMake: Use new component registration function

See merge request espressif/esp-idf!8068
 2020-03-25 08:02:42 +08:00
Angus Gratton
b4d97a8076 Merge branch 'feature/add_heap_info_per_task_example' into 'master' 
Add Task Heap Tracking example

See merge request espressif/esp-idf!7750
 2020-03-23 14:07:00 +08:00
Renz Bagaporo
4d9c573fb6 test, examples: use new component registration function 2020-03-23 10:58:48 +08:00
Shubham Kulkarni
6e09056c25 example: Add Heap Task Tracking example 2020-03-19 15:07:41 +05:30
Ivan Grokhotkov
454293159d Merge branch 'docs/update_esp32s2_oocd_target_name' into 'master' 
Updates OpenOCD commands

See merge request espressif/esp-idf!7906
 2020-03-17 01:15:10 +08:00
Alexey Gerenkov
7ee7a6d7bb docs: Updates OpenOCD command names 2020-03-16 19:06:47 +03:00
Roland Dobai
15884eccf2 Add multi-target support for performance tests 2020-03-09 13:41:56 +01:00
Renz Bagaporo
7dbd77cefc examples: split source files for one of the ulp examples 2020-03-03 16:56:14 +08:00
Shubham Kulkarni
4d40f94168 OTA: Add fix in case of URL redirection and a test case of URL redirection 
Closes https://github.com/espressif/esp-idf/issues/4780
 2020-02-24 16:53:27 +05:30
Jakob Hasse
31edd48b43 C++: Moved all C++ examples to own folder 
* moved C++ examples to a new cxx folder in
  examples
* added experimental C++ component
* added ESPException class to the C++ experimental
  component
* added test cases for ESPException and
  corresponding test macros
 2020-02-18 12:48:57 +08:00
Renz Christian Bagaporo
bb639bb91d ulp: use quotes when specifying files for embedding ulp binaries 2020-02-18 00:12:56 +00:00
Shubham Kulkarni
ba31458347 OTA: Fixed OTA with chunked servers and added example_test with chunked server 2020-02-05 11:56:37 +05:30
Ivan Grokhotkov
50466a5e4f Merge branch 'bugfix/esp32s2_ldscripts' into 'master' 
esp32s2: LD script fixes/improvements and re-enable SystemView examples

Closes IDF-1357, IDF-1354, and IDF-1346

See merge request espressif/esp-idf!7431
 2020-02-05 02:09:29 +08:00
David Cermak
3f10c4af06 OTA: enable example builds for esp32s2 target 
Closes IDF-1035
 2020-01-29 15:20:42 +01:00
Ivan Grokhotkov
4145ca591f examples: re-enable SystemView examples for esp32s2 
Closes IDF-1357
 2020-01-24 10:48:38 +01:00
morris
e30cd361a8 global: rename esp32s2beta to esp32s2 2020-01-22 12:14:38 +08:00
KonstantinKondrashov
b49a657448 build: Add CONFIG_APP_PROJECT_VER to set the project version from Kconfig 2020-01-15 11:02:27 +00:00
Shubham Kulkarni
032a041395 Bugfix for failing OTA example 
example_test.py is added to test advanced_https_ota_example and native ota_example.

Closes https://github.com/espressif/esp-idf/issues/4394
 2019-12-31 14:18:16 +05:30
Angus Gratton
30372f5a4f Merge branch 'docs/esp_netif_programmer_manual' into 'master' 
esp netif: formal fixes (docs and c++ sentinels again)

Closes IDFGH-2265

See merge request espressif/esp-idf!6819
 2019-12-18 13:12:36 +08:00
David Cermak
31b2702387 esp_netif, examples: esp_netif_init() moved into ESP_ERROR_CHECK() 
esp_netif_init() returns standard esp_err_t error code (unlike tcpip_adapter init), so shall be checked for the return value
Also to make the initialization code more consistent.
 2019-12-17 09:07:49 +01:00
David Cermak
bbbdcbfe4c esp_netif: update netsuite test example to use I/O driver configuration 
closes https://github.com/espressif/esp-idf/issues/4403
 2019-12-16 19:38:01 +00:00
Ivan Grokhotkov
522cef42ab examples: re-enable console example for esp32s2beta 2019-12-12 14:34:15 +01:00
Ivan Grokhotkov
9859d8867d Merge branch 'feature/sysview_json_traces' into 'master' 
Support for converting SystemView traces to JSON format

See merge request espressif/esp-idf!5674
 2019-12-09 22:46:13 +08:00
He Yin Ling
c906e2afee test: update example and unit tests with new import roles: 
tiny_test_fw is a python package now. import it using normal way.
 2019-12-07 10:34:54 +08:00
Alexey Gerenkov
b81e537b7f apptrace: Extends SystemView heap & log example to run many allocator/freer tasks 2019-12-04 18:04:11 +03:00
houwenxiang
e4230d11ca bugfix(UART): fix uart driver spinlock misused bug 
1. fix uart driver spinlock misused bug
    2. add uart driver ut test case
    3. undo the change in light_sleep_example_main.c
 2019-12-03 16:06:31 +08:00
Fu Zhi Bo
3a468a1ffd Refactor the touch sensor driver 2019-11-27 20:08:44 +08:00
houwenxiang
f27ae9b0e2 feature: Add uart hal support. 2019-11-26 20:01:50 +08:00
Dmitry
845b2d1cfe Jumps change back to jumpr. because example supports esp32 only. 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
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
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
Ivan Grokhotkov
8ff801766a Merge branch 'docs/update_oocd_config_on_cmd_line' into 'master' 
Updates OpenOCD configuration file names in documentation

See merge request espressif/esp-idf!6226
 2019-11-22 05:32:35 +08:00
Ivan Grokhotkov
910f49942e examples: fix test function name in cpp_rtti example 2019-11-21 15:36:06 +01:00
Ivan Grokhotkov
d0e1edcd53 examples: add 2 CI build/test configurations for system/console 2019-11-21 15:36:06 +01:00
Ivan Grokhotkov
871ea650f6 examples: fix sdkconfig warnings 2019-11-21 15:36:06 +01: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
chenjianqiang
9f9da9ec96 feat(timer): refator timer group driver 
1. add hal and low-level layer for timer group
2. add callback functions to handle interrupt
3. add timer deinit function
4. add timer spinlock take function
 2019-11-21 14:14:19 +08:00
fuzhibo
0c2bf7c8bc rtcio: add hal for driver 2019-11-21 10:40:49 +08:00
Angus Gratton
e510e1779d Merge branch 'bugfix/gcov_in_components' into 'master' 
Fixes libgcov and libapp_trace cross dependency linking issue

Closes IDF-834

See merge request espressif/esp-idf!6250
 2019-11-21 07:09:04 +08:00
Alexey Gerenkov
1626f827d3 docs: Updates OpenOCD configuration file names 2019-11-18 13:33:32 +03:00
Alexey Gerenkov
30ff7198b8 apptrace: Renames Kconfig options 2019-11-13 15:24:01 +03:00
David Cermak
6e0d274f58 esp_netif: example init code fixed to assert only variables, not 
function calls so it won't be skipped if compiled without asserts
 2019-11-13 12:36:25 +01:00
David Cermak
cf710a3cb1 esp_netif: include tcpip_adapter legacy header by default to provide *implicit* compatiblity 2019-11-13 12:36:25 +01:00
David Cermak
b834c99148 examples: modify other examples and tests to use esp_netif instead of tcpip_adapter 2019-11-13 12:36:25 +01:00
David Cermak
a49b934ef8 examples: protocol examples which use common connection component 
updated to use esp_netif_init instead of tcpip_adapter in initialization code
 2019-11-13 12:36:25 +01:00
David Cermak
ffe043b1a8 esp_netif: Introduction of esp-netif component as a replacement of tcpip_adpter 
- provides object oriented access to network intefaces
- not limited to default netifs
- more generic abstraction to network input output functions
- event handler registration removed from component responsibility
- backward compatibility layer for legacy tcpip_apapter APIs

Closes IDF-39
 2019-11-13 12:36:25 +01:00
Alexey Gerenkov
5b83b198c6 gcov: Fixes libgcov and libapp_trace cross dependency linking issue 
Closes IDF-834
 2019-11-12 18:42:08 +03:00
Alexey Gerenkov
02e084e2b5 examples: Collects coverage info in component 2019-11-12 18:42:02 +03:00
Ivan Grokhotkov
18c9e306c2 examples/system: add C++ RTTI example 2019-11-06 15:30:44 +01:00
Angus Gratton
ffdb57e04d Merge branch 'bugfix/http_client_message_complete_callback_invocation' into 'master' 
Fix issue in http client regarding `message_complete` callback invocation

Closes IDFGH-2040

See merge request espressif/esp-idf!6413
 2019-11-05 12:02:10 +08:00
Angus Gratton
8b48a8e72e Merge branch 'feature/efuse_example' into 'master' 
examples: Add an example efuse API usage and the group writing mode

Closes IDF-773

See merge request espressif/esp-idf!5810
 2019-11-05 10:13:21 +08:00
Angus Gratton
c5ef1cae04 Merge branch 'feature/perfmon' into 'master' 
Performance monitor component

See merge request espressif/esp-idf!4705
 2019-11-04 18:25:14 +08:00
Mahavir Jain
e1a6846ac3 examples/ota: disable WiFi power save mode for optimal performance 2019-11-04 12:15:19 +05:30
Mahavir Jain
917a406c0a Logging improvements in OTA example and component 2019-11-04 12:15:19 +05:30
Mahavir Jain
de9549936d examples: fix handle passed to esp_https_ota_is_complete_data_received 2019-11-04 12:15:19 +05:30
Renz Christian Bagaporo
f356d54365 esp_event: revert changes in !5702 2019-11-03 16:19:30 +08:00
KonstantinKondrashov
d7fa288a6c examples: Add an example efuse API usage 
Added: read, write operations for the common and custom efuse tables.
Writing is possible only for CONFIG_EFUSE_VIRTUAL.

Closes: IDF-773
 2019-10-30 15:43:40 +08:00
Angus Gratton
7ce75a42c7 Merge branch 'master' into feature/esp32s2beta_merge 2019-10-25 15:13:52 +11:00
suda-morris
fa32a4bd93 ping: refactor with new esp_ping_xxx APIs 
This refactor is only for backwards compatible.
 2019-10-22 04:38:09 +00:00
Andro Nooh
a77e69c408 lwip: add icmp echo example 
It piggybacks on the console example to add ping support and CLI.

Merges https://github.com/espressif/esp-idf/pull/4093
 2019-10-22 04:38:09 +00:00
Angus Gratton
496ede9bcd Merge branch 'master' into feature/esp32s2beta_merge 2019-10-15 14:59:27 +11:00
suda-morris
81e88764d5 console: fix wrong param passed to esp_err_to_name 2019-10-14 19:49:19 +08:00