Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
39,983 Commits 71 Branches 509 Tags 714 MiB
Commit Graph

21315 Commits

Author SHA1 Message Date
Andrew Tridgell cffb434de8 HAL_ChibiOS: tweak stack on f103-periph 2019-10-24 22:03:43 +11:00
Andrew Tridgell a3b61a1b02 HAL_ChibiOS: enable ROMFS for ZubaxGNSS and f103-periph 
this allows for bootloader update
 2019-10-24 22:03:43 +11:00
Andrew Tridgell 513e483821 AP_Compass: disable HIL for AP_Periph 
this saves several k of flash
 2019-10-24 22:03:43 +11:00
Andrew Tridgell a224342b18 HAL_ChibiOS: enable ROMFS for CUAV_GPS 2019-10-24 22:03:43 +11:00
Andrew Tridgell 14cdac9202 AP_GPS: fixed GPS to UART mapping 
this allows for first GPS as UAVCAN and 2nd as UART. That is not
possible currently unless you waste a uart
 2019-10-24 14:37:30 +11:00
Peter Barker f6b6aa68ed AP_Scripting: add a hello world example 2019-10-24 13:50:51 +11:00
Peter Barker 099379713c AP_Scripting: add simple example of a loop 2019-10-24 13:50:51 +11:00
Peter Barker c30873097a AP_Logger: use ahrs singleton to log ATT, POS and AHRS2 2019-10-24 13:15:46 +11:00
Vlad-Andrei Dorobantu d7132928d1 Copter: corrected undefined data member causing linking error 2019-10-24 10:00:35 +11:00
Randy Mackay 01c36fa6aa AP_Compass: LEARN param default to 0 for all vehicles 2019-10-23 17:15:57 +11:00
Peter Hall 43449a4adb AR_WPNav: remove unneeded overshoot methods 2019-10-23 08:28:39 +08:00
Andrew Tridgell f69be70772 HAL_ChibiOS: save some memory in f103-periph build 2019-10-22 17:51:24 +11:00
Randy Mackay b4a8691a9e AP_NavEKF3: remove wheel encoder update limit 2019-10-22 07:15:48 +08:00
Randy Mackay 63309c6925 AP_NavEKF3: suppress ekf fail-to-set-origin if core disabled 2019-10-22 07:15:48 +08:00
Randy Mackay e32a8556b2 AP_NavEKF2: suppress ekf fail-to-set-origin if core disabled 2019-10-22 07:15:48 +08:00
Randy Mackay 353cb648f6 AP_RPM: rename px4-pwm to just pwm 2019-10-22 07:15:48 +08:00
Peter Barker e84082a099 AP_Logger: canonicalize on STANDBY rather than STANDY_BY 2019-10-21 21:22:17 +08:00
Peter Barker 3bec1c7d4f RC_Channel: correct description of standby option 
Also canonicalise on STANDBY rather than STANDBY
 2019-10-21 21:22:17 +08:00
Andrew Tridgell 0a4576728e HAL_ChibiOS: support a app->bootloader comms region in SRAM 
this allows for UAVCAN update without a 2nd BeginFirmwareUpdate call
 2019-10-21 19:12:01 +11:00
Andrew Tridgell 5605ad6c59 HAL_ChibiOS: enable MissionPlanner compatible app descriptor 2019-10-21 19:12:01 +11:00
Andrew Tridgell 6b841e781c HAL_ChibiOS: pat watchdog immediately in expect_delay_ms() 
this fixes a watchdog issue on AP_Periph if we don't have a timer
thread
 2019-10-21 19:12:01 +11:00
Andrew Tridgell 7973a25c40 HAL_ChibiOS: fixed stack on ZubaxGNSS 2019-10-21 19:12:01 +11:00
Andrew Tridgell 910129eafc HAL_ChibiOS: enable watchdog in AP_Periph firmwares 2019-10-21 19:12:01 +11:00
Andrew Tridgell e392416942 AP_BoardConfig: allow enable of watchdog in hwdef.dat 
this will be used for AP_Periph
 2019-10-21 19:12:01 +11:00
Andrew Tridgell 40431100a9 AP_Flashstorage: fixed init bug on F1 
we can't mark available just before we mark in use on F1
 2019-10-21 19:12:01 +11:00
