Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 908 → Rev 909

/branches/V0.69k CRK HexaLotte/main.c
73,7 → 73,7
#ifdef USE_NAVICTRL
#include "spi.h"
#endif
#if !defined (USE_KILLAGREG) && !defined (USE_NAVICTRL)
#ifdef USE_MK3MAG
#include "mk3mag.h"
#endif
#include "twimaster.h"
134,13 → 134,14
ADC_Init();
I2C_Init();
 
 
#ifdef USE_NAVICTRL
SPI_MasterInit();
#endif
#ifdef USE_KILLAGREG
MM3_Init();
#endif
#ifdef USE_NAVICTRL
SPI_MasterInit();
#endif
#if !defined (USE_KILLAGREG) && !defined (USE_NAVICTRL)
#ifdef USE_MK3MAG
MK3MAG_Init();
#endif
 
169,11 → 170,6
while(!CheckDelay(timer));
 
 
#if !defined (USE_KILLAGREG) && !defined (USE_NAVICTRL)
printf("\n\rSupport for MK3MAG Compass");
#endif
 
 
if(ParamSet.GlobalConfig & CFG_HEIGHT_CONTROL)
{
printf("\n\rCalibrating air pressure sensor..");
183,8 → 179,20
printf("OK\n\r");
}
 
#ifdef USE_NAVICTRL
printf("\n\rSupport for NaviCtrl");
#endif
 
#ifdef USE_KILLAGREG
printf("\n\rSupport for MicroMag3 Compass");
#endif
#ifdef USE_MK3MAG
printf("\n\rSupport for MK3MAG Compass");
#endif
 
 
 
#if defined (USE_KILLAGREG) || defined (USE_MK3MAG)
#if defined (__AVR_ATmega644P__)
if(BoardRelease == 10)
{
195,10 → 203,12
printf("\n\rSupport for GPS at 2nd UART");
}
#else // (__AVR_ATmega644__)
printf("\n\rSupport for GPS at 1st UART");
printf("\n\rSupport for GPS at 1st UART");
#endif
#endif
 
 
 
SetNeutral();
 
ROT_OFF;