Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
1959 commits 10 branches 75 tags 114 MiB
Commit graph

227 commits

Author SHA1 Message Date
Tian Hao
f6de7ea764 component/bt : cleanup status and spell check 2016-11-28 22:40:30 +08:00
Tian Hao
9d9e758756 component/bt : add comment for doxygen 
1. use doxygen check api comment
 2016-11-28 21:59:04 +08:00
Tian Hao
ff8ce12787 component/bt : cleanup the spell && redundant 2016-11-28 14:58:30 +08:00
Tian Hao
19273c7b2d component/bt : run astyle handle the code files 2016-11-25 02:10:15 +08:00
Tian Hao
d7eb709a9c component/bt : add license header 2016-11-25 01:58:26 +08:00
Wangjialin
a5ad8090cf Merge branch 'master' into driver_merge_tmp/merge_timer 
# Conflicts:
#	docs/index.rst
 2016-11-25 01:07:19 +08:00
Wang Jia Lin
35ae2cd1a5 Merge branch 'driver_merge_tmp/merge_pcnt' into 'master' 
driver: PCNT

1. add PCNT module in periph_ctrl.c/.h
2. add description of PCNT status in pcnt_struct.h
3. add PCNT driver code
4. add PCNT example code.

See merge request !229
 2016-11-25 00:41:16 +08:00
Tian Hao
160e81e901 example : cleanup the order 2016-11-24 20:20:59 +08:00
Tian Hao
55e0690f69 component/bt : wifi/bt software coexist option 
1. option of sw coexist
2. cpu set freq function modify
3. update lib
4. ld add static data address
 2016-11-24 19:57:47 +08:00
Ivan Grokhotkov
1bcd90d45d Merge branch 'feature/system_apis' into 'master' 
system_* APIs cleanup

This changeset is mostly about cleaning up `system_*` APIs and moving them from libcore. It has dragged a few more changes along, however.