Andrew Tridgell 5efaea2d92 HAL_ChibiOS: fixed flash storage in ZubaxGNSS 2019-10-21 19:12:01 +11:00
Andrew Tridgell e376884377 HAL_ChibiOS: fixed Zubax bootloader debug 2019-10-21 19:12:01 +11:00
Andrew Tridgell 1f06aa069e HAL_ChibiOS: fixed uprintf() in bootloader 2019-10-21 19:12:01 +11:00
Andrew Tridgell e6cb35090c HAL_ChibiOS: fixed page size for STM31F105 flash 2019-10-21 19:12:01 +11:00
Andrew Tridgell 0ef2a60682 HAL_ChibiOS: support ZubaxGNSS as a AP_Periph target 2019-10-21 19:12:01 +11:00
Andrew Tridgell 44f895ab16 HAL_ChibiOS: fixed for ZubaxGNSS build 2019-10-21 19:12:01 +11:00
Andrew Tridgell 8c796ecd2c HAL_ChibiOS: support f103-RangeFinder 2019-10-21 19:12:01 +11:00
Andrew Tridgell ca1bd8be3c AP_RangeFinder: disable logging for AP_Periph 2019-10-21 19:12:01 +11:00
Andrew Tridgell 3cd7dd9f12 HAL_ChibiOS: disable GPS and MAG in base f103 build 
enable in f103-GPS
 2019-10-21 19:12:01 +11:00
Andrew Tridgell 282936eab2 AP_RangeFinder: allow for less rangefinder instances 
for AP_Periph
 2019-10-21 19:12:01 +11:00
Andrew Tridgell 3ca478747c HAL_ChibiOS: enable airspeed in f103-ADSB 2019-10-21 19:12:01 +11:00
Andrew Tridgell f51378f2e8 AP_Airspeed: enable for use in AP_Periph 2019-10-21 19:12:01 +11:00
Andrew Tridgell fa6b6140e3 HAL_ChibiOS: split out f103-GPS from base f103-periph 
this makes it easier to create more peripheral variants
 2019-10-21 19:12:01 +11:00
Tom Pittenger bbd6f3aa6c SITL: morse simulator should generate packets from same vehicle sysid 2019-10-21 14:29:30 +09:00
Henry Wurzburg 119f0a95ad RC_Channel: added RC option for new takeoff mode 2019-10-21 08:41:58 +11:00
Mirko Denecke b84dcd483d AP_HAL_ChibiOS: remove unnecessary tabs and whitespaces 2019-10-21 08:01:56 +11:00
Mirko Denecke 12c9e50aef AP_IOMCU: remove unnecessary tabs and whitespaces 2019-10-21 07:57:44 +11:00
Andrew Tridgell e90bd27435 HAL_ChibiOS: fixed I2C on F103 
we need to use open-drain, and the sign of the constant matters
 2019-10-20 20:31:02 +11:00
Andrew Tridgell 6f11926dbd HAL_ChibiOS: enable NCP5623 LED in f103-GPS 2019-10-20 20:31:02 +11:00
Jaaaky 54f8e1137e AP_NavEKF3: added EK3_MAG_EF_LIM parameter 
Adapted from EKF2 implementation as of commits
3835d2613, e9ed3540f and df4fc0fff
this sets a limit on the difference between the earth field from the
WMM tables and the learned earth field inside the EKF. Setting it to
zero disables the feature. A positive value sets the limit in mGauss.
 2019-10-20 07:34:35 +11:00
Vlad-Andrei Dorobantu 83c641c76f AP_Compass: corrected the cause of SIGSEGV signal when running AP_Compass_test 2019-10-19 09:58:42 +11:00
Siddharth Purohit eff316dd6b AP_KDECAN: update prearm method to support snprintf methods 2019-10-19 09:55:38 +11:00
Siddharth Purohit 9b2c060cc5 AP_Arming: add support for reporting UAVCAN Server errors 2019-10-19 09:55:38 +11:00
Siddharth Purohit fb48d8ee1b AP_Math: add method for generating hash 2019-10-19 09:55:38 +11:00
Siddharth Purohit 2b410479af HAL_ChibiOS: remove unused code 2019-10-19 09:55:38 +11:00
Siddharth Purohit 4034af6ef1 StorageManager: add storage aread for CAN Dynamic Node Alloc 2019-10-19 09:55:38 +11:00
Siddharth Purohit 9bd379e236 AP_UAVCAN: setup uavcan server with internal storage 2019-10-19 09:55:38 +11:00
Peter Barker aae524b9d5 AP_Mission: add sanity check that 16-bit commands aren't stored_in_location 
This is a rather confusing problem when it happens during development,
so a sanity check is good.  What you see in dev is that your latitude
gets corrupted between when you store and retrieve it, with no warnings
that you're doing something wrong.
 2019-10-18 15:16:21 +11:00
