M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 1
Code Issues Projects Releases Wiki Activity
5,001 Commits 13 Branches 35 Tags 27 MiB
Commit Graph

456 Commits

Author SHA1 Message Date
Sebastien Bourdeauducq 69099691f7 doc: clarify usage of pause/check_pause, closes #571 2016-10-17 20:08:15 +08:00
Robert Jördens 18d18b6685 phaser: add sync ttl input for monitoring 2016-10-10 17:13:23 +02:00
Robert Jördens 4d87f0e9e0 phaser: instantiate jesd204b core, wire up 2016-10-06 14:44:22 +02:00
Robert Jördens c54b6e2f3c phaser: add README 2016-10-05 19:24:34 +02:00
Robert Jördens 4a0eaf0f95 phaser: add jesd204b rtio dds 
gateware: add jesd204b awg

gateware: copy phaser (df3825a)
dsp/tools: update satadd mixin
phaser: no DDS stubs
dsp: accu fix
phaser: cleanup/reduce

sawg: kernel support and docs

sawg: coredevice api fixes

sawg: example ddb/experiment

phaser: add conda package

examples/phaser: typo

sawg: adapt tests, fix accu stb

sawg: tweak dds parameters

sawg: move/adapt/extend tests

sawg: test phy, refactor

phaser: non-rtio spi

phaser: target cli update

phaser: ad9154-fmc-ebz pins

phaser: reorganize fmc signal naming

phaser: add test mode stubs

phaser: txen is LVTTL

phaser: clk spi xfer test

phaser: spi for ad9154 and ad9516

phaser: spi tweaks

ad9154: add register map from ad9144.xml

ad9516: add register map from ad9517.xml and manual adaptation

ad9154_reg: just generate getter/setter macros as well

ad9154: reg WIP

ad9154: check and fix registers

kc705: single ended rtio_external_clk

use single ended user_sma_clk_n instead of p/n to free up one clock sma

kc705: mirror clk200 at user_sma_clock_p

ad9516_regs.h: fix B_COUNTER_MSB

phase: wire up clocking differently

needs patched misoc

kc705: feed rtio_external_clock directly

kc705: remove rtio_external_clk for phaser

phaser: spi tweaks

ad9516: some startup

ad9516_reg fixes

phaser: setup ad9516 for supposed 500 MHz operation

ad9516: use full duplex spi

ad9154_reg: add CONFIG_REG_2

ad9154_reg: fixes

phaser: write some ad9154 config

ad9154_reg: fixes

ad9154: more init, and human readable setup

ad9154/ad9516: merge spi support

ad9154: status readout

Revert "kc705: remove rtio_external_clk for phaser"

This reverts commit d500288bb44f2bf2eeb0c2f237aa207b0a8b1366.

Revert "kc705: feed rtio_external_clock directly"

This reverts commit 8dc7825519e3e75b7d3d29c9abf10fc6e3a8b4c5.

Revert "phase: wire up clocking differently"

This reverts commit ad9cc450ffa35abb54b0842d56f6cf6c53c6fbcc.

Revert "kc705: mirror clk200 at user_sma_clock_p"

This reverts commit 7f0dffdcdd28e648af84725682f82ec6e5642eba.

Revert "kc705: single ended rtio_external_clk"

This reverts commit a9426d983fbf5c1cb768da8f1da26d9b7335e9cf.

ad9516: 2000 MHz clock

phaser: test clock dist

phaser: test freqs

ad9154: iostandards

phaser: drop clock monitor

phaser: no separate i2c

phaser: drive rtio from refclk, wire up sysref

phaser: ttl channel for sync

ad9154: 4x interp, status, tweaks

phaser: sync/sysref 33V banks

phaser: sync/sysref LVDS_25 inputs are VCCO tolerant

phaser: user input-only ttls

phaser: rtio fully from refclk

ad9154: reg name usage fix

ad9154: check register modifications

Revert "ad9154: check register modifications"

This reverts commit 45121d90edf89f7bd8703503f9f317ad050f9564.

ad9154: fix status code

ad9154: addrinc, recal serdes pll

phaser: coredevice, example tweaks

sawg: missing import

sawg: type fixes

ad9514: move setup functions

ad9154: msb first also decreasing addr

phaser: use sys4x for rtio internal ref

phaser: move init code to main

