Skip to content

Commit

Permalink
PreFlightCheck: add checks for CPU and RAM load
Browse files Browse the repository at this point in the history
  • Loading branch information
MaEtUgR committed Apr 9, 2020
1 parent 8338f4e commit 17778ee
Show file tree
Hide file tree
Showing 6 changed files with 94 additions and 0 deletions.
1 change: 1 addition & 0 deletions ROMFS/px4fmu_common/init.d-posix/rcS
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ then

param set TRIG_INTERFACE 3

param set COM_CPU_MAX -1
fi

# Adapt timeout parameters if simulation runs faster or slower than realtime.
Expand Down
1 change: 1 addition & 0 deletions src/modules/commander/Arming/PreFlightCheck/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ px4_add_library(PreFlightCheck
checks/powerCheck.cpp
checks/ekf2Check.cpp
checks/failureDetectorCheck.cpp
checks/cpuResourceCheck.cpp
)
target_include_directories(PreFlightCheck PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(PreFlightCheck PUBLIC ArmAuthorization HealthFlags)
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,8 @@ bool PreFlightCheck::preflightCheck(orb_advert_t *mavlink_log_pub, vehicle_statu
failed = true;
}

failed = failed || !cpuResourceCheck(mavlink_log_pub, reportFailures);

/* Report status */
return !failed;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,4 +113,5 @@ class PreFlightCheck
static bool failureDetectorCheck(orb_advert_t *mavlink_log_pub, const vehicle_status_s &status, const bool report_fail,
const bool prearm);
static bool check_calibration(const char *param_template, const int32_t device_id);
static bool cpuResourceCheck(orb_advert_t *mavlink_log_pub, const bool report_fail);
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
/****************************************************************************
*
* Copyright (c) 2020 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name PX4 nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/

#include "../PreFlightCheck.hpp"

#include <drivers/drv_hrt.h>
#include <systemlib/mavlink_log.h>
#include <lib/parameters/param.h>
#include <uORB/Subscription.hpp>
#include <uORB/topics/cpuload.h>

using namespace time_literals;

bool PreFlightCheck::cpuResourceCheck(orb_advert_t *mavlink_log_pub, const bool report_fail)
{
bool success = true;

uORB::SubscriptionData<cpuload_s> cpuload_sub{ORB_ID(cpuload)};
cpuload_sub.update();

float cpuload_percent_max;
param_get(param_find("COM_CPU_MAX"), &cpuload_percent_max);

if (cpuload_percent_max > 0.f) {

if (hrt_elapsed_time(&cpuload_sub.get().timestamp) > 2_s) {
success = false;

if (report_fail) {
mavlink_log_critical(mavlink_log_pub, "Fail: No CPU load information");
}
}

const float cpuload_percent = cpuload_sub.get().load * 100.f;

if (cpuload_percent > cpuload_percent_max) {
success = false;

if (report_fail) {
mavlink_log_critical(mavlink_log_pub, "Fail: CPU load too high: %3.1f", (double)cpuload_percent);
}
}
}

return success;
}
13 changes: 13 additions & 0 deletions src/modules/commander/commander_params.c
Original file line number Diff line number Diff line change
Expand Up @@ -899,3 +899,16 @@ PARAM_DEFINE_INT32(COM_MOT_TEST_EN, 1);
* @increment 0.1
*/
PARAM_DEFINE_FLOAT(COM_KILL_DISARM, 5.0f);

/**
* Maximum allowed CPU load to still allow arming
*
* A negative value disables the check.
*
* @group Commander
* @unit %
* @min -1
* @max 100
* @increment 1
*/
PARAM_DEFINE_FLOAT(COM_CPU_MAX, 95.0f);

0 comments on commit 17778ee

Please sign in to comment.