Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity
65,441 Commits 71 Branches 509 Tags 752 MiB
ArduPilot-4.6
Commit Graph

1295 Commits

Author SHA1 Message Date
Patrick José Pereira
6a63eb65cc ArduSub: Use new AP_FWVersionDefine header 
Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
 2020-09-23 20:58:35 +10:00
Jacob Walser
6b0d146d92 Sub: Version to 4.2.0 DEV 2020-09-22 14:41:58 +01:00
Tatsuya Yamaguchi
f9b7020ac3 Sub: replace message indicating that initialisation has completed 2020-09-22 09:52:52 +10:00
Andy Piper
ebef358922 Sub: conditionally compile ADSB support 2020-09-22 09:33:51 +10:00
Peter Barker
3b5bd9956d Sub: remove dangling method declaration 2020-08-29 09:55:38 +09:00
Siddharth Purohit
5318175f70 Sub: move to using CANManager library 2020-08-19 17:31:09 +10:00
Willian Galvani
385f440d90 Sub: update control_poshold to use AC_PosControlSub 2020-08-03 20:19:28 -07:00
Willian Galvani
7fa8a455d7 Sub: refactor depth control of control_althold to a function 2020-08-03 20:19:28 -07:00
Andy Piper
07df203d19 Sub: make mount/gimbal inclusion configurable per-board 2020-08-04 09:18:14 +10:00
Dr.-Ing. Amilcar do Carmo Lucas
664b181d16 ArduSub: Adapt to upstream mavlink changes to the SCALED_PRESSURE* messages 2020-07-29 14:34:22 +10:00
Mirko Denecke
1db0feea59 ArduSub: update_trigger() is now called in AP_Camera update() 2020-07-15 08:37:28 +09:00
Andy Piper
5bedf44734 Sub: log harmonic notch even if FFT is disabled 2020-06-21 19:09:35 +10:00
Andy Piper
94235c5739 Sub: make sure AP_Vehicle::fast_loop() gets called 2020-05-24 07:43:34 +10:00
Peter Barker
2c16810493 ArduSub: create and use INTERNAL_ERROR macro so we get line numbers 2020-04-30 13:21:36 +10:00
Randy Mackay
137077c47b Sub: remove unnecessary EKF includes 2020-04-28 09:38:23 +09:00
Randy Mackay
36b551b75b Sub: use ahrs set-alt-measurement-noise instead of direct calls to EKF 2020-04-28 09:38:23 +09:00
Rishabh
c1d5f0441c Sub: LogMessage Documentation 2020-04-24 08:24:59 +09:00
Randy Mackay
b73d8b32de Sub: do not send ahrs3 mavlink message 2020-04-22 14:11:17 +09:00
Randy Mackay
6d05ed1eb3 Sub: loiter-turn obeys wpnav-rfnd-use 2020-04-16 17:30:29 +09:00
Randy Mackay
0ab4a184d4 Sub: support circle with terrain altitude 2020-04-16 17:30:29 +09:00
Peter Barker
33f00c0051 ArduSub: remove comment for already-removed in-delay-callback function 
These are now attached to completely unrelated functions, which is
pretty bad.
 2020-04-16 15:11:35 +09:00
Randy Mackay
ac3f99d8dd Sub: add support for visual odometry 2020-04-09 19:41:08 +09:00
Rishabh
08d9553a0f Sub: Logger documentation TimeUS and typo fix 2020-04-07 18:57:01 +10:00
Peter Barker
2b18b0f480 Sub: add D16, D32, DFLT, DU16 and DU32 LogMessage documentation 2020-04-07 10:41:22 +10:00
Willian Galvani
824816ddcb Sub: send messages to GCS when toggling roll/pitch control 2020-03-30 11:19:45 -07:00
Willian Galvani
ba415c99fe Sub: send Roll/Pitch Toggle flag 2020-03-30 11:19:45 -07:00
Peter Barker
eda1dc2914 Sub: add CTUN log information 2020-03-21 09:34:43 +11:00
Peter Barker
18ddfbdd6e ArduSub: move AP_PARM_KEY_DUMP function up to AP_Vehicle base class 
Common to all vehicles now, including Tracker
 2020-03-10 11:00:14 +11:00
Peter Barker
e5858555de ArduSub: move initialisation of serial and gcs to AP_Vehicle 2020-02-25 11:50:55 +11:00
Peter Barker
4d0c61970d ArduSub: log disarm method 2020-02-22 12:16:29 +11:00
Andy Piper
83b1c3a0bd ArduSub: add gyro fft logging 2020-02-22 11:15:37 +11:00
Rishabh
075ef40d95 Sub: Rename SYSID_SW_MREV to FORMAT_VERSION 2020-02-19 09:45:22 +09:00
murata
f64a0a9df9 Sub: Match the column of element description 2020-02-19 09:44:57 +09:00
Peter Barker
8292e9d4a5 ArduSub: remove unused compass_init_location state 2020-02-18 10:35:49 +11:00
Peter Barker
7658c13c69 Sub: let AP_Vehicle handle loop() 2020-02-06 14:41:06 +11:00
Patrick José Pereira
885ebc41e3 Sub: Ignore MOT_THST_HOVER parameter 
We should ignore this parameter since ROVs are neutral buoyancy

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
 2020-02-05 09:01:33 -05:00
Peter Barker
e7e1cdcc45 ArduSub: move some common init_ardupilot code up to AP_Vehicle 2020-01-28 11:34:51 +11:00
Peter Barker
87b84ec196 Sub: move setup method up to AP_Vehicle base class 2020-01-28 11:34:51 +11:00
Peter Barker
6092a415a5 Sub: allow NavEKFs to be compiled out 2020-01-21 11:53:18 +11:00
Peter Barker
4ecb602def Sub: EKF objects have moved into AP_AHRS_NavEKF 2020-01-21 11:53:18 +11:00
Peter Barker
e97582add0 Sub: let AP_Vehicle base class worry about scheduler delay callback 2020-01-21 11:37:28 +11:00
Peter Hall
89241d25fd Sub: set_likely_flying in vehicle 2020-01-14 22:34:37 -07:00
Andrew Tridgell
4a688e59b2 Sub: update for new SRV_Channels parameter conversion call 2020-01-14 14:23:11 +11:00
Peter Barker
354e44a51e ArduSub: move logging of armed/disarm events into AP_Arming base class 2020-01-14 11:39:36 +11:00
Tatsuya Yamaguchi
1c07609f47 Sub: allow scripts to get modes 2020-01-14 11:16:29 +11:00
Peter Barker
a37df08277 Sub: correct unused expression compilation failure 2020-01-14 11:12:14 +11:00
Andrew Tridgell
5c342c3dab Sub: removed init_vehicle from separate vehicles 
use common call from AP_BoardConfig
 2019-12-30 13:02:04 +11:00
