Subversion Repositories NaviCtrl

Compare Revisions

Ignore whitespace Rev 623 → Rev 624

/trunk/main.h
14,7 → 14,7
 
#define VERSION_MAJOR 2
#define VERSION_MINOR 9
#define VERSION_PATCH 7
#define VERSION_PATCH 8
// 0 = A
// 1 = B
// 2 = C
233,7 → 233,8
u8 Driftkomp;
u8 ReceiverType;
u8 HomeYawMode;
u16 Speak100m;
u8 Speak100m;
u8 AutoWpEventValue;
} __attribute__((packed)) Param_t;
 
typedef struct
/trunk/settings.c
91,6 → 91,7
// {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_AUTO_WP_EVENT_VALUE , "AUTO_WP_EVENT \0" ,"value for the WP-Event Trigger at Auto-Distance [10ms] ", 1, 10, 10, 1, 200}, // in 0,1sek
// {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
/trunk/settings.h
21,7 → 21,8
PID_DPH_SPEED,
PID_WP_REACHED_TIMEOUT,
PID_LOG_AT_MOTORRUN,
PID_SPEAK100M
PID_SPEAK100M,
PID_AUTO_WP_EVENT_VALUE
} ParamId_t;
 
void Settings_Init(void);
/trunk/uart1.c
1016,7 → 1016,7
NaviData_Flags.NCFlags = NaviData.NCFlags;
NaviData_Flags.Errorcode = ErrorCode;
NaviData_Flags.ReserveFlags = 0;
NaviData_Flags.SpeakHoTT = FC.FromFC_SpeakHoTT;
//NaviData_Flags.SpeakHoTT = FC.FromFC_SpeakHoTT; -> in SPI.c
NaviData_Flags.VarioCharacter = FromFC_VarioCharacter;
NaviData_Flags.GPS_ModeCharacter = NC_GPS_ModeCharacter;
NaviData_Flags.BL_MinOfMaxPWM = BL_MinOfMaxPWM;
1027,6 → 1027,7
CRC_Flags = crc_flags;
count_flags = 11*2;
}
NaviData_Flags.SpeakHoTT = 0;
break;
case 1:
case 7: