Subversion Repositories NaviCtrl

Compare Revisions

Ignore whitespace Rev 394 → Rev 395

/trunk/ncmag.c
265,6 → 265,11
#define ACC_CRTL1_YEN 0x02
#define ACC_CRTL1_ZEN 0x04
 
#define ACC_CRTL2_FILTER8 0x00
#define ACC_CRTL2_FILTER16 0x01
#define ACC_CRTL2_FILTER32 0x02
#define ACC_CRTL2_FILTER64 0x03
 
#define ACC_CTRL4_BDU 0x80 // Block data update, (0: continuos update; 1: output registers not updated between MSB and LSB reading)
#define ACC_CTRL4_BLE 0x40 // Big/little endian, (0: data LSB @ lower address; 1: data MSB @ lower address)
#define ACC_CTRL4_FS_2G 0x00
503,6 → 508,7
DebugOut.Analog[16] = AccRawVector.X;
DebugOut.Analog[17] = AccRawVector.Y;
DebugOut.Analog[18] = AccRawVector.Z;
DebugOut.Analog[19] = (DebugOut.Analog[19] * 3 + AccRawVector.Z) / 4;
}
// rx data handler for reading magnetic sensor configuration
void NCMAG_UpdateMagConfig(u8* pRxBuffer, u8 RxBufferSize)
709,13 → 715,14
return(NCMAG_SetMagConfig());
}
 
 
//----------------------------------------------------------------
u8 NCMAG_Init_ACCSensor(void)
{
AccConfig.ctrl_1 = ACC_CRTL1_PM_NORMAL|ACC_CRTL1_DR_400HZ|ACC_CRTL1_XEN|ACC_CRTL1_YEN|ACC_CRTL1_ZEN;
AccConfig.ctrl_2 = 0x00;
AccConfig.ctrl_1 = ACC_CRTL1_PM_NORMAL|ACC_CRTL1_DR_50HZ|ACC_CRTL1_XEN|ACC_CRTL1_YEN|ACC_CRTL1_ZEN;
AccConfig.ctrl_2 = ACC_CRTL2_FILTER64;
AccConfig.ctrl_3 = 0x00;
AccConfig.ctrl_4 = ACC_CTRL4_BDU|ACC_CTRL4_FS_2G;
AccConfig.ctrl_4 = ACC_CTRL4_BDU|ACC_CTRL4_FS_8G;
AccConfig.ctrl_5 = ACC_CTRL5_STW_OFF;
return(NCMAG_SetAccConfig());
}