Peter Barker
073a9e3390
autotest: fix frsky passthrough test
...
Mainly through polling much faster, but also allowing for statustexts in
different orders from frsky/statustext
2021-03-22 18:08:44 +11:00
WillyZehnder
9a8a20f1d2
Tools: environment_install: support Mint 20.1 Ulyssa
...
Support for Linux Mint 20.1 Ulyssa (currently last version)
based on Ubuntu 20.04 Focal implemented
2021-03-20 10:02:56 +11:00
Michael du Breuil
9abf91c86e
AP_Periph: Allow skipping the BatteryInfo model_name
...
This saves a shocking amount of bandwidth. On a CubeOrange-periph
build sending just baro data and 2 battery info's this results in 25%
less bandwidth being used. (Also given that we still have a instance id,
and can get the CAN node's descriptor in the general case this is not
costing us any information).
2021-03-19 17:35:54 +11:00
Peter Barker
e567cca230
autotest: drain mav before receiving system_time in get_sim_time
2021-03-19 09:46:45 +11:00
Peter Barker
8901efd69d
autotest: start and stop MAVProxy for alttype and surface tracking tests
...
autotest doesn't currently supply terrain tiles, so MAVProxy must be
started
2021-03-19 09:46:45 +11:00
Peter Barker
19e5351631
autotest: start and stop mavproxy for setpoint tests
...
These work in terrain frame - but autotest won't satisfy terrain
requests yet
2021-03-19 09:46:45 +11:00
Peter Barker
462ac255a3
autotest: start MAVProxy only as needed for testing
2021-03-19 09:46:45 +11:00
Peter Barker
4269cf52a2
autotest: split application of default parameters and defaultfile parameters
...
ensures all vehicles have LOG_DISARMED
2021-03-19 09:46:45 +11:00
Peter Barker
37efb1cbeb
autotest: Copter sim passes default file instead of setting parms
...
We're now waiting for the vehicle simulation to provide us a heartbeat
for a non-generic frame before considering it good to fly.
Unfortunately, Copter relies on the parameter file to tell it which
frame to use - and we don't apply parameters from parameter files until
after we've checked the heartbeat.
Passing the file into ArduPilot on the commandline means we don't have
this problem.
2021-03-19 09:46:45 +11:00
Peter Barker
dbee2e5d71
autotest: ignore type=0 heartbeat packets on SITL start
...
Until ArduCopter allocates its motors backend we emit a generic type,
for which there is no mode map in pymavlink.
So don't consider the reboot complete until we see a valid heartbeat.
2021-03-19 09:46:45 +11:00
yaapu
ec15614e11
Tools:autotest: added frsky passthrough autotest for terrain message frame 0x500B
2021-03-18 21:43:48 +11:00
Pierre Kancir
3f204d976e
Tools: split coverage script for easier update
2021-03-18 21:33:01 +11:00
Peter Barker
120167f799
autotest: fix fly_square mission
...
waypoint doesn't change until mission is running
2021-03-18 17:02:06 +11:00
Peter Barker
42eec13f5e
autotest: adjust CAN test for lack of MAVProxy
2021-03-18 13:50:57 +11:00
Peter Barker
21c124ab47
autotest: tidy set_parameters
...
Remove commented code, add more to the verbose option
2021-03-18 11:29:45 +11:00
Stavros Korokithakis
f6fc6d22da
autotest: Fix the climb-before-turn test
2021-03-18 07:37:21 +11:00
Pierre Kancir
311a4ed0c7
Tools: correct package_is_installed check
2021-03-17 21:32:30 +11:00
Pierre Kancir
881e42c337
Tools: Give a better chance on default install to get the right package version
2021-03-17 21:32:30 +11:00
roger
b02f868793
Tools: make build installation script compatible with most Linux distros
...
Signed-off-by: <73884126+ardugitter@users.noreply.github.com>
2021-03-17 21:32:30 +11:00
Samuel Tabor
36428f5074
Tools: Handle repeated add-param-file arguments to sim_vehicle.py.
2021-03-17 19:43:03 +11:00
Pierre Kancir
ebe841ba70
Tools: param_parse: validate empty description and fields
2021-03-17 18:54:53 +11:00
Kawamura
15421c16d1
Tools: add psutil for kill_tasks_psutil in sim_vehicle.py
2021-03-17 18:52:22 +11:00
Peter Barker
da52e5d08c
autotest: set SYSID_MYGCS in tests which need it
...
This was still relying on heartbeats coming from MAVProxy. As speedup
increased those heartbeats may not come fast enough - and they really
should be coming from autotest as that's who's doing the commanding.
autotest: set SYSID_MYGCS in AFS test
autotest: set SYSID_MYGCS before setGCSfailsafe
2021-03-17 16:02:45 +11:00
Peter Barker
216140b58d
autotest: remove un-needed portion of reset_delay_item
...
Looks like this function evolved and this appendix remained
2021-03-17 14:17:39 +11:00
Lava Chemist
35815a5130
Tools: build_binaries.py : Add FlywooF745
2021-03-17 09:20:04 +11:00
Peter Barker
f7d8994ce1
autotest: move assert_mission_count up, use it
2021-03-17 00:23:05 +11:00
Peter Barker
30c9d4bcf4
autotest: remove pointless loiter switch
2021-03-16 23:33:51 +11:00
Peter Barker
0c7f3d20a4
autotest: fix attitude test
...
autotest: add a get_messages_frame method
Attempts to get a set of messages as close as reasonable in time.
2021-03-16 14:19:44 +11:00
Stavros Korokithakis
29043d62e9
Add FLIGHT_OPTION to climb before RTL
2021-03-16 11:58:47 +11:00
Lava Chemist
e614c9eeb2
Tools: add bootloader and board types
2021-03-16 11:27:23 +11:00
Peter Barker
4b3adb806c
autotest: add test for tailsitter throttle
2021-03-16 10:41:44 +11:00
Hwurzburg
d15e01d390
Plane: fix DO_CHANGE_SPEED airspeed to impact only AUTO and GUIDED modes
2021-03-16 10:09:34 +11:00
Peter Barker
eb702b0f82
Tools: add support for ATTITUDE_QUATERNION
2021-03-13 09:44:12 +11:00
Peter Barker
0414929310
autotest: fix Heli spline waypoint test
...
Mission isn't round-tripped so make it non-strict
2021-03-13 09:35:22 +11:00
yaapu
3bfa07d35a
Tools:autotest, frsky passthrough fix for long status text message test
2021-03-13 00:14:27 +11:00
bugobliterator
5074b6d336
autotest: add test case for GPS ordering
...
also fix flake8 issues
2021-03-12 16:32:36 +09:00
bugobliterator
48277b43e4
Tools: add autotest for checking GPS ordering
2021-03-12 16:32:36 +09:00
Siddharth Purohit
5657dad3e6
Replay: move underscore one layer down for GPS
2021-03-12 16:32:36 +09:00
Siddharth Purohit
a1a41bb47a
AP_Periph: move underscore one layer down for GPS
2021-03-12 16:32:36 +09:00
Michael du Breuil
06a40da355
AP_Periph: Send ardupilot.gnss.Status
2021-03-12 09:39:55 +11:00
Peter Barker
f78d7c3b25
autotest: add option to not check current wp after set_current_wp
...
Sometimes a waypoint is set which we'll never emit as our current
waypoint (e.g. a JUMP)
2021-03-10 09:12:39 +11:00
Peter Barker
4a251bebbd
autotest: fix fly_home_land_and_disarm; wp 7 is never current wp
...
This is never a current waypoint, so we can't wait for it
2021-03-10 09:12:39 +11:00
Peter Barker
3ddffdab9b
autotest: correct wait_current_waypoint timeout behaviour
2021-03-10 09:12:39 +11:00
Randy Mackay
78ddd0512c
Tools: autotest for copter spelling fix
2021-03-09 11:49:42 +11:00
Randy Mackay
4abae23306
Tools: disable QuadPlane.GyroFFT autotest
2021-03-08 08:52:05 +09:00
Peter Barker
bdeadce95b
autotest: improve deadreckoning test
...
autotest: use location_offset rather than coordinates in Deadreckoning test
2021-03-05 21:34:58 +11:00
Peter Barker
425ab1358a
autotest: tidy streamrate handling
...
Stop setting MAVProxy stream rates; these are neither here-nor-there now as MAVProxy will only modify its own connection's streamrates now
Stop doing the set-streamrate dance to work around MAVProxy's
set_streamrate algorithms.
Remove useless and misleading set of streamrate in Plane test; we reset
streamrates on the reboot immediately following this set. Considering
the streamrate was never eset this was a good thing.
2021-03-05 21:34:58 +11:00
James O'Shannessy
bcc0da9c47
AutoTest: Adds additional autotests to capture mode change while breached
...
AutoTest: Adds test for fence breach switching to guided mode when no fence return point is present. In upstream, this results in a vehicle fly-away.
2021-03-05 14:52:46 +11:00
James O'Shannessy
269fa5cbe2
AutoTest: Copter remove FENCE_AUTOENABLE tests
...
Addresses comments made in review, removes the FENCE_AUTOENABLE param for copter.
No param means no tests required.
2021-03-05 14:52:46 +11:00
James O'Shannessy
dac5996d93
AutoTest: Fix autotest conflicts after rebase on upstream
2021-03-05 14:52:46 +11:00
James O'Shannessy
e16bbe6e18
AutoTest: Ensure fence state is disabled at end of test
...
This appears to be another case of the fence state carrying over from one test to another. Disabling the fence at the end of the test appears to have fixed this problem
2021-03-05 14:52:46 +11:00
James O'Shannessy
31462418c6
AutoTest: Ensure Copter can RTL and Land even when Fence Floor has not been auto disabled
2021-03-05 14:52:46 +11:00
James O'Shannessy
fa7be629e5
AutoTest: Make fence tests flake8 compliant
2021-03-05 14:52:46 +11:00
James O'Shannessy
01b27bdb61
AutoTest: revert change that breaks quadplane
2021-03-05 14:52:46 +11:00
James O'Shannessy
2353b55452
AutoTest: Address race conditions in changes to fence tests
2021-03-05 14:52:46 +11:00
James O'Shannessy
76a2a76b54
AutotTest: Adds autotests for Plane to test RetRally flag added to AC_Fence
2021-03-05 14:52:46 +11:00
James O'Shannessy
8545715837
AutoTest: Add Static Fence Tests for unallowed arming when breaching geofence
2021-03-05 14:52:46 +11:00
James O'Shannessy
6f7ba3b037
AutoTest: Ensure fence is disabled at end of throttle_failsafe_fence test
2021-03-05 14:52:46 +11:00
James O'Shannessy
6251b6eead
AutoTest: Rebase and carry across changes from autotest
2021-03-05 14:52:46 +11:00
James O'Shannessy
b2346ef6df
AutoTest: Adds additional tests to ArduCopter to test autoenable and floor
...
Adds tests for:
* Testing auto-enable disabled (when no autoenabling of the fence is required)
* Test auto-enabled always after takeoff (when takeoff complete condition met)
* Test auto-enabled disable floor only (when land sequence begins)
* Test auto- on arm/disarm (when vehicle is armed/disarmed)
* Tests ability to land when fence is breached
2021-03-05 14:52:46 +11:00
Dr.-Ing. Amilcar do Carmo Lucas
dd5ede0fe0
autotest: small comment improvements
2021-03-05 14:52:46 +11:00
James O'Shannessy
bbd606b8b5
AutoTest: Corrections to autotests
2021-03-05 14:52:46 +11:00
James O'Shannessy
a3efc9ad98
AutoTest: Fix MAVlite test allowing plane fence to be enabled
2021-03-05 14:52:46 +11:00
James O'Shannessy
47e76a1807
AutoTest: Move fence enable/disable to common location
2021-03-05 14:52:46 +11:00
Dr.-Ing. Amilcar do Carmo Lucas
528defd560
Autotest: activate the fence via a mavlink command
...
This should not be required in the future, please fix this and revert this commit
2021-03-05 14:52:46 +11:00
Dr.-Ing. Amilcar do Carmo Lucas
8d8753b14c
Autotest: fix two copter tests after parameter rename
...
I'm not sure if a better fix would be to remove the set_parameter() call
2021-03-05 14:52:46 +11:00
James O'Shannessy
215901be30
Autotest: Correct the logic for fence based autotest functions
...
Adds corrections to enabling fence using aux function.
Correctly test fences statically. Only uploaded fences can be checked using a fence file, so we check those first. Then we add steps to check tin can, max and minm all set the fence as present, as expected.
Plane will support MAV_PROTOCOL_CAPABILITY_MISSION_FENCE, so we assert that it does support it.
To test ceiling and floor, leverage some existing functions for takeoff, change altitude and land. Check for respective breach.
Add a floor breach check to copter.
2021-03-05 14:52:46 +11:00
James O'Shannessy
1a3e168ced
Autotest: Fence is present, but test looking for not present
...
Autotest: Remove ties to mavlink FENCE_ACTION
Autotest: Add ArduPlane autotest to test ceiling and floor
Adds a test to ensure the vehicle reverts to RTL when breaching a ceiling or floor.
Autotest: Progress the test once we reach takeoff complete and fence enable
Autotest: Use RC_OPTION for Aux Switch functionality
Autotest: Enable fence last
2021-03-05 14:52:46 +11:00
Paul Riseborough
d52594c576
Tools: Fix set_home autotest
...
Don't try to get home until EKF has passed alignment and GPs checks.
Use a more realistic lat/lon offset threshold
2021-03-05 12:10:01 +11:00
Paul Riseborough
0a052d20ea
Tools: Add handling for default airspeed variance
2021-03-05 12:10:01 +11:00
Randy Mackay
0a08793b7d
Tools: Holybro S500 param file
2021-03-04 14:27:20 +09:00
Peter Barker
4aed767fe9
autotest: add test for MAV_CMD_DO_SET_MISSION_CURRENT
2021-03-04 11:59:33 +11:00
Pierre Kancir
52c5a7c417
Tools: add pretty diff size script
2021-03-03 18:56:55 +11:00
Peter Barker
a235246628
autotest: correct units in new AHRS2 test
2021-03-03 18:41:14 +11:00
Pierre Kancir
ecc89411f9
Tools: put UART_chargen in skip list
2021-03-03 18:07:38 +11:00
Pierre Kancir
7a5a7b1eb5
CI: add examples test
2021-03-03 18:07:38 +11:00
Andy Piper
46c5d72166
Tools: add bdshot bootloaders for CubeYellow and mRoControlZeroH7
2021-03-03 18:02:26 +11:00
Peter Barker
b3ee5d5f59
autotest: increase verbosity in AHRS2 test
2021-03-03 16:29:33 +11:00
Peter Barker
5a49d98555
Tools: have decode_watchdog try to decode from .log dataflash dumps
2021-03-03 13:38:12 +11:00
Randy Mackay
a35a7e1523
Tools: autotest manual control test requires 12 deg
...
adjusted down because of lower default angle_max
2021-03-03 08:03:39 +09:00
Peter Barker
317181922c
autotest: ensure we're getting vaguely sane data in AHRS2 message
2021-03-02 20:48:36 +11:00
Peter Barker
cc83562add
autotest: tidy fence handling
2021-03-02 16:54:06 +11:00
Peter Barker
b2d4cefa85
autotest: change heli default RPM type to 10
...
Change default to SITL
2021-03-02 15:41:44 +11:00
Peter Barker
4d2cf8c95b
AP_Frsky_SPort: correct handling of RPM sensor data
...
Nails support down to just two RPM sensors for the time being.
Simplifies things (there was an issue here when I corrected RPM-in-SITL)
2021-03-02 15:41:44 +11:00
Peter Barker
eb499ff731
autotest: improve frsky SPort test
...
- reduces verbosity as we only check the remaining items when new data
received
- reduces repoll interval and explains why we need to re-poll
2021-03-02 15:41:44 +11:00
Peter Barker
7b251b6fd4
autotest: add diagnostics for frsky tests
2021-03-02 15:41:44 +11:00
Peter Barker
2671a2f71f
autotest: fix up FRSky tests for running under Valgrind
2021-03-02 15:41:44 +11:00
Peter Barker
360512f6b0
autotest: preserve commandline customisations on reboot under valgrind
2021-03-02 15:41:44 +11:00
Peter Barker
fc9a93ba67
autotest: stop using mavproxy for clearing missions
2021-03-02 14:24:36 +11:00
Peter Barker
97e2596bf8
autotest: stop clearing mission at start of test
...
These are implicitly cleared by the framework
2021-03-02 14:24:36 +11:00
Peter Barker
973510a4ff
autotest: push context after customising cmdline
...
doing things in the other order causes problems when running the
complete suite
2021-03-02 14:24:36 +11:00
Peter Barker
5d1e105534
autotest: allow more time for mission upload and download
...
We upload some rather large missions....
2021-03-02 14:24:36 +11:00
Peter Barker
10007e2e42
autotest: load missions natively rather than using MAVProxy
2021-03-02 14:24:36 +11:00
Peter Barker
993d87469c
autotest: move mission upload functions from rover to common
2021-03-02 14:24:36 +11:00
Peter Barker
34a52e9cfe
autotest: use wait_statustext in place of mavproxy.expect for autorotate test
2021-03-02 13:34:09 +11:00
Rishabh
6e2339d2d6
Tools: default parameters for Hexsoon TD-650
2021-03-02 10:13:51 +09:00
Peter Barker
0daa1a63d3
autotest: remove pointless fetch_parameters call
...
And the entire method, replace with equivalent test
2021-03-01 17:27:52 +11:00
nkruzan
3e0f9ab4e7
Tools:autotest\common.py fix text typo
2021-03-01 15:15:38 +11:00
Peter Barker
61138f342a
autotest: do not time out receiving of heartbeat if running gdb
...
pausing indefinitely when running GDB is OK.
2021-03-01 13:44:23 +11:00
Peter Barker
1f47698076
autotest: use change_mode in place of mavproxy.send
2021-03-01 13:10:09 +11:00
Andrew Tridgell
97e7b48ca1
Tools: rebuild DrotekP3Pro bootloader
2021-02-28 17:24:25 +11:00
Andrew Tridgell
0528414a9c
AP_Bootloader: limit the 1M flash check to the F427
...
this fixes an issue with the DrotekP3Pro which uses the STM32F469
2021-02-28 17:24:25 +11:00
Andrew Tridgell
b137f9e319
waf: fixed embed error on python2
2021-02-26 10:59:09 +11:00
bugobliterator
6d25b02508
waf: need to crc the padded bootloaders before embedding
2021-02-26 10:59:09 +11:00
Peter Barker
d3b3c443bc
autotest: reset copter completely after autotune test
2021-02-25 10:49:58 +11:00
Andrew Tridgell
98abe125ad
Tools: rebuild IO firmware
...
we now have enough memory again
2021-02-24 18:21:08 +11:00
Peter Barker
013415eb31
autotest: make and mark arducopter.py as flake8-compliant
2021-02-24 15:10:10 +11:00
Andrew Tridgell
b012c472e1
waf: added crc to embedded data
2021-02-23 20:20:07 +11:00
Peter Barker
79f21ed639
autotest: add test for GSF logging
2021-02-23 12:36:33 +11:00
Peter Barker
9d681eecc4
autotest: move to state outside when we leave log structure
...
No vertical whitespace allowed in the structures...
We concatenate all of the LogStructure files; without this we remain in
state_inside and try to parse every line in the concatenation as if it
were a log structure definition
2021-02-23 12:36:33 +11:00
Andrew Tridgell
20da92c8a1
Tools: revert IO firmware
...
this is a temporary fix until the full cause of the IOMCU issue is
found
2021-02-22 19:52:05 +11:00
Peter Barker
4d9cfdaaa8
Vagrant: create a bionic64-desktop VM
...
The focal-desktop appears to have a problem where directories are
considered to be in-use when being deleted. Not reproduced by me, but
reliably by a Windows user.
2021-02-22 15:00:38 +11:00
Andy Piper
fa1bed9735
Tools: rebuild iomcu firmware
2021-02-22 07:07:43 +11:00
Peter Barker
44ec74030e
autotest: recover from flip in althold to remove stabilise throttle problem
2021-02-21 23:11:26 +11:00
Peter Barker
a4a5d52c35
autotest: extend time allowed for RTL for simplemode test
2021-02-21 22:45:06 +11:00
Peter Barker
9120882e9e
autotest: print name of open dataflash log when test exception caught
...
The stack trace is already extremely useful... but mapping back to the
relevant dataflash log is a bit of a pain.
Adding more stuff to this method in the future might be good, too.
2021-02-21 21:35:35 +11:00
Peter Barker
adf44f3b2b
autotest: make and declare sim_vehicle.py flake8-clean
2021-02-21 21:35:17 +11:00
Peter Barker
98451e499a
autotest: make and declare balancebot flake8-clean
2021-02-21 21:35:17 +11:00
Peter Barker
b5f490aff4
autotest: make fly_proximity_avoidance_test_alt_no_avoid more reliable
2021-02-21 17:44:10 +11:00
Andy Piper
94de238751
AP_HAL_ChibiOS: disable RCOUT thread on iomcu and rebuild iomcu.
2021-02-20 14:37:11 +11:00
Peter Barker
d4aef2dba8
autotest: stop using MAVProxy to change mode
2021-02-20 00:03:24 +11:00
Peter Barker
05c9b79a5e
autotest: make and declare quadplane.py flake8-clean
2021-02-20 00:02:33 +11:00
Peter Barker
c13d229877
autotest: use self.set_current_waypoint rather than "wp set" to set current wp
2021-02-19 12:25:40 +11:00
Peter Barker
148e2e751f
autotest: add set_current_waypoint
2021-02-19 12:25:40 +11:00
Peter Barker
b7044d3708
autotest: remove use of global expect_list
2021-02-18 18:18:30 +11:00
Peter Barker
2d17f019b6
autotest: remove pointless manipulation of expect list
...
start_sitl and start_mavproxy already do this stuff
2021-02-18 18:18:30 +11:00
Peter Barker
dcc04ccd09
autotest: stop using MAVProxy to change modes
2021-02-18 17:38:52 +11:00
Peter Barker
2c1df16442
autotest: increase button message timeout to allow for Valgrind speed
2021-02-18 17:04:16 +11:00
Peter Barker
ad06a616b8
autotest: adjust for low log transfer rate under valgrind
2021-02-18 17:04:16 +11:00
Peter Barker
bcc1cb9dbb
autotest: use get_parameter in place of mav's param object
...
This is the only place in the code that does this
2021-02-18 15:06:26 +11:00
Peter Barker
b1ccf3b3f8
autotest: add test for rangefinder-based proximity avoidance enablement
2021-02-18 15:05:51 +11:00
Peter Barker
3cf1b9444f
autotest: get_sim_time_cached in NMEA output test to stop losing msgs
2021-02-18 11:26:22 +11:00
Peter Barker
ce61f44505
autotest: reset SITL commandline after fetching unhidden parameters
...
this makes a difference under Valgrind, which has to reboot slightly differently to normal SITL
2021-02-18 11:26:22 +11:00
Peter Barker
e221e6ce45
autotest: flake8 compliance for ardusub.py
2021-02-18 10:43:05 +11:00
Peter Barker
628a3843b2
autotest: flake8 compliance for arduplane.py
2021-02-18 10:43:05 +11:00
Peter Barker
78aa729b90
autotest: flake8 compliance for common.py
2021-02-18 10:43:05 +11:00
Peter Barker
4c56ac7eb3
autotest: flake8 compliance for antennatracker.py
2021-02-18 10:43:05 +11:00
Peter Barker
726f54e37f
autotest: flake8 compliance for rover.py
2021-02-18 10:43:05 +11:00
Peter Barker
360e2f49b3
Tools: git-tools: add a script suitable for use as a pre-commit hook
2021-02-18 10:43:05 +11:00
Peter Barker
e3887c8d93
autotest: make and mark autotest.py flake8-clean
2021-02-18 10:43:05 +11:00
Peter Barker
3c83d52e52
Tools: add script to check Python files for flake8-cleanliness
2021-02-18 10:43:05 +11:00
Andy Piper
7aa1e2d63b
waf: add AP_VideoTX module
2021-02-17 18:23:33 +11:00
Peter Barker
33fee211a4
autotest: extend pexpect timeouts when running under Valgrind
2021-02-17 18:16:04 +11:00
Peter Barker
a292fe1b8b
autotest: use wait_statustext rather than mavproxy.expect
...
This is important when running under Valgrind as the text can be
significantly delayed. wait_statustext times out in simulation time,
whereas mavproxy.expect has a flat 60s timeout
2021-02-17 18:16:04 +11:00
Peter Barker
c00a82868e
autotest: make DLVR sole airspeed sensor in test
...
The test wasn't actually *using* the DLVR...
2021-02-17 14:23:07 +11:00
Peter Barker
dbdda65956
autotest: add basic test for GPS blending
2021-02-17 11:30:01 +11:00
SSGrady
82a84c8f35
Tools: added name to GIT_Success.txt
2021-02-16 12:42:10 -08:00
Peter Barker
1ca0998f32
Tools: take MAV_CMD_DO_SPRAYER as a mavlink command
2021-02-16 22:36:43 +11:00
Peter Barker
b14dcf4bae
Tools: add mission command to turn sprayer on and off
2021-02-16 22:36:43 +11:00
Peter Barker
be8f747b7a
autotest: adjust timeout for Valgrind; disable for gdb
2021-02-16 13:18:41 +11:00
Andrew Tridgell
ee8e9e3289
waf: fixed handling of vehicle dependency check for abs paths
...
this fixes the use of vehicle dependent cpp files on the build server
2021-02-15 07:23:33 +11:00
Peter Barker
3c3db50843
Vagrant: augment bash when working in a git repository
...
This .bashrc_git originally came from tridge.
2021-02-14 09:57:26 +11:00
Peter Barker
ca49f62b6d
autotest: add test for Plane's RTL_CLIMB_MIN parameter
2021-02-13 19:34:52 +11:00
Peter Barker
e4d5a92721
autotest: add wait_distance_to_nav_target method
2021-02-13 19:34:52 +11:00
Peter Barker
d60fa86026
autotest: use set_map_from_rc more
2021-02-13 19:34:52 +11:00
Peter Barker
a5706a18af
autotest: handle Py2 not having ConnectionResetError built in
2021-02-12 18:24:18 +11:00
Michael du Breuil
50d80e9dc4
AP_Periph: Remove debug printf
2021-02-12 14:51:09 +11:00
Willian Galvani
e5844b7753
Frame_params: Sub: make RNGFND1_TYPE 0 (None)
...
This was causing issues in QGC 4.1 as it was showing an unhealthy
Rangefinder and marking the vehicle as "not ready to fly".
It will be up to the companion computer to set this to 10(Mavlink)
2021-02-11 10:43:50 -08:00
Peter Barker
5e3caefc2d
Vagrant: make ptrace permissive to allow stack dumping
2021-02-11 17:22:48 +11:00
Peter Barker
4020308d40
Vagrant: add desktop to Vagrant
2021-02-11 09:58:53 +11:00
Iampete1
904b493809
Tools: autotest, common.py remove extra comma
2021-02-11 09:20:15 +11:00
Pierre Kancir
8396388af9
Tools: run_examples: add FlashTest to skip list
2021-02-10 18:49:42 +11:00
Peter Barker
4324d66c13
autotest: loosen time constraint on mavlink messages in magcal
...
Saw an error where we didn't get one of these in 5 seconds.
That sounds like too much. But we'll loosen the constrain anyway
2021-02-10 09:28:45 +11:00
Peter Barker
bd8384b322
autotest: break out a get_altitude method
2021-02-10 09:28:25 +11:00
Alessandro Apostoli
e2aaf4c216
Tools: autotest, fix for frsky not defined error ( #4 )
2021-02-10 09:27:58 +11:00
Peter Barker
d9dd93bcdd
autotest: don't run frsky tests armed for the most part
2021-02-10 09:27:58 +11:00
Peter Barker
742d5a9fa0
autotest: add body_frame_velocity
2021-02-08 22:44:32 +11:00
Peter Barker
164da261f1
Tools: initvagrant: install missing cmake so we can build jsbsim
2021-02-07 08:22:28 +11:00
Andrew Tridgell
b113fe15ab
Tools: added MatekH743-periph to autobuild
2021-02-05 20:13:36 +11:00
Randy Mackay
f20fc28a85
Tools: param files to ease SITL setup of GPS-for-yaw
2021-02-05 17:22:27 +09:00
Randy Mackay
a09bdcdda1
Tools: default param file to ease using copter SITL with vicon
2021-02-04 20:21:00 +09:00
Peter Barker
567e9733b6
autotest: augment bisect-helper.py to help with flapping tests
...
- option to allow for a string which must be present in the outout
- option for strings which must not be present in the output
- repeat option so test must pass many times
- elaborate diagnostic output
- option to run under Valgrind (to provoke races)
The output from each test run is poked into a directory in /tmp
The number of runs a test took to fail is poked into a different file in /tmp, helping to tune the --autotest-test-passes parameter
2021-02-04 16:22:28 +11:00
Peter Barker
c2e310d75f
autotest: add test for OBSTACLE_DISTANCE_3D message
2021-02-04 15:50:45 +11:00
Peter Barker
393ec5d6f7
autotest: add test for MAVProxy proximity sensor
2021-02-04 12:03:35 +11:00
danlaks
d244f22522
Tools: AP_Bootloader: Add AP_HW_SWBOOMBOARD_PERIPH identifier
...
SpektreWorks Boom Board AP_Periph device
2021-02-04 08:37:32 +11:00
Andrew Tridgell
699e61da57
Tools: auto-build new matek boards
2021-02-03 19:05:12 +11:00
Andrew Tridgell
4a178d5c44
Tools: added new Matek bootloaders
2021-02-03 19:05:12 +11:00
Andy Piper
553425f994
Scripts: add bi-directional dshot firmware to built binaries
2021-02-03 18:49:06 +11:00
Andy Piper
49f0ba058c
Bootloaders: add bi-directional dshot bootloaders
2021-02-03 18:49:06 +11:00
Michel Pastor
7ad6dd858b
ChibiOS: update SuccexF4 bootloader
2021-02-03 18:37:46 +11:00
Peter Barker
cdaff74948
autotest: stop trying to arm in QRTL
2021-02-03 18:22:10 +11:00
Peter Barker
f65bee80dc
autotest: use BATTERY_STATUS to detect sub reboot
...
Sub doesn't implement AP_Stats so we have custom reboot detection for
it.
The current look-for-string strategy is flawed - we're missing the
string on reboot
2021-02-03 13:58:17 +11:00
Andrew Tridgell
e86e3333a5
Tools: updated KakuteF7 bl
2021-02-03 13:13:32 +11:00
Pierre Kancir
e13a35abc1
Autotest: check for empty message before trying to use it
2021-02-03 12:56:01 +11:00
yaapu
bb576a49b8
Tools: added autotest for frsky rpm telemetry
2021-02-03 12:49:38 +11:00
Michael du Breuil
15ce4fb034
AP_Periph: Use the ArmingStatus broadcast to set the soft_armed state
...
This allows things like GPS_RAW_DATA 2 to start to work for SBF GPS's
2021-02-02 10:57:57 +11:00
Samuel Tabor
d1578e5ba2
autotest: Update soaring default params in line with specified SOAR_THML_BANK.
2021-01-29 11:20:09 -08:00
Andrew Tridgell
6bc4e995a4
CI: build CubeOrange-periph
...
this ensures H7 based peripherals (which are getting more common)
don't break
2021-01-27 18:24:03 +11:00
Pierre Kancir
c02dfd1214
Autotest: add EndMissionBehavior Test for rover
2021-01-27 08:23:52 +09:00
Andrew Tridgell
bb278a1cc7
Tools: allow tempcal_IMU.py to run without existing tcal params
...
this makes it possible to run the tcal script on a log from a board
that doesn't have any existing temperature calibration params
2021-01-27 09:49:35 +11:00
Pierre Kancir
2b71bf8e99
Autotest: fix subtests completion
2021-01-27 08:27:54 +11:00
Andrew Tridgell
49e2a0caed
Tools: fixed valgrind errors with AP_Param::ParamToken
2021-01-26 10:43:09 +11:00
Andrew Tridgell
d47afb2406
autotest: added AHRSTrim test and add trim to accel cal test
...
this ensures the handling of AHRS trim is correct
2021-01-25 16:24:50 +11:00
Andrew Tridgell
3c825bdffc
waf: make AP_NavEKF3_core.h a vehicle dependent include
2021-01-24 11:56:52 +11:00
Peter Barker
ad2ab333f9
Tools: autotest: allow autotest to connect directly to SITL
2021-01-24 09:25:45 +11:00
Peter Barker
8c7d63433c
autotest: clear mission ourselves rather than with MAVProxy at end of test
2021-01-24 09:25:45 +11:00
Peter Barker
30836535d0
autotest: retry dynamic notch test up to 3 times
2021-01-22 11:17:42 +11:00
Pierre Kancir
805493c854
ardupilotwaf: use dynamic generation for ap_periph board name
2021-01-22 05:42:12 +11:00
Siddharth Purohit
c54a597571
AP_Periph: pull out supported targets from wscript into a separate file
2021-01-22 05:42:12 +11:00
Peter Barker
2e2e34d784
autotest: correct run_one_test case (vehicle.testname case)
2021-01-21 22:59:34 +11:00
Peter Barker
1fec88af21
autotest: make arming test a little more verbose
2021-01-21 22:15:16 +11:00
Peter Barker
281296832a
autotest: retry GyroFFTHarmonic test on failure
2021-01-21 16:45:34 +11:00
Peter Barker
3279400e2e
autotest: disarm_with_rc_input shortcuts if it sees rudder-disarm-disabled
2021-01-21 14:25:47 +11:00
Peter Barker
f452c6bb51
autotest: break out a statustext_in_collections method from wait_statustext
2021-01-21 14:25:47 +11:00
Andrew Tridgell
3add045924
autotest: fixed accel/gyro threshold consistency for tempcal
2021-01-21 13:09:21 +11:00
Andrew Tridgell
fe7d933976
autotest: use delay_sim_time() in tempcal test
2021-01-21 13:09:21 +11:00
Andrew Tridgell
af18e0c755
Tools: review fixes
2021-01-21 13:09:21 +11:00
Andrew Tridgell
58b9cd2c6e
autotest: added assert_reach_imu_temperature() abstraction
2021-01-21 13:09:21 +11:00
Andrew Tridgell
5a5ba26468
autotest: expanded accelcal test to check values
...
this checks the resulting accelcal is correct within 1%
2021-01-21 13:09:21 +11:00
Andrew Tridgell
3e640eed80
autotest: changes for per-IMU biases and scaling
2021-01-21 13:09:21 +11:00
Andrew Tridgell
c96e61c0e1
Tools: review fix
2021-01-21 13:09:21 +11:00
Andrew Tridgell
4c315b57ca
autotest: run gyro/accel cal at non-reference temperature
2021-01-21 13:09:21 +11:00
Andrew Tridgell
5a180fa7a8
Tools: cope with offset from cal temp to reference temp
2021-01-21 13:09:21 +11:00
Andrew Tridgell
2359a5a1ea
Tools: fixed stopping of capture on enable change in tempcal
2021-01-21 13:09:21 +11:00
Andrew Tridgell
2cf7e7945c
autotest: make tempcal debug output clearer
2021-01-21 13:09:21 +11:00
Andrew Tridgell
6254787c26
Tools: fixed tempcal for when we have gyro cal but no accel cal
2021-01-21 13:09:21 +11:00
Andrew Tridgell
e87dbacee7
Tools: switch to fixed reference temperature of 35C
2021-01-21 13:09:21 +11:00
Andrew Tridgell
a96b6336b8
Tools: changes from review feedback
2021-01-21 13:09:21 +11:00
Andrew Tridgell
84dda13b42
autotest: use new learn param setup
2021-01-21 13:09:21 +11:00
Andrew Tridgell
e8ab8ed29e
Tools: improve tempcal script
...
- allow display of log corrections
- added online estimator
- allow learning using TCLR records
2021-01-21 13:09:21 +11:00
Andrew Tridgell
30385fb8cb
autotest: use set_parameters() in IMU temp cal test
2021-01-21 13:09:21 +11:00
Andrew Tridgell
0c3655b01f
autotest: fixed epsilon handling in set_parameters
2021-01-21 13:09:21 +11:00
Andrew Tridgell
327db46c15
autotest: added automatic testing of IMU Temperature calibration
2021-01-21 13:09:21 +11:00
Andrew Tridgell
c4664d8e32
Tools: added script to calculate IMU temp compensation parameters
...
this is run over an onboard log to calculate the INS_TCAL parameters
to enable temperature compensation for gyro and accel
2021-01-21 13:09:21 +11:00
Peter Barker
c7a6047904
autotest: add option to retry tests / create and use Test definition object
2021-01-21 10:23:17 +11:00
Peter Barker
03b2473c61
autotest: correct get_parameter_direct attempts decrement
2021-01-20 20:06:46 +11:00
bugobliterator
9e15b5785b
ardupilotwaf: fix spec args as distcc doesn't like it
2021-01-20 19:21:14 +11:00
Andrew Tridgell
7e89c05204
autotest: fixed --tracker option to sim_vehicle.py
2021-01-20 11:11:47 +11:00
Andrew Tridgell
bd9dd7ff4c
Tools: added vnav linux target
2021-01-20 10:06:45 +11:00
Andrew Tridgell
c396d15890
Revert "autotest: ensure defaults files don't set already-default-values"
...
This reverts commit 3d431cd4f1
.
It breaks MissionPlanner SITL. We can re-apply once MissionPlanner
copes with external_model.
2021-01-20 08:54:43 +11:00
Peter Barker
04a52835c0
autotest: correct Rover set-position-target-global-int test
...
The vehicles doesn't send us set messages!
2021-01-19 21:16:39 +11:00
Peter Barker
1cb86303b4
Tools: add test for maxbotixi2cxl
2021-01-19 11:20:47 +11:00
Iampete1
5e00f5ae48
Tools: ardupilotwaf: ap_library: add genrated bindings to whitle list and add support for ends with whitle listing
2021-01-19 11:18:10 +11:00
Iampete1
8d7299d052
Tools: ardupilotwaf: ap_library.py: allow vehicle in build/
2021-01-19 11:18:10 +11:00
Peter Barker
8eb670d685
autotest: trim default values from rover defaults files
2021-01-19 10:34:00 +11:00
Peter Barker
3d431cd4f1
autotest: ensure defaults files don't set already-default-values
...
autotest: mark some vehicles as having external physics models
autotest: add default_params_filename to some vehicle info
2021-01-19 10:34:00 +11:00
Peter Barker
7d86cc08ad
autotest: correct SITL commandline for no default parameter file
2021-01-19 10:34:00 +11:00
Peter Barker
8f9d3909f1
autotest: model_defaults_filepath always returns a list
2021-01-19 10:34:00 +11:00
André
30eed3103b
sim_vehicle fix
2021-01-19 06:30:12 +11:00
Peter Barker
210b0e7c5f
autotest: stop emitting port 14550 all the time
...
this can confuse other things going on on the same machine. It is still
available by specifying --viewerip if desired
2021-01-18 21:46:43 +11:00
Peter Barker
30929e7f1a
autotest: add verbose option to assert_sensor_state
2021-01-18 21:25:58 +11:00
Peter Barker
2c0e3751a9
autotest: reboot after moving from EKF type 10 to EKF type 2
...
Bad things happen with home set but origin not
2021-01-18 20:48:11 +11:00
Peter Barker
662e86780b
autotest: reduce motor vibration for landing
2021-01-18 20:14:08 +11:00
Peter Barker
6becd90df0
autotest: increase timeout on DO_CHANGE_SPEED test
2021-01-18 19:08:46 +11:00
Peter Barker
5848ff7512
autotest: eliminate race condition in plane fence static test
2021-01-18 16:32:21 +11:00
Peter Barker
e9c6c08a97
autotest: remove 'make' compatability from sim_vehicle
2021-01-18 16:24:09 +11:00
Peter Barker
6865649b9b
autotest: tidy and correct ekf lane switching test
2021-01-18 15:19:39 +11:00
Peter Barker
ba1973d343
autotest: parse messages when setting parameters
...
This breaks some tests which are waiting on statustexts while setting
parameters
2021-01-18 15:19:39 +11:00
Peter Barker
48a38f3ee2
autotest: wait for GPS fix before installing position validation handling
2021-01-18 15:11:19 +11:00
Peter Barker
2d62fb99b1
autotest: force-disarm copter before reboot in GCS failsafe tests
2021-01-18 14:17:32 +11:00
Andrew Tridgell
d9de0ef649
autotest: added copter-bfx params
2021-01-17 12:25:47 +11:00
Randy Mackay
b18e5966f7
Tools: fixes from peer review as AHRS default changed to EKF3
2021-01-16 08:24:23 +09:00
Randy Mackay
2f51b59de4
Tools: copter test parameter validation waits 10sec before starting
...
This allows the GPS driver to initialise which avoids an EKF3 source requires GPS failure
2021-01-16 08:24:23 +09:00
Randy Mackay
bb926a2976
Tools: autotest fly_gyro_fft disables EKF2 and EKF3
...
fly_gyro_fft_harmonic also disables EKF2 and EKF3
2021-01-16 08:24:23 +09:00
Randy Mackay
f9e7d59756
Tools: Copter.ArmFeatures fixups for EKF3
...
changed to disable the simulated GPS instead of disabling the driver
expected EKF flags are slightly different
2021-01-16 08:24:23 +09:00
Randy Mackay
9c56b406be
Tools: Copter.AltEstimation fixes
...
disable baro so EKF has no altitude estimate
add check that mode change to ALT_HOLD failed
2021-01-16 08:24:23 +09:00
Randy Mackay
1f8b48e8f7
Tools: common autotest spelling fix
...
reach should be reached
2021-01-16 08:24:23 +09:00
Randy Mackay
f68f26e75d
Tools: Copter.VisionPosition config for EKF3
2021-01-16 08:24:23 +09:00
Randy Mackay
d2bdc949b2
Tools: Copter.OpticalFlowLimits checks altitude
2021-01-16 08:24:23 +09:00
Randy Mackay
0ba696f761
Tools: Copter.OpticalFlowLimits config for EKF2/3
2021-01-16 08:24:23 +09:00
Randy Mackay
d00194c60a
Tools: copter test_rangefinder_switchover config for EKF2/3
2021-01-16 08:24:23 +09:00
Randy Mackay
bd8b85d1e5
Tools: remove ekf2 enable from copter defaults
2021-01-16 08:24:23 +09:00
Peter Barker
cd8a393ac2
autotest: create own RC thread to handle setting of RC overrides
...
autotest: prevent method-on-undef problem in case of early test failure
autotest: plumb MAVProxy rc input back in for switch test
autotest: close off rc thread in case of timeout
2021-01-15 20:56:30 +11:00
Randy Mackay
d02a61a65d
Tools: default parameters for hexsoon td860
2021-01-14 13:13:32 +09:00
nkruzan
c0e4ef4219
Tools: vagrant: update path to CMAC-circuit.txt
2021-01-14 11:34:10 +11:00
Jacob Walser
e235c379bf
Frame_params: rename bluerov2 4.0 firmware defaults files
...
These files apply to 4.0.0...4.0.2, not only 4.0.2
2021-01-13 12:50:28 -05:00
Peter Barker
1dad0ecb46
autotest: disarm vehicle in case vibration test excepts
2021-01-13 19:46:13 +11:00
Peter Barker
47aea5f44c
autotest: print stack traces for caught exceptions
2021-01-13 19:46:13 +11:00
Pierre Kancir
fc0e2fec6b
Tools: add caching for --target= completion that is long
2021-01-13 19:20:57 +11:00
Andy Piper
a07cbc8706
Tools: BeastF7 bootloader
...
add BeastH7/BeastF7 to builds
update BeastF7 bootloader
2021-01-13 18:09:33 +11:00
Peter Barker
e85e6d3375
autotest: use new set_parameters in place of many set_parameter calls
...
autotest: use set_parameters for applying from parameter file
autotest: use set_parameters in place of many set_parameter calls
2021-01-13 15:09:29 +11:00
Peter Barker
2917c75f35
autotest: add option to timeout parameter fetching in system time
2021-01-13 15:09:29 +11:00
Peter Barker
83f2f365c0
autotest: implement a more efficient set_parameters, implement set_parameter in terms of it
2021-01-13 15:09:29 +11:00
Peter Barker
f478666700
autotest: correct scripting test for missing message
...
The message could pass us by
2021-01-13 12:24:17 +11:00
Peter Barker
8497f8fc73
autotest: correct some timeout issues around Copter takeoff
2021-01-13 12:24:17 +11:00
Peter Barker
0a39c49711
autotest: gpstovicon: reboot after setting new EKF type rather than before
2021-01-13 12:24:17 +11:00
Peter Barker
252b166099
autotest: reboot after Copter gyrofft test
...
Really weird things happen if you switch from EKF2 to EKF10 - like your
home position being set but your origin not!
2021-01-13 12:24:17 +11:00
Peter Barker
e7aefc7fe4
autotest: make polling home position quiet by default
2021-01-13 12:24:17 +11:00
Peter Barker
5318538182
autotest: reboot SITL when moving from EKF10 to EKF2 in mag test
...
Bad things happen when moving from one to the other...
2021-01-13 12:24:17 +11:00
Peter Barker
987466bc3d
autotest: increase timeout on avoidance-corners test
...
Race conditions can mean angles are less than expected
2021-01-13 12:24:17 +11:00
Peter Barker
fdb5b5e6d6
autotest: correct dataflash transfer test for long periods
...
This came in with a 35 second delay, which is rather spectacular given
the 5 second loop it is in.
2021-01-11T11:54:30.3046835Z dataflash_logger status
2021-01-11T11:54:30.3047406Z MANUAL> DFLogger: Active Rate(35s):408.788kB/s Block:65034 Missing:0 Fixed:0 Abandoned:0
2021-01-11T11:54:30.3048195Z Timed out looking for Active Rate\([0-9]s\):([0-9]+[.][0-9]+)
2021-01-11T11:54:30.3048801Z AT-0472.3: Exception caught: 60
2021-01-13 12:24:17 +11:00
Willian Galvani
9020c79677
Tools: Frame_params: Sub: fix parameter types
...
These files are consumed by QGroundControl. This means integers
should not have a decimal point.
2021-01-12 11:44:25 -08:00
Peter Barker
3a264e0a76
autotest: use LOG_STRUCTURE_FROM as key string (don't need library name)
2021-01-12 17:44:24 +11:00
Pierre Kancir
409177d22a
Tools: remove duplicate kg/m.m
2021-01-12 10:21:55 +11:00
Josh Henderson
0052e4d528
Tools: auotest add LOG_STRUCTURE_FROM_AHRS
2021-01-12 10:13:22 +11:00
Mirko Denecke
d08487b8ae
AP_Periph: fix command to build bootloader
2021-01-11 12:27:44 -08:00
Andrew Tridgell
faae0a8609
Tools: added support for v3 Invensense sensors
...
starting with ICM-40609, ICM-42688 and ICM-42605
2021-01-11 14:43:35 +11:00
Peter Barker
4d19ff6b26
autotest: prompt ArduPilot for SYSTEM_TIME message during reboot
...
This helps us actually execute the timeouts appropriately and thus
re-fetch the STAT_BOOTCNT parameter we use for detecting the reboot
Eliminates annoying pauses during testing.
2021-01-09 16:20:12 +11:00
Peter Barker
8e6d144d72
autotest: re-raise KeyboardInterrupt after closing pexpects
...
this gives a stack trace, which is handy if the tests get caught
indefinitely somewhere
2021-01-09 15:16:50 +11:00
Peter Barker
5120ebf2f6
autotest: add a set_parameters method
2021-01-08 23:51:33 +11:00
Jacob Walser
c5ec0cfdee
Frame_params: (BlueRov2/Sub-3.5.1) revert to 19086e34
...
this file is targeted specifically at 3.5.1 firmware
the subsequent contributions reflecting changes to master should
not have been applied
2021-01-07 07:39:59 -08:00
Jacob Walser
4c13a5ae4f
Frame_params: (BlueRov2 Heavy/Sub-3.5.2) revert to 9897ff60
...
this file is targeted specifically at 3.5.2 firmware
the subsequent contributions reflecting changes to master should
not have been applied
2021-01-07 07:39:59 -08:00
Jacob Walser
567c6d4991
Frame_params: (BlueRov2/Sub-3.5.2) revert to 83bb1e7f
...
this file is targeted specifically at 3.5.2 firmware
the subsequent contributions reflecting changes to master should
not have been applied
2021-01-07 07:39:59 -08:00
Jacob Walser
367e7b35de
Frame_params: add defaults for bluerov2 on Sub 3.5.4 firmware
2021-01-07 07:39:59 -08:00
Jacob Walser
3ce9d9eb44
Frame_params: add defaults for bluerov2 on Sub 4.0.2 firmware
2021-01-07 07:39:59 -08:00
Andrew Tridgell
ad29be14c6
autotest: added ARACE_hand location
2021-01-07 18:42:33 +11:00
Peter Barker
4fb4beab67
Tools: adjust decode_watchdog.py for new message format
2021-01-07 17:06:09 +11:00
Peter Barker
7474948971
autotest: add test for mavlink rangefinder out-of-range-low
2021-01-06 15:33:41 +11:00
Peter Barker
fdd0297f12
autotest: add more tests for MAVLink rangefinder
...
Allows for finer-grain control over what messages we're sending.
2021-01-06 15:33:41 +11:00
Andrew Tridgell
ae6569ab67
AP_Periph: updated release notes for 1.2.0
2021-01-06 07:59:33 +11:00