Merge pull request #516 from blckmn/development

Fixed CJMCU build fail
This commit is contained in:
J Blackman 2016-06-15 13:29:59 +10:00 committed by GitHub
commit 2dc9e2166e
3 changed files with 14 additions and 4 deletions

View File

@ -88,11 +88,10 @@ const extiConfig_t *selectMPUIntExtiConfig(void)
#if defined(MPU_INT_EXTI)
static const extiConfig_t mpuIntExtiConfig = { .io = IO_TAG(MPU_INT_EXTI) };
return &mpuIntExtiConfig;
#endif
#ifdef USE_HARDWARE_REVISION_DETECTION
#elif defined(USE_HARDWARE_REVISION_DETECTION)
return selectMPUIntExtiConfigByHardwareRevision();
#else return NULL;
#else
return NULL;
#endif
}

View File

@ -28,6 +28,7 @@
#include "drivers/sensor.h"
#include "drivers/accgyro.h"
#include "drivers/accgyro_spi_mpu6500.h"
#include "drivers/exti.h"
#include "hardware_revision.h"
@ -51,3 +52,8 @@ void detectHardwareRevision(void)
void updateHardwareRevision(void)
{
}
const extiConfig_t *selectMPUIntExtiConfigByHardwareRevision(void)
{
return NULL;
}

View File

@ -14,7 +14,10 @@
* You should have received a copy of the GNU General Public License
* along with Cleanflight. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "drivers/exti.h"
typedef enum cjmcuHardwareRevision_t {
UNKNOWN = 0,
REV_1, // Blue LED3
@ -27,3 +30,5 @@ void updateHardwareRevision(void);
void detectHardwareRevision(void);
void spiBusInit(void);
const extiConfig_t *selectMPUIntExtiConfigByHardwareRevision(void);