Ivan Grokhotkov 
							
						 
					 
					
						
						
							
						
						ba874ccb04 
					 
					
						
						
							
							Merge branch 'feature/freemodbus_add_tcp_master_slave' into 'master'  
						
						 
						
						... 
						
						
						
						freemodbus:  add tcp master and slave support
Closes IDFGH-1147 and IDF-452
See merge request espressif/esp-idf!7506  
						
						
					 
					
						2020-07-22 00:34:06 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Lisitsyn 
							
						 
					 
					
						
						
							
						
						d0b9829eef 
					 
					
						
						
							
							examples: freemodbus add tcp support for common master/slave iface  
						
						 
						
						... 
						
						
						
						Add TCP port files to provide Modbus TCP interface for communication
Add freemodbus add tcp support for common master/slave iface and tcp example based on socket API
The communication between master and slave checked for each example serial_master, serial_slave (use ModbusPoll TCP)
update tcp example according netif changes, fix ci issues
update TCP slave implementation
update example_test.py to to set IP through stdin
update API documentation
event bit instead of semahore to lock communication resource
update default options and master/slave port files
Closes https://github.com/espressif/esp-idf/issues/858 
Closes IDF-452 
						
						
					 
					
						2020-07-22 00:34:04 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ivan Grokhotkov 
							
						 
					 
					
						
						
							
						
						c7e54fd277 
					 
					
						
						
							
							Merge branch 'bugfix/doc_rs485_fix_incorrect_sch_label' into 'master'  
						
						 
						
						... 
						
						
						
						doc: uart rs485 fix incorrect sch circuit label
Closes DOC-302
See merge request espressif/esp-idf!9649  
						
						
					 
					
						2020-07-21 22:07:47 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marius Vikhammer 
							
						 
					 
					
						
						
							
						
						09f240c1e1 
					 
					
						
						
							
							doc/websocket: updates the API reference for ESP WebSocket Client  
						
						 
						
						
						
						
					 
					
						2020-07-21 15:44:16 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Angus Gratton 
							
						 
					 
					
						
						
							
						
						6798ab3a08 
					 
					
						
						
							
							Merge branch 'bugfix/shared_stack_not_switching_correctly' into 'master'  
						
						 
						
						... 
						
						
						
						bugfix/shared_stack: Fix task stack not being replaced by shared stack correctly
See merge request espressif/esp-idf!7956  
						
						
					 
					
						2020-07-20 08:32:37 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Angus Gratton 
							
						 
					 
					
						
						
							
						
						f83a61e2c8 
					 
					
						
						
							
							Merge branch 'feature/ulp_riscv' into 'master'  
						
						 
						
						... 
						
						
						
						feature/components: Initial support for ULP-RISC-V Coprocessor on esp32s2
Closes IDF-521
See merge request espressif/esp-idf!8781  
						
						
					 
					
						2020-07-20 08:27:20 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Krzysztof Budzynski 
							
						 
					 
					
						
						
							
						
						81bfba06e1 
					 
					
						
						
							
							Merge branch 'docs/saola_guide_update' into 'master'  
						
						 
						
						... 
						
						
						
						Update ESP32-S2-Saola-1 User Guide according to DGAP-60
Closes DGAP-60
See merge request espressif/esp-idf!9632  
						
						
					 
					
						2020-07-16 14:02:08 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								aleks 
							
						 
					 
					
						
						
							
						
						74edd54c03 
					 
					
						
						
							
							doc: uart rs485 fix incorrect sch circuit label  
						
						 
						
						
						
						
					 
					
						2020-07-16 07:16:17 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felipe Neves 
							
						 
					 
					
						
						
							
						
						b6dba84323 
					 
					
						
						
							
							ulp: added support to building code for riscv ULP coprocessor  
						
						 
						
						
						
						
					 
					
						2020-07-15 15:28:49 -03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wang Ning 
							
						 
					 
					
						
						
							
						
						20190c1811 
					 
					
						
						
							
							Update according to DGAP-60  
						
						 
						
						
						
						
					 
					
						2020-07-15 16:04:49 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felipe Neves 
							
						 
					 
					
						
						
							
						
						a700035a85 
					 
					
						
						
							
							test/shared_stack_printf: improved printf with shared stack function test  
						
						 
						
						
						
						
					 
					
						2020-07-14 12:56:02 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Felipe Neves 
							
						 
					 
					
						
						
							
						
						938a73756c 
					 
					
						
						
							
							esp_common/shared_stack: modifed the stack switch procedure to a simpler way  
						
						 
						
						... 
						
						
						
						esp_common/shared_stack: refactored the implemenation of shared stack function (still not working properly)