Andy Piper
1bd6adec23 Sub: create generic vehicle management and move runcam to it 
add OSD and RCMapper to build
 2019-12-30 13:02:04 +11:00
Peter Barker
12cccac361 Sub: let GCS base class handle proximity and rangefinder messages 2019-12-24 12:08:54 +11:00
Andrew Tridgell
f42c4e9ce1 Sub: fixed range check for RC channel 2019-12-20 10:55:14 +11:00
Randy Mackay
b1ccf5b9d5 Sub: remove unused TERRAIN_FOLLOW parameter 2019-12-17 20:02:01 +09:00
Peter Barker
526adee814 Sub: move setting of GPS SYS_STATUS bits up to base class 2019-12-05 13:02:19 +11:00
Willian Galvani
acfe02dbf0 Sub: set cam mount to 0,0,0 and RC mode after initialization 2019-12-03 10:59:46 -05:00
Willian Galvani
c509b1caa2 Sub: Accept position_target_global_int for depth control in ALT_HOLD 2019-12-03 10:57:47 -05:00
Willian Galvani
2e9bd43c49 Sub: rate-limit init_motor_test() calls 2019-12-03 10:50:38 -05:00
Willian Galvani
741c467f03 Sub: do not initialize rc channels 6 and higher 2019-12-03 13:13:28 +08:00
Randy Mackay
952517cb40 Sub: scripting init sends failure message 2019-12-03 12:48:32 +08:00
Peter Barker
d5b970bd18 Sub: vehicle parent class now instantiates AHRS 2019-12-02 09:16:22 +11:00
Peter Barker
38a0fe4564 Sub: rename system_status as it won't be called from base class 2019-11-27 14:27:53 +11:00
Jacob Walser
95124eb73e Sub: version to 4.1.0dev 2019-11-25 22:28:45 -05:00
Marian Soban
3892c90d1f Sub: add stubs to avoid linking LTM telemetry 2019-11-26 12:14:13 +11:00
Peter Barker
5ebf27ac61 Sub: rename parameter to avoid name conflict with lock 2019-11-12 16:33:12 +11:00
Peter Barker
7e81aa8f64 Sub: add methods to avoid linking AP_Avoidance 2019-11-12 13:48:09 +11:00
Peter Barker
5a28aa9c1b Sub: move dummy methods into system.cpp 2019-11-12 13:48:09 +11:00
Peter Barker
dee1cfadfd Sub: adjust for renaming of RangeFinder files 2019-11-12 07:14:37 +08:00
Peter Barker
b3f1fdf182 Sub: use enum-class for RangeFinder Status 2019-11-09 08:01:53 +11:00
Peter Barker
db36ef3433 Sub: use enum-class for RangeFinder type 2019-11-09 08:01:53 +11:00
Patrick José Pereira
2fae0cf5c0 Sub: Remove unnecessary includes 
Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
 2019-11-06 09:40:23 -08:00
Peter Barker
e1686db7bf Sub: correct compilation when avoidance enabled 2019-11-06 16:36:35 +11:00
Peter Barker
20f904ce66 Sub: correct compilation with fence disabled 2019-11-06 16:36:35 +11:00
Peter Barker
9f719ec02e Sub: stop providing current location to mount 2019-11-05 19:55:45 +11:00
Peter Barker
795afdd259 Sub: let GCS superclass specify param float capabilitiy 2019-11-05 11:26:23 +11:00
Peter Barker
3819366a9e Sub: cope with change in namespace of LogEvent enum 
Also eliminate the Log_Write_Event wrappers
 2019-11-05 08:19:26 +08:00
Andrew Tridgell
d307cf7d21 ArduSub: moved AC_PID dependency to core 2019-11-02 16:31:04 +11:00
Michael du Breuil
3f94f0d517 Sub: Support new AP_Vehicle::set_mode 2019-10-25 08:48:22 +08:00
Peter Barker
3cd66dbdd9 Sub: use ahrs singleton to log ATT, POS and AHRS2 2019-10-24 13:15:46 +11:00
Randy Mackay
35b993b220 Sub: minor comment change 2019-10-22 07:15:48 +08:00
Peter Barker
c0052a5e71 Sub: move many members up to base class 2019-10-08 11:26:04 +11:00
Peter Barker
347c247ad0 Sub: become an AP_Vehicle 2019-10-08 11:26:04 +11:00
Peter Barker
739bc486fa Sub: remove bogus ARMING_CHECK_NONE 'bitmask value' 2019-10-08 10:31:07 +11:00
Peter Barker
3ef94a69ad Sub: call periodic fence update function 2019-09-28 07:58:48 +09:00
Peter Barker
6891225438 Sub: initialise AC_Fence library 2019-09-28 07:58:48 +09:00
Willian Galvani
9c6a63b55b sub: fixup joystick changes according to review 
https://github.com/ArduPilot/ardupilot/pull/11861
 2019-09-27 13:20:20 -07:00
Justin
ee65aa2993 joystick: addressed issue9801. Upon engaging input hold, the controller will not read new directional inputs until input hold is disabled or the conrols are returned to their neutral position. 2019-09-27 13:20:20 -07:00
Willian Galvani
adcf0d398d Sub: update calibration if reading is above water level 2019-09-27 13:17:10 -07:00
Willian Galvani
0c5753112a AP_TemperatureSensor: Update TSYS01 for Pixhawk2 2019-09-27 13:08:26 -07:00
Willian Galvani
2b0773c18b Sub: Create MOTOR_DETECT mode 
This mode attempts to detect the direction of all motors and adjust parameters appropriately.
 2019-09-26 09:39:50 -07:00
