Skip to content

Commit 6cde8c5

Browse files
edsparkedspark
committed
Fixes all syntatical errors
1 parent eeaea80 commit 6cde8c5

File tree

2 files changed

+43
-39
lines changed

2 files changed

+43
-39
lines changed

‎src/SparkFun_Qwiic_KX13X.cpp

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -78,21 +78,21 @@ bool QwDevKX13X::initialize(uint8_t settings)
7878
if( settings == INT_SETTINGS )
7979
{
8080
enablePhysInterrupt();
81-
routeHardwareInterrupt(HI_DATA_READY);
82-
retVal = writeRegisterRegion(SFE_KX13X_CNTL1, INT_SETTINGS);
81+
routeHardwareInterrupt(0x10);
82+
retVal = writeRegisterByte(SFE_KX13X_CNTL1, INT_SETTINGS);
8383
}
8484

8585
if( settings == SOFT_INT_SETTINGS )
86-
retVal = writeRegisterRegion(SFE_KX13X_CNTL1, INT_SETTINGS);
86+
retVal = writeRegisterByte(SFE_KX13X_CNTL1, INT_SETTINGS);
8787

8888

8989
if( settings == BUFFER_SETTINGS )
9090
{
9191
enablePhysInterrupt();
92-
routeHardwareInterrupt(HI_BUFFER_FULL);
93-
enableSampleBuffer();
94-
setBufferOperationMode(BUFFER_MODE_FIFO, BUFFER_16BIT_SAMPLES);
95-
retVal = writeRegisterRegion(SFE_KX13X_CNTL1, INT_SETTINGS);
92+
routeHardwareInterrupt(0x40);//Buffer full interrupt
93+
enableSampleBuffer(); //Enable buffer
94+
setBufferOperationMode(0x00); //FIFO
95+
retVal = writeRegisterByte(SFE_KX13X_CNTL1, INT_SETTINGS);
9696
}
9797

9898

