Browse Source

MERGE - OLIMEXINO - Initial support for the OLIMEXINO board.

PWM and ADC configuration is the same as the naze32 for now.  Requires an accelerometer is connected via I2C2.
I2C signals SDA2 and SCL2 are on the UEXT header (Pins 6 and 5 respectively)
USART signals TX and RX are on the CON3/CON4 headers (TX = D7, RX = D8)
Onboard LEDs (LED1/LED2) working.
Buzzer support removed for now as it conflicted with PWM map and LEDs.
mma845x support disabled as it conflicted with an LED.
Relocated some NAZE specific comments.

git-svn-id: https://afrodevices.googlecode.com/svn/trunk/baseflight@302 7c89a4a9-59b9-e629-4cfe-3a2d53b20e61

Conflicts:

	src/board.h
	src/main.c

Conflicts:

	src/main.c
master
timecop@gmail.com 12 years ago
committed by Dominic Clifton
parent
commit
4bde0d0c9c
  1. 10
      src/board.h
  2. 2
      src/main.c
  3. 8
      src/sensors.c

10
src/board.h

@ -130,10 +130,8 @@ typedef struct baro_t
#define SENSORS_SET (SENSOR_ACC)
#endif
#ifdef NAZE
// Afroflight32
#else
// Afroflight32
#define LED0_GPIO GPIOB
#define LED0_PIN GPIO_Pin_3 // PB3 (LED)
#define LED1_GPIO GPIOB
@ -196,9 +194,7 @@ typedef struct baro_t
#include "drv_l3g4200d.h"
#include "drv_pwm.h"
#include "drv_uart.h"
#endif
#ifdef NAZE
#else
// AfroFlight32
#include "drv_system.h" // timers, delays, etc
#include "drv_adc.h"

2
src/main.c

@ -57,7 +57,7 @@ int main(void)
adcInit(&adc_params);
// We have these sensors
// We have these sensors; SENSORS_SET defined in board.h depending on hardware platform
sensorsSet(SENSORS_SET);
mixerInit(); // this will set useServo var depending on mixer type

8
src/sensors.c

@ -59,7 +59,7 @@ retry:
if (mcfg.acc_hardware == ACC_ADXL345)
break;
; // fallthrough
case 2: // MPU6050
case 2: // MPU6050
if (haveMpu6k) {
mpu6050Detect(&acc, &gyro, mcfg.gyro_lpf, &mcfg.mpu6050_scale); // yes, i'm rerunning it again. re-fill acc struct
accHardware = ACC_MPU6050;
@ -67,8 +67,8 @@ retry:
break;
}
; // fallthrough
#ifndef OLIMEXINO
case 3: // MMA8452
#ifndef OLIMEXINO
if (mma8452Detect(&acc)) {
accHardware = ACC_MMA8452;
if (mcfg.acc_hardware == ACC_MMA8452)
@ -289,7 +289,7 @@ int Baro_update(void)
return 0;
baroDeadline = currentTime;
if (state) {
baro.get_up();
baro.start_ut();
@ -476,7 +476,7 @@ int Mag_getADC(void)
writeEEPROM(1, true);
}
}
return 1;
}
#endif

Loading…
Cancel
Save