Peter Barker
5e6b6ee0e0 Sub: remove stale enum entries for log message types 2019-09-18 15:02:57 +10:00
Peter Barker
d32a7b3a29 Sub: wrap_180_cd no longer returns floats for integer arguments 2019-09-18 12:57:02 +10:00
Peter Barker
5692f3d79e AP_Math: stop returning float for integer wrap_180/wrap_360 etc 2019-09-18 12:57:02 +10:00
Willian Galvani
f86a712a14 Sub: default RNGFNDR1_TYPE to mavlink 2019-09-17 07:06:06 -07:00
Peter Barker
6deac0fa42 Sub: implement dummy afs singleton getting to avoid linking AFS 2019-09-17 09:13:43 +10:00
Willian Galvani
0e4366d540 Sub: improve motor test message 2019-09-16 13:56:32 -07:00
Willian Galvani
db6beb913d Sub: force cam pan and tilt inputs to channels 7 and 8 2019-09-16 13:31:32 -07:00
Peter Barker
4ef64261a1 Sub: mount uses AP_SerialManager singleton 2019-08-28 06:55:28 +10:00
Peter Barker
c5333c2765 Sub: fix format-string compilation warning 
../../ArduSub/commands_logic.cpp: In member function 'void Sub::do_nav_delay(const AP_Mission::Mission_Command&)':
../../ArduSub/commands_logic.cpp:485:84: warning: format '%u' expects argument of type 'unsigned int', but argument 4 has type 'long unsigned int' [-Wformat=]
     gcs().send_text(MAV_SEVERITY_INFO, "Delaying %u sec",nav_delay_time_max_ms/1000);
                                                                                    ^
 2019-08-27 09:41:58 +10:00
Michael du Breuil
48f52655c1 Sub: Remove APM_Config.h 2019-08-21 22:16:49 -06:00
Peter Barker
4e002b84c5 Sub: correct compilation when terrain is enabled 2019-08-21 22:05:36 +01:00
Tom Pittenger
018e766a3f Sub: NAV_Delay variable timers to be all unsigned and labeled as _ms 2019-08-19 15:24:06 -07:00
Peter Barker
45af50f8bd Sub: avoid allocate a GCS_MAVLINK per mavlink channel 2019-08-14 18:25:43 +10:00
Peter Barker
03e6065380 Sub: move automatic declination setting into AP_Compass itself 2019-08-13 10:02:13 +10:00
Peter Barker
6347febc9a Sub: pass format string through to check_failed 2019-08-05 14:18:05 +10:00
Peter Barker
157da70cf7 Sub: fix compiler warnings on has_disarm_function 2019-08-02 08:23:57 +10:00
Peter Barker
68edf6351d Sub: tighten type on mavlink_coordinate_frame_to_location_alt_frame 2019-08-01 17:45:30 +10:00
Michael du Breuil
c37398f6ff Sub: Convert ARMING_CHECK 2019-07-30 10:42:16 +10:00
Michael du Breuil
ce6fb75e52 Sub: Add keydump feature 2019-07-30 10:42:16 +10:00
Leonard Hall
ad4b6fdeae Sub: param conversion for attitude control FF and FILT 2019-07-25 17:38:15 +09:00
Leonard Hall
157f786adf Global: rename desired to target in PID info 2019-07-25 17:38:15 +09:00
Justin
f3634450d7 Sub: Enforce configuration of a disarm button 2019-07-17 12:44:41 -04:00
Pierre Kancir
147a678569 ArduSub: pass mavlink_message_t by const reference 2019-07-16 20:51:42 +10:00
Peter Barker
1f4a1cef70 Sub: correct LOIT parameter documentation prefix 
Closes #11769
 2019-07-16 16:15:39 +10:00
Michael du Breuil
bbcb976e73 Sub: Reduce dependency on inertial nav 2019-07-16 12:11:42 +09:00
Peter Barker
11c5d7cfca Sub: RangeFinder uses AP_SerialManager singleton 2019-07-16 09:29:48 +10:00
Justin
3dfaa5f021 Sub: Changed the MAV_SEVERITY of the motor test timed out message to INFO so that it wont be read out loud everytime the user ends the motor test 2019-07-10 12:19:27 -04:00
Peter Barker
0af3ecca70 Sub: split RC_CHANNELS messages onto separate ap_message ids 2019-07-09 13:08:45 +10:00
Peter Barker
9afb334f0c Sub: stop passing relay and ahrs into camera constructor 2019-07-09 09:32:39 +10:00
Peter Barker
b6efd0bea1 Sub: EKF logging moved into EKF from logger 2019-07-06 19:05:51 +10:00
Peter Barker
5444903504 Sub: ServoRelayEvents uses Relay singleton 2019-07-03 23:59:24 -07:00
Peter Barker
bd2516bc89 Sub: add sanity check when fetching GCS_MAVLink instance 2019-06-27 07:54:45 +10:00
Michael du Breuil
e22bda2527 Sub: Send a heartbeat on mode change 2019-06-26 12:58:18 -07:00
Peter Barker
973222c786 Sub: allow GCS MAVLink base class to handle out-of-time for sending messages 2019-06-25 10:29:40 +10:00
Peter Barker
f67fd4e08c Sub: remove pointless protocol parameter to setup_uart 2019-06-25 09:47:08 +10:00
Peter Barker
1de6fed20e Sub: stop pointlessly passing serial manager around 2019-06-25 09:47:08 +10:00
Michael du Breuil
ba65b163f7 Sub: Remove wrapper around MAVLink send heartbeat 2019-06-18 13:59:52 +01:00
Michael du Breuil
b2743a0eb6 Sub: Enable scripting parameters 2019-06-18 00:06:32 -07:00
Peter Barker
80652dffd0 Sub: set os_sw_version to date fw was compiled 
Also avoids non-trivial-designator compilation error
 2019-06-18 10:54:01 +10:00
Peter Barker
de5ace24fd Sub: remove duplicate EV log message definition 2019-06-12 10:05:59 +10:00
Peter Barker
4c4d37bd86 Sub: stop setting AC_Avoid in AC_WPNav; it uses singleton now 2019-06-06 11:47:22 +10:00
Willian Galvani
4b16271b3d Sub: Remove rangefinder support of control loops 
The rangefinder handling doesn't handle sonar glitches like
locking on to reflections very well. We will remove the
rangefinder as an input to the controllers until we can do a
more robust implementation.
 2019-06-05 11:54:45 -04:00
