Skip to content

Commit 437cb80

Browse files
authored
Merge pull request #2 from truher/patch-2
Fix warnings
2 parents 0156c3a + 3c2ea94 commit 437cb80

File tree

1 file changed

+13
-16
lines changed

1 file changed

+13
-16
lines changed

src/SparkFun_Qwiic_KX13X.cpp

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -603,15 +603,14 @@ outputData QwiicKX132::getAccelData(){
603603

604604
uint8_t tempRegVal;
605605
KX13X_STATUS_t returnError;
606-
if( getRawAccelData(&rawAccelData) )
607-
if( convAccelData(&userAccel, &rawAccelData) )
606+
if( getRawAccelData(&rawAccelData) &&
607+
convAccelData(&userAccel, &rawAccelData) )
608608
return userAccel;
609-
else {
610-
userAccel.xData = 0xFF;
611-
userAccel.yData = 0xFF;
612-
userAccel.zData = 0xFF;
613-
return userAccel;
614-
}
609+
610+
userAccel.xData = 0xFF;
611+
userAccel.yData = 0xFF;
612+
userAccel.zData = 0xFF;
613+
return userAccel;
615614
}
616615

617616
// Converts acceleration data according to the set range value.
@@ -693,16 +692,14 @@ outputData QwiicKX134::getAccelData(){
693692

694693
uint8_t tempRegVal;
695694
KX13X_STATUS_t returnError;
696-
if( getRawAccelData(&rawAccelData) )
697-
if( convAccelData(&userAccel, &rawAccelData) )
695+
if( getRawAccelData(&rawAccelData) &&
696+
convAccelData(&userAccel, &rawAccelData) )
698697
return userAccel;
699-
else {
700-
userAccel.xData = 0xFF;
701-
userAccel.yData = 0xFF;
702-
userAccel.zData = 0xFF;
703-
return userAccel;
704-
}
705698

699+
userAccel.xData = 0xFF;
700+
userAccel.yData = 0xFF;
701+
userAccel.zData = 0xFF;
702+
return userAccel;
706703
}
707704

708705
// Converts acceleration data according to the set range value.

0 commit comments

Comments
 (0)