/trunk/main.c |
---|
540,7 → 540,7 |
SPI0_GetFlightCtrlVersion(); |
if(FC_Version.Compatible != FC_SPI_COMPATIBLE) |
{ |
UART1_PutString("\n\r Flight-Ctrl not compatible"); |
UART1_PutString("\n\r Flight-Ctrl not compatible\n\r"); |
LED_RED_ON; |
} |
#endif |
556,7 → 556,7 |
LED_GRN_ON; |
LED_RED_OFF; |
Settings_GetParamValue(PID_SEND_NMEA, &NMEA_Interval); |
UART1_PutString("\r\n"); |
for (;;) // the endless main loop |
{ |
Polling(); |
/trunk/main.h |
---|
14,7 → 14,7 |
#define VERSION_MAJOR 2 |
#define VERSION_MINOR 0 |
#define VERSION_PATCH 1 |
#define VERSION_PATCH 3 |
// 0 = A |
// 1 = B |
// 2 = C |
/trunk/settings.c |
---|
92,7 → 92,7 |
{PID_MIN_EVENT_TIME , "MIN_EVENT_TIME \0" ,"minimum time of the Waypoint-Event value (seconds) ", 1, 2, 2, 0, 600}, // in seconds |
{PID_WP_ACCELERATE , "WAYPOINT DYNAMIC\0" ,"dynamic for flying waypoints in percent (0-200) ", 1, 100, 100, 0, 255}, // in percent or Poti |
{PID_WP_WAIT_FOR_LED , "WAIT_FOR_OUT1 \0" ,"Wait on Waypoint until Out-Pattern is finished (1=on 0=off) ", 1, 1, 1, 0, 1}, |
{PID_SEND_NMEA , "NMEA_INTERVAL \0" ,"NMEA Output interval in ms (0 = disabled) ", 1, 0, 0, 200, 60000}, // the log interval for GPX logging, 0 = off |
{PID_SEND_NMEA , "NMEA_INTERVAL \0" ,"NMEA Output interval in ms (0 = disabled) ", 1, 0, 0, 0, 60000}, // the log interval for GPX logging, 0 = off |
{PID_GPS_AUTOCONFIG , "GPSAUTOCONFIG \0" ,"GPS configmode (0 = off, 1 = on) ", 1, 1, 1, 0, 1} |
}; |
/trunk/spi_slave.c |
---|
661,8 → 661,7 |
CHK_POTI_MM(Parameter.NaviGpsDLimit,FromFlightCtrl.Param.Byte[8],0,255); |
FC.RC_Quality = FromFlightCtrl.Param.Byte[9]; |
NaviData.RC_Quality = FC.RC_Quality; |
NC_Wait_for_LED = FromFlightCtrl.Param.Byte[10]; |
DebugOut.Analog[16] = NC_Wait_for_LED; |
NC_Wait_for_LED = FromFlightCtrl.Param.Byte[10]; |
// FC.RC_RSSI = FromFlightCtrl.Param.Byte[10]; |
// if(!FC.RC_RSSI) NaviData.RC_Quality = FC.RC_Quality; else NaviData.RC_Quality = FC.RC_RSSI; |
// NaviData.RC_RSSI = FC.RC_RSSI; |
/trunk/timer2.c |
---|
187,7 → 187,7 |
GPIO_InitTypeDef GPIO_InitStructure; |
TIM_InitTypeDef TIM_InitStructure; |
UART1_PutString("\r\n Timer2 init..."); |
UART1_PutString(" Timer2 init..."); |
SCU_APBPeriphClockConfig(__GPIO6, ENABLE); // Enable the GPIO6 Clock |
245,7 → 245,7 |
TIM_CounterCmd(TIM2, TIM_CLEAR); // reset timer |
TIM_CounterCmd(TIM2, TIM_START); // start the timer |
UART1_PutString("ok"); |
UART1_PutString("ok\r\n"); |
} |
void TIMER2_Deinit(void) |
/trunk/uart1.c |
---|
264,7 → 264,7 |
// initialize the debug timer |
UART1_DebugData_Timer = SetDelay(UART1_DebugData_Interval); |
UART1_NaviData_Timer = SetDelay(UART1_NaviData_Interval)+500; |
NMEA_Timer = SetDelay(9000); |
NMEA_Timer = SetDelay(14000); |
// Fill Version Info Structure |
UART_VersionInfo.SWMajor = VERSION_MAJOR; |
665,7 → 665,7 |
} |
#endif |
// if terminating character or end of txd buffer reached |
if((tmp_tx == '\r') || (UART1_tx_buffer.Position == UART1_tx_buffer.DataBytes)) |
if((tmp_tx == '\0') || (UART1_tx_buffer.Position == UART1_tx_buffer.DataBytes)) |
{ |
Buffer_Clear(&UART1_tx_buffer); // clear txd buffer |
#ifdef FOLLOW_ME |
678,7 → 678,6 |
} |
//$GPGGA,HHMMSS.ss,BBBB.BBBB,b,LLLLL.LLLL,l,Q,NN,D.D,H.H,h,G.G,g,A.A,RRRR*PP |
//$GPGGA,090527.40,5317.15615,N,00729.08295,E,1,04,2.26,-2.6,M,45.5,M,,* |
//$GPGGA,191410,4735.5634,N,00739.3538,E,1,04,4.4,351.5,M,48.0,M,,*45 |
//$GPGGA,092120.20,,,,,0,00,99.99,,,,,,*6C |
void CreateNmeaGGA(void) |
743,7 → 742,7 |
{ |
crc ^= array[x]; |
} |
i += sprintf(&array[i], "%02x\n\r",crc); |
i += sprintf(&array[i], "%02x%c%c",crc,0x0d,0x0a); |
AddSerialData(&UART1_tx_buffer,array,i); |
// +++++++++++++++++++++++++++++++++++++++++++ |