Peter Barker
b25acb4d22 Sub: move Arming functions into AP_Arming file 2019-05-30 16:02:10 +09:00
Peter Barker
8566a17a1d Sub: move arming-related functionality into parent classes 
Logging moves up
arming via mavlink moves up
arming via switch moves up

arming switch may be forced off using BRD parameter
 2019-05-30 07:37:30 +09:00
Peter Barker
6774bab363 Sub: stop passing references to AC_Avoid constructor 2019-05-22 07:48:02 -06:00
Tom Pittenger
5519527874 Sub: move heartbeat sending to gcs instead of by vehicles 2019-05-14 10:54:45 -06:00
Peter Barker
aae9dc55e3 Sub: move responsibility for logging into library 2019-04-23 10:06:17 +10:00
Peter Barker
c6a9130d84 Sub: call compass cal routine directly from sched table 2019-04-23 10:06:17 +10:00
Peter Barker
f66f36287e Sub: move setting of compass sys_status bits up 2019-04-16 09:48:23 +10:00
Peter Barker
cb88bc7f53 Sub: adjust for desired spool state renames 2019-04-14 12:18:03 +09:00
Michael du Breuil
75e5efc16e Sub: Check all EKF cores are healthy before arming 2019-04-09 10:53:25 +10:00
Pierre Kancir
8425a58585 ArduSub: move check_latlng to Location 2019-04-08 12:56:01 -07:00
Jacob Walser
3c58fba030 sub: version to 3.7.0-dev 2019-04-08 15:07:29 -04:00
Leonard Hall
d8d3522cba Sub: replace set_throttle_out_unstabilized 2019-04-08 09:42:21 +09:00
Michael du Breuil
698e4e440e Sub: Fix rangefinder init 2019-04-06 09:15:22 +11:00
Jacob Walser
5ac19bc5a3 sub: update release notes for 3.5.4 2019-04-05 11:56:37 -04:00
Michael du Breuil
3017a762f0 Sub: include FWversion 2019-04-05 20:12:53 +11:00
Peter Barker
8b34852147 Sub: add param conversion from MAG_ENABLE to COMPASS_ENABLED 2019-04-02 10:24:49 +11:00
Peter Barker
b1c4a5ade7 Sub: move enabled parameter into compass library 2019-04-02 10:24:49 +11:00
Tom Pittenger
2dc766556d Sub: rename dataflash to logger 2019-03-28 16:40:57 +11:00
Peter Barker
e3561f7204 Sub: add log entry if depth sensor failure is resolved 2019-03-27 12:02:53 -04:00
Peter Barker
706a75ad03 Sub: move Log_Write_Error into library 2019-03-27 12:36:40 +11:00
Patrick José Pereira
d2052cdd35 Sub: Use new reset_i in relax_alt_hold_controllers 
Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
 2019-03-26 13:37:18 -04:00
Patrick José Pereira
33768cd79c Sub: Fix overshoot from joystick input 
This approach waits for a zero derivative point and to set the new actual position
Such method is necessary since the inertia of the ROV underwater is bigger than aerial vehicles
resulting in a big overshoot

Fix #9797

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
 2019-03-26 13:37:18 -04:00
Peter Barker
173611e819 Sub: move various sensor status flag updates up 2019-03-26 11:03:21 +11:00
Jacob Walser
ad67511f46 Sub: bugfix fail condition in motor test initialization 2019-03-25 09:00:26 +11:00
Peter Barker
513a635ff7 Sub: remove definition of Devo constructor 2019-03-23 11:25:21 +11:00
Peter Barker
b3f76e39ec Sub: move command-long DO_SET_HOME up 2019-03-19 19:56:13 +11:00
Peter Barker
f4cafe4ffa Sub: add dummy methods to avoid linking DevoTelem 2019-03-19 14:39:14 +11:00
Peter Barker
fabf0a10d5 Sub: move vehicle_initialised to be on GCS not GCS_MAVLink 2019-03-19 14:39:14 +11:00
Peter Barker
1ce531b921 Sub: move base_mode and frame_type into GCS from GCS_MAVLink 2019-03-19 14:39:14 +11:00
Peter Barker
5b618fb582 Sub: fill Notify flag for flying 2019-03-19 14:39:14 +11:00
Peter Barker
eb7cf9843e Sub: use enum class for AltFrame enumeration 2019-03-19 10:31:18 +11:00
Peter Barker
b1c789f73d Sub: move sending of RPM message up 2019-03-16 10:33:01 +09:00
Peter Barker
069a2d0e35 Sub: compass init never fails 2019-03-13 13:06:50 +11:00
Peter Barker
c48042424b Sub: use enum class for ArmingMethod and ArmingRequired 2019-03-12 19:48:14 +11:00
Peter Barker
d7735a316a Sub: remove unused calculation of longitude scale 2019-03-12 10:11:12 +11:00
Peter Barker
b04d084a50 Sub: move sending of send_pid_tuning up 2019-03-05 10:41:56 +11:00
Michael du Breuil
e8401671e3 Sub: Allow scripting to run 2019-03-05 08:45:54 +11:00
Dr.-Ing. Amilcar do Carmo Lucas
3fd5e05601 Sub: replace location_offset() and get_distance() function calls with Location object member function calls 
This allows removing duplicated code
 2019-02-28 11:44:09 +11:00
Peter Barker
97792d1774 Sub: AHRS set_orientation renamed to update_orientation 2019-02-26 10:28:09 +11:00
Peter Barker
285fe4c79c Sub: explicitly type constant 
This makes clang happier
 2019-02-20 19:23:54 +11:00
