Skip to content

Commit b1c88c8

Browse files
authored
Merge pull request #6 from deddy11/start_CTRL9_XL
Review from register CTRL9_XL
2 parents 4e9c85b + 169a829 commit b1c88c8

File tree

3 files changed

+689
-125
lines changed

3 files changed

+689
-125
lines changed

src/ISM330DLCSensor.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1516,14 +1516,14 @@ ISM330DLCStatusTypeDef ISM330DLCSensor::Enable_Double_Tap_Detection(ISM330DLC_In
15161516
switch (int_pin)
15171517
{
15181518
case ISM330DLC_INT1_PIN:
1519-
if ( ISM330DLC_ACC_GYRO_W_TapEvOnInt1( (void *)this, ISM330DLC_ACC_GYRO_INT1_TAP_ENABLED ) == MEMS_ERROR )
1519+
if ( ISM330DLC_ACC_GYRO_W_TapEvOnInt1( (void *)this, ISM330DLC_ACC_GYRO_INT1_DOUBLE_TAP_ENABLED ) == MEMS_ERROR )
15201520
{
15211521
return ISM330DLC_STATUS_ERROR;
15221522
}
15231523
break;
15241524

15251525
case ISM330DLC_INT2_PIN:
1526-
if ( ISM330DLC_ACC_GYRO_W_TapEvOnInt2( (void *)this, ISM330DLC_ACC_GYRO_INT2_TAP_ENABLED ) == MEMS_ERROR )
1526+
if ( ISM330DLC_ACC_GYRO_W_TapEvOnInt2( (void *)this, ISM330DLC_ACC_GYRO_INT2_DOUBLE_TAP_ENABLED ) == MEMS_ERROR )
15271527
{
15281528
return ISM330DLC_STATUS_ERROR;
15291529
}
@@ -1543,13 +1543,13 @@ ISM330DLCStatusTypeDef ISM330DLCSensor::Enable_Double_Tap_Detection(ISM330DLC_In
15431543
ISM330DLCStatusTypeDef ISM330DLCSensor::Disable_Double_Tap_Detection(void)
15441544
{
15451545
/* Disable double tap interrupt on INT1 pin. */
1546-
if ( ISM330DLC_ACC_GYRO_W_TapEvOnInt1( (void *)this, ISM330DLC_ACC_GYRO_INT1_TAP_DISABLED ) == MEMS_ERROR )
1546+
if ( ISM330DLC_ACC_GYRO_W_TapEvOnInt1( (void *)this, ISM330DLC_ACC_GYRO_INT1_DOUBLE_TAP_DISABLED ) == MEMS_ERROR )
15471547
{
15481548
return ISM330DLC_STATUS_ERROR;
15491549
}
15501550

15511551
/* Disable double tap interrupt on INT2 pin. */
1552-
if ( ISM330DLC_ACC_GYRO_W_TapEvOnInt2( (void *)this, ISM330DLC_ACC_GYRO_INT2_TAP_DISABLED ) == MEMS_ERROR )
1552+
if ( ISM330DLC_ACC_GYRO_W_TapEvOnInt2( (void *)this, ISM330DLC_ACC_GYRO_INT2_DOUBLE_TAP_DISABLED ) == MEMS_ERROR )
15531553
{
15541554
return ISM330DLC_STATUS_ERROR;
15551555
}
@@ -1970,7 +1970,7 @@ ISM330DLCStatusTypeDef ISM330DLCSensor::Get_Event_Status( ISM330DLC_Event_Status
19701970
return ISM330DLC_STATUS_ERROR;
19711971
}
19721972

1973-
if(ReadReg(ISM330DLC_ACC_GYRO_FUNC_SRC, &Func_Src ) == ISM330DLC_STATUS_ERROR )
1973+
if(ReadReg(ISM330DLC_ACC_GYRO_FUNC_SRC1, &Func_Src ) == ISM330DLC_STATUS_ERROR )
19741974
{
19751975
return ISM330DLC_STATUS_ERROR;
19761976
}
@@ -2014,7 +2014,7 @@ ISM330DLCStatusTypeDef ISM330DLCSensor::Get_Event_Status( ISM330DLC_Event_Status
20142014
}
20152015
}
20162016

2017-
if((Md1_Cfg & ISM330DLC_ACC_GYRO_INT1_TAP_MASK) || (Md2_Cfg & ISM330DLC_ACC_GYRO_INT2_TAP_MASK))
2017+
if((Md1_Cfg & ISM330DLC_ACC_GYRO_INT1_DOUBLE_TAP_MASK) || (Md2_Cfg & ISM330DLC_ACC_GYRO_INT2_DOUBLE_TAP_MASK))
20182018
{
20192019
if((Tap_Src & ISM330DLC_ACC_GYRO_DOUBLE_TAP_EV_STATUS_MASK))
20202020
{

0 commit comments

Comments
 (0)