@@ -145,7 +145,8 @@ uint8_t QwDevKX13X::getOperatingMode(){
145145
// Possible KX132 arguments: 0x00 (2g), 0x01 (4g), 0x02 (8g), 0x03 (16g)
146146
// Possible KX134 arguments: 0x00 (8g), 0x01 (16g), 0x02 (32g), 0x03 (64g)
147147
// KX13X needs to be set into standby mode to change this value
148-
bool QwDevKX13X::setRange(uint8_t range){
148+
bool QwDevKX13X::setRange(uint8_t range)
149+
{
149150

150151
int retVal;
151152

@@ -161,7 +162,7 @@ bool QwDevKX13X::setRange(uint8_t range){
161162

162163
}
163164

164-
bool QwDevKX13X::enableDataEngine();
165+
bool QwDevKX13X::enableDataEngine()
165166
{
166167
int retVal;
167168
uint8_t tempVal;
@@ -181,7 +182,7 @@ bool QwDevKX13X::enableDataEngine();
181182
return true;
182183
}
183184

184-
bool QwDevKX13X::enableTapEngine();
185+
bool QwDevKX13X::enableTapEngine()
185186
{
186187
int retVal;
187188
uint8_t tempVal;
@@ -201,7 +202,7 @@ bool QwDevKX13X::enableTapEngine();
201202
return true;
202203
}
203204

204-
bool QwDevKX13X::enableTiltEngine();
205+
bool QwDevKX13X::enableTiltEngine()
205206
{
206207
int retVal;
207208
uint8_t tempVal;
@@ -255,7 +256,7 @@ float QwDevKX13X::getOutputDataRate()
255256
int retVal;
256257
uint8_t tempVal;
257258

258-
retVal = readRegisterRegion(SFE_KX13X_ODCNTL, &tempVal);
259+
retVal = readRegisterRegion(SFE_KX13X_ODCNTL, &tempVal, 1);
259260

260261
if( retVal != 0 )
261262
return 0.0;
@@ -295,7 +296,7 @@ bool QwDevKX13X::enablePhysInterrupt(bool enable)
295296

296297
tempVal = tempVal | (enable << 6);
297298

298-
retVal = writRegisterByte(SFE_KX13X_INC1, tempVal);
299+
retVal = writeRegisterByte(SFE_KX13X_INC1, tempVal);
299300

300301
if( retVal != 0 )
301302
return false;
@@ -315,7 +316,7 @@ bool QwDevKX13X::setPinMode(bool activeLow)
315316

316317
tempVal = tempVal | (activeLow << 5);
317318

318-
retVal = writRegisterByte(SFE_KX13X_INC1, tempVal);
319+
retVal = writeRegisterByte(SFE_KX13X_INC1, tempVal);
319320

320321
if( retVal != 0 )
321322
return false;
@@ -335,7 +336,7 @@ bool QwDevKX13X::setLatchControl(bool pulse)
335336

336337
tempVal = tempVal | (pulse << 4);
337338

338-
retVal = writRegisterByte(SFE_KX13X_INC1, tempVal);
339+
retVal = writeRegisterByte(SFE_KX13X_INC1, tempVal);
339340

340341
if( retVal != 0 )
341342
return false;
@@ -358,7 +359,7 @@ bool QwDevKX13X::setPulseWidth(uint8_t width)
358359

359360
tempVal = tempVal | (width << 6);
360361

361-
retVal = writRegisterByte(SFE_KX13X_INC1, tempVal);
362+
retVal = writeRegisterByte(SFE_KX13X_INC1, tempVal);
362363

363364
if( retVal != 0 )
364365
return false;
@@ -389,7 +390,7 @@ bool QwDevKX13X::routeHardwareInterrupt(uint8_t rdr, uint8_t pin)
389390

390391
if( pin == 2 )
391392
{
392-
retVal = writeRegisterByte(KX13X_INC6, rdr);
393+
retVal = writeRegisterByte(SFE_KX13X_INC6, rdr);
393394

394395
if( retVal != 0 )
395396
return true;
@@ -425,7 +426,7 @@ bool QwDevKX13X::dataTrigger()
425426
int retVal;
426427
uint8_t tempVal;
427428

428-
retVal = readRegisterRegion(SFE_KX13X_INS2, &tempVal);
429+
retVal = readRegisterRegion(SFE_KX13X_INS2, &tempVal, 1);
429430

430431
if( retVal != 0 )
431432
return false;
@@ -466,7 +467,7 @@ bool QwDevKX13X::setBufferThreshold(uint8_t threshold)
466467
if( retVal != 0 )
467468
return true;
468469

469-
return false
470+
return false;
470471

471472
}
472473

@@ -490,7 +491,7 @@ bool QwDevKX13X::setBufferOperationMode(uint8_t operationMode)
490491

491492
tempVal = tempVal | operationMode;
492493

493-
retVal = writeRegisterRegion(SFE_KX13X_BUF_CNTL2, tempVal, 1);
494+
retVal = writeRegisterByte(SFE_KX13X_BUF_CNTL2, tempVal);
494495

495496
if( retVal != 0 )
496497
return false;
@@ -661,19 +662,19 @@ bool QwDevKX13X::getRawAccelData(rawOutputData *rawAccelData){
661662
}
662663

663664

664-
int QwDevKX13X::readRegisterRegion(uint8_t reg, uint8_t *value, uint8_t len)
665+
int QwDevKX13X::readRegisterRegion(uint8_t reg, uint8_t *data, uint16_t len)
665666
{
666-
return _sfeBus->readRegisterRegion(_i2cAddress, reg, *value, len);
667+
return (int)_sfeBus->readRegisterRegion(_i2cAddress, reg, data, len);
667668
}
668669

669-
int QwDevKX13X::writeRegisterRegion(uint8_t reg, uint8_t *value, uint8_t len)
670+
int QwDevKX13X::writeRegisterRegion(uint8_t reg, uint8_t *data, uint16_t len)
670671
{
671-
return _sfeBus->writeRegisterRegion(_i2cAddress, reg, *value, len);
672+
return (int)_sfeBus->writeRegisterRegion(_i2cAddress, reg, data, len);
672673
}
673674

674675
int QwDevKX13X::writeRegisterByte(uint8_t reg, uint8_t value)
675676
{
676-
return _sfeBus->writeRegisterByte(_i2cAddress, reg, value);
677+
return (int)_sfeBus->writeRegisterByte(_i2cAddress, reg, value);
677678
}
678679

679680

@@ -682,14 +683,12 @@ int QwDevKX13X::writeRegisterByte(uint8_t reg, uint8_t value)
682683
//******************************************************************************************
683684
//******************************************************************************************
684685

685-
// Constructor
686-
QwiicKX132::QwiicKX132() { }
687686

688687
// Uses the beginCore function to check that the part ID from the "who am I"
689688
// register matches the correct value. Uses I2C for data transfer.
690689
bool QwDevKX132::init(void)
691690
{
692-
if( !_sfebus->ping(_i2cAddress) )
691+
if( !_sfeBus->ping(_i2cAddress) )
693692
return false;
694693

695694
if( getUniqueID() != KX132_WHO_AM_I )
@@ -700,7 +699,7 @@ bool QwDevKX132::init(void)
700699

701700
// Grabs raw accel data and passes it to the following function to be
702701
// converted.
703-
bool QwiicKX132::getAccelData(outputData *userData){
702+
bool QwDevKX132::getAccelData(outputData *userData){
704703

705704
bool retVal;
706705

@@ -709,7 +708,7 @@ bool QwiicKX132::getAccelData(outputData *userData){
709708
if( !retVal )
710709
return false;
711710

712-
retVal = convAccelData(&userData, &rawAccelData);
711+
retVal = convAccelData(userData, &rawAccelData);
713712

714713
if( !retVal )
715714
return false;
@@ -718,7 +717,7 @@ bool QwiicKX132::getAccelData(outputData *userData){
718717
}
719718

720719
// Converts acceleration data according to the set range value.
721-
bool QwiicKX132::convAccelData(outputData *userAccel, rawOutputData *rawAccelData){
720+
bool QwDevKX132::convAccelData(outputData *userAccel, rawOutputData *rawAccelData){
722721

723722
uint8_t regVal;
724723
uint8_t range;
@@ -766,12 +765,11 @@ bool QwiicKX132::convAccelData(outputData *userAccel, rawOutputData *rawAccelDat
766765
//******************************************************************************************
767766

768767
//Constructor
769-
QwiicKX134::QwiicKX134() { }
770768

771769

772770
bool QwDevKX134::init(void)
773771
{
774-
if( !_sfebus->ping(_i2cAddress) )
772+
if( !_sfeBus->ping(_i2cAddress) )
775773
return false;
776774

777775
if( getUniqueID() != KX132_WHO_AM_I )
@@ -780,7 +778,8 @@ bool QwDevKX134::init(void)
780778
return true;
781779
}
782780

783-
bool QwiicKX134::getAccelData(outputData *userData){
781+
bool QwDevKX134::getAccelData(outputData *userData)
782+
{
784783

785784
bool retVal;
786785

@@ -789,15 +788,16 @@ bool QwiicKX134::getAccelData(outputData *userData){
789788
if( !retVal )
790789
return false;
791790

792-
retVal = convAccelData(&userData, &rawAccelData);
791+
retVal = convAccelData(userData, &rawAccelData);
793792

794793
if( !retVal )
795794
return false;
796795

797796
return true;
798797
}
799798

800-
bool QwiicKX134::convAccelData(outputData *userAccel, rawOutputData *rawAccelData){
799+
bool QwDevKX134::convAccelData(outputData *userAccel, rawOutputData *rawAccelData)
800+
{
801801

802802
uint8_t regVal;
803803
uint8_t range;

‎src/SparkFun_Qwiic_KX13X.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class QwDevKX13X
8484
// data Array to store data in
8585
// length Size of data in bytes (8 bits): 2 bytes = length of two
8686
// retval -1 = error, 0 = success
87-
int32_t writeRegisterRegion(uint8_t reg, uint8_t *data, uint16_t length);
87+
int writeRegisterRegion(uint8_t reg, uint8_t *data, uint16_t length);
8888

8989
//////////////////////////////////////////////////////////////////////////////////
9090
// writeRegisterByte()
@@ -96,7 +96,7 @@ class QwDevKX13X
9696
// data Array to store data in
9797
// retval -1 = error, 0 = success
9898
//
99-
int32_t writeRegisterByte(uint8_t reg, uint8_t data);
99+
int writeRegisterByte(uint8_t reg, uint8_t data);
100100

101101
//////////////////////////////////////////////////////////////////////////////////
102102
// readRegisterRegion()
@@ -109,7 +109,7 @@ class QwDevKX13X
109109
// length Length of the data to read
110110
// retval -1 = error, 0 = success
111111

112-
int32_t readRegisterRegion(uint8_t reg, uint8_t *data, uint16_t length);
112+
int readRegisterRegion(uint8_t reg, uint8_t *data, uint16_t length);
113113

114114
//////////////////////////////////////////////////////////////////////////////////
115115
// setCommunicationBus()
@@ -178,6 +178,8 @@ class QwDevKX132 : public QwDevKX13X
178178
{
179179
public:
180180

181+
QwDevKX132() {};
182+
181183
bool init(void);
182184
bool getAccelData(outputData *userData);
183185
bool convAccelData(outputData *userAccel, rawOutputData *rawAccelData);
@@ -195,6 +197,8 @@ class QwDevKX134 : public QwDevKX13X
195197
{
196198
public:
197199

200+
QwDevKX134() {};
201+
198202
bool init(void);
199203
bool getAccelData(outputData *userData);
200204
bool convAccelData(outputData *userAccel, rawOutputData *rawAccelData);

0 commit comments

Comments
 (0)