Peter Barker
1ce80e1f17 Sub: remove stale STREAM_RAW_CONTROLLER_msgs variable 2019-02-20 19:23:54 +11:00
Peter Barker
e75dccfc71 Sub: Rally no longer takes ahrs in constructor 2019-02-20 18:03:38 +11:00
Peter Barker
57e8528a96 Sub: move update_sensor_flags to GCS_Sub.cpp 2019-02-20 11:57:00 +11:00
Peter Barker
cb95bf7814 Sub: move update_sensor_status_flags into GCS subclasses 2019-02-19 14:09:59 +11:00
Peter Barker
bb706305d0 Sub: move sensor flags to be a GCS thing rather than a GCS_MAVLINK thing 2019-02-19 14:09:59 +11:00
Peter Barker
7b80f56a80 Sub: GCS_MAVLink takes care of mavlink capabilities 2019-02-19 13:14:52 +11:00
Peter Barker
57e5991fde Sub: move try_send_message of nav_controller_output up 2019-02-19 10:08:00 +11:00
Peter Barker
db362eaa13 Sub: remove redundant home-setting sanity checks 2019-02-15 08:28:45 +11:00
Peter Barker
8937ef3190 Sub: make setting of home boolean in preparation for sanity checks 2019-02-15 08:28:45 +11:00
Peter Barker
dc0ad11f7a Sub: use altitude frame mapping function 
Remove checking for coordinate frames

This is very much NFC.  This change uncovers previous dead code in the
case that we are not ignoring yaw.
 2019-02-13 10:06:49 +11:00
Peter Barker
44b7763caf Sub: move handling of command-int MAV_CMD_DO_SET_HOME up 2019-02-13 09:42:26 +11:00
Peter Barker
0c8f0377ca Sub: move handling of fence point handling up 2019-02-08 11:47:59 +09:00
Peter Barker
5002fa2081 Sub: move handling of MAV_CMD_DO_SET_FENCE_ENABLED up 2019-02-08 11:47:59 +09:00
Peter Barker
17e4981785 Sub: move handling of RC_CHANNELS_OVERRIDE up 2019-02-05 13:59:21 +11:00
Peter Barker
fc19ce03b6 Sub: move sending of sys_status message up 2019-02-05 11:07:39 +11:00
Peter Barker
1690f78f4c Sub: move handling Write_Event into AP_Logger 2019-02-04 09:30:07 +09:00
Peter Barker
3521d98b52 Copter: move handling Write_Event into AP_Logger 2019-02-04 09:30:07 +09:00
Randy Mackay
aa7743e991 Sub: integrate AC_WPNav::get_speed rename to get_default_speed 2019-01-31 19:34:32 +09:00
Peter Barker
66624c46a6 Sub: AC_Fence is included for all vehicles 2019-01-31 13:44:29 +09:00
Peter Barker
05c9ded9fc Sub: move sending of fence_status message up 2019-01-31 13:44:29 +09:00
Peter Barker
79eb0ac75f Sub: fence no longer takes reference to ahrs in constructor 2019-01-31 11:25:38 +09:00
Peter Barker
6fc76a32af GLOBAL: use AP::logger() and strip redundant Log_ from methods 2019-01-18 18:08:20 +11:00
Peter Barker
b47733142f GLOBAL: rename DataFlash_Class to AP_Logger 2019-01-18 18:08:20 +11:00
Francisco Ferreira
8850ab73a6
Sub: add KDECAN to included libraries 2019-01-18 00:57:33 +00:00
Peter Barker
9783bf730f Sub: log_terrain_data no longer takes a DataFlash argument 2019-01-18 11:17:40 +11:00
Peter Barker
696c8e3fb9 Sub: Log_Write_SIMSTATE no longer takes dataflash pointer 2019-01-18 11:16:54 +11:00
Peter Barker
9e8d2d7f7d Sub: remove PX4 FWVersion info 2019-01-16 11:47:55 +11:00
Peter Barker
d8e90ded90 Sub: adjust for Location_Class and Location unification 2019-01-16 11:45:29 +11:00
Peter Barker
b4c65dde92 Sub: adjust for Location_Class and Location unification 2019-01-16 11:45:29 +11:00
Peter Barker
d92f34c3d0 Sub: adjust for location flags being moved out of union 2019-01-16 11:45:29 +11:00
Randy Mackay
8ba87171e6 Sub: desired-ground-idle replaces spin-when-armed 2019-01-15 11:41:44 +09:00
Pierre Kancir
2c895599e1 Sub: correct rc_checks_copter_sub call 2019-01-11 08:38:53 +09:00
Peter Barker
23ab90c596 Sub: Terrain uses rally singleton 2019-01-09 10:14:16 +11:00
Randy Mackay
8830e8d4e5 Sub: remove unused error code 2019-01-08 19:42:32 +09:00
Michael du Breuil
b4c5041aad Sub: Remove unneeded GCS rally override 2019-01-08 10:39:50 +11:00
Michael du Breuil
58895b5a82 Sub: Reset all storage when format version is incorrect 2019-01-08 10:35:37 +11:00
murata
90f2f38fb2 Sub: Delete NuttX version processing 2019-01-08 10:06:20 +11:00
Andrew Tridgell
088442880e build: removed makefile build system 2018-12-22 11:06:59 +11:00
Andrew Tridgell
25c659822a Sub: changed Log_Write_Rate to use AHRS_View 2018-12-21 22:17:52 +11:00
Peter Barker
8a44bf50a8 Sub: split SIMSTATE, AHRS2 and AHRS3 onto their own ap_message ids 2018-12-19 13:19:23 +11:00
Peter Barker
0e1957328e Sub: split DISTANCE_SENSOR onto its own ap_message id 2018-12-19 07:24:37 +11:00
Peter Barker
87d27957d9 Sub: try_send_message caller checks telemetry_delayed 2018-12-18 14:25:56 +11:00
Peter Barker
d1daacd699 Sub: split SYS_STATUS and POWER_STATUS onto separate ap_messages 2018-12-18 14:05:20 +11:00
Francisco Ferreira
6f01073786 Sub: fix error in task scheduled rate 2018-12-14 09:17:02 +09:00
Peter Barker
bbf1c434c6 Sub: DataFlash uses AP_Mission singleton 2018-12-13 14:45:30 +09:00
Peter Barker
aab9103356 Sub: GCS_MAVLink now uses Mission singleton 2018-12-13 10:52:52 +09:00
Peter Barker
e498883624 Sub: split MSG_SCALED_PRESSURE into three separate messages 2018-12-12 21:36:01 +11:00
Peter Barker
85f579021e Sub: GCS_MAVLink uses dataflash singleton 2018-12-11 08:43:47 +09:00
Peter Barker
2e58eb1d46 Sub: call GCS update_send at main loop rate 2018-12-10 12:52:41 +09:00
Peter Barker
5e196525bf Sub: split MSG_RAW_IMU1 into per-IMU ap_messages 2018-12-10 12:52:41 +09:00
Peter Barker
4d21630bf0 Sub: send both SYS_STATUS or POWER_STATUS or neither 2018-12-10 12:52:41 +09:00
Peter Barker
e2e17b8822 Sub: rename send_extended_status1 to send_sys_status 2018-12-10 12:52:41 +09:00
Peter Barker
b31ce6ae69 Sub: adjust for new update entry points into GCS 2018-12-10 12:52:41 +09:00
Peter Barker
fe6342107b Sub: add parameter stream to list-of-all-streams 2018-12-10 12:52:41 +09:00
Peter Barker
85a96195fd Sub: rename MSG_EXTENDED_STATUS2 to MSG_MEMINFO 2018-12-04 18:01:38 +11:00
Peter Barker
a40937337d Sub: rename MSG_RAW_IMU2 and MSG_RAW_IMU3 to reflect what they send 2018-12-04 17:45:32 +11:00
Peter Barker
27405f9dd7 Sub: remove pointless wrappers around gcs functions 2018-11-23 10:56:17 +11:00
Peter Barker
376a422cff Sub: OpticalFlow takes care of its own logging 2018-11-13 10:40:23 +11:00
Peter Barker
2bca18b712 Sub: do not pass ahrs to opticalflow constructor 2018-11-13 10:40:23 +11:00
Peter Barker
102f06bb92 Sub: move sending of optical flow status up to base class 2018-11-13 10:40:23 +11:00
Peter Barker
2116737e35 Sub: don't pass ahrs to terrain constructor 2018-11-08 20:59:45 +11:00
Peter Barker
cadeb428b6 Sub: stop passing ahrs to Mission constructor 2018-11-08 10:01:16 +09:00
murata
9bf4428c28 Sub: Add patch number to VERSION notation 2018-11-08 09:11:07 +09:00
Michael du Breuil
4540109513 Sub: Fix battery failsafe parameter conversion 2018-11-06 10:18:39 +09:00
Michael du Breuil
68d713b971 Sub: Make capability init consistent 2018-11-05 14:04:36 +11:00
Peter Barker
793ff201b4 Sub: remove dead do_erase_logs method 2018-11-02 20:44:31 +09:00
Peter Barker
a487cb09ed Sub: move handling of gimbal messages up 
Sub: move handling of mav_cmd_do_mount_control up

