/trunk/main.h |
---|
14,7 → 14,7 |
#define VERSION_MAJOR 2 |
#define VERSION_MINOR 5 |
#define VERSION_PATCH 0 |
#define VERSION_PATCH 1 |
// 0 = A |
// 1 = B |
// 2 = C |
/trunk/settings.c |
---|
94,6 → 94,7 |
{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, 0, 60000}, // the log interval for NMEA output, 0 = off |
{PID_CH_SPEED , "COMINGHOME_SPEED\0" ,"Maximum speed for coming home in 0,1m/sec (80 = 8,0 m/sec) ", 1, 80, 80, 10, 150}, |
{PID_DPH_SPEED , "DYNAMIC_PH_SPEED\0" ,"Maximum speed for dynamic position hold in 0,1m/sec ", 1, 100, 100, 20, 150}, |
{PID_GPS_AUTOCONFIG , "GPSAUTOCONFIG \0" ,"GPS configmode (0 = off, 1 = on) ", 1, 1, 1, 0, 1} |
}; |
/trunk/settings.h |
---|
16,7 → 16,8 |
PID_WP_WAIT_FOR_LED, |
PID_WP_ACCELERATE, |
PID_SEND_NMEA, |
PID_CH_SPEED |
PID_CH_SPEED, |
PID_DPH_SPEED |
} ParamId_t; |
void Settings_Init(void); |
/trunk/spi_slave.c |
---|
309,7 → 309,6 |
VIC_ITCmd(SSP0_ITLine, DISABLE); // disable SPI interrupt |
ToFlightCtrl.CompassHeading = Compass_Heading; |
DebugOut.Analog[10] = ToFlightCtrl.CompassHeading; |
//GyroCompassCorrected = (3600 + FromFlightCtrl.GyroHeading + FC.FromFC_CompassOffset - GeoMagDec) % 3600; |
GyroCompassCorrected = (3600 + FromFlightCtrl.GyroHeading + FC.FromFC_CompassOffset + GeoMagDec) % 3600; |
if(ToFlightCtrl.CompassHeading >= 0) ToFlightCtrl.CompassHeading = (360 + ToFlightCtrl.CompassHeading + FromFlightCtrl.GyroYaw / 12) % 360; |
ToFlightCtrl.MagVecX = MagVector.X; |
/trunk/uart1.c |
---|
150,8 → 150,8 |
"OperatingRadius ", |
"FC-Flags ", //5 |
"NC-Flags ", |
"Voltage [0,1V] ", |
"Current [0,1A] ", |
"Voltage [0.1V] ", |
"Current [0.1A] ", |
"GPS Data ", |
"CompassHeading ", //10 |
"GyroHeading ", |
172,8 → 172,8 |
"Magnet Z ", |
"Distance N ", |
"Distance E ", |
"GPS_Nick ", |
"GPS_Roll ", //30 |
"-GPS_Nick ", |
"-GPS_Roll ", //30 |
"Used_Sats " |
}; |