Subversion Repositories NaviCtrl

Compare Revisions

Ignore whitespace Rev 269 → Rev 270

/trunk/main.c
122,7 → 122,7
void GetNaviCtrlVersion(void)
{
u8 msg[25];
 
sprintf(msg,"\n\r NaviCtrl HW: V%d.%d SW: V%d.%d%c", Version_HW/10, Version_HW%10, VERSION_MAJOR, VERSION_MINOR, 'a'+ VERSION_PATCH);
UART1_PutString(msg);
}
350,7 → 350,7
DebugOut.Status[1] = 0x00;
 
Compass_Init();
 
SPI0_GetFlightCtrlVersion();
if(FC_Version.Compatible != FC_SPI_COMPATIBLE)
{
358,7 → 358,7
LED_RED_ON;
}
 
GPS_Init();
GPS_Init();
 
// ---------- Prepare the isr driven
// set to absolute lowest priority
367,7 → 367,7
VIC_ITCmd(EXTIT3_ITLine, ENABLE);
 
Debug_OK("START");
 
for (;;) // the endless main loop
{
UART0_ProcessRxData(); // process request
/trunk/ncmag.c
335,7 → 335,7
if((Calibration.MagX.Range > MIN_CALIBRATION) && (Calibration.MagY.Range > MIN_CALIBRATION) && (Calibration.MagZ.Range > MIN_CALIBRATION))
{
NCMAG_IsCalibrated = NCMag_CalibrationWrite();
BeepTime = 1500;
BeepTime = 2500;
UART1_PutString("\r\n Calibration okay");
}
else
/trunk/ubx.c
376,7 → 376,6
if (RxHdr.Length >= UBX_MSG_DATA_SIZE)
{
ubxState = UBXSTATE_IDLE;
DebugOut.Analog[25]++;
}
else
{
398,7 → 397,6
else // rx buffer overrun
{
ubxState = UBXSTATE_IDLE;
DebugOut.Analog[25]++;
}
break;
 
407,7 → 405,6
else
{
ubxState = UBXSTATE_IDLE;
DebugOut.Analog[24]++;
}
break;
 
462,7 → 459,6
} // EOF filter matches
} // EOF != INVALID
}// EOF crc ok
else DebugOut.Analog[24]++;
ubxState = UBXSTATE_IDLE; // ready to parse new data
break;
 
/trunk/usb_endp.c
50,7 → 50,7
}
SetEPRxValid(ENDP3);
 
//sprintf(text,"USB (%ld): %s\n\r", USB_BufferRxCount, USB_BufferRx);
//sprintf(text,"USB (%ld): %s\n\r", USB_Buffer, USB_BufferCount);
//UART1_PutString(text);
}
/*******************************************************************************
/trunk/usbinc/usb_desc.h
29,7 → 29,7
#define USB_INTERFACE_DESCRIPTOR_TYPE 0x04
#define USB_ENDPOINT_DESCRIPTOR_TYPE 0x05
 
#define VIRTUAL_COM_PORT_DATA_SIZE 64
#define VIRTUAL_COM_PORT_DATA_SIZE 64
#define VIRTUAL_COM_PORT_INT_SIZE 8
 
#define VIRTUAL_COM_PORT_SIZ_DEVICE_DESC 18