Subversion Repositories NaviCtrl

Compare Revisions

Ignore whitespace Rev 229 → Rev 228

/trunk/i2c.c
186,7 → 186,6
I2C_ITConfig(I2C1, ENABLE);
 
VIC_Config(I2C1_ITLine, VIC_IRQ , PRIORITY_I2C1);
I2C_Heading.Heading = -1;
 
I2C1_Timeout = SetDelay(10*I2C1_TIMEOUT);
I2C_GenerateSTOP(I2C1, ENABLE);
230,7 → 229,7
I2C_RxBufferSize = 0;
 
I2C1_Timeout = SetDelay(10*I2C1_TIMEOUT);
I2C_Heading.Heading = -1;
I2C_Heading.Heading = -2;
 
UART1_PutString("ok");
}
/trunk/main.c
134,7 → 134,7
ErrorCode = 3;
StopNavigation = 1;
}
else if(CheckDelay(I2C1_Timeout))
else if((CheckDelay(I2C1_Timeout)) || (I2C_Heading.Heading == -2))
{
LED_RED_ON;
sprintf(ErrorMSG,"no MK3Mag communication ");
282,6 → 282,7
VIC_Config(EXTIT3_ITLine, VIC_IRQ, PRIORITY_SW);
// enable interrupts
VIC_ITCmd(EXTIT3_ITLine, ENABLE);
I2C1_Timeout = SetDelay(1000);
for (;;) // the endless main loop
{
UART0_ProcessRxData(); // process request
/trunk/main.h
3,13 → 3,13
 
#define VERSION_MAJOR 0
#define VERSION_MINOR 19
#define VERSION_PATCH 4
#define VERSION_PATCH 3
 
#define VERSION_SERIAL_MAJOR 11
#define VERSION_SERIAL_MINOR 0
 
#define FC_SPI_COMPATIBLE 13
#define MK3MAG_I2C_COMPATIBLE 3
#define MK3MAG_I2C_COMPATIBLE 4
// FC FLAGS
#define FCFLAG_MOTOR_RUN 0x01