Randy Mackay dee4e867e4 AP_Logger: add vibration failsafe error subsystem 2019-10-18 11:15:25 +09:00
Leonard Hall e5f724bc3a AC_PosControl: add high vibration compensation 2019-10-18 11:15:25 +09:00
Randy Mackay 0052dcc8f8 AC_PID: update pid_info when integrator set 2019-10-18 11:15:25 +09:00
Randy Mackay adf4d8fd47 AP_InertialNav: use ekf::get_vert_pos_rate during high vibration 2019-10-18 11:15:25 +09:00
Randy Mackay 5baed38266 AP_NavEKF3: reduce EK3_HRT_FILT max to 30 2019-10-18 11:15:25 +09:00
Paul Riseborough 5b1d9ed868 AP_NavEKF3: Add missing vertical position derivative calculation 2019-10-18 11:15:25 +09:00
Randy Mackay e2d3afaaa7 AP_NavEKF2: reduce EK2_HRT_FILT max to 30 2019-10-18 11:15:25 +09:00
Paul Riseborough c26c6fd078 AP_NavEKF2: Add missing vertical position derivative calculation 
Use a third order order complementary filter to estimate the rate of change of vertical position output.
 2019-10-18 11:15:25 +09:00
Randy Mackay 4a1247b9f7 AP_AHRS: add get_innovations 2019-10-18 11:15:25 +09:00
Leonard Hall 05f1161e63 RC_Channel: Support for Standby functions 2019-10-17 14:57:18 +09:00
Leonard Hall e8e969af62 AP_Logger: Support for Standby functions 2019-10-17 14:57:18 +09:00
Leonard Hall 5acfc77a3c AC_AttitudeControl: Support for Standby functions 2019-10-17 14:57:18 +09:00
Michael du Breuil 3274398bc2 AP_Scripting: Fix up uint32_t manipulation, fix AP_Notify 
This also adds a touched up version of the foxhunt demo that was done at
the 2019 developer unconf
 2019-10-16 21:57:41 -07:00
Andrew Tridgell c03796d7de GCS_MAVLink: fixed uninitialised bytes in send_named_float() 
this fixes an issue with mavproxy with python3
 2019-10-17 13:50:35 +11:00
Peter Barker 49687d4e5d AP_HAL_SITL: ToneAlarm doesn't play tones if disabled via param 2019-10-16 16:00:35 +11:00
Peter Barker 47fbf70e85 SITL: create SITL tonealarm files to hold enable parameter 2019-10-16 16:00:35 +11:00
Peter Barker d6f10a12eb AP_Notify: add a simulated buzzer for SITL 2019-10-16 16:00:35 +11:00
Peter Barker 111c17d0b4 AP_HAL_SITL: add a simulated buzzer 2019-10-16 16:00:35 +11:00
Peter Barker 32ec6d7e9a SITL: add a simulated buzzer 2019-10-16 16:00:35 +11:00
Andrew Tridgell df90cee8a0 AP_ADSB: added handle_adsb_vehicle() API 
this allows for UAVCAN ADSB adapters
 2019-10-16 13:13:24 +11:00
Andrew Tridgell 8650229ad4 AP_ADSB: added singleton interface 2019-10-16 13:13:24 +11:00
Andrew Tridgell 16bc7f800e AP_UAVCAN: support ADSB over UAVCAN 2019-10-16 13:13:24 +11:00
Andrew Tridgell b9885034b1 HAL_ChibiOS: added a f103-ADSB firmware 
for presenting a ping ADSB device as UAVCAN
 2019-10-16 13:13:24 +11:00
Andrew Tridgell 85271a8747 HAL_ChibiOS: split out f103-GPS from base f103-periph 
this makes it easier to create more peripheral variants
 2019-10-16 13:13:24 +11:00
