Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 891 → Rev 892

/branches/MicroMag3_Nick666/V0.69k/compass.c
63,7 → 63,7
else if (MM3.AXIS == MM3_Y) SPDR = MM3_PERIOD_512 + MM3_Y_AXIS; // Micromag Period Select ist 256 (0x30)
else SPDR = MM3_PERIOD_512 + MM3_Z_AXIS; //if (MM3.AXIS == MM3_Z)
MM3.DRDY = SetDelay(10); // Laut Datenblatt max. Zeit bis Messung fertig (bei PS 512 eigentlich 8 ms)
MM3.DRDY = SetDelay(8); // Laut Datenblatt max. Zeit bis Messung fertig
MM3.STATE = MM3_WAIT_DRDY;
return;
220,7 → 220,7
Hx = (((int32_t)(mm3_x_axis - MM3_calib.X_off)) *512) /MM3_calib.X_range;
Hy = (((int32_t)(mm3_y_axis - MM3_calib.Y_off)) *512) /MM3_calib.Y_range;
Hz = (((int32_t)(mm3_z_axis - MM3_calib.Z_off)) *512) /MM3_calib.Z_range;
 
// Neigungskompensierung
x_corr = Hx * cos_nick;
x_corr -= Hz * sin_nick;
/branches/MicroMag3_Nick666/V0.69k/compass.h
44,7 → 44,7
#define MM3_PERIOD_4096 0x70
 
// Spikes Filtern
#define Max_Axis_Value 500
#define Max_Axis_Value 512
 
// Die Werte der Statemachine
#define MM3_RESET 0
/branches/MicroMag3_Nick666/V0.69k/fc.c
1052,6 → 1052,7
DebugOut.Analog[0] = IntegralNick / EE_Parameter.GyroAccFaktor;
DebugOut.Analog[1] = IntegralRoll / EE_Parameter.GyroAccFaktor;
DebugOut.Analog[2] = Mittelwert_AccNick;
DebugOut.Analog[3] = Mittelwert_AccRoll;
DebugOut.Analog[4] = MesswertGier;
DebugOut.Analog[5] = HoehenWert;