Skip to content
Snippets Groups Projects
Commit b79e4ab5 authored by Matthias Grob's avatar Matthias Grob Committed by Lorenz Meier
Browse files

land detector: reverted scientific notation unwanted doubles

parent 03d7b652
No related branches found
No related tags found
No related merge requests found
......@@ -127,10 +127,10 @@ protected:
static constexpr uint32_t LAND_DETECTOR_UPDATE_RATE_HZ = 50;
/* Time in us that landing conditions have to hold before triggering a land. */
static constexpr uint64_t LAND_DETECTOR_TRIGGER_TIME_US = 2e6;
static constexpr uint64_t LAND_DETECTOR_TRIGGER_TIME_US = 2000000;
/* Time interval in us in which wider acceptance thresholds are used after arming. */
static constexpr uint64_t LAND_DETECTOR_ARM_PHASE_TIME_US = 2e6;
static constexpr uint64_t LAND_DETECTOR_ARM_PHASE_TIME_US = 2000000;
orb_advert_t _landDetectedPub;
struct vehicle_land_detected_s _landDetected;
......
......@@ -179,7 +179,7 @@ bool MulticopterLandDetector::_get_landed_state()
// Return status based on armed state and throttle if no position lock is available.
if (_vehicleLocalPosition.timestamp == 0 ||
hrt_elapsed_time(&_vehicleLocalPosition.timestamp) > 0.5e6 ||
hrt_elapsed_time(&_vehicleLocalPosition.timestamp) > 500000 ||
!_vehicleLocalPosition.xy_valid ||
!_vehicleLocalPosition.z_valid) {
......@@ -188,7 +188,7 @@ bool MulticopterLandDetector::_get_landed_state()
// falling consider it to be landed. This should even sustain
// quite acrobatic flight.
if ((_min_trust_start > 0) &&
(hrt_elapsed_time(&_min_trust_start) > 8e6)) {
(hrt_elapsed_time(&_min_trust_start) > 8000000)) {
return true;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment