Subversion Repositories NaviCtrl

Compare Revisions

Ignore whitespace Rev 330 → Rev 331

/trunk/main.c
290,6 → 290,7
LED_RED_ON;
sprintf(ErrorMSG,"Magnet error ");
newErrorCode = 22;
DebugOut.Status[1] |= 0x08;
}
else // no error occured
{
/trunk/main.h
14,7 → 14,7
 
#define VERSION_MAJOR 0
#define VERSION_MINOR 25
#define VERSION_PATCH 10
#define VERSION_PATCH 12
// 0 = A
// 1 = B
// 2 = C
35,7 → 35,7
#define VERSION_SERIAL_MINOR 0
 
#ifndef FOLLOW_ME
#define FC_SPI_COMPATIBLE 24
#define FC_SPI_COMPATIBLE 25
#else
#define FC_SPI_COMPATIBLE 0xFF
#endif
88,25 → 88,25
#define NCERR_FLAG_EEPROM_NOT_FOUND 0x00000080
 
// Parameter.GlobalConfig
#define FC_CFG_HOEHENREGELUNG 0x01
#define FC_CFG_HOEHEN_SCHALTER 0x02
#define FC_CFG_HEADING_HOLD 0x04
#define FC_CFG_KOMPASS_AKTIV 0x08
#define FC_CFG_KOMPASS_FIX 0x10
#define FC_CFG_GPS_AKTIV 0x20
#define FC_CFG_ACHSENKOPPLUNG_AKTIV 0x40
#define FC_CFG_DREHRATEN_BEGRENZER 0x80
#define FC_CFG_HOEHENREGELUNG 0x01
#define FC_CFG_HOEHEN_SCHALTER 0x02
#define FC_CFG_HEADING_HOLD 0x04
#define FC_CFG_KOMPASS_AKTIV 0x08
#define FC_CFG_KOMPASS_FIX 0x10
#define FC_CFG_GPS_AKTIV 0x20
#define FC_CFG_ACHSENKOPPLUNG_AKTIV 0x40
#define FC_CFG_DREHRATEN_BEGRENZER 0x80
 
//Parameter.ExtraConfig
#define CFG2_HEIGHT_LIMIT 0x01
#define CFG2_VARIO_BEEP 0x02
#define CFG_SENSITIVE_RC 0x04
#define CFG_3_3V_REFERENCE 0x08
#define CFG_NO_RCOFF_BEEPING 0x10
#define CFG_GPS_AID 0x20
#define CFG_TEACHABLE_CAREFREE 0x40
//Parameter.ExtraConfig
#define CFG2_HEIGHT_LIMIT 0x01
#define CFG2_VARIO_BEEP 0x02
#define CFG_SENSITIVE_RC 0x04
#define CFG_3_3V_REFERENCE 0x08
#define CFG_NO_RCOFF_BEEPING 0x10
#define CFG_GPS_AID 0x20
#define CFG_TEACHABLE_CAREFREE 0x40
#define CFG_IGNORE_MAG_ERR_AT_STARTUP 0x80
 
 
#define LIMIT_MIN(value, min) {if(value <= min) value = min;}
#define LIMIT_MAX(value, max) {if(value >= max) value = max;}
#define LIMIT_MIN_MAX(value, min, max) {if(value <= min) value = min; else if(value >= max) value = max;}
/trunk/spi_slave.c
56,6 → 56,7
// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
#include <string.h>
#include <math.h>
#include "91x_lib.h"
#include "led.h"
#include "gps.h"
107,7 → 108,7
u32 ToFC_AltitudeRate = 0;
s32 ToFC_AltitudeSetpoint = 0;
u8 FromFC_VarioCharacter = ' ';
u8 DisableFC_Sticks = 0;
u8 GPS_Aid_StickMultiplikator = 0;
u8 NC_GPS_ModeCharacter = ' ';
u8 FCCalibActive = 0;
u8 FC_is_Calibrated = 0;
309,7 → 310,7
ToFlightCtrl.Param.sByte[4] = (s8) ToFcGpsZ;
ToFlightCtrl.Param.Byte[5] = (s8) ToFC_Rotate_C;
ToFlightCtrl.Param.Byte[6] = (s8) ToFC_Rotate_S;
if(DisableFC_Sticks) ToFlightCtrl.Param.Byte[7] = FLAG_GPS_AID; else ToFlightCtrl.Param.Byte[7] = 0x00;
ToFlightCtrl.Param.Byte[7] = GPS_Aid_StickMultiplikator;
if(CAM_Orientation.UpdateMask & CAM_UPDATE_AZIMUTH)
{
ToFlightCtrl.Param.sInt[4] = CAM_Orientation.Azimuth;
/trunk/spi_slave.h
104,7 → 104,7
extern ToFlightCtrl_t ToFlightCtrl;
extern volatile u32 SPI0_Timeout;
extern SPI_Version_t FC_Version;
extern u8 DisableFC_Sticks;
extern u8 GPS_Aid_StickMultiplikator;
 
void SPI0_Init(void);
void SPI0_GetFlightCtrlVersion(void);