Sub: move handling of deprecated mount messages up

Sub: move handling of command_do_set_roi up

Sub: move handling of command_do_set_roi up

Sub: mount no longer takes ahrs in constructor
 2018-10-30 17:19:14 +11:00
Peter Barker
d690baecf9 Sub: let AP_Mission handle common camera commands 2018-10-30 15:37:18 +11:00
Peter Barker
5a8a3963d4 Sub: move servorelayevents mission handling into AP_Mission 2018-10-30 15:37:18 +11:00
Peter Barker
e79d107761 Sub: mission library handles gripper 2018-10-30 15:37:18 +11:00
Peter Barker
7289f0d04c Sub: AC_Avoid is built on all vehicles 2018-10-30 12:10:42 +11:00
Andrew Tridgell
a8f5079df9 Sub: enable in-flight compass learning 2018-10-24 07:25:42 +10:00
Peter Barker
ecd69e4359 Sub: remove pointless zero-initialisation 2018-10-23 16:12:45 +11:00
Peter Barker
da5ed06714 Sub: leave AHRS to log and notify home changes 2018-10-16 10:55:13 +11:00
Peter Barker
47b5cf98ea Sub: make libraries get EKF control limits themselves 2018-10-09 10:47:38 +11:00
Michael du Breuil
27fad4489e Sub: Cope with AC_PosControl renaming 2018-09-20 15:15:45 -07:00
Leonard Hall
ccb30d44ac Sub: Missing Loiter Init on accel 2018-09-19 17:29:55 +09:00
Michael du Breuil
18512eebbb Sub: Allow starting mission commands to fail 2018-09-11 06:42:00 +10:00
Peter Barker
c0a990fda7 Sub: correct failsafe recovery test 2018-09-07 18:11:11 +09:00
Peter Barker
753be1142f Sub: use camera singleton to get camera rather than callback 2018-08-31 15:48:56 +10:00
Peter Barker
e4c0ef789b Sub: GCS_MAVLink uses compass singleton, stop implementing get_compass 2018-08-31 15:48:56 +10:00
Peter Barker
ff9a7b3f44 Sub: failsafe: subtract times, don't add them 
Avoids integer wrap issues
 2018-08-25 16:14:01 +09:00
Randy Mackay
012dd57246 Sub: rename gcs_check_input to gcs_update 2018-08-24 15:30:50 +09:00
Michael du Breuil
7fd8211253 Sub: Remove unneeded ServoRelayEvent mask set 2018-08-20 21:31:06 -07:00
Randy Mackay
54df7ad88d Sub: remove compass accumulate 2018-08-06 11:05:34 +10:00
Andrew Tridgell
660da5aaea Sub: fixed RC_Channels parameter docs 2018-08-04 12:28:38 +10:00
Peter Barker
1ba0901e51 Sub: minimal support for inheritting from RC_Channel 2018-08-01 12:11:30 +09:00
Michael du Breuil
ad185edd48 Sub: Update notify initilization 2018-08-01 09:22:09 +10:00
Peter Barker
2d1ed75592 Sub: handle command_long in GCS base class 2018-07-06 09:43:09 +10:00
Peter Barker
332fcb3226 Sub: handle command_int in base class 2018-07-06 09:43:09 +10:00
Peter Barker
d183847aa3 Sub: use compass singleton for logging 2018-07-04 20:11:27 +01:00
Peter Barker
3cfdcb1f2c ArduSub: use ArmingMethod enumeration 2018-07-03 15:16:38 +10:00
Peter Barker
cc46ab3092 Sub: use singletons in AP_Arming 2018-07-03 13:44:11 +10:00
Peter Barker
e0eb3424ec Sub: move mavlink reboot code up to base class 2018-07-03 12:12:25 +10:00
Jacob Walser
f4da0215d1 Sub: add motor test implementation 2018-07-02 11:31:58 -04:00
Patrick José Pereira
dcd3f83539 Sub: Remove void as parameter 
Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
 2018-07-02 11:25:03 -04:00