esp_expression_with_stack: refactored the shared stack function calling mechanism and updated the documentation 
						
						
					 
					
						2020-07-14 12:56:02 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Cermak 
							
						 
					 
					
						
						
							
						
						1c8171c3e8 
					 
					
						
						
							
							asio: option to use wolfSSL as TLS stack for ASIO  
						
						 
						
						... 
						
						
						
						Plus other minor update, make openssl aware of current modes (SSL_set_mode)
Update coding style in examples and tests, including copyright notices 
						
						
					 
					
						2020-07-14 10:42:17 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Cermak 
							
						 
					 
					
						
						
							
						
						9459c0dd43 
					 
					
						
						
							
							asio: Basic SSL/TLS support in asio port for ESP platform  
						
						 
						
						... 
						
						
						
						This port employs IDF port of OpenSSL for most common features, others
are discouraged or not supported. The port also introduces several stubs
for OpenSSL functions which ASIO needs to get compiled and linked.
Upstream ASIO supports WolfSSL as SSL/TLS stack, as well, which is
another option for SSL support in ASIO on ESP platform. 
						
						
					 
					
						2020-07-14 10:42:17 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sU8U7SfkcwTJVH7PjaVmej7D 
							
						 
					 
					
						
						
							
						
						6673407f98 
					 
					
						
						
							
							httpd_resp_send: use HTTPD_RESP_USE_STRLEN when possible  
						
						 
						
						
						
						
					 
					
						2020-07-13 05:34:56 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael (XIAO Xufeng) 
							
						 
					 
					
						
						
							
						
						f6dd63d03d 
					 
					
						
						
							
							spi_slave_hd: new driver for spi slave in half duplex mode  
						
						 
						
						
						
						
					 
					
						2020-07-11 00:00:50 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hao Ning 
							
						 
					 
					
						
						
							
						
						214c3a54b9 
					 
					
						
						
							
							Doc/add chinese updates in contribute folder  
						
						 
						
						
						
						
					 
					
						2020-07-10 21:16:37 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Krzysztof Budzynski 
							
						 
					 
					
						
						
							
						
						6333896b6f 
					 
					
						
						
							
							Merge branch 'doc/update_chip_features' into 'master'  
						
						 
						
						... 
						
						
						
						doc: update chip features in getting started
Closes IDFGH-3616
See merge request espressif/esp-idf!9541  
						
						
					 
					
						2020-07-10 15:18:08 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marius Vikhammer 
							
						 
					 
					
						
						
							
						
						4d6030e03f 
					 
					
						
						
							
							doc: update chip features in getting started  
						
						 
						
						... 
						
						
						
						Fixed number of cores for ESP32 and ESP32S2 being wrong.
Updated S2 to reflect that we have to ULP coprocessors
Closes IDFGH-3616
Closes https://github.com/espressif/esp-idf/issues/5556  
						
						
					 
					
						2020-07-10 09:50:55 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ivan Grokhotkov 
							
						 
					 
					
						
						
							
						
						8e6d450a8c 
					 
					
						
						
							
							Revert "Merge branch 'feature/gdb_stub_task_state' into 'master'"  
						
						 
						
						... 
						
						
						
						This reverts commit c41a0c1907 , reversing
changes made to 5c1d317766 . 
						
						
					 
					
						2020-07-09 17:16:47 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ivan Grokhotkov 
							
						 
					 
					
						
						
							
						
						8cd1f99ace 
					 
					
						
						
							
							Merge branch 'refactor/common_rom_gpio_apis' into 'master'  
						
						 
						
						... 
						
						
						
						esp_rom: extract common GPIO apis into esp_rom_gpio.h
See merge request espressif/esp-idf!9248  
						
						
					 
					
						2020-07-07 17:28:39 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ivan Grokhotkov 
							
						 
					 
					
						
						
							
						
						adf86bd95e 
					 
					
						
						
							
							Merge branch 'feature/console_repl_on_uart' into 'master'  
						
						 
						
						... 
						
						
						
						console_repl: move UART specific configuration into single config structure
See merge request espressif/esp-idf!8964  
						
						
					 
					
						2020-07-07 16:27:47 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								morris 
							
						 
					 
					
						
						
							
						
						a4d0033c03 
					 
					
						
						
							
							esp_rom: extract common GPIO apis into esp_rom_gpio.h  
						
						 
						
						
						
						
					 
					
						2020-07-07 11:40:19 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael (XIAO Xufeng) 
							
						 
					 
					
						
						
							
						
						4e8ae0343b 
					 
					
						
						
							
							Merge branch 'bugfix/add_api_adc2_vref_to_gpio_for_esp32s2' into 'master'  
						
						 
						
						... 
						
						
						
						driver(adc): esp32s2 support API `adc2_vref_to_gpio`