phaser: naming cleanup

phaser: cleanup pins

phaser: move spi to kernel cpu

phaser: kernel support for ad9154 spi

ad9154: add r/w methods

ad9154: need return annotations

ad9154: r/w methods are kernels

ad9154_reg: portable helpers

phaser: cleanup startup kernel

ad9154: status test

ad9154: prbs test

ad9154: move setup, document

phaser: more documentation
 2016-10-05 16:17:50 +02:00
Sebastien Bourdeauducq 82fbd3e9c9 doc: CCBs, applet setup from experiment 2016-09-09 23:25:29 +08:00
Sebastien Bourdeauducq 4ef5eb2644 doc: move VADJ, closes #554 2016-09-09 18:40:58 +08:00
Robert Jördens c38e2cda9d doc/manual: no analytics_id with rtd 2016-08-25 22:21:29 +02:00
Robert Jördens 0a4d4e30ef doc: use sphinx_rtd_theme 2016-08-25 21:52:46 +02:00
Robert Jördens 8753785ef7 doc/rtio: cleanup 2016-08-25 20:42:44 +02:00
Robert Jördens 9f7c33ca84 doc/rtio: make vis coloring consistent 2016-08-25 19:23:06 +02:00
Robert Jördens c2e0e0bd7e doc/rtio: vis RTIOUndeflow tweak 2016-08-25 19:14:31 +02:00
Robert Jördens 8f952fdb98 doc/rtio: vis RTIOUnderflow 2016-08-25 19:06:11 +02:00
Robert Jördens 446dcf2123 doc/rtio: input vis 2016-08-25 18:42:16 +02:00
Robert Jördens eb180da730 doc/rtio: vis: now_mu -> now since not didactically relevant 2016-08-25 18:18:02 +02:00
Robert Jördens aabe53e5fa doc/rtio: handover vis, tweak other vis's 2016-08-25 18:15:48 +02:00
Robert Jördens 7481d4e732 doc/rtio: sync() visualization 2016-08-25 14:51:34 +02:00
Robert Jördens aee0345ed7 doc: ship wavedrom js b/c https 2016-08-25 12:56:36 +02:00
Robert Jördens 60919c2ea7 doc: use wavedrom to visualize stuff 2016-08-25 12:17:05 +02:00
Robert Jördens 552146bd08 doc/rtio: fix description of idle kernel/reset 2016-08-25 12:17:05 +02:00
Robert Jördens 69ea3d3cc0 doc: rtio concepts, closes #451 2016-08-24 17:39:03 +02:00
Robert Jördens df876a4e06 doc: expand/refine getting_started_core 2016-08-23 18:01:34 +02:00
Robert Jördens 5adda1c4c8 doc: cleanup git checkout instructions (see #542) 2016-08-23 18:00:54 +02:00
whitequark 9a0c3dae93 doc: add our binutils patch to installing_from_source. 2016-08-21 19:55:59 +00:00
whitequark cea57e2b46 doc: update installing_from_source. 2016-08-21 02:16:48 +00:00
Sebastien Bourdeauducq 728aff71ae manual: explain how applets work. Closes #536 2016-08-11 19:09:47 +08:00
whitequark 3dc0101459 doc: explain monomorphism of user-defined classes. 
Fixes #523.
 2016-08-03 23:18:54 +00:00
Robert Jördens ecda94705e doc/management_system: point out check_pause() (closes #522) 2016-07-21 16:42:09 +02:00
Robert Jördens 06bb1a2774 doc/installing_from_source: update/fix (closes #516) 2016-07-21 16:33:51 +02:00
Sebastien Bourdeauducq d2d897a885 manual/getting_started: add examples location info, closes #501 2016-07-07 12:43:10 +08:00
Sebastien Bourdeauducq ea10a2af6e manual/faq: update for inter-experiment seamless handover 2016-07-07 12:42:46 +08:00
Sebastien Bourdeauducq 18eddd00e1 manual: add core.reset() calls 2016-06-29 11:48:33 +08:00
Sebastien Bourdeauducq 3befe37221 manual: minor cleanup 2016-06-22 10:01:56 +08:00
Sebastien Bourdeauducq 48c0812df0 manual: split source install instructions to a separate page 2016-06-22 09:45:56 +08:00
Sebastien Bourdeauducq 2912515e5c doc: add warning about pipistrello current draw 2016-06-11 10:26:35 -06:00
Sebastien Bourdeauducq ca9724f517 doc: add core device comms details 2016-06-11 10:01:15 -06:00
whitequark 284e0d6876 doc: update installing.rst to reflect openocd packaged in conda. 2016-06-04 07:53:53 +00:00
Sebastien Bourdeauducq e8aadd0a1a doc: document common KC705 problems. Closes #450 2016-06-03 23:20:38 -04:00
Sebastien Bourdeauducq 5ce155614e doc/getting_started_mgmt: adapt to changes. Closes #462 2016-06-03 23:10:00 -04:00
Sebastien Bourdeauducq 5ebd28f576 doc: fix bool input 2016-06-03 22:56:12 -04:00
Sebastien Bourdeauducq 10267f39c9 log: use broadcast instead of sync_struct, filter on new messages only (#411) 2016-05-27 23:43:29 -05:00
Robert Jördens a6afc16585 doc/manual: add links to source code 2016-05-27 19:01:14 +02:00
Sebastien Bourdeauducq e98fdfa7ca manual/installing: mention netmask and gateway. Closes #441 2016-05-25 10:32:36 -05:00
dhslichter 141edb521a qc2: swap SPI/TTL, all TTL lines are now In+Out compatible 2016-05-19 10:42:03 +08:00
Robert Jördens 9898daf9a4 README: DOI/citation format 2016-05-11 15:23:28 +02:00
Sebastien Bourdeauducq fc4effb91d update logo 2016-04-30 00:30:24 +08:00
whitequark 79c7c2dd45 doc: explain RPC return type annotations. 
Fixes #410.
 2016-04-29 12:09:14 +00:00
Sebastien Bourdeauducq e8ae6fcd9f doc: move compiler details to separate chapter 2016-04-27 01:35:40 +08:00
whitequark 00c0a306ef doc: Document fast-math flag and kernel invariants. 
Fixes #351, #359.
 2016-04-26 02:15:16 +00:00
Sebastien Bourdeauducq faa268e814 manual/installing: --toolchain vivado 2016-04-14 01:25:36 +08:00
Sebastien Bourdeauducq 6fc73a0256 manual/installing: -H nist_... 2016-04-14 01:20:13 +08:00
Sebastien Bourdeauducq a5038726be typo 2016-04-14 01:17:56 +08:00
Sebastien Bourdeauducq dd0e622e4a manual/faq: list HITL TTL connections 2016-04-14 01:01:51 +08:00
Sebastien Bourdeauducq 7d2fa951d6 manual/git: commit needed before starting master, refresh. Closes #387 2016-04-14 00:33:56 +08:00
dhslichter f395a630e0 Updated qc2 pinouts for SPI and 2x DDS bus, update docs 2016-04-13 18:38:34 +08:00
Sebastien Bourdeauducq 56af4e9147 doc/installing: add note about example dependencies 2016-04-11 17:03:49 +08:00
Robert Jördens 36c1fdb5ad installing.rst: typo 2016-04-10 21:01:00 +08:00
Robert Jördens 62eae5eb34 installing.rst: adapters renaming from ed1c368 2016-04-10 11:21:09 +08:00
Robert Jördens 7f7750eef2 installing.rst: triple colons 2016-04-10 11:17:45 +08:00
Robert Jördens 26f55f2010 installing.rst: update, clarify 2016-04-09 23:58:11 +08:00
Robert Jördens 4e802f844d README: rewrite, summarizing more aspects of ARTIQ 2016-04-09 23:55:27 +08:00
Robert Jördens 4c32334d90 introduction.rst: update license 2016-04-09 21:33:25 +08:00
whitequark 32102bc25f doc: use proper CMAKE_BUILD_TYPE for LLVM. 
Fixes #380.
 2016-04-06 22:05:55 +00:00
Sebastien Bourdeauducq eb68ab9ad0 doc: remote execution 2016-04-06 19:13:41 +08:00
Sebastien Bourdeauducq 221d1bde0c manual/developing_a_ndsp: update to new bind interface 2016-04-06 19:13:01 +08:00
Sebastien Bourdeauducq e1da9de39d manual/faq: cleanup/update 2016-04-05 14:17:06 +08:00
Sebastien Bourdeauducq affe4d45aa ship examples with package 2016-04-05 13:59:39 +08:00
Sebastien Bourdeauducq 3efb841557 client: add --async option to scan-repository, recommend usage in git post-receive 2016-04-04 22:17:39 +08:00
Sebastien Bourdeauducq 7453d85d5e GUI -> dashboard 2016-04-04 22:12:45 +08:00
Robert Jördens c6516f3c83 doc: conda channel -> label 2016-03-31 10:29:07 +02:00
Robert Jördens d561681cc1 doc: add note about xcb (closes #361) 2016-03-31 10:28:57 +02:00
Sebastien Bourdeauducq 05317a9259 manual: QC2 FMC voltage 2016-03-31 10:47:16 +08:00
Sebastien Bourdeauducq 1a513634ff doc/tutorial: add missing type annotation in LED example. Closes #356 2016-03-29 14:53:52 +08:00
Sebastien Bourdeauducq 4c622194c2 doc: update flterm instructions. Closes #346 2016-03-25 20:10:53 +08:00
Robert Jördens 22cd12f721 doc: correctly place the openocd section, link it, add explanation 2016-03-20 20:19:12 +01:00
Joe Britton d069380f6b Fix typo. And in build of openocd on Ubuntu the aclocal dependency is provided by automake. 
adduser requires root

conda installation requires user to build OpenOCD by hand.
 2016-03-20 20:18:32 +01:00
Robert Jördens 8e41d50145 doc: add pipistrello adapter explicitly (closes: #339) 2016-03-20 19:57:07 +01:00
Sebastien Bourdeauducq 878ab9a39b manual: document DDS and SPI RTIO channels 2016-03-10 22:38:49 +08:00
Sebastien Bourdeauducq 1739e0f2f8 coredevice: put cache into separate file/device 2016-03-10 10:46:19 +08:00
Sebastien Bourdeauducq f0b0b1bac7 support for multiple DDS buses (untested) 2016-03-09 17:12:50 +08:00
Robert Jördens f33baf339f pipistrello: drop ttls on pmod, add leds back in 2016-03-08 23:34:51 +01:00
Robert Jördens f39208c95a pipistrello: try with fewer leds/pmod ttl 2016-03-08 22:10:47 +01:00
Robert Jördens 104d641c59 pipistrello: move the spi channel like kc705 2016-03-08 13:30:05 +01:00
Robert Jördens 40c1cde2e2 doc: kc705.clock: add spi bus mappings (closes #321) 2016-03-08 13:28:32 +01:00
Robert Jördens 9898cb14db doc: add pipistrello spi bus 2016-03-08 13:18:55 +01:00
Robert Jördens e23e91f8ac doc: add pipistrello pmod ttl channels 2016-03-08 13:13:33 +01:00
Sebastien Bourdeauducq 2770d9c729 doc: I2C/QC2 2016-03-05 19:02:03 +08:00
Robert Jördens 669fbaa4f1 ad53xx->ad5360 and refactor 2016-03-04 00:00:25 +01:00
Robert Jördens f754d2c117 Merge branch 'spimaster' 
* spimaster: (52 commits)
  runtime/rtio: rtio_process_exceptional_status() has only one user
  coredevice.spi, doc/manual: add spi
  kc705: move ttl channels together again, update doc
  runtime: rt2wb_input -> rtio_input_data
  examples/tdr: adapt to compiler changes
  bridge: really fix O/OE
  runtime: define constants for ttl addresses
  coredevice.ttl: fix sensitivity
  bridge: fix ttl o/oe addresses
  runtime: refactor ttl*()
  rtio: rm rtio_write_and_process_status
  coredevice.spi: unused import
  rt2wb, exceptions: remove RTIOTimeout
  gateware.spi: delay only writes to data register, update doc
  nist_clock: disable spi1/2
  runtime/rt2wb: use input/output terminology and add (async) input
  examples: update device_db for nist_clock spi
  gateware.spi: rework wb bus sequence
  nist_clock: rename spi*.ce to spi*.cs_n
  nist_clock: add SPIMasters to spi buses
  ...
 2016-03-01 22:08:08 +01:00
Robert Jördens 0456169558 coredevice.spi, doc/manual: add spi 2016-03-01 21:29:09 +01:00
Robert Jördens 2cc1dfaee3 kc705: move ttl channels together again, update doc 2016-03-01 19:40:32 +01:00
Robert Jördens 8fa98f6486 doc: use term 'gateware' 
FPGA newcomers are not used to the term 'bitstream'. To insist that this file
is the result of the gateware compilation and thus the binary FPGA format,
add the term 'gateware' as a prefix.
 2016-02-29 20:50:45 +01:00
Sebastien Bourdeauducq 5fad570f5e targets/kc705-nist_clock: add clock generator on LA32 for testing purposes 2016-03-01 00:35:26 +08:00
Sebastien Bourdeauducq a1e1f2b387 doc: insist that output() must be called on TTLInOut. Closes #297 2016-03-01 00:28:40 +08:00
Sebastien Bourdeauducq d0d56bd3fe doc: update install instructions 2016-03-01 00:19:55 +08:00
Sebastien Bourdeauducq 5d41113dbc doc: convert to 'with parallel' 2016-02-23 15:53:41 +08:00
whitequark 51a5910002 Rename 'with parallel' to 'with interleave' (#265). 2016-02-22 13:24:43 +00:00
Sebastien Bourdeauducq be6b64a243 doc: fix conda install instructions 2016-02-22 17:52:18 +08:00
Sebastien Bourdeauducq 14683f297a doc: remove 'Ubuntu 15.10+/Debian jessie+ specific instructions'. Closes #282 2016-02-22 12:08:22 +08:00
Sebastien Bourdeauducq 122ddc40aa doc: add section for RTIO analyzer, mention GtkWave 2016-02-15 23:07:41 +01:00
whitequark 617c416124 Add documentation for rtio_log (#206). 2016-02-15 21:43:02 +00:00
whitequark 3da9bfc704 doc: binutils patch is not needed any more. 2016-02-15 18:25:15 +00:00
Sebastien Bourdeauducq b97be9c08d Merge branch 'newtesting' 2016-02-14 21:30:19 +01:00
Sebastien Bourdeauducq b68035d162 manual/installing: refresh 2016-02-10 23:37:21 +01:00
Sebastien Bourdeauducq 64263b75d0 use https for m-labs.hk 2016-02-10 17:20:29 +01:00
Sebastien Bourdeauducq 9ca8b48bf9 assume 'import artiq' works before running tests 2016-02-02 21:52:33 +01:00
Sebastien Bourdeauducq b7de92e96c remove pxi6733 support (now lives at https://github.com/m-labs/aq_ni6733 2016-02-02 18:41:57 +01:00
Robert Jördens 0d7dc7b144 doc: update Underflow catching example 2016-01-25 17:24:00 -07:00
Robert Jördens 765001054d artiq.experiment: merge language and coredevice namespaces 
perl -i -pe 's/^from artiq import \*$/from artiq.experiment import */' your_experiments/*.py

(assuming you skipped the changes form the previous commit)
 2016-01-25 17:24:00 -07:00
Robert Jördens fbe4d96572 artiq: move namespace artiq.* -> artiq.language.* 
perl -i -pe 's/^from artiq import \*$/from artiq.language import */' your_experiments/*.py
 2016-01-25 17:24:00 -07:00
Robert Jördens ea3bb27029 doc/manual: cleanup commented out variables 2016-01-25 17:23:49 -07:00
Robert Jördens 0bbed9bcb6 RELEASING.rst, doc: show release notes in manual 2016-01-25 17:20:15 -07:00
Robert Jördens b56c55a90d manual: __version__ cleanup 2016-01-25 17:04:56 -07:00
Robert Jördens 0151ac55ff ppp: update documentation 2016-01-25 12:29:05 -07:00
Sebastien Bourdeauducq fa1afb7dd8 add information about CLOCK hardware 2016-01-20 21:06:02 -05:00
Robert Jördens e42fd9ca31 doc: use actual version 2016-01-19 18:25:31 -07:00
Robert Jördens cf17be92e3 doc: add artiq_flash 2016-01-18 21:41:42 -07:00
Sebastien Bourdeauducq cb2513f8ba manual: fix coreconfig label 2016-01-13 14:42:05 -07:00
Sebastien Bourdeauducq adf552e8d1 manual: artiq.coredevice.runtime_exceptions -> artiq.coredevice.exceptions 2016-01-13 14:40:44 -07:00
Sebastien Bourdeauducq e4996fed92 manual/thorlabs_tcube: add note about USB/power sequencing 2016-01-13 14:38:22 -07:00
Sebastien Bourdeauducq 0b37000874 manual: add core device analyzer TCP port 2016-01-13 14:02:37 -07:00
Sebastien Bourdeauducq 1543141cee update copyright year 2016-01-08 11:53:04 +08:00
Sebastien Bourdeauducq 028ed72b72 doc: typo 2016-01-07 10:06:43 +08:00
Robert Jördens 0bbe886669 doc/manual: umask warning and openocd installation refinement 2016-01-06 13:12:42 -07:00
Robert Jördens 358ad2e927 artiq_flash: drop redundant instruction, tweak doc 2016-01-06 11:24:05 -07:00
Robert Jördens 25ce0928bd build/doc: simplify proxy bitstream locations 2016-01-05 10:23:50 -07:00
Robert Jördens d633c8e1f8 doc: update and cleanup flashing/installing/building 2016-01-05 10:21:34 +08:00
Sebastien Bourdeauducq 5f3b69dd19 frontend/coreconfig: simplify action names 2015-12-24 18:54:23 +08:00
Sebastien Bourdeauducq 179c50480f frontend: split coretool into coreconfig, corelog and coreanalyzer 2015-12-24 18:51:11 +08:00
Sebastien Bourdeauducq 7548229910 doc/manual/installing: remove outdated note 2015-12-11 10:32:01 +08:00
Sebastien Bourdeauducq 5e14afde3e scheduler: use current (last scanned) repo revision instead of HEAD 2015-12-06 19:00:41 +08:00
whitequark d560b579f0 doc: update mention of int64. 2015-11-24 20:24:38 +08:00
whitequark d732b6c6d4 doc: nested lists are now supported. 2015-11-24 17:53:40 +08:00
whitequark c14299dca8 Merge branch 'new-py2llvm' 2015-11-24 03:01:54 +08:00
whitequark 9fc7a42036 pipistrello: expose LED{1..4} as RTIO channels. 2015-11-23 18:26:45 +08:00
Felix Held 8b4b269371 doc/manual/installing: fix a bug, add Fedora specific instructions 
Signed-off-by: Felix Held <felix-artiq@felixheld.de>
 2015-11-21 10:23:58 +08:00
whitequark 51f04f6311 Explicitly use the python3.5 binary everywhere. 2015-11-07 13:39:39 +03:00
Sebastien Bourdeauducq b13ee2ed8f doc: update compilation instructions 2015-11-04 23:38:24 +08:00
Sebastien Bourdeauducq 73fed53c09 manual: document startup clock and kernel 2015-11-01 00:24:44 +08:00
Sebastien Bourdeauducq e6b230b71c Merge branch 'master' of github.com:m-labs/artiq 2015-10-30 13:41:45 +08:00
Sebastien Bourdeauducq 2c77c80b4f master: expose more scheduler APIs to the experiments 2015-10-30 13:41:18 +08:00
whitequark ff93e3c149 manual: update installing.rst to elaborate QC1/QC2 differences. 2015-10-30 05:07:01 +03:00
whitequark 62419c0952 manual: update installing.rst. 2015-10-30 04:18:42 +03:00
Sebastien Bourdeauducq 3044a053e1 databases: assume empty dataset_db if file not present. Closes #156 2015-10-24 10:15:20 +08:00
whitequark f3e61e265c conda: move everything except artiq to conda-recipes (closes #138). 2015-10-16 07:06:22 +03:00
Sebastien Bourdeauducq cbda753f44 master: TCP server for remote logging 2015-10-16 00:53:35 +08:00
Sebastien Bourdeauducq ef487ee8b0 doc: more updates for dataset API 2015-10-13 18:45:04 +08:00
Sebastien Bourdeauducq fc4791bbbe doc: new dataset API 2015-10-13 18:11:17 +08:00
Sebastien Bourdeauducq ceb18d05b3 manual/management: add warning about setups that resolve the current hostname to localhost. closes #134 2015-10-13 01:47:18 +08:00
Sebastien Bourdeauducq 5f89d1a78f doc: document core device driver. Closes #119 2015-10-06 18:12:57 +08:00