Patrick José Pereira
90601c80e9 Sub: Simplify some returns 
Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
 2018-06-29 15:51:30 -04:00
Patrick José Pereira
e229d46612 Sub: Update functions argument names to match with cpp 
Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
 2018-06-29 15:51:30 -04:00
Peter Barker
fd055bfa58 Sub: use check_failed function 2018-06-23 15:33:19 +10:00
Patrick José Pereira
d14b37e89c Sub: Change from labs to abs for floats 
Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
 2018-06-21 17:24:14 +01:00
Patrick José Pereira
cbef5db174 Sub: Simplify return logic 
Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
 2018-06-21 17:24:14 +01:00
Andrew Tridgell
5eab425065 Sub: added ESC_TELEMETRY to mavlink streams 2018-06-21 10:48:02 +10:00
Peter Barker
c17514cf85 Sub: use AP_FWVersion singleton 2018-06-18 19:10:37 +01:00
Peter Barker
4cc236b8a7 Sub: use AP_RTC 
Sub: AP_GPS now sets the system time directly

Sub: use AP_RTC for delays in missions
 2018-06-15 08:01:22 +10:00
Patrick José Pereira
d3da8f2914 Sub: Add attitude control with althold via mavlink 
Allow ordinary attitude positions without a gps system

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
 2018-06-12 17:27:56 -04:00
Patrick José Pereira
3701fc0937 Sub: Move from micros() to AP_HAL::micros() 
AP_HAL::micros() is a more common style around the rest of the project

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
 2018-06-12 17:27:56 -04:00
Patrick José Pereira
4de371743e Sub: Move from millis() to AP_HAL::millis() 
AP_HAL::millis() is a more common style around the rest of the project

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
 2018-06-12 17:27:56 -04:00
Patrick José Pereira
a856f747aa Sub: Organize descend climb_rate calc 
Make it more clear to read

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
 2018-06-12 17:27:56 -04:00
Peter Barker
32b8b86019 Sub: move handling of MAV_CMD_DO_GRIPPER up 2018-06-11 19:07:39 +01:00
Patrick José Pereira
5a8d04e8f5 Sub: Simplify some returns logic 
Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
 2018-06-08 11:25:51 -04:00
Michael du Breuil
c642d1ed74 Sub: Rework to support override changes 2018-06-05 09:51:09 +10:00
Peter Barker
1dbfb9943c Sub: make VFR_HUD always return height above MSL 2018-06-05 09:38:20 +10:00
Michael du Breuil
5a0a8a6705 Sub: Remove software type param 2018-06-05 09:14:12 +10:00
Peter Barker
31c6d7aaa0 Sub: Location gets ahrs from singleton 2018-06-01 16:18:33 +01:00
Peter Barker
3694f085dc Sub: move try_send_message handling of EKF_STATUS_REPORT up 2018-06-01 16:12:45 +01:00
Peter Barker
48a4523a73 Sub: fix comments in config.h 2018-06-01 13:28:43 +09:00
Peter Barker
69d8980608 Sub: split home-set and home-locked state 2018-05-29 14:38:45 +10:00
Peter Barker
1f31bd21c4 Sub: create persist_streamrates() callback to indicate persistence 2018-05-29 13:08:29 +10:00
Peter Barker
18c494b25f Sub: move sending of vfr_hud up 2018-05-29 13:00:40 +10:00
Peter Barker
420b9869f7 Sub: move sending of simstate up 2018-05-23 18:36:50 +10:00
Peter Barker
148756bc1c Sub: add type-correctness for stream messages 2018-05-22 11:21:25 +10:00
Peter Barker
f0dd90b81a Sub: eliminate MSG_LIMITS_STATUS 2018-05-22 09:05:14 +09:00
Peter Barker
cc899d74e2 Sub: move try_send_message of servo-output-raw up 2018-05-21 19:08:08 +01:00
Peter Barker
324be6ca0d Sub: move sending of GLOBAL_POSITION_INT up to GCS_MAVLINK 2018-05-17 15:48:06 +01:00
Peter Barker
a81b4266fe Sub: remove arguments to send_home and send_ekf_origin 2018-05-17 20:42:36 +10:00
Peter Barker
3e7cb08804 Sub: move send_attitude up to GCS_MAVLINK 2018-05-17 18:28:43 +10:00
Peter Barker
c91ba19e7f Sub: override sending of scaled_pressure3 
Without this change we run the risk of sending out the same message with
vastly different data in it
 2018-05-17 15:37:14 +10:00
Peter Barker
12f62a44ce Sub: move try_send_message sending of sensor offsets up 2018-05-17 15:37:14 +10:00
Peter Barker
5736aa6ef3 Sub: move try_send_message of RAW_IMU up to GCS_MAVLINK 2018-05-17 15:37:14 +10:00
Peter Barker
631e967df3 Sub: handle setting of ekf origin in GCS_MAVLink 2018-05-17 10:13:42 +10:00
Peter Barker
9a73f0c260 Sub: move Log_Write_Home_And_Origin into AP_AHRS 2018-05-17 10:13:42 +10:00
Michael du Breuil
2d7f60ab59 Sub: Use named float wrappers 2018-05-17 00:59:45 +01:00
Michael du Breuil
936c7faa3e Sub: AP_Proximity is now a common library 2018-05-16 23:21:41 +01:00
Michael du Breuil
216457a281 Sub: Move MAVLink rangefinder up to parent 2018-05-16 23:21:41 +01:00
Michael du Breuil
5393337dfa Sub: Send all distance sensors 2018-05-16 23:21:41 +01:00
Michael du Breuil
3927fb3107 Sub: Remove the usage of RC_Channels::set_overrides() 2018-05-11 12:13:39 +01:00
Peter Barker
0a0e11ba21 Sub: correct compilation when features disabled 
Gripper
Mount
 2018-05-10 17:55:13 +09:00