Closes IDF-1356
See merge request espressif/esp-idf!9051  
						
						
					 
					
						2020-07-06 13:00:00 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Angus Gratton 
							
						 
					 
					
						
						
							
						
						e2ed523e28 
					 
					
						
						
							
							Merge branch 'feature/sphinx_idf_theme_pip' into 'master'  
						
						 
						
						... 
						
						
						
						docs: update build system to use sphinx_idf_theme pip package
Closes IDF-1488
See merge request espressif/esp-idf!9256  
						
						
					 
					
						2020-07-06 12:49:19 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marius Vikhammer 
							
						 
					 
					
						
						
							
						
						ccdd3d3db8 
					 
					
						
						
							
							docs: update sphinx_idf_theme documentation  
						
						 
						
						... 
						
						
						
						Bump CI doc-env docker image to v5 
						
						
					 
					
						2020-07-06 10:45:43 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								morris 
							
						 
					 
					
						
						
							
						
						29f8aecfc0 
					 
					
						
						
							
							console_repl: change config structure to support different devices  
						
						 
						
						
						
						
					 
					
						2020-07-02 07:39:46 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								fuzhibo 
							
						 
					 
					
						
						
							
						
						8d922847af 
					 
					
						
						
							
							driver(adc): esp32s2 support API adc2_vref_to_gpio  
						
						 
						
						
						
						
					 
					
						2020-07-01 06:21:45 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nachiket Kukade 
							
						 
					 
					
						
						
							
						
						fc5d7239ea 
					 
					
						
						
							
							esp_wifi: Update wifi lib  
						
						 
						
						... 
						
						
						
						1. Avoid parsing RSN/WPA IE's after connection
2. Remove AUTH_CHANGED reason code logic 
						
						
					 
					
						2020-06-30 18:35:46 +05:30  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darian Leung 
							
						 
					 
					
						
						
							
						
						97721d469c 
					 
					
						
						
							
							TWAI: Add ESP32-S2 support  
						
						 
						
						... 
						
						
						
						This commit adds TWAI driver support for the
ESP32-S2. The following features were added:
- Expanded BRP support
- Expanded CLKOUT Divider Support
- Updated example READMEs 
						
						
					 
					
						2020-06-30 16:56:03 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ivan Grokhotkov 
							
						 
					 
					
						
						
							
						
						5985c07ab7 
					 
					
						
						
							
							docs: add section about USB CDC console  
						
						 
						
						
						
						
					 
					
						2020-06-26 15:38:49 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marius Vikhammer 
							
						 
					 
					
						
						
							
						
						32761b9782 
					 
					
						
						
							
							docs: fix link_roles not linking correctly for certain files  
						
						 
						
						... 
						
						
						
						Link_roles could link incorrectly if the name of a file matched the name of a submodule 
						
						
					 
					
						2020-06-22 20:42:59 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Krzysztof Budzynski 
							
						 
					 
					
						
						
							
						
						4995fe510e 
					 
					
						
						
							
							Merge branch 'docs/saola_update' into 'master'  
						
						 
						
						... 
						
						
						
						Add dimensions of ESP32-S2-Saola-1 User Guide
See merge request espressif/esp-idf!9249  
						
						
					 
					
						2020-06-22 14:10:39 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Renz Bagaporo 
							
						 
					 
					
						
						
							
						
						3386316f81 
					 
					
						
						
							
							docs: fix build issue requiring new location of cpu_start.c  
						
						 
						
						
						
						
					 
					
						2020-06-19 18:40:10 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wang Ning 
							
						 
					 
					
						
						
							
						
						27f24a5d06 
					 
					
						
						
							
							Add dimensions  
						
						 
						
						
						
						
					 
					
						2020-06-19 13:04:07 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Angus Gratton 
							
						 
					 
					
						
						
							
						
						b3ef89942f 
					 
					
						
						
							
							Merge branch 'feature/cmake_overriding_components_new_features' into 'master'  
						
						 
						
						... 
						
						
						
						CMake: useful features for overriding components
