Subversion Repositories NaviCtrl

Compare Revisions

Ignore whitespace Rev 576 → Rev 577

/trunk/main.h
14,7 → 14,7
 
#define VERSION_MAJOR 2
#define VERSION_MINOR 7
#define VERSION_PATCH 3
#define VERSION_PATCH 5
// 0 = A
// 1 = B
// 2 = C
/trunk/settings.c
89,7 → 89,8
// {PID_ABSOLUTE_FLYING_RANGE , "MAX_FLYING_RANGE\0" ,"max. range in m ", 1, 0, 0, 0, 60000}, // in [m]
// {PID_AUTO_DESCEND_RANGE , "DESCEND_RANGE \0" ,"Auto-descend range in m (0 = disabled) (only comm. License) ", 1, 0, 0, 0, 60000}, // in [m]
{PID_GPS_SBAS_CONFIG , "GPS_SBAS_DGPS_ON\0" ,"GPS SBAS mode (0 = off, 1 = on) ", 1, 1, 1, 0, 1},
{PID_MIN_EVENT_TIME , "MIN_EVENT_TIME \0" ,"minimum time of the Waypoint-Event value (seconds) ", 1, 2, 2, 0, 600}, // in seconds
// {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_REACHED_TIMEOUT , "WP_TIMEOUT \0" ,"the MK increases the WP-target radius after this timeout [s]", 1, 5, 5, 0, 6000}, // 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, 0, 60000}, // the log interval for NMEA output, 0 = off
/trunk/settings.h
18,7 → 18,8
PID_SEND_NMEA,
PID_CH_SPEED,
PID_POSITION_ACCURACY,
PID_DPH_SPEED
PID_DPH_SPEED,
PID_WP_REACHED_TIMEOUT
} ParamId_t;
 
void Settings_Init(void);
/trunk/spi_slave.c
107,7 → 107,7
u8 SPI_CommandCounter = 0;
s32 ToFC_Rotate_C = 64, ToFC_Rotate_S = 0;
s32 HeadFreeStartAngle = 0;
s16 FC_WP_EventChannel = 0, LogFC_WP_EventChannel = 0; // gibt einen Schaltkanal an die FC weiter, wenn der Wegpunkt erreicht wurde
s16 FC_WP_EventChannel = 0, LogFC_WP_EventChannel = 0, FC_WP_EventChannel_Processed = 0; // gibt einen Schaltkanal an die FC weiter, wenn der Wegpunkt erreicht wurde
u32 ToFC_AltitudeRate = 0;
s32 ToFC_AltitudeSetpoint = 0;
u8 FromFC_VarioCharacter = ' ';
421,6 → 421,7
ToFlightCtrl.Param.sInt[3] = NaviData.HomePositionDeviation.Bearing; // deg //6&7
if(FC_WP_EventChannel > 254) FC_WP_EventChannel = 254; // Muss in SPI_NCCMD_GPSINFO bleiben! (siehe oben)
if(FC_WP_EventChannel) LogFC_WP_EventChannel = FC_WP_EventChannel; // to make sure that it will be logged
FC_WP_EventChannel_Processed = 1;
// ++++++++++++++++++++++++++++++++++
// Waypoint event +++++++++++++++++++
// ++++++++++++++++++++++++++++++++++
437,7 → 438,7
if(tmp == 0) NCParams_ClearValue(NCPARAMS_WP_EVENT_FOREVER);
}
else ToFlightCtrl.Param.Byte[8] = (s8)(FC_WP_EventChannel - 127);
FC_WP_EventChannel = 0; // the GPS-Routine will set it again
// FC_WP_EventChannel = 0; // the GPS-Routine will set it again
// ++++++++++++++++++++++++++++++++++
if(NCRARAM_STATE_VALID == NCParams_GetValue(NCPARAMS_ALTITUDE_RATE, &tmp))
{
/trunk/spi_slave.h
70,7 → 70,7
extern s32 ToFcGpsZ;
extern s32 ToFC_Rotate_C, ToFC_Rotate_S;
extern s32 HeadFreeStartAngle;
extern s16 FC_WP_EventChannel,LogFC_WP_EventChannel;
extern s16 FC_WP_EventChannel,LogFC_WP_EventChannel,FC_WP_EventChannel_Processed;
extern u32 ToFC_AltitudeRate;
extern s32 ToFC_AltitudeSetpoint;
extern u8 NC_GPS_ModeCharacter;
/trunk/waypoints.c
77,6 → 77,7
u8 PointCount = 0; // number of points in the list can be maximal equal to MAX_LIST_LEN
u8 POICount = 0; // number of point of interest in the list
s16 HeadingOld = -1;
u32 SD_WaypointTimeout = 5; // Setting on SD-Card
 
u8 WPActive = FALSE;
 
/trunk/waypoints.h
75,6 → 75,7
// load target gps positiin and heading from file
u8 PointList_LoadSinglePoint(WPL_Store_t * pWPL_Store);
 
extern u32 SD_WaypointTimeout; // Setting on SD-Card
extern void ClearWLP_Name(void);
extern s16 HeadingOld;