djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,770 Commits 21 Branches 274 Tags 785 MiB
d933f8ac50
Commit Graph

1051 Commits

Author SHA1 Message Date
Dan Halbert
4655a71793 Turn off keypad on some builds to avoid overflow 2021-06-15 14:11:04 -04:00
Tsutomu IKEGAMI
fd222dd066 Fix typo in Wio Terminal pin board.I2S_BLCK to I2S_BCLK (bit clock) 2021-06-15 20:51:55 +09:00
Kattni Rembor
12d0e65a2a Space out pin groups. 2021-06-14 15:37:02 -04:00
Kattni Rembor
f96642de25 Add A0 as alias to pot pin. 2021-06-14 15:32:12 -04:00
George White
9cde8a2265
MicroMod SAMD51 - correct I2C_INT pin 2021-06-03 06:05:13 -04:00
George White
26c6bd2346
MicroMod SAMD51 - correct SCL2 2021-06-03 05:39:09 -04:00
George White
6e36f30d9f
MicroMod SAMDt1 - correct board nane 2021-06-03 05:36:05 -04:00
George White
2b068414e1
Fix missing comma 
Doh
 2021-06-02 23:13:08 -04:00
George White
0437199706
Fix some pin mappings 
Conflicts:
	ports/atmel-samd/boards/sparkfun_samd51_micromod/pins.c
 2021-06-02 22:22:04 -04:00
George White
4c493c86c8 Add Sparkfun MicroMod SAMD51 2021-06-02 22:05:58 -04:00
George White
db1830d62b Add Sparkfun MicroMod SAMD51 2021-06-02 21:53:23 -04:00
Dan Halbert
3930440bc5 Fix usb_cdc.enable(console=False, data=True) 2021-06-02 11:29:56 -04:00
Dan Halbert
5eb4cc6489 Remove non-product Adafruit boards 2021-05-26 16:01:17 -04:00
Scott Shawcroft
5643355e90
Merge remote-tracking branch 'adafruit/main' into simplify_status_led 2021-05-20 08:35:15 -07:00
Scott Shawcroft
642fbcf87a
Handle status led power 
This no longer turns on status LED power before running user code.
Therefore, use of the status LED on some boards will also have to
enable the power.
 2021-05-19 10:57:14 -07:00
Dan Halbert
1e2a945782 Make busio.SPI be NotImplementedError on proxlight to save space 2021-05-14 21:52:54 -04:00
Scott Shawcroft
5c33c9d597
Fix SAMD 
RTC needed to wait for sync. NeoPixel on SAMD doesn't need disabled
caches. It just needed timing adjustment for 120mhz clock speed.
 2021-05-14 16:14:24 -07:00
Dan Halbert
990e58902d add CIRCUITPY_PIXELBUF to all trinkeys; add NeoPixel to prox 2021-05-14 17:09:15 -04:00
Dan Halbert
6a2ba83e30 Update Rotary Trinkey and Slide Trinkey pins 2021-05-14 15:40:29 -04:00
Scott Shawcroft
1a0b4193b7
Simplify the status LED to save power 
This also removes the need to pin share because we don't use the
status LED while user code is running.

The status flashes fallback to the HW_STATUS LED if no RGB LED is
present. Each status has a unique blink pattern as well.

One caveat is the REPL state. In order to not pin share, we set the
RGB color once. PWM and single color will be shutoff immediately but
DotStars and NeoPixels will hold the color until the user overrides
it.

Fixes #4133
 2021-05-13 14:41:20 -07:00
Dan Halbert
0eb4b9b982
Merge pull request #4742 from kattni/led 
Add LED pin to Adafruit boards.
 2021-05-10 21:12:02 -04:00
Kattni Rembor
294ef59f27 Add LED pin to Adafruit boards. 2021-05-10 16:39:01 -04:00
Scott Shawcroft
4eb4f14840
Merge pull request #4734 from dhalbert/dynamic-usb-fixes 
fix HID; fix interface name table creation
 2021-05-10 12:55:29 -07:00
Ben Bleything
44f162bb64
free up PA00 and PA01 on BHB 2021-05-09 10:19:48 -07:00
Dan Halbert
becff6f93d restore pulseio to pirkey 2021-05-09 11:33:35 -04:00
Dan Halbert
843598ec3a fix more board builds 2021-05-05 18:44:27 -04:00
Dan Halbert
579cdf30f1 fix more build errors 2021-05-05 16:49:29 -04:00
Dan Halbert
c37f021791 regularize and shrink many builds 2021-05-05 12:35:41 -04:00
Scott Shawcroft
b35fa44c8a
Merge MicroPython 1.12 into CircuitPython 2021-05-03 14:01:18 -07:00
Scott Shawcroft
25ccd5d8f1
Merge pull request #4679 from t-ikegami/wio_add_pin_assign 
Add DAC* and RTL_* pin assignments to Wio Terminal board.
 2021-05-03 11:08:28 -07:00
Dan Halbert
94ed5e0048
Merge pull request #4696 from dhalbert/no-pulseio-on-small-boards 
Include pulseio only on CIRCUITPY_FULL_BUILD
 2021-05-03 09:35:29 -04:00
Dan Halbert
9ca0e689a5
Merge branch 'main' into wio_add_pin_assign 2021-05-03 09:33:18 -04:00
Dan Halbert
e475dc8899 Fix broken builds 2021-05-03 00:09:15 -04:00
Dan Halbert
07dab34294 re-enable for pirkey 2021-05-01 09:32:13 -04:00
Jeff Epler
dfa7c3d32d codeformat: Fix handling of ** 
After discussing with danh, I noticed that `a/**/b` would not match `a/b`.

After correcting this and re-running "pre-commit run --all", additional
files were reindented, including the codeformat script itself.
 2021-04-30 15:30:13 -05:00
Jeff Epler
e95e921ca1 codeformat: Fix filename matching 
In #4683, tannewt noticed that uncrustify was not running on some
file in common-hal.

I investigated and found that it was not being run on a bunch of paths.

Rather than make incremental changes, I rewrote list_files to work
bsaed on regular expressions; these regular expressions are created from
the same git-style glob patterns.

I spot-checked some specific filenames after this change, and all looks good:

```
$ python3 tools/codeformat.py -v --dry-run tests/basics/int_small.py ports/raspberrypi/common-hal/pulseio/PulseIn.c extmod/virtpin.c tests/thread/thread_exit1.py  ports/raspberrypi/background.h extmod/re1.5/recursiveloop.c
tools/codeformat.py -v --dry-run tests/basics/int_small.py ports/raspberrypi/common-hal/pulseio/PulseIn.c extmod/virtpin.c tests/thread/thread_exit1.py ports/raspberrypi/background.h extmod/re1.5/recursiveloop.c
uncrustify -c /home/jepler/src/circuitpython/tools/uncrustify.cfg -lC --no-backup extmod/virtpin.c ports/raspberrypi/background.h ports/raspberrypi/common-hal/pulseio/PulseIn.c
black --fast --line-length=99 -v tests/thread/thread_exit1.py
```
recursiveloop and int_small are excluded, while PulseIn, virtpin,
and background are included.

Testing running from a subdirectory (not _specifically_ supported though):
```
(cd ports && python3 ../tools/codeformat.py -v --dry-run raspberrypi/common-hal/pulseio/PulseIn.c ../extmod/virtpin.c)
../tools/codeformat.py -v --dry-run raspberrypi/common-hal/pulseio/PulseIn.c ../extmod/virtpin.c
uncrustify -c /home/jepler/src/circuitpython/tools/uncrustify.cfg -lC --no-backup ../extmod/virtpin.c raspberrypi/common-hal/pulseio/PulseIn.
```

As a side-effect, a bunch more files are re-formatted now. :-P
 2021-04-30 10:48:08 -05:00
Dan Halbert
353e55d710
Merge pull request #4688 from jepler/fix-pixelbuf-subscr 
objtype: Restore our customized behavior of instance_subscr
 2021-04-30 10:45:44 -04:00
Tsutomu IKEGAMI
11a9372da3 Set Xtal, Aref, and NC pins to be IGNORE_ed in microcontroller.pin for Wio Terminal. 2021-04-30 13:06:09 +09:00
Tsutomu IKEGAMI
d79d6ba688 Add I2S_* pin assignments to Wio Terminal board. 2021-04-30 13:03:29 +09:00
Mark
5679eb4fd7
Merge pull request #4677 from skerr92/add-cp-sapling-rev-b 
Add cp sapling rev b
 2021-04-29 19:22:49 -05:00
