From 08bd3ea121a8a134edf0835bc4092565bb845aa6 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Fri, 4 Sep 2015 18:05:01 -0400 Subject: [PATCH] fix launch method iteration --- src/lib/launchdetection/LaunchDetector.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/launchdetection/LaunchDetector.cpp b/src/lib/launchdetection/LaunchDetector.cpp index 52f5c32576..24f2953426 100644 --- a/src/lib/launchdetection/LaunchDetector.cpp +++ b/src/lib/launchdetection/LaunchDetector.cpp @@ -66,7 +66,7 @@ LaunchDetector::~LaunchDetector() void LaunchDetector::reset() { /* Reset all detectors */ - for (uint8_t i = 0; i < sizeof(launchMethods)/sizeof(LaunchMethod); i++) { + for (uint8_t i = 0; i < sizeof(launchMethods)/sizeof(LaunchMethod *); 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 (uint8_t i = 0; i < sizeof(launchMethods)/sizeof(LaunchMethod *); 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 (uint8_t i = 0; i < sizeof(launchMethods)/sizeof(LaunchMethod *); i++) { if(launchMethods[i]->getLaunchDetected() != LAUNCHDETECTION_RES_NONE) { warnx("selecting launchmethod %d", i); activeLaunchDetectionMethodIndex = i; // from now on only check this method @@ -113,7 +113,7 @@ float LaunchDetector::getPitchMax(float pitchMaxDefault) { /* if a lauchdetectionmethod is active or only one exists return the pitch limit from this method, * otherwise use the default limit */ if (activeLaunchDetectionMethodIndex < 0) { - if (sizeof(launchMethods)/sizeof(LaunchMethod) > 1) { + if (sizeof(launchMethods)/sizeof(LaunchMethod *) > 1) { return pitchMaxDefault; } else { return launchMethods[0]->getPitchMax(pitchMaxDefault);