- `system_deep_sleep` deprecated, new name is `esp_deep_sleep`
- `system_efuse_read_mac` deprecated, new name is `esp_efuse_read_mac`
- `system_read/write_rtc_mem` removed (reason: we use linker to place code/data into RTC memory now)
- `system_get_sdk_version` deprecated. Returns "master" for now. Support for compile-time and runtime version detection will be done in a separate MR.
- `system_get_time` and variations have been deprecated. `gettimeofday` should be used instead.
- `system_restart` deprecated, new name is `esp_restart`. Rewritten code to work correctly from any of the cores.
- `system_restore` deprecated, `esp_wifi_restore` should be used instead.
- `system_get_rst_info` removed (it wasn't in a header file)
- RTC library has been updated to latest version
- Logging output from `libfoo.a` goes through `foo_printf` function now, where `foo ` is any of the library names. For libraries other than rtc and phy, this is a temporary measure, until we finish switching to esp_log library and clean up all uses of printf/ets_printf.
- ESP-IDF build will fail if any of the libraries have printf/ets_printf reference.
-  Added `esp_random` function which gets values from HW RNG. I have added code which makes sure the value is not polled too often (allows at least 16 APB cycles). Also added a header file for HW RNG (just one register).
- Moved random number generation functions used by wpa library into wpa_supplicant component.

See merge request !234
 2016-11-24 18:22:50 +08:00
Tian Hao
7a41ab6982 Merge branch 'master' into feature/btdm_bluedroid 
1. update bt lib submodule

# Conflicts:
#	components/bootloader/src/main/esp32.bootloader.ld
#	components/bt/component.mk
#	components/esp32/component.mk
#	components/esp32/lib
 2016-11-24 15:45:04 +08:00
Wangjialin
f97f198c9d driver: improve pulse counter code 
1. Modify some comments in pcnt.h
2. Modify api/pcnt.rst
3. Improve example code.
4. Add status definitions in pcnt_reg.h
 2016-11-24 12:01:21 +08:00
Angus Gratton
79646f41b5 Fixes for stdlib.h inclusion 
Refs:
http://esp32.com/viewtopic.php?f=13&t=550
http://esp32.com/viewtopic.php?f=13&t=551

rmt.c should include stdlib.h for malloc, esp_bignum,c &
https_request_main.c for abort().

FreeRTOSConfig.h is only including stdlib if
CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION is set. However, it is
included for abort() so needs to be included whenever
CONFIG_FREERTOS_ASSERT_FAIL_ABORT is set.

This change includes unconditionally in FreeRTOSConfig.h. This is to
avoid this kind of bug where compiler errors are dependent on config. I
suggest we don't change this to be more selective until we have 'make
randomconfig' style tests in CI.
 2016-11-24 08:20:21 +11:00
Wangjialin
6db1482cd5 Merge branch 'master' into driver_merge_tmp/merge_pcnt 
# Conflicts:
#	components/driver/include/driver/periph_ctrl.h
 2016-11-23 18:15:54 +08:00
Tian Hao
85aac3afa6 component/bt : decrease callback cb param size 
1. decrease callback cb param size
2. add write in gatt server demo
 2016-11-23 15:34:21 +08:00
Wangjialin
a3c4a70ba3 driver: add hardware timer code. 
1. add timer driver code
2. add timer example code
3. replace api for enable interrupt in task_wdt.c
 2016-11-23 02:15:27 +08:00
Ivan Grokhotkov
df6edb50e9 implement esp_deep_sleep, fix build issues 2016-11-22 21:54:49 +08:00
Tian Hao
db007fbb2e component/bt : clean up the demos 
1. cleanup gatt client demo
2. cleanup gatt server demo
3. cleanup blufi demo
4. use correct log level
 2016-11-22 20:32:45 +08:00
Tian Hao
595bd2e3c4 component/bt : gatt client fix search service bug 
1. fix search service bug
2. delete some print
 2016-11-22 17:26:30 +08:00
Wangjialin
6a1dbc3f1c add RMT driver and example 2016-11-22 00:57:19 +08:00
Tian Hao
3b432735c6 component/bt : fix advertising data and refer bug 2016-11-21 22:38:00 +08:00
Wangjialin
1cc1d9d721 driver: Add PCNT code 
1. add PCNT module in periph_ctrl.c/.h
2. add description of PCNT status in pcnt_struct.h
3. add PCNT driver code
4. add PCNT example code.
 2016-11-21 18:17:07 +08:00
Tian Hao
4ed6404e9f Merge remote-tracking branch 'remotes/origin/feature/btdm_arch_debug1' into feature/btdm_arch 
# Conflicts:
#	components/bt/bluedroid/api/include/esp_gatt_defs.h
#	components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c
 2016-11-21 14:50:51 +08:00
Yulong
1561c02ba9 component bt:Add stop scan API to the esp_gap_ble API module 2016-11-19 09:56:36 -05:00
Yulong
a76b65ed95 compnent bt:debug the btc_gattc received data error issues. 2016-11-19 08:00:08 -05:00
Tian Hao
0245a2028c component/bt : gatts fix 
1. gatt server demo
2. gatt server fix bug(bta btc covert bug)
3. fix print lost
 2016-11-18 22:10:35 +08:00
Yulong
3edcd29a83 compoent bt:debug the btc_gap_ble module, fix the adv len not long fix 2016-11-18 05:00:47 -05:00
Yulong
2f7288ff03 component bt:debug the scan result and add the resove adv data method to the gapapi 2016-11-18 03:43:51 -05:00
Wu Jian Gang
8ab4e11840 Merge branch 'feature/openssl' into 'master' 
OpenSSL API examples

add openssl demo

See merge request !198
 2016-11-18 15:50:50 +08:00
Dong Heng
2b196b4f3e components/openssl_demo: remove the apache license header and add cc license head 2016-11-18 10:07:34 +08:00
Tian Hao
37365cef95 component/bt : gatt server 
1.add gatt server demo for user
2. some function didn't be tested
 2016-11-18 00:30:35 +08:00
Yulong
645717b147 Merge remote-tracking branch 'origin/feature/btdm_arch' into feature/btdm_arch_debug1 2016-11-17 08:08:19 -05:00
Yulong
7548b8c622 component bt: Added the client demo to the bt project 2016-11-17 06:37:56 -05:00
Tian Hao
a35e2d42f0 Merge remote-tracking branch 'remotes/origin/feature/btdm_arch_debug1' into feature/btdm_arch 
1. merge to fix gap modify
 2016-11-17 11:28:10 +08:00
Tian Hao
aafaebefb4 component/bt : move blufi to new architecture btc task 
1. move blufi to new architecture
2. delete some log trace
 2016-11-16 22:11:59 +08:00
Yulong
a63383dd19 component bt:change the scan rsp callback & scan param setup 2016-11-16 06:50:44 -05:00
Tian Hao
9691fe9dae component/bt : init api 
1. use future to redefine init api
 2016-11-16 16:26:02 +08:00
Tian Hao
8fed003ce5 component/bt : main api 
1. use blufi check main api ok
 2016-11-16 11:28:41 +08:00
Angus Gratton
9ae07082ff examples: Update component.mk for new conventions 2016-11-16 14:20:47 +11:00
Dong Heng
2ed9e2d9a8 feature/openssl: fixup the file and code style 2016-11-16 11:11:01 +08:00
Dong Heng
656543c5ca feature/openssl: fixup some insufficient 2016-11-16 10:46:03 +08:00
Tian Hao
521ef3f579 component/bt : new architectecture 
1st compile ok
 2016-11-15 20:56:15 +08:00
Dong Heng
4d25986aaa Merge branch 'master' into feature/openssl 2016-11-15 15:20:48 +08:00
Dong Heng
a2b1f4221b feature/openssl: add the openssl server demo 2016-11-15 15:08:51 +08:00
Dong Heng
dfaac25a37 feature/openssl: add openssl server demo and remove some check function 2016-11-15 15:04:21 +08:00
Dong Heng
858fe9815b feature/openssl: add openssl client demo 2016-11-15 11:12:58 +08:00
Dong Heng
794b4ff578 components/openssl: add client and server demo 2016-11-14 15:11:22 +08:00
Angus Gratton
751736f902 ble_adv example: Remove int return value from app_main() 2016-11-14 15:55:26 +11:00
Angus Gratton
f7af4ddc89 Examples: Remove deprecated system_init() call 2016-11-14 15:54:33 +11:00
Angus Gratton
c15024e629 Merge branch 'master' into feature/build_component_project_vars 2016-11-14 14:54:41 +11:00
Angus Gratton
ea4005e673 Merge branch 'feature/esptool_secure_boot' into 'master' 
Secure boot support

Also includes a lot of esptool.py changes (two new command line tools, espefuse.py and espsecure.py)
https://github.com/themadinventor/esptool/compare/feature/esp32_v20_refactor...feature/esp32_secure_boot?expand=1


See merge request !163
 2016-11-14 11:32:04 +08:00
Ivan Grokhotkov
980be385cb Merge branch 'feature/nvs_examples' into 'master' 
NVS examples

Add two examples for working with NVS.

One is reading and writing an integer value, another is reading and writing a blob.


See merge request !194
 2016-11-11 14:25:27 +08:00
Ivan Grokhotkov
9aa9086c8b examples: minor tweaks to comments 2016-11-11 12:16:54 +08:00
Krzysztof
3aca537157 Optimsed code 
Following note in review by @igrr 👍
 2016-11-10 07:37:16 +01:00
Krzysztof
f7cb6fc969 NVS Examples update 
Updated previusly submitted example, saved it as "07_nvs_rw_value" and
added a new one.

Overview of examples:
* 07_nvs_rw_value - simple read and write a single value
* 08_nvs_rw_blob - read and write a blob that is extened with new data
on each restart of ESP32

Removed LICENSE files
 2016-11-10 06:52:48 +01:00
Angus Gratton
208e83def7 build system: Refactor component.mk to not need component_common.mk 
New makefile component_wrapper.mk allows some variables to be set
before component.mk is evaluated. This properly fixes problems with
sdkconfig being hard to access in all phases of the build.

Including component_common.mk is no longer necessary and will print a
deprecation warning for components which use it.
 2016-11-10 15:52:22 +11:00
Angus Gratton
fce359b240 build system: Add support for embedded arbitrary binary or text files in .rodata 
Simplifies examples of embedding a certificate file or a root cert.

This is a much cruder mechanism than the full flash filesystem we want
eventually, but still sometimes useful.
 2016-11-08 11:13:54 +11:00
Tian Hao
118984283a component/bt : blufi use api 
1. use api
2. bluetooth init/deinit/enable/disable wrap api(1st version)
3. bluetooth deinit(free resource) still some problem
 2016-11-07 02:16:00 +08:00
Krzysztof
025bb47302 Non-Volatile Storage (NVS) example 
Demonstrates how to read and write a value using NVS.
The value tracks number of ESP32 module restarts.
Example also shows how to use basic diagnostics if read / write
operation was successful.
 2016-11-06 18:19:49 +01:00
Tian Hao
3b489f04f0 component:bt : change adv api 2016-11-06 23:58:37 +08:00
Krzysztof
b981b195be Fixed broken links 2016-11-05 17:04:35 +01:00
Tian Hao
224acf37f6 component/bt : api category 2016-11-05 20:40:07 +08:00
Tian Hao
084248e211 component/bt : cleanup task evt 2016-11-05 19:57:53 +08:00
Tian Hao
5c3ce5b269 component/bt : demo compile fix 2016-11-05 02:50:51 +08:00
Tian Hao
aa6fe04148 component/bt : cleanup the liscence header 2016-11-05 02:48:16 +08:00
Tian Hao
acda125e8b Merge branch 'feature/btdm_prf_task' into feature/btdm_bluedroid 
# Conflicts:
#	components/bt/bluedroid/profiles/core/bt_prf_sys_main.c
#	components/bt/bluedroid/profiles/core/bt_prf_task.c
#	components/bt/bluedroid/profiles/core/include/bt_prf_sys.h
#	components/bt/bluedroid/profiles/core/include/bt_prf_task.h
#	components/bt/bluedroid/profiles/esp/include/wx_airsync_prf.h
#	components/bt/bluedroid/profiles/esp/wechat_AirSync/wx_airsync_prf.c
#	components/bt/bluedroid/stack/btm/btm_sec.c
 2016-11-04 19:32:47 +08:00
Tian Hao
4ea38327b6 component:bt delete old demo trash 2016-11-04 17:50:40 +08:00
Yulong
b83b0ed06a commpnent bt:Added the stop advertising to the bt project 2016-11-04 05:36:32 -04:00
Yulong
90d9f1a74e component bt:debug the profile task can work 2016-11-04 02:34:52 -04:00
Yulong
c377650cdd component bt:Added the profile task to the bt project 2016-11-03 04:27:44 -04:00
Ivan Grokhotkov
eb2c633cbf newlib: implement settimeofday, integrate LwIP SNTP, add SNTP example 2016-11-03 12:46:46 +08:00
Yulong
57f8128718 component bt:Change the battery client profile to the new API 2016-11-02 07:04:11 -04:00
Yulong
2cea783ca1 component bt:Added the app_button event process function to the bt project 2016-11-02 02:21:31 -04:00
yulong
97c75a88ae component bt:Change the button profile function to the new API function 2016-11-02 02:05:30 -04:00
Tian Hao
66b31b89ac Merge branch 'feature/btdm_gap' into feature/btdm_bluedroid 
# Conflicts:
#	examples/07_blufi/components/bluedroid_demos/app_project/SampleClientProject.c
#	examples/07_blufi/components/bluedroid_demos/app_project/SampleServerProject.c
#	examples/07_blufi/components/bluedroid_demos/include/bt_app_common.h
 2016-11-01 14:19:38 +08:00
Tian Hao
cb33e2a5ae Merge branch 'feature/btdm_blufi' into feature/btdm_bluedroid 
# Conflicts:
#	components/bt/bluedroid/bta/dm/bta_dm_pm.c
#	components/bt/component.mk
#	examples/07_blufi/components/bluedroid_demos/app_core/bt_app_core.c
#	examples/07_blufi/components/bluedroid_demos/app_project/SampleServerProject.c
 2016-11-01 14:01:49 +08:00
wangmengyang
a8b2608dd9 component/bt: merge SDP client and SDP server example to a single demo 2016-11-01 11:54:01 +08:00
yulong
1cc3858dc8 component bt:Modified the API method to the bt project 2016-10-31 07:24:03 -04:00
yulong
3053518f8a component bt:modified the API format to the standard format 2016-10-31 06:55:54 -04:00
wangmengyang
2d15803f70 component/bt: add new demo for Bluetooth SDP client 
1. add Bluetooth SDP client demo;
2. some minor typo fixes
 2016-10-31 12:34:11 +08:00
wangmengyang
0933339e4b component/bt: add new demo for bluetooth SDP server 
1. add bluetooth SDP server demo
2. some minor typo fixes
 2016-10-28 15:48:27 +08:00
yulong
d6db871068 component bt:Change the profile function method to new API 2016-10-28 01:54:42 -04:00
yulong
5ede46f213 component bt:Change the profile & app interface to new API 2016-10-26 08:19:48 -04:00
yulong
3cd8149288 component bt:Finished Adding all the GATTS API to the bt project 2016-10-26 06:16:43 -04:00
yulong
a799bb8519 component bt:Finished Adding the GATTC API to the bt project 2016-10-26 05:50:23 -04:00
Tian Hao
45638b3f98 component/bt : use LOG_XXX instead of print 2016-10-26 15:57:40 +08:00
yulong
fd064e5d88 component bt: Added the Gatt client API to the bt project 2016-10-25 23:56:45 -04:00
yulong
86dc0ae808 component bt: Added the param len & connect API to the bt project 2016-10-25 09:12:10 -04:00
Tian Hao
20d33d636b component/bt ; add notify 2016-10-25 15:05:08 +08:00
Tian Hao
8e247f3b4c component/bt : delete extra GATTAPP_REGISTER 2016-10-24 20:07:19 +08:00
Tian Hao
5fbfa2a01d blufi cleanup the bad things 2016-10-24 17:08:37 +08:00
wangmengyang
063e9e8287 component/bt: Merge branch 'feature/btdm_bluedroid' into feature/bt_gap 2016-10-21 15:19:39 +08:00
wangmengyang
2c0ceb484b component/bt: Bluedroid BTA/SDP module is ported 2016-10-21 15:12:22 +08:00
yulong
94442708f5 component bt:added the advertising & scanning API to the bt project 2016-10-21 02:16:01 -04:00
wangmengyang
e81ff4f68c component/bt: fix compiler error for examples/07_blufi 
1. add the missing include of header in bt_app_core.c for examples/07_blufi,
 where macro "BUT_PROFILE_CFG" should be set non-zero;
 2016-10-19 19:51:18 +08:00
yulong
2182b69b3d component bt:added the button profile event & process method to the project 2016-10-18 05:22:36 -04:00
wangmengyang
0574f2f55a component/bt: fix of compiler errors after previous merge of code; 2016-10-17 23:53:02 +08:00
wangmengyang
9476dc2eb8 components/bt: Merge branch 'feature/wechat_prf' into feature/btdm_bluedroid 
warning: example 07 has complier errors;

# Conflicts:
#	components/bt/bluedroid/profiles/esp/ble_button/button_pro.c
#	components/bt/bluedroid/stack/btu/btu_init.c
 2016-10-17 23:06:33 +08:00
Tian Hao
28fa3c1a70 component/bt : new coexist lib 
change boot loader.ld , the 0x40098000 may set other instructions
 2016-10-17 15:47:45 +08:00
yulong
2fdd9ba930 component bt:change the hid profile & bt_profile task 2016-10-17 02:15:36 -04:00
yulong
7cb55c2c6c component bt: added the WX_AIRSYNC_CFG macro to control the wechat profile 2016-10-16 23:54:22 -04:00
Tian Hao
f87ebb6d49 Merge branch 'feature/btdm_blufi' into feature/btdm_bluedroid 
# Conflicts:
#	components/bt/bluedroid/stack/btu/btu_task.c
 2016-10-16 17:08:05 +08:00
yulong
1a08abea78 component bt:1.update the BLE hid to the project 
2.update the app adverting method
 2016-10-15 06:28:54 -04:00
yulong
f68c8dd687 commponant bt:change bt_app_main to app_main 2016-10-14 04:44:56 -04:00
yulong
65445b21dd commponent bt:1.add bt_prf_act.c file for the state machine 
2.add the bt_app_api.h file
	      3.modified the bt_prf_task.c==>added the free & start task function
 2016-10-13 04:02:30 -04:00
yulong
6a5f5400f0 commponent bt: 1.added the bt_app_sec.c file used for the security of the bt module; 
2.added the bt_app_sec.h file which defined the sturct used for the bt security
 2016-10-12 23:41:30 -04:00
yulong
849ba39544 commponent bt:add the wechat airsync profile to the project 
1. add the wx_airsync_prf.h which have been define the sturcter data has been
used for the wechat airsync profile database
2. add the wx_airsync_prf.c file
3. add the app_airsync_md5.c file
4. add the app_airsync_prf.c
5. add epb.c file
6. add epb_mmbp.c
7. add mpbledemo2.c
8. add wechar_crc.c
9  add wechat_aes.c
10. add app_airsync_md5.h
11. add app_airsync_prf.h
12. add app_wechat_util.h
13. add epb.h
14. add epb_mmbp.h
15 add mpbledemo2.h
16 add wechar_crc.h
17 add wechat_aes.h
 2016-10-11 05:43:36 -04:00
wangmengyang
833eb88679 minor bug fixes for releasing bluedroid task events and deleting message queue 2016-10-10 20:16:30 +08:00
Tian Hao
e32d4e546a component/bt : advertising no random address 
1. advertising with public bdaddr
2. increase queue size avoid for exception because of the log is a lot
 2016-10-10 19:21:12 +08:00
Tian Hao
eb8cb8d22e component/bt : add bluf that use bluetooth config wifi connection demos 
1. add libphy.a librtc.a, but store in bt submodule, if someone use them, please copy to esp32/lib/ instead the origin one
2. add 07_blufi demo
3. change esp32/Kconfig to allow bt/wifi coexist
 2016-10-07 11:16:13 +08:00
Tian Hao
1c877be609 component/bt : modify some files adapt to new master 
1. fix some header files include
2. modify demo
 2016-10-07 10:47:25 +08:00
Tian Hao
0b37621438 Merge branch 'master' into feature/btdm_bluedroid 
feature/btdm_bluedroid use newest master

# Conflicts:
#	components/bt/component.mk
 2016-10-07 10:31:37 +08:00
Tian Hao
6c793cb8eb component/bt : adjust the bluedroid architecture 
1. move the app demo code to example
2. move the header files to correct path
3. move profile to profiles directory and seperate esp&std
4. some other codes
5. needs continue to cleanup the code
 2016-09-27 21:38:07 +08:00
Angus Gratton
fdb90ddd21 Merge remote-tracking branch 'origin/bugfix/modify_some_wifi_apis' into feature/initial_examples 2016-09-27 19:37:06 +10:00
Angus Gratton
a98ab8d801 nvs: Remove flash layout arguments from nvs_init() 
Add notes that current NVS layout defaults are a Work In Progress and
not yet integrated with the partition table.
 2016-09-27 13:28:45 +10:00
Angus Gratton
c3f418aa90 Update http_request & https_request examples for new startup flow 2016-09-27 12:06:54 +10:00
Angus Gratton
6850751ee8 Add very simple "hello world" & "blink" examples 2016-09-27 12:06:54 +10:00
Angus Gratton
de76546227 Build examples out-of-tree as part of CI process 2016-09-27 12:06:54 +10:00
Angus Gratton
8016e862e0 Examples: Use event groups for waiting until WiFi is associated & ESP has IP 2016-09-27 10:41:05 +10:00
Angus Gratton
db183e653c BT example: Enable BT stack in config by default 2016-09-27 10:41:05 +10:00
Angus Gratton
22e99694e3 Documentation: Add contributor guide, expand README & add an examples README 2016-09-27 10:38:00 +10:00
Angus Gratton
af0a5d8d7e examples: Add https_request example 2016-09-27 10:38:00 +10:00
Angus Gratton
d4b8a916a4 examples: HTTP request example 2016-09-27 10:38:00 +10:00
Ivan Grokhotkov
7cef0308dc Change application entry point name back to app_main 2016-09-26 14:48:41 +08:00
Ivan Grokhotkov
b936441b9b Startup flow refactoring 
This change removes implicit WiFi/BT initialization from startup code.
"main" task is started once essential part of startup code is complete.
This task calls application-provided "int main(void)" function, which can call WiFi/BT init functions if necessary.
 2016-09-26 00:50:57 +08:00
snake
95c48d4b84 1. clean up the macro. 2. change component/bt/lib url to use new lib 2016-09-23 10:48:55 +08:00
wangmengyang
5383af1e2e BLE ADV Demo 2016-09-22 21:15:54 +08:00