See merge request espressif/esp-idf!8220  
						
						
					 
					
						2020-06-19 11:56:56 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Renz Bagaporo 
							
						 
					 
					
						
						
							
						
						ebf07d353d 
					 
					
						
						
							
							cmake: allow overriding kconfig, kconfig_projbuild on registration  
						
						 
						
						
						
						
					 
					
						2020-06-16 20:42:00 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Renz Bagaporo 
							
						 
					 
					
						
						
							
						
						f8d0c5770b 
					 
					
						
						
							
							cmake: take note of component overriden dir  
						
						 
						
						
						
						
					 
					
						2020-06-16 20:42:00 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Krzysztof 
							
						 
					 
					
						
						
							
						
						1e34a1499b 
					 
					
						
						
							
							Resolve broken link reported on  https://esp32.com/viewtopic.php?f=5&t=14148#p61447  by boarchuz  
						
						 
						
						
						
						
					 
					
						2020-06-15 21:34:11 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Krzysztof Budzynski 
							
						 
					 
					
						
						
							
						
						79a0e892a0 
					 
					
						
						
							
							Merge branch 'feature/coredump_allow_variable_dumping' into 'master'  
						
						 
						
						... 
						
						
						
						Added coredump user defined variable into coredump
Closes IDF-44
See merge request espressif/esp-idf!8730  
						
						
					 
					
						2020-06-15 02:35:38 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alexey Gerenkov 
							
						 
					 
					
						
						
							
						
						1deeadf4c5 
					 
					
						
						
							
							Added coredump user defined variable into coredump  
						
						 
						
						
						
						
					 
					
						2020-06-15 02:35:38 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Angus Gratton 
							
						 
					 
					
						
						
							
						
						eef0e178a0 
					 
					
						
						
							
							Merge branch 'feature/msys2_env_update' into 'master'  
						
						 
						
						... 
						
						
						
						windows: Update MSYS2 pre-compiled legacy build environment
Closes IDF-1289 and IDF-1526
See merge request espressif/esp-idf!9034  
						
						
					 
					
						2020-06-12 07:26:09 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Krzysztof Budzynski 
							
						 
					 
					
						
						
							
						
						f17b4763e0 
					 
					
						
						
							
							Merge branch 'doc/structures_enum4style_guide' into 'master'  
						
						 
						
						... 
						
						
						
						Doc/structures enum4style guide
See merge request espressif/esp-idf!7140  
						
						
					 
					
						2020-06-08 22:05:56 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Krzysztof Budzynski 
							
						 
					 
					
						
						
							
						
						d3a400c159 
					 
					
						
						
							
							Merge branch 'feature/freertos_authentic_includes_docs' into 'master'  
						
						 
						
						... 
						
						
						
						docs: Added ORIG_INCLUDE_PATH description to the doc
See merge request espressif/esp-idf!6889  
						
						
					 
					
						2020-06-08 18:24:57 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ivan Grokhotkov 
							
						 
					 
					
						
						
							
						
						7283b99c97 
					 
					
						
						
							
							Merge branch 'feature/dfu_select_device' into 'master'  
						
						 
						
						... 
						
						
						
						Add ability to select a device for DFU flashing
Closes IDF-1652
See merge request espressif/esp-idf!8956  
						
						
					 
					
						2020-06-08 15:55:04 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kapil.gupta 
							
						 
					 
					
						
						
							
						
						179292f9b3 
					 
					
						
						
							
							esp_wifi: Remove auth_changed event and fix wpa2 authmode threshold  
						
						 
						
						... 
						
						
						
						Added following as part of this change
1. Removed auth_changed event
2. Updated doc regarding usage of  WPA/WEP secuiry modes
3. Fixed WPA2 enterprise authmode threshold. 
						
						
					 
					
						2020-06-04 17:54:26 +05:30  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Angus Gratton 
							
						 
					 
					
						
						
							
						
						9d52318683 
					 
					
						
						
							
							Merge branch 'doc/ds_S2' into 'master'  
						
						 
						
						... 
						
						
						
						DOC: DS documentation for S2
See merge request espressif/esp-idf!8450  
						
						
					 
					
						2020-06-04 16:36:13 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Krzysztof Budzynski 
							
						 
					 
					
						
						
							
						
						cfadc65073 
					 
					
						
						
							
							Merge branch 'docs/hal_and_ll' into 'master'  
						
						 
						
						... 
						
						
						
						Add documentation about ESP-IDF Hardware Abstraction (HAL and LL)
Closes IDF-1198
See merge request espressif/esp-idf!9030  
						
						
					 
					
						2020-06-04 16:33:40 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darian Leung 
							
						 
					 
					
						
						
							
						
						e61bbbcb61 
					 
					
						
						
							
							Add HAL and LL documentation  
						
						 
						
						... 
						
						
						
						This commit adds docuemntation regarding Hardware
Abstraction in ESP-IDF. 
						
						
					 
					
						2020-06-04 15:02:49 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jakob Hasse 
							
						 
					 
					
						
						
							
						
						516680a4ff 
					 
					
						
						
							
							Doc: DS documentation for S2  
						
						 
						
						
						
						
					 
					
						2020-06-04 10:49:22 +08:00