Michael du Breuil e54acb8bde AP_Scripting: Add an example message interval script 2019-10-16 09:48:55 +09:00
Michael du Breuil 076cf0bdc8 AP_Scripting: Add a one arg variant of uint32_t, and expose table unpack 2019-10-16 09:48:55 +09:00
Bill Geyer 63d9b47530 AP_Motors: make init_targets_on_arming global 2019-10-16 08:17:09 +09:00
bnsgeyer d1a0635ec2 AC_AttitudeControl: incorporate SysID into tradheli 2019-10-16 08:17:09 +09:00
Leonard Hall 0834726b48 AC_AttitudeControl: Support System ID tests 2019-10-16 08:17:09 +09:00
Andrew Tridgell b7ae12a9d3 HAL_ChibiOS: reduce max compasses to 1 on AP_Periph 2019-10-16 08:58:52 +11:00
Andrew Tridgell 7ad91fa1c9 AP_Compass: don't show too many params when max compasses 1 2019-10-16 08:58:52 +11:00
Michael du Breuil a80ff80061 AP_Motors: Fix safe disarm 2019-10-16 08:46:49 +11:00
Leonard Hall 6e8413f122 AP_Motors: Use safety timer to enable pwm before spool up 2019-10-16 08:46:49 +11:00
Michael du Breuil df8c9e5825 AP_Scripting: Raise default heap size 2019-10-15 15:35:12 -06:00
Michael du Breuil cf94a02207 AP_Scripting: Stop running scripts if the enable flag ever goes false 2019-10-15 15:35:12 -06:00
Peter Barker 9fee2a9c06 AP_Vehicle: add singleton 2019-10-15 13:24:20 +11:00
Leonard Hall d4b922336b Copter: add voltage compensation to _throttle_thrust_max 2019-10-15 10:45:36 +09:00
Andrew Tridgell 00260db65a AP_GPS: fixed UAVCAN GPS status when disconnected 
this fixes the status reported for a UAVCAN GPS when the cable is
unplugged. It should be "NO GPS", but was instead reporting "NO
FIX". The user had no way to distinguish between not finding a CAN GPS
at all and it not getting satellites

thanks to CUAV for reporting
 2019-10-14 19:08:37 -06:00
murata 000aa4f515 AP_RangeFinder: Add TF03-180 2019-10-15 10:07:53 +09:00
Randy Mackay 6588c93e44 SRV_Channel: renamed EPM to Gripper in FUNCTION param docs 2019-10-15 09:11:06 +09:00
Andrew Tridgell c2067d5bc2 AP_NavEKF3: set a min yaw accuracy from GPS of 5 degrees 
GPS modules tend to be rather optimistic about their yaw accuracy. By
setting a min or 5 degrees we prevent the user constantly getting
warnings about yaw innovations
 2019-10-15 11:06:11 +11:00
Andrew Tridgell 37fb028532 AP_GPS: improved checking for valid yaw for moving baseline 
and fixed check for carrSolnFixed
 2019-10-15 11:06:11 +11:00
Michael du Breuil 2587b13ae7 AP_GPS: UBLOX: Parse RELPOSNED messages 
This does not yet:
  - validate the receiver configuration
  - manage timing out stale GPS heading info
  - relPosNormalized usage isn't clear, which may defeat the STRICT_LENGTH_CHECK
 2019-10-15 11:06:11 +11:00
Michael du Breuil cb5bba8379 AP_Logger: Log GPS yaw accuracy 2019-10-15 11:06:11 +11:00
Michael du Breuil f0e742caa3 AP_Scripting: Fix generation of uint32_t arguments 
This also fixes the message interval description not generating
correctly, it must have been manually edited before
 2019-10-14 17:51:54 -06:00
Andrew Tridgell 97dc76732c HAL_ChibiOS: drop mRoControlZeroF7 DPS310 clock to 5MHz 2019-10-15 10:22:15 +11:00
Andrew Tridgell 94418ca70e AP_Baro: added register checking and reset to DPS280 driver 
this is to fix an issue found on a mRoControlZeroF7
 2019-10-15 10:22:15 +11:00
