Subversion Repositories MK3Mag

Compare Revisions

Ignore whitespace Rev 29 → Rev 30

/branches/MK3Mag V0.14 Code Redesign Killagreg/main.c
72,24 → 72,24
 
uint16_t Led_Timer = 0;
 
struct Scaling_t
typedef struct
{
int16_t Range;
int16_t Offset;
} ;
} Scaling_t;
 
struct Calibration_t
typedef struct
{
struct Scaling_t MagX;
struct Scaling_t MagY;
struct Scaling_t MagZ;
struct Scaling_t AccX;
struct Scaling_t AccY;
struct Scaling_t AccZ;
};
Scaling_t MagX;
Scaling_t MagY;
Scaling_t MagZ;
Scaling_t AccX;
Scaling_t AccY;
Scaling_t AccZ;
} Calibration_t;
 
struct Calibration_t eeCalibration EEMEM; // calibration data in EEProm
struct Calibration_t Calibration; // calibration data in RAM
Calibration_t eeCalibration EEMEM; // calibration data in EEProm
Calibration_t Calibration; // calibration data in RAM
 
// magnet sensor variable
int16_t RawMagnet1a, RawMagnet1b; // raw magnet sensor data
455,7 → 455,7
if(NC_Connected) NC_Connected--;
if(FC_Connected) FC_Connected--;
// fall back to attitude estimation from acc sensor if NC or FC does'nt send attittude data
if(!NC_Connected && ! NC_Connected)
if(!FC_Connected && ! NC_Connected)
{
AttitudeSource = ATTITUDE_SOURCE_ACC;
Orientation = ORIENTATION_FC;