Seth Kerr
8b611d4b6b changing mpconfigboard makefile 2021-04-29 16:45:08 -06:00
Jeff Epler
90bdb25219 ignore some pins to reclaim flash space 2021-04-29 14:36:29 -05:00
Jeff Epler
6498684f5e ignore some pins to reclaim flash space 2021-04-29 14:30:31 -05:00
Seth Kerr
555ade7ff3 final change to ja flags i think 2021-04-28 20:42:13 -06:00
Seth Kerr
8090af07dd fix ja build issue 2021-04-28 19:14:45 -06:00
Tsutomu IKEGAMI
22c4abd28f Add DAC* and RTL_* pin assignments to Wio Terminal board. 2021-04-28 18:57:21 +09:00
Seth Kerr
e85091193b adding CP Sapling Rev B 2021-04-27 16:30:44 -06:00
Scott Shawcroft
17fcd499b2
Merge pull request #4649 from tannewt/merge_1.11_2 
Merge MicroPython v1.11 into CircuitPython
 2021-04-27 11:02:02 -07:00
Kattni Rembor
4e1d2fa056 Adding clearer on-board DotStar pin names. 2021-04-27 12:52:24 -04:00
Scott Shawcroft
76033d5115
Merge MicroPython v1.11 into CircuitPython 2021-04-26 15:47:41 -07:00
ajs256
de3c5ff976
oh crud, i forgot a semicolon 2021-04-25 16:42:58 -07:00
ajs256
4bafbca0c3 Trinkeys: Clear neopixels on board reset 2021-04-25 12:58:52 -07:00
Scott Shawcroft
80e8b4ac14
Merge pull request #4635 from jepler/pcc 
WIP: Implement 'ParallelImageCapture' for samd51
 2021-04-23 13:31:53 -07:00
anecdata
2198b1a4df
Update mpconfigboard.h 2021-04-17 20:15:04 -05:00
Jeff Epler
fc4538f845 WIP: Implement 'ParallelImageCapture' for samd51 2021-04-16 17:18:59 -05:00
Dan Halbert
cc36402a64 turn storage back on 2021-04-13 11:06:59 -04:00
lady ada
d136078768 try re-enabling storage 2021-04-12 22:17:20 -04:00
lady ada
8053d4a7a3 remove neopixels 2021-04-11 22:33:03 -04:00
lady ada
42abb982fe rename proxsense to proxlight 2021-04-11 18:39:14 -04:00
lady ada
9dc6d691b8 add prox trinkey and rename others to adafruit_ 2021-04-11 17:45:37 -04:00
lady ada
56be8306cd try adding a submodule? 2021-04-10 23:22:13 -04:00
lady ada
137745e911 neokey trinkey friend 2021-04-10 23:04:48 -04:00
Scott Shawcroft
ebfe36c9aa
Merge pull request #4576 from felixerdy/main 
Add senseBox MCU
 2021-04-09 10:27:37 -07:00
felixerdy
ca6dda4d2b reorder alias 2021-04-09 08:35:13 +02:00
felixerdy
e5cffa94e8 add aliases for TX and RX 2021-04-08 21:19:27 +02:00
Brian Dean
8544249fc0 boards/bdmicro_vina_d51: Replace old rev with new rev and rename. 
This update to the PR retains the earlier board rev (with a rename) so
that backward binary compatibility is not lost for the earlier board
revision. The primary name 'vina-d51' is retained for the latest
revision to make it easy for customers to select the proper UF2
download - because the name matches the commercial name.

Details:

Replace bdmicro_vina_d51 with bdmicro_vina_d51_pcb7 (revision 7 of
PCB) with boardfiles unmodified. Add _pcb7 to the workflow build.

Replace bdmicro_vina_d51 boardfile content with latest PCB updates
(revision 10 ov PCB). Add minimal comments in the board files to make
it clear which PCB revision is implemented. Update the USB PID to
reflect an updated board revision.
 2021-04-07 09:11:30 -04:00
Brian Dean
3e558a89ac boards/bdmicro_vina_d51: A few updates for flexibility and expansion. 
ESP-01 header renamed to AUX, and expanded to 12 pins from 8
pins. Pins 1-8 still accommodate the ESP-01, with expansion to full
SERCOM 4-pad support to allow for SPI and I2C on that expansion port
with additional GPIO control.

