Subversion Repositories NaviCtrl

Compare Revisions

Ignore whitespace Rev 621 → Rev 622

/trunk/main.h
14,7 → 14,7
 
#define VERSION_MAJOR 2
#define VERSION_MINOR 9
#define VERSION_PATCH 5
#define VERSION_PATCH 7
// 0 = A
// 1 = B
// 2 = C
233,6 → 233,7
u8 Driftkomp;
u8 ReceiverType;
u8 HomeYawMode;
u16 Speak100m;
} __attribute__((packed)) Param_t;
 
typedef struct
/trunk/settings.c
86,6 → 86,7
{PID_KML_LOGGING , "KMLLOGGING \0" ,"KML logging interval in ms (0 = disabled) ", 1, 200, 500, 0, 60000}, // the log interval for KML logging, 0 = off
{PID_GPX_LOGGING , "GPXLOGGING \0" ,"GPX logging interval in ms (0 = disabled) ", 1, 500, 500, 0, 60000}, // the log interval for GPX logging, 0 = off
{PID_LOG_AT_MOTORRUN , "LOG_AT_MOTOR_RUN\0" ,"Start GPX logfile as soon as motors start (0 = off, 1 = on) ", 1, 1, 1, 0, 1},
{PID_SPEAK100M , "HOTT_SPEAK_100M \0" ,"HoTT Speaks '100m' when distance or altitude > 100m (1 = on)", 1, 1, 1, 0, 1},
// {PID_ABSOLUTE_FLYING_ALT , "MAX_FLYING_ALT \0" ,"max. altitude in m ", 1, 0, 0, 0, 30000}, // in [m]
// {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]
/trunk/settings.h
20,7 → 20,8
PID_POSITION_ACCURACY,
PID_DPH_SPEED,
PID_WP_REACHED_TIMEOUT,
PID_LOG_AT_MOTORRUN
PID_LOG_AT_MOTORRUN,
PID_SPEAK100M
} ParamId_t;
 
void Settings_Init(void);
/trunk/spi_slave.h
32,15 → 32,17
#define SPEAK_MAX_RANGE 25
#define SPEAK_MAX_ALTITUD 26
 
#define SPEAK_20M 37 // ?
#define SPEAK_MK_OFF 38
#define SPEAK_ALTITUDE_ON 39
#define SPEAK_ALTITUDE_OFF 40
#define SPEAK_100M 41 // ?
#define SPEAK_CF_ON 46
#define SPEAK_SINKING 47
#define SPEAK_SINKING 47 // ?
#define SPEAK_RISING 48
#define SPEAK_HOLDING 49
#define SPEAK_HOLDING 49 // ?
#define SPEAK_GPS_ON 50
#define SPEAK_FOLLWING 51
#define SPEAK_FOLLWING 51 // ?
#define SPEAK_STARTING 52
 
 
/trunk/uart1.c
1101,6 → 1101,7
NaviData_Home.HomeLongitude = NaviData.HomePosition.Longitude;
NaviData_Home.HomeLatitude = NaviData.HomePosition.Latitude;
NaviData_Home.HomeAltitude = NaviData.HomePosition.Altitude;
NaviData_Home.WP_OperatingRadius = MaxWP_Radius_in_m;
crc_home = CRC16((unsigned char*)(&NaviData_Home.HomeLongitude), sizeof(NaviData_Home_t) - START_PAYLOAD_DATA); // update crc for the license structure
if((crc_home != CRC_Home) || (--count_home == 0))
{
/trunk/uart1.h
183,7 → 183,7
} __attribute__((packed)) NaviData_Target_t;
extern NaviData_Target_t NaviData_Target;
 
typedef struct // 13 (27 Bytes belegen 43 ASCII-Zeichen)
typedef struct // 13 (30 Bytes belegen 47 ASCII-Zeichen)
{
u8 Index; // version of the data structure
s32 ActualLongitude; //
196,7 → 196,10
s16 HomeAltitude; // hight according to air pressure
u16 WP_OperatingRadius; // current WP operation radius around the Home Position in m
u8 LipoCellCount;
u8 reserve;
u8 DescendRange; // in [10m]
u8 ManualFlyingRange; // in [10m]
u8 reserve1;
u8 reserve2;
} __attribute__((packed)) NaviData_Home_t;
extern NaviData_Home_t NaviData_Home;