Subversion Repositories MK3Mag

Compare Revisions

Ignore whitespace Rev 70 → Rev 71

/trunk/main.c
87,7 → 87,7
Scaling_t AccX;
Scaling_t AccY;
Scaling_t AccZ;
unsigned char Version;
uint8_t Version;
} Calibration_t;
 
Calibration_t eeCalibration EEMEM; // calibration data in EEProm
107,8 → 107,8
 
int16_t Heading = -1; // the current compass heading in deg
int16_t ZeroHeading = 180;
unsigned char InternalCalstate = 0, ActualCalstate = 0;
signed char PotiToFC[12] = {0,0,0,0,0,0,0,0,0,0,0,0};
uint8_t InternalCalstate = 0, ActualCalstate = 0;
int8_t PotiToFC[12] = {0,0,0,0,0,0,0,0,0,0,0,0};
 
void CalcFields(void)
{
420,18 → 420,18
int16_t tmp0, tmp1, tmp2;
if(AccPresent)
{
tmp0 = AccAttitudeNick/4;
tmp1 = AccAttitudeRoll/4;
tmp2 = (360 + Heading - ZeroHeading) % 360;
tmp2 -= 180;
tmp2 *= 2;
if(tmp0 > 127) tmp0 = 127; else if(tmp0 < -127) tmp0 = -127;
if(tmp1 > 127) tmp1 = 127; else if(tmp1 < -127) tmp1 = -127;
if(tmp2 > 127) tmp2 = 127; else if(tmp2 < -127) tmp2 = -127;
PotiToFC[0] = (PotiToFC[0] + tmp0) / 2;
PotiToFC[1] = (PotiToFC[1] + tmp1) / 2;
PotiToFC[2] = (PotiToFC[2] + tmp2) / 2;
}
tmp0 = AccAttitudeNick/4;
tmp1 = AccAttitudeRoll/4;
tmp2 = (360 + Heading - ZeroHeading) % 360;
tmp2 -= 180;
tmp2 *= 2;
if(tmp0 > 127) tmp0 = 127; else if(tmp0 < -127) tmp0 = -127;
if(tmp1 > 127) tmp1 = 127; else if(tmp1 < -127) tmp1 = -127;
if(tmp2 > 127) tmp2 = 127; else if(tmp2 < -127) tmp2 = -127;
PotiToFC[0] = (PotiToFC[0] + tmp0) / 2;
PotiToFC[1] = (PotiToFC[1] + tmp1) / 2;
PotiToFC[2] = (PotiToFC[2] + tmp2) / 2;
}
}
#endif
 
/trunk/main.h
29,7 → 29,7
extern uint8_t InternalCalstate, ActualCalstate;
 
extern int16_t MagX, MagY, MagZ;
extern signed char PotiToFC[12];
extern int8_t PotiToFC[12];
void SetDebugValues(void);
 
#endif //_MAIN_H_