Update pins.c with additional signals provided AUX_1-8, along with
UART, SPI, I2C name usage as aliases to appropriate AUX_1-8
signals. Additionally, add several alternate names specific to several
expansion modules - the ESP-01, and the ATW-01 using the WINC_1500
(SPI) w/interrupt and control needed for the WINC - with assignments
to module pin positions.

Re-work SERCOM assignments to accommodate the above from other parts
of the board, which required moving a SERCOM or two around in order to
accommodate the 4-pad sercom pin mapping on the AUX port.

Built and tested using latest from 'main':

Adafruit CircuitPython 6.2.0-rc.0-70-ga1562430f-dirty on 2021-04-05;
BDMICRO VINA-D51 with samd51n20
 2021-04-05 10:44:52 -04:00
sabas1080
8b6ffba392 Update comment 2021-04-04 11:10:32 -05:00
sabas1080
53f3282e9c change flash device 2021-04-02 14:42:38 -06:00
sabas1080
f8da94b8ba removed o¡modules not availables 2021-04-02 14:40:27 -06:00
sabas1080
c1987b7311 init port hunter cat nfc! 2021-04-02 13:19:59 -06:00
Tsutomu IKEGAMI
be50732515 Fix SD_DET pin assignment of seeduino_wio_terminal. 2021-04-01 17:09:56 +09:00
Scott Shawcroft
aec0ef3cbf
Switch devices.h to nvm.toml data 2021-03-25 09:57:18 -07:00
felixerdy
cde659651b add brown out detect level 2021-03-23 19:17:45 +01:00
Limor "Ladyada" Fried
4b42932188
Merge pull request #4449 from ladyada/main 
adventure together with rotary trinkey
 2021-03-20 13:37:31 -04:00
lady ada
8884682cac adventure together with rotary trinkey 2021-03-20 12:03:51 -04:00
Jeff Epler
bfc8c89536
Merge pull request #4403 from jepler/bitmap-read-2 
bitmaptools: Add readinto, arrayblit
 2021-03-17 07:57:31 -05:00
Jeff Epler
94fa8e8a60 disable bitmaptools on small board 2021-03-16 19:04:21 -05:00
Jeff Epler
75ba26ee7c
Merge pull request #4421 from kattni/led-pin 
Adding LED for D13/L pin name.
 2021-03-16 18:58:14 -05:00
Jeff Epler
58679dc038 Merge remote-tracking branch 'origin/main' into bitmap-read-2 2021-03-16 12:21:50 -05:00
Kattni Rembor
2b910b7292 Adding LED for D13/L pin name. 2021-03-16 12:14:40 -04:00
Mark
e326d7ca80
Merge branch 'main' into rp_dp_parallel 2021-03-15 20:00:13 -05:00
microDev
a52eb88031
run code formatting script 2021-03-15 19:27:36 +05:30
felixerdy
6c32a1f67f update pins of senseBox MCU 2021-03-15 10:27:50 +01:00
Jeff Epler
b33d77bfe8 disable bitmaptools on over-full board 2021-03-14 20:08:09 -05:00
felixerdy
de93df6444 add senseBox MCU 2021-03-12 17:57:55 +01:00
gamblor21
7321411962 Added frequency to parallel display 2021-03-11 19:32:43 -06:00
Jeff Epler
f1ada8e880 Automatically count EXTERNAL_FLASH_DEVICES 2021-03-07 11:48:39 -06:00
Dan Halbert
4cf6579e22 remove general changes; not consistent across builds 2021-03-05 10:10:50 -05:00
Dan Halbert
0a58d451ad
Merge pull request #4306 from Neradoc/fix-reset-to-safe 
press reset to safe mode on ports where reset reason is not implemented
 2021-03-02 15:44:52 -05:00
Scott Shawcroft
e4f0e47d9f
Merge pull request #4233 from pewpew-game/displayio-group-list 
displayio: make Group use a python list internally
 2021-03-02 09:59:58 -08:00
