Skip to content

Fix warnings #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 7, 2021
Merged

Fix warnings #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 13 additions & 16 deletions src/SparkFun_Qwiic_KX13X.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,15 +603,14 @@ outputData QwiicKX132::getAccelData(){

uint8_t tempRegVal;
KX13X_STATUS_t returnError;
if( getRawAccelData(&rawAccelData) )
if( convAccelData(&userAccel, &rawAccelData) )
if( getRawAccelData(&rawAccelData) &&
convAccelData(&userAccel, &rawAccelData) )
return userAccel;
else {
userAccel.xData = 0xFF;
userAccel.yData = 0xFF;
userAccel.zData = 0xFF;
return userAccel;
}

userAccel.xData = 0xFF;
userAccel.yData = 0xFF;
userAccel.zData = 0xFF;
return userAccel;
}

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

uint8_t tempRegVal;
KX13X_STATUS_t returnError;
if( getRawAccelData(&rawAccelData) )
if( convAccelData(&userAccel, &rawAccelData) )
if( getRawAccelData(&rawAccelData) &&
convAccelData(&userAccel, &rawAccelData) )
return userAccel;
else {
userAccel.xData = 0xFF;
userAccel.yData = 0xFF;
userAccel.zData = 0xFF;
return userAccel;
}

userAccel.xData = 0xFF;
userAccel.yData = 0xFF;
userAccel.zData = 0xFF;
return userAccel;
}

// Converts acceleration data according to the set range value.
Expand Down