From 3c2ea94e26c31597887c7cc9a3b5ef9d2835d392 Mon Sep 17 00:00:00 2001
From: truher <joel@truher.org>
Date: Tue, 29 Jun 2021 21:33:00 -0700
Subject: [PATCH] Fix warnings

In member function 'outputData QwiicKX132::getAccelData()':
warning: control reaches end of non-void function [-Wreturn-type]

In member function 'outputData QwiicKX134::getAccelData()':
warning: control reaches end of non-void function [-Wreturn-type]
---
 src/SparkFun_Qwiic_KX13X.cpp | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/SparkFun_Qwiic_KX13X.cpp b/src/SparkFun_Qwiic_KX13X.cpp
index 335ec88..b3937f6 100644
--- a/src/SparkFun_Qwiic_KX13X.cpp
+++ b/src/SparkFun_Qwiic_KX13X.cpp
@@ -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. 
@@ -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.