Dan Halbert
248acd07c8 shrink builds 2021-03-02 12:25:42 -05:00
Radomir Dopieralski
cb2cf81136 ugame10 - disable pulseio to make more room for the French 2021-03-02 11:11:55 +01:00
Dan Halbert
54d11a8e2d
Merge pull request #4299 from jamesbowman/main 
Add EVE support for Feather M4 Express
 2021-03-01 22:56:50 -05:00
Scott Shawcroft
d0eab5c561
Merge pull request #4256 from kmatch98/bt_cleanup 
Add `bitmaptools` module
 2021-03-01 18:24:12 -08:00
James Bowman
0dabd1ace2 Add EVE support for Feather M4 Express 2021-03-01 14:42:48 -08:00
Scott Shawcroft
7562b0cbb8
Turn off GC opt on catwan_usbstick 2021-02-26 12:00:01 -08:00
Kevin Matocha
ec4cd68edc More mpconfigboard.mk corrections for small builds 2021-02-25 17:48:50 -06:00
Kevin Matocha
a7a4f93ff8 Updated build configs to turn off BITMAPTOOLS for smaller builds 2021-02-25 15:44:32 -06:00
Kamil Tomaszewski
fb32e0a7fd qtpy_m0_haxpress: Change config to make it fit. 2021-02-25 09:44:33 +01:00
Dan Halbert
a30d4ad25d set SUPEROPT_VM = 0 on most non-Express SAMD21 boards 2021-02-22 23:03:11 -05:00
Dan Halbert
e344c6d684 fix some builds 2021-02-18 14:24:58 -05:00
Seth Kerr
9e626fdd5c new cp sapling board 2021-02-14 20:00:32 -05:00
Scott Shawcroft
f6603aa566
Merge pull request #4168 from BHDynamics/main 
Add DynaLoRa-USB Dongle
 2021-02-10 11:03:16 -08:00
Enrique Casado
983c75fb24 Add more pin names 2021-02-10 12:19:50 +01:00
Dan Halbert
5bb722b927
Merge pull request #4122 from hathach/fix-3986 
Fix 3986 background reset remove existing usb callback
 2021-02-05 09:13:28 -05:00
Enrique Casado
70e15d61b2 ports/atmel-samd/boards/dynalora_usb/board.c 2021-02-05 13:24:59 +01:00
Dan Halbert
25d456a5b8 shrink a couple of builds 2021-02-04 22:15:32 -05:00
BiffoBear
4eb396806c Updated trinket_m0 make file to squeeze all translations as per Dan Halbert. 2021-02-03 11:47:56 +07:00
Patrick Van Oosterwijck
0dbd3293a9 Add board Silicognition LLC M4-Shim 2021-01-30 18:35:35 -07:00
Dan Halbert
13812a788f
Merge pull request #4060 from dhalbert/regularize-extmod-modules 
CIRCUITPY_* switches for JSON, RE, etc. Doc cleanup
 2021-01-26 12:54:21 -05:00
Scott Shawcroft
a2ac2da7cc
Merge pull request #3936 from gamblor21/busdevice_fixes 
Changing adafruit_bus_device to duck typing
 2021-01-25 14:41:53 -08:00
Dan Halbert
69c71bd522 fix some build errors 2021-01-25 11:54:10 -05:00
Dan Halbert
69869e1439 CIRCUITPY_* switches for JSON, RE, etc. Doc cleanup 2021-01-24 23:10:20 -05:00
David Glaude
abd9f7894d
Permit Gameduino 3X Dazzler support on that board. 
Totally untested, change request based on change made in #2581.
It might be my first PR in CircuitPython core...
Maybe this should be confirmed by @jamesbowman

Those are the two boards that seems supported:
* Metro M4 Express
* Metro nRF52840 Express

The only Metro that this PR concern:
* Metro M4 AirLift Lite

Other Metro I found and are maybe not supported:
* Metro ESP32-S2
* Metro M0 Express
* Metro M7 1011
 2021-01-24 12:53:06 +01:00
