Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 2445 → Rev 2446

/I2C_Telemetry/trunk/main.c
167,7 → 167,7
StickGier = 0; StickGas = 0; StickRoll = 0; StickNick = 0;
RED_OFF;
GRN_ON;
 
LED_Init();
Timer0_Init();
Timer2_Init();
USART0_Init();
/I2C_Telemetry/trunk/uart.c
129,7 → 129,7
"8 ",
"Voltage [0.1V] ",
"Receiver Level ", //10
"GOS Data ",
"GPS Data ",
"Motor 1 ",
"Motor 2 ",
"Motor 3 ",
180,7 → 180,6
uint8_t c;
 
c = UDR0;
 
MKProtocol_CollectSerialFrame(&UART0_rx_buffer, c); // ckeck for MK-Frame
UBX_Parser(c); // and check ubx protocol parser for gpx data
}
/I2C_Telemetry/trunk/ubx.c
112,7 → 112,7
volatile ubx_nav_sol_t UbxSol = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, INVALID};
volatile ubx_nav_posllh_t UbxPosLlh = {0,0,0,0,0,0,0, INVALID};
volatile ubx_nav_velned_t UbxVelNed = {0,0,0,0,0,0,0,0,0, INVALID};
ubxmsg_t UbxMsg;
volatile ubxmsg_t UbxMsg;
 
 
 
239,6 → 239,7
{
UBX_Timeout = SetDelay(UBX_TIMEOUT);
DebugOut.Analog[11]++;
CountNewGpsDataIn5Sec++;
// update GPS data only if the status is INVALID or PROCESSED
if(GPSData.Status != NEWDATA)
{ // wait for new data at all neccesary ubx messages
302,8 → 303,8
break;
 
case UBXSTATE_SYNC2: // check msg class to be NAV
if (c == UBX_CLASS_NAV) ubxState = UBXSTATE_CLASS;
else ubxState = UBXSTATE_IDLE; // unsupported message class
RxHdr.Class = c;
ubxState = UBXSTATE_CLASS;
break;
 
case UBXSTATE_CLASS: // check message identifier
/I2C_Telemetry/trunk/ubx.h
76,7 → 76,7
} __attribute__((packed)) ubxmsg_t;
// msg obj to reveive
// set Class and Id and correspoinding masks of a message that should be received
extern ubxmsg_t UbxMsg;
extern volatile ubxmsg_t UbxMsg;
 
extern uint16_t UBX_Timeout;