343,16 → 343,15 |
u8 i = 0, crc = MAG_CALIBRATION_COMPATIBLE; |
EEPROM_Result_t eres; |
u8 *pBuff = (u8*)&Calibration; |
Calibration.Version = CALIBRATION_VERSION + (NCMAG_Orientation<<4);; |
|
if (I2Cx == NCMAG_PORT_EXTERN) |
{ |
address = EEPROM_ADR_MAG_CALIBRATION_EXTERN; |
Calibration.Version = CALIBRATION_VERSION + (NCMAG_Orientation<<4);; |
} |
else if (I2Cx == NCMAG_PORT_INTERN) |
{ |
address = EEPROM_ADR_MAG_CALIBRATION_INTERN; |
Calibration.Version = CALIBRATION_VERSION; |
} |
else return(i); |
|
706,7 → 705,7 |
u8 TxBytes = 0; |
u8 CfgData[] = { REG_303D_CTRL0 | REG_MASK_AUTOINCREMENT, |
0, // Ctrl 0 -> Fifo |
LSM303D_ACC_RATE_6HZ, // Ctrl 1 -> ACC Update Speed |
LSM303D_ACC_RATE_50HZ, // Ctrl 1 -> ACC Update Speed |
LSM303D_ACC_SCALE_8g, // Ctrl 2 -> ACC Gain + Filter (0 = 773Hz) |
0, // Ctrl 3 -> Interrupts |
0, // Ctrl 4 -> Interrupts |
1196,12 → 1195,13 |
if(!retval) |
{ |
// search internal sensor afterwards |
UART1_PutString(" internal sensor"); |
if(UART_VersionInfo.HWMajor >= 30) UART1_PutString(" main I2C-Bus "); |
else UART1_PutString(" internal sensor "); |
Compass_I2CPort = NCMAG_PORT_INTERN; |
} |
else |
{ |
UART1_PutString(" external sensor"); |
UART1_PutString(" external sensor "); |
Compass_I2CPort = NCMAG_PORT_EXTERN; |
} |
//------------------------------------------- |