Dan Halbert
dc421a6ca8 squeeze some builds 2021-01-23 06:18:15 -05:00
Dan Halbert
8c49c8df0a shrink arduino_mkr1300 2021-01-22 11:26:33 -05:00
Dan Halbert
e3275be8b1
Merge pull request #3911 from hugodahl/add-translation-for-builtin-object-help 
Update built-in help output for localization (Issue #3907)
 2021-01-22 03:49:19 -05:00
Dan Halbert
63b5e56c72 shrink feather_m0_adalogger and gemma_m0 2021-01-21 23:49:49 -05:00
Dan Halbert
ea9fe24971 shrink arduino_mkrzero build 2021-01-21 18:02:35 -05:00
Dan Halbert
9b8246f889 shrink sparkfun_samd21_dev de_DE build 2021-01-21 15:56:30 -05:00
mrangen
dea2bcd8f0 Fixed comment in mpconfigboard.h 2021-01-17 21:20:27 -07:00
gamblor21
41b9196167 Disabling in more small boards 2021-01-17 00:00:06 -06:00
gamblor21
49e059cdaf Removing frozen libraries 2021-01-16 16:37:42 -06:00
Jeff Epler
c44c99398d
Merge pull request #3983 from dhalbert/6.1.0-shrink-builds 
shrink some de_DE builds
 2021-01-12 20:19:43 -06:00
Dan Halbert
4b30412871 shrink some de_DE builds 2021-01-12 18:23:37 -05:00
lady ada
748d44892d fix some precommit complaints 2021-01-12 12:55:02 -05:00
lady ada
f7f97ae1b7 samd21 board with only 4 neopixels + two touchpads 2021-01-12 12:50:08 -05:00
Scott Shawcroft
91245297e8
Merge pull request #3659 from iot49/msgpack 
module msgpack
 2021-01-11 15:22:39 -08:00
foamyguy
13efbf24e5 disable msgpack on boards without room 2021-01-09 10:33:56 -06:00
iot49
1a82555803
Merge branch 'main' into msgpack 2021-01-05 11:19:11 -08:00
Kattni Rembor
bbd4de33d1 Add adafruit_bus_device to CPX builds. 2021-01-04 15:53:39 -05:00
Benjamin Shockley
9286f26831
Added CP Dotstart Lib to Build 
Added the CircuitPython dotstar library to the Mini SAM M4 build so users do not have to include the library to utilize the built-in APA102 LED.
 2021-01-03 10:42:58 -06:00
Jeff Epler
83c6774a44 Revert "Removing frozen libs" 
This reverts commit 23ed3ef971.
 2020-12-30 10:55:28 -06:00
Dan Halbert
f202eb734a
Merge pull request #3842 from StackRduino/main 
add stackrduino_m0_pro
 2020-12-18 12:33:34 -05:00
Dan Halbert
8f9cd7075e
Merge pull request #3752 from jepler/gcc10 
build: Update to gcc10
 2020-12-17 11:03:40 -05:00
Hany Elkomy
7afa1a1d76
Update mpconfigboard.mk 
reduced to CFLAGS_INLINE_LIMIT = 35 for tranaslations
 2020-12-17 22:47:01 +08:00
Hany Elkomy
06022a5e91
Update mpconfigboard.mk 
changed CFLAGS_INLINE_LIMIT = 55
 2020-12-17 21:58:24 +08:00
Hany Elkomy
81ff95a8eb
Add files via upload 2020-12-17 20:29:54 +08:00
Hany Elkomy
bc95c7f219
Delete board.c 2020-12-17 17:08:52 +08:00
Hany Elkomy
f3fb014166
Delete mpconfigboard.h 2020-12-17 17:08:50 +08:00
Hany Elkomy
1284418fa7
Delete mpconfigboard.mk 2020-12-17 17:08:48 +08:00
Hany Elkomy
736c0d4c3d
Delete pins.c 2020-12-17 17:08:46 +08:00
Hany Elkomy
0a7c74230c
Update mpconfigboard.mk 
updated for 6.1
 2020-12-17 16:26:54 +08:00
Hany Elkomy
109e147b46
Update board.c 
updated path to board.h
 2020-12-17 16:22:47 +08:00
Hany Elkomy
23ad9c7402
Update mpconfigboard.h 
removed whitespace
 2020-12-17 15:17:04 +08:00
Hany Elkomy
3d9e4958c5
Add files via upload 2020-12-17 14:24:24 +08:00
Hany Elkomy
f3b7cd6a5d
Delete pins.c 2020-12-17 14:24:07 +08:00
Hany Elkomy
70739ff639
Update pins.c 2020-12-17 13:11:53 +08:00
Hany Elkomy
fac0bf1db8
Add files via upload 2020-12-17 12:37:32 +08:00