fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-06 15:18:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Launch detection: Fix hard typing in array size calculation, fix use of index variable

Browse Source
This commit is contained in:
Lorenz Meier
2015-09-05 22:03:42 +02:00
parent 08bd3ea121
commit 9d5a2e9815
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/launchdetection/LaunchDetector.cpp
+3 -3
View File
@@ -66,7 +66,7 @@ LaunchDetector::~LaunchDetector()
void LaunchDetector::reset()
{
/* Reset all detectors */
for (uint8_t i = 0; i < sizeof(launchMethods)/sizeof(LaunchMethod *); i++) {
for (unsigned i = 0; i < (sizeof(launchMethods) / sizeof(launchMethods[0])); i++) {
launchMethods[i]->reset();
}
@@ -79,7 +79,7 @@ void LaunchDetector::reset()
void LaunchDetector::update(float accel_x)
{
if (launchdetection_on.get() == 1) {
for (uint8_t i = 0; i < sizeof(launchMethods)/sizeof(LaunchMethod *); i++) {
for (unsigned i = 0; i < (sizeof(launchMethods) / sizeof(launchMethods[0])); i++) {
launchMethods[i]->update(accel_x);
}
}
@@ -90,7 +90,7 @@ LaunchDetectionResult LaunchDetector::getLaunchDetected()
if (launchdetection_on.get() == 1) {
if (activeLaunchDetectionMethodIndex < 0) {
/* None of the active launchmethods has detected a launch, check all launchmethods */
for (uint8_t i = 0; i < sizeof(launchMethods)/sizeof(LaunchMethod *); i++) {
for (unsigned i = 0; i < (sizeof(launchMethods) / sizeof(launchMethods[0])); i++) {
if(launchMethods[i]->getLaunchDetected() != LAUNCHDETECTION_RES_NONE) {
warnx("selecting launchmethod %d", i);
activeLaunchDetectionMethodIndex = i; // from now on only check this method