Randy Mackay 7ce2fb8783 GCS_Mavlink: handle_preflight_reboot made virtual 2019-10-15 07:41:44 +09:00
Henry Wurzburg c515f4b317 AP_HAL_ChibiOS/hwdef: update KakuteF4 readme 2019-10-14 10:04:30 +11:00
Andy Piper 28b866cc8f AP_HAL_ChibiOS: hardware definitions for Kakute F7 Mini 2019-10-12 21:53:55 +11:00
liang 8de44ec319 AP_Airspeed: protect sample timestamp while get data 2019-10-12 18:15:06 +11:00
Michael du Breuil 05d104675e AP_Logger: Fix logging of current on non primary instances 2019-10-11 08:39:28 +11:00
Andy Piper ef7f8531fb Filter: set the harmonic notch filter ref default to zero (disabled) 
Modify parameter descriptions for tradheli
 2019-10-10 20:26:02 +09:00
Leonard Hall 4a1a5e81ea AP_Motors: Add variable to record the final thrust value 
Add Throttle_Out for other frames
 2019-10-10 20:26:02 +09:00
Andrew Tridgell d6e17b0c2b AP_InertialSensor: publish an IMU temperature 
makes testing of mavlink extension easier
 2019-10-10 13:23:03 +11:00
Andrew Tridgell 29e65a7294 GCS_MAVLink: supply IMU temperature in mavlink extensions 2019-10-10 13:23:03 +11:00
Do Carmo Lucas dc4ad26e96 GCS_MAVLink: updates to support the latest stable mavlink changes (IMU temperature extension) 2019-10-10 13:23:03 +11:00
Andrew Tridgell 77bf67e15f HAL_ChibiOS: fixed padding of neopixel bits 
lack of padding at start caused occasional glitches in colors
displayed
 2019-10-10 10:41:19 +11:00
Peter Barker 25fd04d402 AP_Proximity: declare RangeFinder as a class to avoid circular include issue 2019-10-08 11:26:04 +11:00
Peter Barker 9aaa6c49fa AP_BoardConfig: correct include of AP_Vehicle_Type 2019-10-08 11:26:04 +11:00
Peter Barker 083d4ac3ea DataFlash: adjust for new vehicle base class 2019-10-08 11:26:04 +11:00
Peter Barker 405bf0ce7f AP_Mission: adjust for new vehicle base class 2019-10-08 11:26:04 +11:00
Peter Barker 8e412d0885 AP_Compass: adjust for new vehicle base class 2019-10-08 11:26:04 +11:00
Peter Barker cf201afdf6 AP_AccelCal: adjust for new vehicle base class 2019-10-08 11:26:04 +11:00
Peter Barker 8bb51f4b7d AC_AttitudeControl: adjust for new vehicle base class 2019-10-08 11:26:04 +11:00
Peter Barker 1ea365d52a AP_Vehicle: move many members up to base class 2019-10-08 11:26:04 +11:00
Peter Barker a6b6bb99f3 AP_NMEA_Output: skip sending sentences if no space on UART 
AP_NMEA_Output: clean scope by removing unneeded temps

AP_NMEA_Output: redo last_sent to last_run

AP_NMA_Output: early-exit if no data
 2019-10-08 11:07:19 +11:00
Peter Barker 5428d13502 AP_Arming: remove bogus ARMING_CHECK_NONE 'bitmask value' 
This looks like a bitmask value, but if you treat it like one (and
people have in the past!) by using logical operations then you get the
incorrect result.

Places which were checking for equivalence to ARMING_CHECK_NONE now
simply check the bitmask to see if it is all-empty.
 2019-10-08 10:31:07 +11:00
murata 371f11b7f4 AP_Motors: Change to description(NFC) 2019-10-08 08:26:17 +09:00
Andrew Tridgell 4866fd68b5 AP_BoardConfig: fixed CAN init without SLCAN 2019-10-08 10:02:14 +11:00
Andrew Tridgell 15d98220e0 AP_HAL: enabled SLCAN on fmuv2 and Pixhawk1-1M 
this fits for now, and is needed for CAN GPS for now
 2019-10-08 10:02:14 +11:00
Andrew Tridgell 08b3bc4506 AP_UAVCAN: cleanup ifdefs for SLCAN enable 2019-10-08 10:02:14 +11:00
Andrew Tridgell 53fab5767f AP_HAL: cleanup ifdefs for SLCAN enable 2019-10-08 10:02:14 +11:00
Andrew Tridgell 15e4641e51 AP_HAL_ChibiOS: cleanup ifdefs for SLCAN enable 2019-10-08 10:02:14 +11:00
Andrew Tridgell 6b3c10f0e7 AP_BoardConfig: cleanup ifdefs for SLCAN enable 2019-10-08 10:02:14 +11:00
Henry Wurzburg 4a42a3a23a Rover: implement steering trim save in armed/manual mode only 2019-10-08 07:41:57 +09:00
vierfuffzig cb054e714b AP_RTC: add local time support 2019-10-07 19:55:42 +11:00
vierfuffzig 1f9b2f712e AP_OSD: add clock panel 2019-10-07 19:55:42 +11:00
Randy Mackay e4336551cd AP_Follow: add clear_offsets_if_required method 
this restores the offsets to zero if they were initialised from zero when the lead vehicle was first spotted
 2019-10-07 08:30:45 +09:00
Ebin f6c7ac88d0 SITL: Yaw rate calculation uses wheel offset 2019-10-07 07:31:53 +11:00
Peter Barker e32d8ecda1 AP_WheelEncoder: add SITL backend 
AP_WheelEncoder: added update function for SITL quadrature encoder
 2019-10-07 07:31:51 +11:00
Peter Barker 4d17a7cf89 AP_Logger: tidy MessageWriter stages using enum class 2019-10-05 16:37:43 +10:00
Henry Wurzburg 880285dad4 AP_BLHeli: Change descriptions in SERVO_BLH_PORT param to actual AP port 2019-10-05 16:35:59 +10:00
Michel Pastor dec5b97275 AP_Logger: fix logging on 256Mbit flash chips 2019-10-05 16:25:22 +10:00
Andrew Tridgell 39182e70e4 AP_Motors: enable docs for hover thr learning in plane 2019-10-04 14:01:08 +10:00
Michel Pastor 49bf0a3057 AP_Logger: fix AP_Logger_Block::get_num_logs() 2019-10-04 12:49:16 +10:00
Randy Mackay db7836ad48 AP_SmartRTL: fixup compile error 
fix typo introduced by me attempting a minor fixup before merging
 2019-10-04 10:01:49 +09:00
Peter Barker fd0a8b72b4 AP_Logger: correct uninitialised value when logging all rally points 2019-10-04 10:39:01 +10:00
Henry Wurzburg 13e66e9f7c AP_SmartRTL: give warning buffer is about to fill-up 2019-10-04 08:57:30 +09:00
Andrew Tridgell 555f56a8af HAL_ChibiOS: removed wait on CAN peripheral in H7 
these wait busy loops can take a very long time, and end up causing
interrupts to be lost elsewhere in the system, causing lost bytes on
UARTs

We should not have while loops waiting on peripharals like this. If we
do need to wait for a flag to clear then it needs to be done in a low
priority thread, or we need to check for completion in a timer

CAN still seems to work with this change, but needs flight testing
 2019-10-03 15:26:47 +10:00
Henry Wurzburg 9717548cb5 AP_Follow: hide params not used by Rover 2019-10-03 07:18:47 +09:00
Andrew Tridgell 3ebc69320c AP_Logger: fixed LOG_FILE_DSRMROT with delayed log stop 
now that we persist logging for 15s after disarm we need to also delay
the log rotation if LOG_FILE_DSRMROT=1. Otherwise we will put the log
data into the next log, which defeats the purpose of the 15s
persistance
 2019-10-03 07:17:16 +10:00
vierfuffzig b89c60d5b0 AP_BLHeli: fix watchdog resets with telemetry active from non-multirotor motors 2019-10-02 21:06:22 +10:00
Randy Mackay 8686197c59 GCS_MAVLink: add comment above set-message-interval 2019-10-02 16:17:09 +09:00
Randy Mackay 3a113a31bb GCS_MAVLink: minor fix to set_message_interval 2019-10-02 16:09:44 +09:00
Tatsuya Yamaguchi 5039bdc8ea AP_Scripting: add set_message_interval binding 2019-10-02 16:09:44 +09:00
Tatsuya Yamaguchi 9a99d9bff5 GCS_MAVLink: add set_message_interval functions 2019-10-02 16:09:44 +09:00