Peter Barker
524d63522a Sub: move sending of battery data up 2018-05-09 11:40:31 -07:00
Peter Barker
5674a68457 Sub: move data stream send up 2018-05-09 16:15:38 +10:00
Peter Barker
133b9930a6 Sub: make scheduler track whether it has called the delay callback 2018-05-09 16:15:38 +10:00
Jacob Walser
cd98bef1f7 Sub: Update release notes for Sub-3.5.3 2018-05-08 14:41:36 -04:00
Peter Barker
b7cd5491e2 Sub: move try_send_message handling of RC_CHANNELS up 2018-05-08 12:33:32 +01:00
Patrick José Pereira
e62b560095 Sub: Move SITL barometer check to control_check_barometer 
Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
 2018-05-07 17:28:51 -04:00
Peter Barker
f075d6bd93 Sub: move try_send_message of heartbeats up to GCS_MAVLINK 2018-05-07 11:30:13 -06:00
Peter Barker
5bad067a8d Sub: move try_send_message handling of VIBRATION up 2018-05-07 11:23:28 -06:00
Jacob Walser
aadbd04726 Sub: Update release notes for 3.5.3-beta 2018-04-29 17:21:26 -04:00
Andrew Tridgell
705474a2ff Sub: remove old pde file 
this was here for upgrading very old MissionPlanner versions. We can
remove it now
 2018-04-26 14:25:01 +10:00
Michael du Breuil
6642b9e585 Sub: Support new RC_Channels::read_input() 2018-04-26 08:00:09 +10:00
Jacob Walser
68da3a123c Sub: add armed check to preflight baro calibration 
This check was lost in 05ee33d!
 2018-04-23 15:12:35 -04:00
Jacob Walser
0223cf70ed Sub: better check and text message for baro calibration failure 2018-04-23 15:12:35 -04:00
Jacob Walser
7caca6a251 Sub: reduce default ACRO_YAW_P by 25% to 3.375 2018-04-23 15:12:35 -04:00
Jacob Walser
4fae5cdfcf Sub: disarm motors if failsafe action fails 2018-04-23 15:12:35 -04:00
Jacob Walser
4fe8746a2a Sub: remove arbitrary scalars from manual mode inputs 
fix bluerobotics/ardusub#150
 2018-04-23 15:12:35 -04:00
Jacob Walser
c76ff32aa1 Sub: Do not report altitude in GLOBAL_POSITION_INT if there is no depth 
sensor connected

Fix bluerobotics/ardusub#145
 2018-04-19 14:58:06 -04:00
Patrick José Pereira
0878f5044c Sub: Send a clear message if depth sensor is not connected 
Fix bluerobotics/ardusub#151

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
 2018-04-19 07:45:00 -07:00
Peter Barker
c7327acef7 Sub: use AP_ServoRelayEvents singleton 2018-04-18 20:31:55 +09:00
Peter Barker
a10c843e6e Sub: GPS now logs its own data 2018-04-18 13:50:55 +09:00
Peter Barker
fdd410f105 Sub: Baro does its own dataflash logging 2018-04-12 19:12:12 +01:00
Michael du Breuil
9f673c2746 Sub: Use RC_Channels instead of hal.rcin 2018-04-11 21:47:07 +01:00
Jacob Walser
de0d158f37 Sub: apply yaw input scaling in manual mode 
Close bluerobotics/ardusub#68
 2018-04-11 14:06:32 -04:00
Michael du Breuil
e840006ff9 Sub: Check MANUAL_CONTROL target 2018-04-10 16:54:34 +01:00
Randy Mackay
defdeaed95 Sub: integrate AC_Loiter 2018-04-04 10:45:10 +09:00
Randy Mackay
6728659b4a Sub: add AC_Loiter to make build 2018-04-04 10:45:10 +09:00
Francisco Ferreira
ba44d11988
Sub: fix method shadowing 2018-04-03 16:29:34 +01:00
Peter Barker
fa3b3964e8 Sub: factor vehicle's mavlink send_heartbeat 2018-04-03 13:05:19 +01:00
Peter Barker
05ee33d037 Sub: tidy handling of barometer calibrations 2018-04-02 23:25:05 +01:00
Peter Barker
5536a321ed Sub: move common calibration functions up 2018-04-02 23:25:05 +01:00
Peter Barker
fe293abf37 Sub: factor out preflight calibration function 2018-04-02 23:25:05 +01:00
Michael du Breuil
6ebe954d51 Sub: Support new battery failsafes 2018-03-27 22:12:21 +01:00
Peter Barker
4b12fab5f5 Sub: allow DataFlash to handle log sending 2018-03-26 09:22:47 +09:00
Peter Barker
c9664a9923 Sub: move handling of get_home_position up 2018-03-19 10:32:37 +09:00
Peter Barker
3af4806d38 Sub: move home state into AP_AHRS 2018-03-19 10:32:37 +09:00
Peter Barker
78ca188dc3 Sub: use ins singleton 2018-03-16 00:37:35 -07:00
Randy Mackay
d43341c532 Sub: run guided velocity control at main loop rate 2018-03-16 13:50:57 +09:00
Randy Mackay
c857f8332b Sub: replace NTUN with PSC logging 2018-03-16 13:50:57 +09:00
Randy Mackay
01d1d41302 Sub: integrate attitude control inertial_frame_reset 2018-03-16 13:50:57 +09:00
Randy Mackay
2154d08185 Sub: remove setting of pos-con jerk 2018-03-16 13:50:57 +09:00
Randy Mackay
2697e19513 Sub: guided removes xy mode from calls to pos-con 
Also always limit angle to maintain altitude
 2018-03-16 13:50:57 +09:00
Randy Mackay
da17034a3d Sub: replace smoothing gain with AC_AttitudeControl::set_input_tc 2018-03-16 13:50:57 +09:00
Dr.-Ing. Amilcar Do Carmo Lucas
f63388cb07 Sub: Obey RANGEFINDER_ENABLED and AC_TERRAIN build macros 2018-03-15 15:03:22 +00:00
Ebin
5dde62cce9 Sub: Changed log message IDs to enum 
Changes log message IDs to enum and removes values for the params in LoggingParameters enum
 2018-03-14 09:33:39 +09:00